Title: [143730] trunk/Source/WebCore
- Revision
- 143730
- Author
- [email protected]
- Date
- 2013-02-22 08:12:40 -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.
Point based hit tests should not append but assign HitTestResults.
* rendering/RenderFrameBase.cpp:
(WebCore::RenderFrameBase::nodeAtPoint):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (143729 => 143730)
--- trunk/Source/WebCore/ChangeLog 2013-02-22 15:54:12 UTC (rev 143729)
+++ trunk/Source/WebCore/ChangeLog 2013-02-22 16:12:40 UTC (rev 143730)
@@ -1,3 +1,15 @@
+2013-02-22 Allan Sandfeld Jensen <[email protected]>
+
+ Multiple Layout Test crashes (ASSERT) on chromium linux debug after r143727
+ https://bugs.webkit.org/show_bug.cgi?id=110609
+
+ Reviewed by Antonio Gomes.
+
+ Point based hit tests should not append but assign HitTestResults.
+
+ * rendering/RenderFrameBase.cpp:
+ (WebCore::RenderFrameBase::nodeAtPoint):
+
2013-02-22 Andrey Lushnikov <[email protected]>
Web Inspector: show source location after drawer views
Modified: trunk/Source/WebCore/rendering/RenderFrameBase.cpp (143729 => 143730)
--- trunk/Source/WebCore/rendering/RenderFrameBase.cpp 2013-02-22 15:54:12 UTC (rev 143729)
+++ trunk/Source/WebCore/rendering/RenderFrameBase.cpp 2013-02-22 16:12:40 UTC (rev 143730)
@@ -121,7 +121,12 @@
HitTestResult childFrameResult(newHitTestLocation);
bool isInsideChildFrame = childRoot->hitTest(newHitTestRequest, newHitTestLocation, childFrameResult);
- result.append(childFrameResult);
+
+ if (newHitTestLocation.isRectBasedTest())
+ result.append(childFrameResult);
+ else if (isInsideChildFrame)
+ result = childFrameResult;
+
if (isInsideChildFrame)
return true;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
