Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / net / proxy / proxy_resolver_v8.cc

diff --git a/src/net/proxy/proxy_resolver_v8.cc b/src/net/proxy/proxy_resolver_v8.cc
index 37f31bf..24fbe9e 100644 (file)
--- a/src/net/proxy/proxy_resolver_v8.cc
+++ b/src/net/proxy/proxy_resolver_v8.cc
@@ -93,13 +93,11 @@ class V8ExternalStringFromScriptData
       const scoped_refptr<ProxyResolverScriptData>& script_data)
       : script_data_(script_data) {}
 
-  virtual const uint16_t* data() const OVERRIDE {
+  const uint16_t* data() const override {
     return reinterpret_cast<const uint16*>(script_data_->utf16().data());
   }
 
-  virtual size_t length() const OVERRIDE {
-    return script_data_->utf16().size();
-  }
+  size_t length() const override { return script_data_->utf16().size(); }
 
  private:
   const scoped_refptr<ProxyResolverScriptData> script_data_;
@@ -107,7 +105,8 @@ class V8ExternalStringFromScriptData
 };
 
 // External string wrapper so V8 can access a string literal.
-class V8ExternalASCIILiteral : public v8::String::ExternalAsciiStringResource {
+class V8ExternalASCIILiteral
+    : public v8::String::ExternalOneByteStringResource {
  public:
   // |ascii| must be a NULL-terminated C string, and must remain valid
   // throughout this object's lifetime.
@@ -116,13 +115,9 @@ class V8ExternalASCIILiteral : public v8::String::ExternalAsciiStringResource {
     DCHECK(base::IsStringASCII(ascii));
   }
 
-  virtual const char* data() const OVERRIDE {
-    return ascii_;
-  }
+  const char* data() const override { return ascii_; }
 
-  virtual size_t length() const OVERRIDE {
-    return length_;
-  }
+  size_t length() const override { return length_; }
 
  private:
   const char* ascii_;
@@ -138,7 +133,7 @@ class V8ExternalASCIILiteral : public v8::String::ExternalAsciiStringResource {
 const size_t kMaxStringBytesForCopy = 256;
 
 // Converts a V8 String to a UTF8 std::string.
-std::string V8StringToUTF8(v8::Handle<v8::String> s) {
+std::string V8StringToUTF8(v8::Local<v8::String> s) {
   int len = s->Length();
   std::string result;
   if (len > 0)
@@ -147,7 +142,7 @@ std::string V8StringToUTF8(v8::Handle<v8::String> s) {
 }
 
 // Converts a V8 String to a UTF16 base::string16.
-base::string16 V8StringToUTF16(v8::Handle<v8::String> s) {
+base::string16 V8StringToUTF16(v8::Local<v8::String> s) {
   int len = s->Length();
   base::string16 result;
   // Note that the reinterpret cast is because on Windows string16 is an alias
@@ -194,7 +189,7 @@ v8::Local<v8::String> ASCIILiteralToV8String(v8::Isolate* isolate,
 
 // Stringizes a V8 object by calling its toString() method. Returns true
 // on success. This may fail if the toString() throws an exception.
-bool V8ObjectToUTF16String(v8::Handle<v8::Value> object,
+bool V8ObjectToUTF16String(v8::Local<v8::Value> object,
                            base::string16* utf16_result,
                            v8::Isolate* isolate) {
   if (object.IsEmpty())
@@ -378,7 +373,7 @@ class ProxyResolverV8::Context {
       return ERR_PAC_SCRIPT_FAILED;
     }
 
-    v8::Handle<v8::Value> argv[] = {
+    v8::Local<v8::Value> argv[] = {
       ASCIIStringToV8String(isolate_, query_url.spec()),
       ASCIIStringToV8String(isolate_, query_url.HostNoBrackets()),
     };
@@ -517,7 +512,7 @@ class ProxyResolverV8::Context {
   }
 
   // Handle an exception thrown by V8.
-  void HandleError(v8::Handle<v8::Message> message) {
+  void HandleError(v8::Local<v8::Message> message) {
     base::string16 error_message;
     int line_number = -1;
 
@@ -531,7 +526,7 @@ class ProxyResolverV8::Context {
 
   // Compiles and runs |script| in the current V8 context.
   // Returns OK on success, otherwise an error code.
-  int RunScript(v8::Handle<v8::String> script, const char* script_name) {
+  int RunScript(v8::Local<v8::String> script, const char* script_name) {
     v8::TryCatch try_catch;
 
     // Compile the script.