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

Side by Side Diff: third_party/WebKit/Source/web/WebLocalFrameImpl.h

Issue 2628053003: Remove extension group from DOMWrapperWorld. (Closed)
Patch Set: Fix GCCallbackTest Created 3 years, 11 months 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2009 Google Inc. All rights reserved. 2 * Copyright (C) 2009 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
100 WebRect visibleContentRect() const override; 100 WebRect visibleContentRect() const override;
101 bool hasHorizontalScrollbar() const override; 101 bool hasHorizontalScrollbar() const override;
102 bool hasVerticalScrollbar() const override; 102 bool hasVerticalScrollbar() const override;
103 WebView* view() const override; 103 WebView* view() const override;
104 WebDocument document() const override; 104 WebDocument document() const override;
105 WebPerformance performance() const override; 105 WebPerformance performance() const override;
106 void dispatchUnloadEvent() override; 106 void dispatchUnloadEvent() override;
107 void executeScript(const WebScriptSource&) override; 107 void executeScript(const WebScriptSource&) override;
108 void executeScriptInIsolatedWorld(int worldID, 108 void executeScriptInIsolatedWorld(int worldID,
109 const WebScriptSource* sources, 109 const WebScriptSource* sources,
110 unsigned numSources, 110 unsigned numSources) override;
111 int extensionGroup) override;
112 void setIsolatedWorldSecurityOrigin(int worldID, 111 void setIsolatedWorldSecurityOrigin(int worldID,
113 const WebSecurityOrigin&) override; 112 const WebSecurityOrigin&) override;
114 void setIsolatedWorldContentSecurityPolicy(int worldID, 113 void setIsolatedWorldContentSecurityPolicy(int worldID,
115 const WebString&) override; 114 const WebString&) override;
116 void setIsolatedWorldHumanReadableName(int worldID, 115 void setIsolatedWorldHumanReadableName(int worldID,
117 const WebString&) override; 116 const WebString&) override;
118 void addMessageToConsole(const WebConsoleMessage&) override; 117 void addMessageToConsole(const WebConsoleMessage&) override;
119 void collectGarbage() override; 118 void collectGarbage() override;
120 v8::Local<v8::Value> executeScriptAndReturnValue( 119 v8::Local<v8::Value> executeScriptAndReturnValue(
121 const WebScriptSource&) override; 120 const WebScriptSource&) override;
122 void requestExecuteScriptAndReturnValue(const WebScriptSource&, 121 void requestExecuteScriptAndReturnValue(const WebScriptSource&,
123 bool userGesture, 122 bool userGesture,
124 WebScriptExecutionCallback*) override; 123 WebScriptExecutionCallback*) override;
125 void requestExecuteV8Function(v8::Local<v8::Context>, 124 void requestExecuteV8Function(v8::Local<v8::Context>,
126 v8::Local<v8::Function>, 125 v8::Local<v8::Function>,
127 v8::Local<v8::Value> receiver, 126 v8::Local<v8::Value> receiver,
128 int argc, 127 int argc,
129 v8::Local<v8::Value> argv[], 128 v8::Local<v8::Value> argv[],
130 WebScriptExecutionCallback*) override; 129 WebScriptExecutionCallback*) override;
131 void executeScriptInIsolatedWorld( 130 void executeScriptInIsolatedWorld(
132 int worldID, 131 int worldID,
133 const WebScriptSource* sourcesIn, 132 const WebScriptSource* sourcesIn,
134 unsigned numSources, 133 unsigned numSources,
135 int extensionGroup,
136 WebVector<v8::Local<v8::Value>>* results) override; 134 WebVector<v8::Local<v8::Value>>* results) override;
137 void requestExecuteScriptInIsolatedWorld( 135 void requestExecuteScriptInIsolatedWorld(
138 int worldID, 136 int worldID,
139 const WebScriptSource* sourceIn, 137 const WebScriptSource* sourceIn,
140 unsigned numSources, 138 unsigned numSources,
141 int extensionGroup,
142 bool userGesture, 139 bool userGesture,
143 WebScriptExecutionCallback*) override; 140 WebScriptExecutionCallback*) override;
144 v8::Local<v8::Value> callFunctionEvenIfScriptDisabled( 141 v8::Local<v8::Value> callFunctionEvenIfScriptDisabled(
145 v8::Local<v8::Function>, 142 v8::Local<v8::Function>,
146 v8::Local<v8::Value>, 143 v8::Local<v8::Value>,
147 int argc, 144 int argc,
148 v8::Local<v8::Value> argv[]) override; 145 v8::Local<v8::Value> argv[]) override;
149 v8::Local<v8::Context> mainWorldScriptContext() const override; 146 v8::Local<v8::Context> mainWorldScriptContext() const override;
150 void reload(WebFrameLoadType) override; 147 void reload(WebFrameLoadType) override;
151 void reloadWithOverrideURL(const WebURL& overrideUrl, 148 void reloadWithOverrideURL(const WebURL& overrideUrl,
(...skipping 328 matching lines...) Expand 10 before | Expand all | Expand 10 after
480 477
481 DEFINE_TYPE_CASTS(WebLocalFrameImpl, 478 DEFINE_TYPE_CASTS(WebLocalFrameImpl,
482 WebFrame, 479 WebFrame,
483 frame, 480 frame,
484 frame->isWebLocalFrame(), 481 frame->isWebLocalFrame(),
485 frame.isWebLocalFrame()); 482 frame.isWebLocalFrame());
486 483
487 } // namespace blink 484 } // namespace blink
488 485
489 #endif 486 #endif
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/web/SuspendableScriptExecutor.cpp ('k') | third_party/WebKit/Source/web/WebLocalFrameImpl.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698