Title: [218538] releases/WebKitGTK/webkit-2.16/Source/WebCore
- Revision
- 218538
- Author
- [email protected]
- Date
- 2017-06-19 23:24:41 -0700 (Mon, 19 Jun 2017)
Log Message
Merge r217441 - ASSERTION FAILED: !needsStyleRecalc() || !document().childNeedsStyleRecalc()
https://bugs.webkit.org/show_bug.cgi?id=172576
<rdar://problem/32181979>
Reviewed by Brent Fulgham.
Ensure that we clean the subframe's document before start searching for a focusable element.
Covered by existing test.
* page/FocusController.cpp:
(WebCore::FocusController::findFocusableElementDescendingDownIntoFrameDocument):
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.16/Source/WebCore/ChangeLog (218537 => 218538)
--- releases/WebKitGTK/webkit-2.16/Source/WebCore/ChangeLog 2017-06-20 06:23:34 UTC (rev 218537)
+++ releases/WebKitGTK/webkit-2.16/Source/WebCore/ChangeLog 2017-06-20 06:24:41 UTC (rev 218538)
@@ -1,3 +1,18 @@
+2017-05-25 Zalan Bujtas <[email protected]>
+
+ ASSERTION FAILED: !needsStyleRecalc() || !document().childNeedsStyleRecalc()
+ https://bugs.webkit.org/show_bug.cgi?id=172576
+ <rdar://problem/32181979>
+
+ Reviewed by Brent Fulgham.
+
+ Ensure that we clean the subframe's document before start searching for a focusable element.
+
+ Covered by existing test.
+
+ * page/FocusController.cpp:
+ (WebCore::FocusController::findFocusableElementDescendingDownIntoFrameDocument):
+
2017-05-24 Jiewen Tan <[email protected]>
Crash on WebCore::FrameSelection::setSelectionWithoutUpdatingAppearance + 1195
Modified: releases/WebKitGTK/webkit-2.16/Source/WebCore/page/FocusController.cpp (218537 => 218538)
--- releases/WebKitGTK/webkit-2.16/Source/WebCore/page/FocusController.cpp 2017-06-20 06:23:34 UTC (rev 218537)
+++ releases/WebKitGTK/webkit-2.16/Source/WebCore/page/FocusController.cpp 2017-06-20 06:24:41 UTC (rev 218538)
@@ -378,8 +378,9 @@
// 2) the deepest-nested HTMLFrameOwnerElement.
while (is<HTMLFrameOwnerElement>(element)) {
HTMLFrameOwnerElement& owner = downcast<HTMLFrameOwnerElement>(*element);
- if (!owner.contentFrame())
+ if (!owner.contentFrame() || !owner.contentFrame()->document())
break;
+ owner.contentFrame()->document()->updateLayoutIgnorePendingStylesheets();
Element* foundElement = findFocusableElementWithinScope(direction, FocusNavigationScope::scopeOwnedByIFrame(owner), nullptr, event);
if (!foundElement)
break;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
