Title: [95457] trunk/Source/WebKit/chromium
- Revision
- 95457
- Author
- [email protected]
- Date
- 2011-09-19 12:44:18 -0700 (Mon, 19 Sep 2011)
Log Message
r95385 broke Chromium. Fix it.
https://bugs.webkit.org/show_bug.cgi?id=68378
Unreviewed, build fix.
* src/FrameLoaderClientImpl.cpp:
(WebKit::FrameLoaderClientImpl::didCreateScriptContext):
(WebKit::FrameLoaderClientImpl::willReleaseScriptContext):
Modified Paths
Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (95456 => 95457)
--- trunk/Source/WebKit/chromium/ChangeLog 2011-09-19 19:38:32 UTC (rev 95456)
+++ trunk/Source/WebKit/chromium/ChangeLog 2011-09-19 19:44:18 UTC (rev 95457)
@@ -1,3 +1,14 @@
+2011-09-19 Aaron Boodman <[email protected]>
+
+ r95385 broke Chromium. Fix it.
+ https://bugs.webkit.org/show_bug.cgi?id=68378
+
+ Unreviewed, build fix.
+
+ * src/FrameLoaderClientImpl.cpp:
+ (WebKit::FrameLoaderClientImpl::didCreateScriptContext):
+ (WebKit::FrameLoaderClientImpl::willReleaseScriptContext):
+
2011-09-19 Jochen Eisinger <[email protected]>
Unreviewed, build fix
Modified: trunk/Source/WebKit/chromium/src/FrameLoaderClientImpl.cpp (95456 => 95457)
--- trunk/Source/WebKit/chromium/src/FrameLoaderClientImpl.cpp 2011-09-19 19:38:32 UTC (rev 95456)
+++ trunk/Source/WebKit/chromium/src/FrameLoaderClientImpl.cpp 2011-09-19 19:44:18 UTC (rev 95457)
@@ -143,14 +143,26 @@
#if USE(V8)
void FrameLoaderClientImpl::didCreateScriptContext(v8::Handle<v8::Context> context, int worldId)
{
- if (m_webFrame->client())
+ if (m_webFrame->client()) {
+ // FIXME: Remove these once Chromium is updated to use the new version of didCreateScriptContext().
+ if (worldId)
+ m_webFrame->client()->didCreateScriptContext(m_webFrame);
+ else
+ m_webFrame->client()->didCreateIsolatedScriptContext(m_webFrame, worldId, context);
+
m_webFrame->client()->didCreateScriptContext(m_webFrame, context, worldId);
+ }
}
void FrameLoaderClientImpl::willReleaseScriptContext(v8::Handle<v8::Context> context, int worldId)
{
- if (m_webFrame->client())
+ if (m_webFrame->client()) {
+ // FIXME: Remove this once Chromium is updated to use willReleaseScriptContext().
+ if (worldId)
+ m_webFrame->client()->didDestroyScriptContext(m_webFrame);
+
m_webFrame->client()->willReleaseScriptContext(m_webFrame, context, worldId);
+ }
}
#endif
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
