Title: [111235] trunk/Source/WebKit2
- Revision
- 111235
- Author
- [email protected]
- Date
- 2012-03-19 13:41:59 -0700 (Mon, 19 Mar 2012)
Log Message
Make WebFrameLoaderClient::createFrame more like WebKit1 version.
https://bugs.webkit.org/show_bug.cgi?id=81550
Covered by existing tests.
Reviewed by Jessie Berlin.
* WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp: (WebKit::WebFrameLoaderClient::createFrame):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (111234 => 111235)
--- trunk/Source/WebKit2/ChangeLog 2012-03-19 20:39:15 UTC (rev 111234)
+++ trunk/Source/WebKit2/ChangeLog 2012-03-19 20:41:59 UTC (rev 111235)
@@ -1,3 +1,14 @@
+2012-03-19 Alexey Proskuryakov <[email protected]>
+
+ Make WebFrameLoaderClient::createFrame more like WebKit1 version.
+ https://bugs.webkit.org/show_bug.cgi?id=81550
+
+ Covered by existing tests.
+
+ Reviewed by Jessie Berlin.
+
+ * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp: (WebKit::WebFrameLoaderClient::createFrame):
+
2012-03-19 Anders Carlsson <[email protected]>
Find in page highlights get out of place when scrolling
Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp (111234 => 111235)
--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp 2012-03-19 20:39:15 UTC (rev 111234)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp 2012-03-19 20:41:59 UTC (rev 111235)
@@ -1245,6 +1245,9 @@
m_frame->coreFrame()->loader()->loadURLIntoChildFrame(url, referrer, coreSubframe);
// The frame's onload handler may have removed it from the document.
+ if (!subframe->coreFrame())
+ return 0;
+ ASSERT(subframe->coreFrame() == coreSubframe);
if (!coreSubframe->tree()->parent())
return 0;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
