Skip to content

Commit

Permalink
Rename v8::ExternalAsciiStringResource to v8::ExternalOneByteStringRe…
Browse files Browse the repository at this point in the history
…source.

The former is a deprecated alias for the latter and will be removed soon.

TBR=eroman@chromium.org
BUG=none

Review URL: https://codereview.chromium.org/640413003

Cr-Commit-Position: refs/heads/master@{#299661}
  • Loading branch information
hashseed authored and Commit bot committed Oct 15, 2014
1 parent 755aaca commit 0d0c476
Show file tree
Hide file tree
Showing 8 changed files with 43 additions and 40 deletions.
4 changes: 2 additions & 2 deletions extensions/extensions.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
4 changes: 2 additions & 2 deletions extensions/renderer/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
4 changes: 2 additions & 2 deletions extensions/renderer/resource_bundle_source_map.cc
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,10 @@ bool ResourceBundleSourceMap::Contains(const std::string& name) {
v8::Handle<v8::String> 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
2 changes: 1 addition & 1 deletion extensions/renderer/resource_bundle_source_map.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
25 changes: 0 additions & 25 deletions extensions/renderer/static_v8_external_ascii_string_resource.cc

This file was deleted.

26 changes: 26 additions & 0 deletions extensions/renderer/static_v8_external_one_byte_string_resource.cc
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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;
Expand All @@ -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_
3 changes: 2 additions & 1 deletion net/proxy/proxy_resolver_v8.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down

0 comments on commit 0d0c476

Please sign in to comment.