Title: [175007] branches/safari-600.2-branch/Source/WebKit2
Diff
Modified: branches/safari-600.2-branch/Source/WebKit2/ChangeLog (175006 => 175007)
--- branches/safari-600.2-branch/Source/WebKit2/ChangeLog 2014-10-22 00:53:39 UTC (rev 175006)
+++ branches/safari-600.2-branch/Source/WebKit2/ChangeLog 2014-10-22 01:17:38 UTC (rev 175007)
@@ -1,3 +1,21 @@
+2014-10-21 Dana Burkart <[email protected]>
+
+ Merge r172968
+
+ 2014-08-26 Simon Fraser <[email protected]>
+
+ Crashes in hit testing under WebPage::determinePrimarySnapshottedPlugIn()
+ https://bugs.webkit.org/show_bug.cgi?id=136240
+ rdar://problem/17231462
+
+ Reviewed by Darin Adler.
+
+ determinePrimarySnapshottedPlugIn() does render tree hit testing, so needs
+ to ensure that layout is up-to-date.
+
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::determinePrimarySnapshottedPlugIn):
+
2014-09-13 Babak Shafiei <[email protected]>
Merge r173595
Modified: branches/safari-600.2-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (175006 => 175007)
--- branches/safari-600.2-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-10-22 00:53:39 UTC (rev 175006)
+++ branches/safari-600.2-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-10-22 01:17:38 UTC (rev 175007)
@@ -4549,6 +4549,8 @@
++m_numberOfPrimarySnapshotDetectionAttempts;
+ layoutIfNeeded();
+
MainFrame& mainFrame = corePage()->mainFrame();
if (!mainFrame.view())
return;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
