summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
Diffstat (limited to 'chrome')
-rw-r--r--chrome/renderer/render_view.cc24
-rw-r--r--chrome/renderer/render_view.h6
2 files changed, 15 insertions, 15 deletions
diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc
index a6c8cb5..b0e5ba0 100644
--- a/chrome/renderer/render_view.cc
+++ b/chrome/renderer/render_view.cc
@@ -1186,18 +1186,6 @@ void RenderView::BindDOMAutomationController(WebFrame* frame) {
L"domAutomationController");
}
-void RenderView::DidCreateScriptContextForFrame(WebFrame* webframe) {
- EventBindings::HandleContextCreated(webframe, false);
-}
-
-void RenderView::DidDestroyScriptContextForFrame(WebFrame* webframe) {
- EventBindings::HandleContextDestroyed(webframe);
-}
-
-void RenderView::DidCreateIsolatedScriptContext(WebFrame* webframe) {
- EventBindings::HandleContextCreated(webframe, true);
-}
-
bool RenderView::RunJavaScriptMessage(int type,
const std::wstring& message,
const std::wstring& default_value,
@@ -2327,6 +2315,18 @@ void RenderView::didExhaustMemoryAvailableForScript(WebFrame* frame) {
Send(new ViewHostMsg_JSOutOfMemory(routing_id_));
}
+void RenderView::didCreateScriptContext(WebFrame* frame) {
+ EventBindings::HandleContextCreated(frame, false);
+}
+
+void RenderView::didDestroyScriptContext(WebFrame* frame) {
+ EventBindings::HandleContextDestroyed(frame);
+}
+
+void RenderView::didCreateIsolatedScriptContext(WebFrame* frame) {
+ EventBindings::HandleContextCreated(frame, true);
+}
+
void RenderView::didChangeContentsSize(WebFrame* frame, const WebSize& size) {
// We don't always want to send the change messages over IPC, only if we've
// be put in that mode by getting a |ViewMsg_EnableIntrinsicWidthChangedMode|
diff --git a/chrome/renderer/render_view.h b/chrome/renderer/render_view.h
index 42237b8..e11a8e1 100644
--- a/chrome/renderer/render_view.h
+++ b/chrome/renderer/render_view.h
@@ -169,9 +169,6 @@ class RenderView : public RenderWidget,
const WebKit::WebURLError& error,
const std::string& html,
bool replace);
- virtual void DidCreateScriptContextForFrame(WebKit::WebFrame* webframe);
- virtual void DidDestroyScriptContextForFrame(WebKit::WebFrame* webframe);
- virtual void DidCreateIsolatedScriptContext(WebKit::WebFrame* webframe);
virtual void OnMissingPluginStatus(
WebPluginDelegateProxy* delegate,
int status);
@@ -349,6 +346,9 @@ class RenderView : public RenderWidget,
virtual void didRunInsecureContent(
WebKit::WebFrame* frame, const WebKit::WebSecurityOrigin& origin);
virtual void didExhaustMemoryAvailableForScript(WebKit::WebFrame* frame);
+ virtual void didCreateScriptContext(WebKit::WebFrame* frame);
+ virtual void didDestroyScriptContext(WebKit::WebFrame* frame);
+ virtual void didCreateIsolatedScriptContext(WebKit::WebFrame* frame);
virtual void didChangeContentsSize(
WebKit::WebFrame* frame, const WebKit::WebSize& size);
virtual void reportFindInPageMatchCount(