diff --git a/extensions/extensions.gyp b/extensions/extensions.gyp index 1e51f2d72da6ea..ee0a40ddb27f72 100644 --- a/extensions/extensions.gyp +++ b/extensions/extensions.gyp @@ -930,8 +930,8 @@ 'renderer/send_request_natives.h', 'renderer/set_icon_natives.cc', 'renderer/set_icon_natives.h', - 'renderer/static_v8_external_ascii_string_resource.cc', - 'renderer/static_v8_external_ascii_string_resource.h', + 'renderer/static_v8_external_one_byte_string_resource.cc', + 'renderer/static_v8_external_one_byte_string_resource.h', 'renderer/test_features_native_handler.cc', 'renderer/test_features_native_handler.h', 'renderer/user_gestures_native_handler.cc', diff --git a/extensions/renderer/BUILD.gn b/extensions/renderer/BUILD.gn index 01577ea2bd2e6c..ded00cf0b5a5a0 100644 --- a/extensions/renderer/BUILD.gn +++ b/extensions/renderer/BUILD.gn @@ -132,8 +132,8 @@ source_set("renderer") { "send_request_natives.h", "set_icon_natives.cc", "set_icon_natives.h", - "static_v8_external_ascii_string_resource.cc", - "static_v8_external_ascii_string_resource.h", + "static_v8_external_one_byte_string_resource.cc", + "static_v8_external_one_byte_string_resource.h", "test_features_native_handler.cc", "test_features_native_handler.h", "user_gestures_native_handler.cc", diff --git a/extensions/renderer/resource_bundle_source_map.cc b/extensions/renderer/resource_bundle_source_map.cc index 954a6d73acb8c7..9b0a85adbbfb0b 100644 --- a/extensions/renderer/resource_bundle_source_map.cc +++ b/extensions/renderer/resource_bundle_source_map.cc @@ -38,10 +38,10 @@ bool ResourceBundleSourceMap::Contains(const std::string& name) { v8::Handle ResourceBundleSourceMap::ConvertString( v8::Isolate* isolate, const base::StringPiece& string) { - // v8 takes ownership of the StaticV8ExternalAsciiStringResource (see + // v8 takes ownership of the StaticV8ExternalOneByteStringResource (see // v8::String::NewExternal()). return v8::String::NewExternal( - isolate, new StaticV8ExternalAsciiStringResource(string)); + isolate, new StaticV8ExternalOneByteStringResource(string)); } } // namespace extensions diff --git a/extensions/renderer/resource_bundle_source_map.h b/extensions/renderer/resource_bundle_source_map.h index 1e088cdd0031be..84a5411964ccf8 100644 --- a/extensions/renderer/resource_bundle_source_map.h +++ b/extensions/renderer/resource_bundle_source_map.h @@ -12,7 +12,7 @@ #include "base/memory/linked_ptr.h" #include "base/strings/string_piece.h" #include "extensions/renderer/module_system.h" -#include "extensions/renderer/static_v8_external_ascii_string_resource.h" +#include "extensions/renderer/static_v8_external_one_byte_string_resource.h" #include "v8/include/v8.h" namespace ui { diff --git a/extensions/renderer/static_v8_external_ascii_string_resource.cc b/extensions/renderer/static_v8_external_ascii_string_resource.cc deleted file mode 100644 index 5d64d2ede4a685..00000000000000 --- a/extensions/renderer/static_v8_external_ascii_string_resource.cc +++ /dev/null @@ -1,25 +0,0 @@ -// Copyright 2014 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#include "extensions/renderer/static_v8_external_ascii_string_resource.h" - -namespace extensions { - -StaticV8ExternalAsciiStringResource::StaticV8ExternalAsciiStringResource( - const base::StringPiece& buffer) - : buffer_(buffer) { -} - -StaticV8ExternalAsciiStringResource::~StaticV8ExternalAsciiStringResource() { -} - -const char* StaticV8ExternalAsciiStringResource::data() const { - return buffer_.data(); -} - -size_t StaticV8ExternalAsciiStringResource::length() const { - return buffer_.length(); -} - -} // namespace extensions diff --git a/extensions/renderer/static_v8_external_one_byte_string_resource.cc b/extensions/renderer/static_v8_external_one_byte_string_resource.cc new file mode 100644 index 00000000000000..3f54b5ddfb57df --- /dev/null +++ b/extensions/renderer/static_v8_external_one_byte_string_resource.cc @@ -0,0 +1,26 @@ +// Copyright 2014 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "extensions/renderer/static_v8_external_one_byte_string_resource.h" + +namespace extensions { + +StaticV8ExternalOneByteStringResource::StaticV8ExternalOneByteStringResource( + const base::StringPiece& buffer) + : buffer_(buffer) { +} + +StaticV8ExternalOneByteStringResource:: + ~StaticV8ExternalOneByteStringResource() { +} + +const char* StaticV8ExternalOneByteStringResource::data() const { + return buffer_.data(); +} + +size_t StaticV8ExternalOneByteStringResource::length() const { + return buffer_.length(); +} + +} // namespace extensions diff --git a/extensions/renderer/static_v8_external_ascii_string_resource.h b/extensions/renderer/static_v8_external_one_byte_string_resource.h similarity index 58% rename from extensions/renderer/static_v8_external_ascii_string_resource.h rename to extensions/renderer/static_v8_external_one_byte_string_resource.h index 850f36d6d48ab8..97923b88fbe7ca 100644 --- a/extensions/renderer/static_v8_external_ascii_string_resource.h +++ b/extensions/renderer/static_v8_external_one_byte_string_resource.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef EXTENSIONS_RENDERER_STATIC_V8_EXTERNAL_ASCII_STRING_RESOURCE_H_ -#define EXTENSIONS_RENDERER_STATIC_V8_EXTERNAL_ASCII_STRING_RESOURCE_H_ +#ifndef EXTENSIONS_RENDERER_STATIC_V8_EXTERNAL_ONE_BYTE_STRING_RESOURCE_H_ +#define EXTENSIONS_RENDERER_STATIC_V8_EXTERNAL_ONE_BYTE_STRING_RESOURCE_H_ #include "base/compiler_specific.h" #include "base/strings/string_piece.h" @@ -14,11 +14,12 @@ namespace extensions { // A very simple implementation of v8::ExternalAsciiStringResource that just // wraps a buffer. The buffer must outlive the v8 runtime instance this resource // is used in. -class StaticV8ExternalAsciiStringResource - : public v8::String::ExternalAsciiStringResource { +class StaticV8ExternalOneByteStringResource + : public v8::String::ExternalOneByteStringResource { public: - explicit StaticV8ExternalAsciiStringResource(const base::StringPiece& buffer); - virtual ~StaticV8ExternalAsciiStringResource(); + explicit StaticV8ExternalOneByteStringResource( + const base::StringPiece& buffer); + virtual ~StaticV8ExternalOneByteStringResource(); virtual const char* data() const override; virtual size_t length() const override; @@ -29,4 +30,4 @@ class StaticV8ExternalAsciiStringResource } // namespace extensions -#endif // EXTENSIONS_RENDERER_STATIC_V8_EXTERNAL_ASCII_STRING_RESOURCE_H_ +#endif // EXTENSIONS_RENDERER_STATIC_V8_EXTERNAL_ONE_BYTE_STRING_RESOURCE_H_ diff --git a/net/proxy/proxy_resolver_v8.cc b/net/proxy/proxy_resolver_v8.cc index 26f3e718909463..dc224cdac2dfdf 100644 --- a/net/proxy/proxy_resolver_v8.cc +++ b/net/proxy/proxy_resolver_v8.cc @@ -107,7 +107,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.