Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(29)

Side by Side Diff: chrome/renderer/extensions/chrome_v8_extension.cc

Issue 8277020: Stop copying extension bindings scripts. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Removed orphaned variable. Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/renderer/extensions/chrome_v8_extension.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/renderer/extensions/chrome_v8_extension.h" 5 #include "chrome/renderer/extensions/chrome_v8_extension.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/lazy_instance.h" 8 #include "base/lazy_instance.h"
9 #include "base/stringprintf.h" 9 #include "base/stringprintf.h"
10 #include "base/string_util.h" 10 #include "base/string_util.h"
(...skipping 13 matching lines...) Expand all
24 using WebKit::WebView; 24 using WebKit::WebView;
25 25
26 namespace { 26 namespace {
27 27
28 const char kChromeHidden[] = "chromeHidden"; 28 const char kChromeHidden[] = "chromeHidden";
29 29
30 #ifndef NDEBUG 30 #ifndef NDEBUG
31 const char kValidateCallbacks[] = "validateCallbacks"; 31 const char kValidateCallbacks[] = "validateCallbacks";
32 #endif 32 #endif
33 33
34 typedef std::map<int, std::string> StringMap;
35 static base::LazyInstance<StringMap> g_string_map = LAZY_INSTANCE_INITIALIZER;
36
37 static base::LazyInstance<ChromeV8Extension::InstanceSet> g_instances = 34 static base::LazyInstance<ChromeV8Extension::InstanceSet> g_instances =
38 LAZY_INSTANCE_INITIALIZER; 35 LAZY_INSTANCE_INITIALIZER;
39 36
40 } // namespace 37 } // namespace
41 38
42 39
43 // static 40 // static
44 const char* ChromeV8Extension::GetStringResource(int resource_id) { 41 base::StringPiece ChromeV8Extension::GetStringResource(int resource_id) {
45 StringMap* strings = g_string_map.Pointer(); 42 return ResourceBundle::GetSharedInstance().GetRawDataResource(resource_id);
46 StringMap::iterator it = strings->find(resource_id);
47 if (it == strings->end()) {
48 it = strings->insert(std::make_pair(
49 resource_id,
50 ResourceBundle::GetSharedInstance().GetRawDataResource(
51 resource_id).as_string())).first;
52 }
53 return it->second.c_str();
54 } 43 }
55 44
56 // static 45 // static
57 content::RenderView* ChromeV8Extension::GetCurrentRenderView() { 46 content::RenderView* ChromeV8Extension::GetCurrentRenderView() {
58 WebFrame* webframe = WebFrame::frameForCurrentContext(); 47 WebFrame* webframe = WebFrame::frameForCurrentContext();
59 DCHECK(webframe) << "RetrieveCurrentFrame called when not in a V8 context."; 48 DCHECK(webframe) << "RetrieveCurrentFrame called when not in a V8 context.";
60 if (!webframe) 49 if (!webframe)
61 return NULL; 50 return NULL;
62 51
63 WebView* webview = webframe->view(); 52 WebView* webview = webframe->view();
64 if (!webview) 53 if (!webview)
65 return NULL; // can happen during closing 54 return NULL; // can happen during closing
66 55
67 content::RenderView* renderview = content::RenderView::FromWebView(webview); 56 content::RenderView* renderview = content::RenderView::FromWebView(webview);
68 DCHECK(renderview) << "Encountered a WebView without a WebViewDelegate"; 57 DCHECK(renderview) << "Encountered a WebView without a WebViewDelegate";
69 return renderview; 58 return renderview;
70 } 59 }
71 60
72 ChromeV8Extension::ChromeV8Extension(const char* name, int resource_id, 61 ChromeV8Extension::ChromeV8Extension(const char* name, int resource_id,
73 ExtensionDispatcher* extension_dispatcher) 62 ExtensionDispatcher* extension_dispatcher)
74 : v8::Extension(name, 63 : v8::Extension(name,
75 GetStringResource(resource_id), 64 GetStringResource(resource_id).data(),
76 0, // num dependencies 65 0, // num dependencies
77 NULL), // dependencies array 66 NULL, // dependencies array
67 GetStringResource(resource_id).size()), // source length
78 extension_dispatcher_(extension_dispatcher) { 68 extension_dispatcher_(extension_dispatcher) {
79 g_instances.Get().insert(this); 69 g_instances.Get().insert(this);
80 } 70 }
81 71
82 ChromeV8Extension::ChromeV8Extension(const char* name, int resource_id, 72 ChromeV8Extension::ChromeV8Extension(const char* name, int resource_id,
83 int dependency_count, 73 int dependency_count,
84 const char** dependencies, 74 const char** dependencies,
85 ExtensionDispatcher* extension_dispatcher) 75 ExtensionDispatcher* extension_dispatcher)
86 : v8::Extension(name, 76 : v8::Extension(name,
87 GetStringResource(resource_id), 77 GetStringResource(resource_id).data(),
88 dependency_count, 78 dependency_count,
89 dependencies), 79 dependencies,
80 GetStringResource(resource_id).size()),
90 extension_dispatcher_(extension_dispatcher) { 81 extension_dispatcher_(extension_dispatcher) {
91 g_instances.Get().insert(this); 82 g_instances.Get().insert(this);
92 } 83 }
93 84
94 ChromeV8Extension::~ChromeV8Extension() { 85 ChromeV8Extension::~ChromeV8Extension() {
95 g_instances.Get().erase(this); 86 g_instances.Get().erase(this);
96 } 87 }
97 88
98 // static 89 // static
99 const ChromeV8Extension::InstanceSet& ChromeV8Extension::GetAll() { 90 const ChromeV8Extension::InstanceSet& ChromeV8Extension::GetAll() {
(...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after
236 if (args.Length() < 1) 227 if (args.Length() < 1)
237 return v8::Undefined(); 228 return v8::Undefined();
238 229
239 std::vector<std::string> components; 230 std::vector<std::string> components;
240 for (int i = 0; i < args.Length(); ++i) 231 for (int i = 0; i < args.Length(); ++i)
241 components.push_back(*v8::String::Utf8Value(args[i]->ToString())); 232 components.push_back(*v8::String::Utf8Value(args[i]->ToString()));
242 233
243 LOG(ERROR) << JoinString(components, ','); 234 LOG(ERROR) << JoinString(components, ',');
244 return v8::Undefined(); 235 return v8::Undefined();
245 } 236 }
OLDNEW
« no previous file with comments | « chrome/renderer/extensions/chrome_v8_extension.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698