Title: [95669] trunk/Source/WebKit/chromium
- Revision
- 95669
- Author
- [email protected]
- Date
- 2011-09-21 14:21:47 -0700 (Wed, 21 Sep 2011)
Log Message
Remove old and busted context notification APIs
https://bugs.webkit.org/show_bug.cgi?id=68381
Reviewed by David Levin.
* public/WebFrameClient.h:
* src/FrameLoaderClientImpl.cpp:
(WebKit::FrameLoaderClientImpl::didCreateScriptContext):
(WebKit::FrameLoaderClientImpl::willReleaseScriptContext):
Modified Paths
Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (95668 => 95669)
--- trunk/Source/WebKit/chromium/ChangeLog 2011-09-21 20:39:08 UTC (rev 95668)
+++ trunk/Source/WebKit/chromium/ChangeLog 2011-09-21 21:21:47 UTC (rev 95669)
@@ -1,3 +1,15 @@
+2011-09-21 Aaron Boodman <[email protected]>
+
+ Remove old and busted context notification APIs
+ https://bugs.webkit.org/show_bug.cgi?id=68381
+
+ Reviewed by David Levin.
+
+ * public/WebFrameClient.h:
+ * src/FrameLoaderClientImpl.cpp:
+ (WebKit::FrameLoaderClientImpl::didCreateScriptContext):
+ (WebKit::FrameLoaderClientImpl::willReleaseScriptContext):
+
2011-09-21 Xianzhu Wang <[email protected]>
Ensure TestWebKitAPI works on mac, win, chromium-mac and chromium-linux
Modified: trunk/Source/WebKit/chromium/public/WebFrameClient.h (95668 => 95669)
--- trunk/Source/WebKit/chromium/public/WebFrameClient.h 2011-09-21 20:39:08 UTC (rev 95668)
+++ trunk/Source/WebKit/chromium/public/WebFrameClient.h 2011-09-21 21:21:47 UTC (rev 95669)
@@ -295,27 +295,12 @@
// Script in the page tried to allocate too much memory.
virtual void didExhaustMemoryAvailableForScript(WebFrame*) { }
+#if WEBKIT_USING_V8
// Notifies that a new script context has been created for this frame.
// This is similar to didClearWindowObject but only called once per
// frame context.
- // FIXME: Remove this when Chromium is updated to use the below version.
- virtual void didCreateScriptContext(WebFrame*) { }
-#if WEBKIT_USING_V8
virtual void didCreateScriptContext(WebFrame*, v8::Handle<v8::Context>, int worldId) { }
-#endif
- // Notifies that a garbage-collected context was created - content
- // scripts.
- // FIXME: Remove this when Chromium is updated to use didCreateScriptContext().
-#if WEBKIT_USING_V8
- virtual void didCreateIsolatedScriptContext(WebFrame*, int worldID, v8::Handle<v8::Context>) { }
-#endif
-
- // Notifies that this frame's script context has been destroyed.
- // FIXME: Remove this when Chromium is updated to use the below version.
- virtual void didDestroyScriptContext(WebFrame*) { }
-
-#if WEBKIT_USING_V8
// WebKit is about to release its reference to a v8 context for a frame.
virtual void willReleaseScriptContext(WebFrame*, v8::Handle<v8::Context>, int worldId) { }
#endif
Modified: trunk/Source/WebKit/chromium/src/FrameLoaderClientImpl.cpp (95668 => 95669)
--- trunk/Source/WebKit/chromium/src/FrameLoaderClientImpl.cpp 2011-09-21 20:39:08 UTC (rev 95668)
+++ trunk/Source/WebKit/chromium/src/FrameLoaderClientImpl.cpp 2011-09-21 21:21:47 UTC (rev 95669)
@@ -143,26 +143,14 @@
#if USE(V8)
void FrameLoaderClientImpl::didCreateScriptContext(v8::Handle<v8::Context> context, int worldId)
{
- if (m_webFrame->client()) {
- // FIXME: Remove these once Chromium is updated to use the new version of didCreateScriptContext().
- if (worldId)
- m_webFrame->client()->didCreateIsolatedScriptContext(m_webFrame, worldId, context);
- else
- m_webFrame->client()->didCreateScriptContext(m_webFrame);
-
+ if (m_webFrame->client())
m_webFrame->client()->didCreateScriptContext(m_webFrame, context, worldId);
- }
}
void FrameLoaderClientImpl::willReleaseScriptContext(v8::Handle<v8::Context> context, int worldId)
{
- if (m_webFrame->client()) {
- // FIXME: Remove this once Chromium is updated to use willReleaseScriptContext().
- if (!worldId)
- m_webFrame->client()->didDestroyScriptContext(m_webFrame);
-
+ if (m_webFrame->client())
m_webFrame->client()->willReleaseScriptContext(m_webFrame, context, worldId);
- }
}
#endif
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
