Title: [143744] trunk/Source/WebCore
- Revision
- 143744
- Author
- allan.jen...@digia.com
- Date
- 2013-02-22 09:53:07 -0800 (Fri, 22 Feb 2013)
Log Message
Multiple Layout Test crashes (ASSERT) on chromium linux debug after r143727
https://bugs.webkit.org/show_bug.cgi?id=110609
Reviewed by Antonio Gomes.
Revert r128869. InnerNode may now again be from a child document,
and should be handled and not asserted against.
* dom/Document.cpp:
(WebCore::Document::updateHoverActiveState):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (143743 => 143744)
--- trunk/Source/WebCore/ChangeLog 2013-02-22 17:47:51 UTC (rev 143743)
+++ trunk/Source/WebCore/ChangeLog 2013-02-22 17:53:07 UTC (rev 143744)
@@ -1,3 +1,16 @@
+2013-02-22 Allan Sandfeld Jensen <allan.jen...@digia.com>
+
+ Multiple Layout Test crashes (ASSERT) on chromium linux debug after r143727
+ https://bugs.webkit.org/show_bug.cgi?id=110609
+
+ Reviewed by Antonio Gomes.
+
+ Revert r128869. InnerNode may now again be from a child document,
+ and should be handled and not asserted against.
+
+ * dom/Document.cpp:
+ (WebCore::Document::updateHoverActiveState):
+
2013-02-22 Andreas Kling <akl...@apple.com>
Element: Make updateName/updateId/updateLabel private.
Modified: trunk/Source/WebCore/dom/Document.cpp (143743 => 143744)
--- trunk/Source/WebCore/dom/Document.cpp 2013-02-22 17:47:51 UTC (rev 143743)
+++ trunk/Source/WebCore/dom/Document.cpp 2013-02-22 17:53:07 UTC (rev 143744)
@@ -5804,7 +5804,8 @@
return;
Element* innerElementInDocument = result.innerElement();
- ASSERT(!innerElementInDocument || innerElementInDocument->document() == this);
+ while (innerNodeInDocument && innerNodeInDocument->document() != this)
+ innerNodeInDocument = innerNodeInDocument->document()->ownerElement();
Element* oldActiveElement = activeElement();
if (oldActiveElement && !request.active()) {
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
