From 4c59809d91bef5c7ce54748fc35189cc62657f66 Mon Sep 17 00:00:00 2001 From: "aa@chromium.org" Date: Fri, 16 Sep 2011 00:46:40 +0000 Subject: Use a v8 external string resource for the extension api json. BUG=95147 Review URL: http://codereview.chromium.org/7904026 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@101424 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/chrome_renderer.gypi | 2 ++ .../extensions/extension_process_bindings.cc | 7 ++++- .../renderer/static_v8_external_string_resource.cc | 18 ++++++++++++ .../renderer/static_v8_external_string_resource.h | 32 ++++++++++++++++++++++ 4 files changed, 58 insertions(+), 1 deletion(-) create mode 100644 chrome/renderer/static_v8_external_string_resource.cc create mode 100644 chrome/renderer/static_v8_external_string_resource.h diff --git a/chrome/chrome_renderer.gypi b/chrome/chrome_renderer.gypi index 70cd207..5119c5f 100644 --- a/chrome/chrome_renderer.gypi +++ b/chrome/chrome_renderer.gypi @@ -175,6 +175,8 @@ 'renderer/spellchecker/spellcheck.h', 'renderer/spellchecker/spellcheck_worditerator.cc', 'renderer/spellchecker/spellcheck_worditerator.h', + 'renderer/static_v8_external_string_resource.cc', + 'renderer/static_v8_external_string_resource.h', 'renderer/translate_helper.cc', 'renderer/translate_helper.h', 'renderer/visitedlink_slave.cc', diff --git a/chrome/renderer/extensions/extension_process_bindings.cc b/chrome/renderer/extensions/extension_process_bindings.cc index b746186..5efb997 100644 --- a/chrome/renderer/extensions/extension_process_bindings.cc +++ b/chrome/renderer/extensions/extension_process_bindings.cc @@ -31,6 +31,7 @@ #include "chrome/renderer/extensions/js_only_v8_extensions.h" #include "chrome/renderer/extensions/renderer_extension_bindings.h" #include "chrome/renderer/extensions/user_script_slave.h" +#include "chrome/renderer/static_v8_external_string_resource.h" #include "content/renderer/render_view.h" #include "content/renderer/render_view_visitor.h" #include "grit/common_resources.h" @@ -40,6 +41,7 @@ #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" #include "third_party/skia/include/core/SkBitmap.h" #include "third_party/skia/include/core/SkColor.h" +#include "ui/base/resource/resource_bundle.h" #include "v8/include/v8.h" #include "webkit/glue/webkit_glue.h" @@ -189,7 +191,10 @@ class ExtensionImpl : public ExtensionBase { private: static v8::Handle GetExtensionAPIDefinition( const v8::Arguments& args) { - return v8::String::New(GetStringResource(IDR_EXTENSION_API_JSON)); + return v8::String::NewExternal( + new StaticV8ExternalAsciiStringResource( + ResourceBundle::GetSharedInstance().GetRawDataResource( + IDR_EXTENSION_API_JSON))); } static v8::Handle GetExtensionViews(const v8::Arguments& args) { diff --git a/chrome/renderer/static_v8_external_string_resource.cc b/chrome/renderer/static_v8_external_string_resource.cc new file mode 100644 index 0000000..6a0b5b4 --- /dev/null +++ b/chrome/renderer/static_v8_external_string_resource.cc @@ -0,0 +1,18 @@ +// Copyright (c) 2011 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 "chrome/renderer/static_v8_external_string_resource.h" + +StaticV8ExternalAsciiStringResource::StaticV8ExternalAsciiStringResource( + const base::StringPiece& buffer) + : buffer_(buffer) { +} + +const char* StaticV8ExternalAsciiStringResource::data() const { + return buffer_.data(); +} + +size_t StaticV8ExternalAsciiStringResource::length() const { + return buffer_.length(); +} diff --git a/chrome/renderer/static_v8_external_string_resource.h b/chrome/renderer/static_v8_external_string_resource.h new file mode 100644 index 0000000..7a72b79 --- /dev/null +++ b/chrome/renderer/static_v8_external_string_resource.h @@ -0,0 +1,32 @@ +// Copyright (c) 2011 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. + +#ifndef CHROME_RENDERER_EXTENSIONS_STATIC_V8_EXTERNAL_STRING_RESOURCE_H_ +#define CHROME_RENDERER_EXTENSIONS_STATIC_V8_EXTERNAL_STRING_RESOURCE_H_ +#pragma once + +#include "base/compiler_specific.h" +#include "base/string_piece.h" +#include "v8/include/v8.h" + +namespace base { +class StringPiece; +} + +// 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 { + public: + explicit StaticV8ExternalAsciiStringResource(const base::StringPiece& buffer); + + virtual const char* data() const OVERRIDE; + virtual size_t length() const OVERRIDE; + + private: + base::StringPiece buffer_; +}; + +#endif // CHROME_RENDERER_EXTENSIONS_STATIC_V8_EXTERNAL_STRING_RESOURCE_H_ -- cgit v1.1