<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[174431] releases/WebKitGTK/webkit-2.6/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/174431">174431</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2014-10-08 04:19:08 -0700 (Wed, 08 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/173865">r173865</a> - Ensure that layout is up-to-date before hit-testing via RenderView
https://bugs.webkit.org/show_bug.cgi?id=136651
Reviewed by David Hyatt.
Ensure that layout is up-to-date before we do hit-testing via the RenderView.
Previously, RenderLayer::hitTest() called updateLayout(), but it's better
to push that responsibility onto RenderView before entering the RenderLayer
tree.
Make callers a little more consistent in getting the RenderView via
Frame::contentRenderer(), though perhaps we should remove that and just
call Document::renderView() everywhere.
* accessibility/AccessibilityObject.cpp:
(WebCore::AccessibilityObject::press): Hit test via the RenderView, rather
than doing so on the RenderView's layer, to ensure that we updateLayout().
* accessibility/AccessibilityRenderObject.cpp:
(WebCore::AccessibilityRenderObject::accessibilityHitTest): This code calls
hitTest() on arbitrary layers, so needs to explicitly update layout.
* editing/FrameSelection.cpp:
(WebCore::FrameSelection::contains):
* page/EventHandler.cpp:
(WebCore::EventHandler::eventMayStartDrag):
(WebCore::EventHandler::updateSelectionForMouseDrag):
(WebCore::EventHandler::hitTestResultAtPoint): The explicit updateLayout() is
no longer needed.
(WebCore::EventHandler::updateCursor):
(WebCore::EventHandler::handleWheelEvent):
(WebCore::EventHandler::hoverTimerFired):
(WebCore::hitTestResultInFrame):
* page/Frame.cpp:
(WebCore::Frame::contentRenderer):
* rendering/RenderLayer.cpp:
(WebCore::RenderLayer::hitTest):
* rendering/RenderView.cpp:
(WebCore::RenderView::hitTest): Here's where we ensure that layout is up-to-date.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit26SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.6/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit26SourceWebCoreaccessibilityAccessibilityObjectcpp">releases/WebKitGTK/webkit-2.6/Source/WebCore/accessibility/AccessibilityObject.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit26SourceWebCoreaccessibilityAccessibilityRenderObjectcpp">releases/WebKitGTK/webkit-2.6/Source/WebCore/accessibility/AccessibilityRenderObject.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit26SourceWebCoreeditingFrameSelectioncpp">releases/WebKitGTK/webkit-2.6/Source/WebCore/editing/FrameSelection.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit26SourceWebCorepageEventHandlercpp">releases/WebKitGTK/webkit-2.6/Source/WebCore/page/EventHandler.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit26SourceWebCorepageFramecpp">releases/WebKitGTK/webkit-2.6/Source/WebCore/page/Frame.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit26SourceWebCorerenderingRenderLayercpp">releases/WebKitGTK/webkit-2.6/Source/WebCore/rendering/RenderLayer.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit26SourceWebCorerenderingRenderViewcpp">releases/WebKitGTK/webkit-2.6/Source/WebCore/rendering/RenderView.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit26SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/WebCore/ChangeLog (174430 => 174431)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/WebCore/ChangeLog 2014-10-08 11:15:51 UTC (rev 174430)
+++ releases/WebKitGTK/webkit-2.6/Source/WebCore/ChangeLog 2014-10-08 11:19:08 UTC (rev 174431)
</span><span class="lines">@@ -1,3 +1,43 @@
</span><ins>+2014-09-22 Simon Fraser <simon.fraser@apple.com>
+
+ Ensure that layout is up-to-date before hit-testing via RenderView
+ https://bugs.webkit.org/show_bug.cgi?id=136651
+
+ Reviewed by David Hyatt.
+
+ Ensure that layout is up-to-date before we do hit-testing via the RenderView.
+ Previously, RenderLayer::hitTest() called updateLayout(), but it's better
+ to push that responsibility onto RenderView before entering the RenderLayer
+ tree.
+
+ Make callers a little more consistent in getting the RenderView via
+ Frame::contentRenderer(), though perhaps we should remove that and just
+ call Document::renderView() everywhere.
+
+ * accessibility/AccessibilityObject.cpp:
+ (WebCore::AccessibilityObject::press): Hit test via the RenderView, rather
+ than doing so on the RenderView's layer, to ensure that we updateLayout().
+ * accessibility/AccessibilityRenderObject.cpp:
+ (WebCore::AccessibilityRenderObject::accessibilityHitTest): This code calls
+ hitTest() on arbitrary layers, so needs to explicitly update layout.
+ * editing/FrameSelection.cpp:
+ (WebCore::FrameSelection::contains):
+ * page/EventHandler.cpp:
+ (WebCore::EventHandler::eventMayStartDrag):
+ (WebCore::EventHandler::updateSelectionForMouseDrag):
+ (WebCore::EventHandler::hitTestResultAtPoint): The explicit updateLayout() is
+ no longer needed.
+ (WebCore::EventHandler::updateCursor):
+ (WebCore::EventHandler::handleWheelEvent):
+ (WebCore::EventHandler::hoverTimerFired):
+ (WebCore::hitTestResultInFrame):
+ * page/Frame.cpp:
+ (WebCore::Frame::contentRenderer):
+ * rendering/RenderLayer.cpp:
+ (WebCore::RenderLayer::hitTest):
+ * rendering/RenderView.cpp:
+ (WebCore::RenderView::hitTest): Here's where we ensure that layout is up-to-date.
+
</ins><span class="cx"> 2014-09-19 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> Latching in iframes is not working as expected
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26SourceWebCoreaccessibilityAccessibilityObjectcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/WebCore/accessibility/AccessibilityObject.cpp (174430 => 174431)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/WebCore/accessibility/AccessibilityObject.cpp 2014-10-08 11:15:51 UTC (rev 174430)
+++ releases/WebKitGTK/webkit-2.6/Source/WebCore/accessibility/AccessibilityObject.cpp 2014-10-08 11:19:08 UTC (rev 174431)
</span><span class="lines">@@ -782,12 +782,9 @@
</span><span class="cx"> // as the target of the action.
</span><span class="cx"> Element* hitTestElement = nullptr;
</span><span class="cx"> if (Document* document = this->document()) {
</span><del>- RenderView* renderView = document->renderView();
- RenderLayer* layer = renderView->layer();
-
</del><span class="cx"> HitTestRequest request(HitTestRequest::ReadOnly | HitTestRequest::Active | HitTestRequest::AccessibilityHitTest);
</span><del>- HitTestResult hitTestResult = HitTestResult(clickPoint());
- layer->hitTest(request, hitTestResult);
</del><ins>+ HitTestResult hitTestResult(clickPoint());
+ document->renderView()->hitTest(request, hitTestResult);
</ins><span class="cx"> if (hitTestResult.innerNode()) {
</span><span class="cx"> Node* innerNode = hitTestResult.innerNode()->deprecatedShadowAncestorNode();
</span><span class="cx"> if (innerNode->isElementNode())
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26SourceWebCoreaccessibilityAccessibilityRenderObjectcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/WebCore/accessibility/AccessibilityRenderObject.cpp (174430 => 174431)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/WebCore/accessibility/AccessibilityRenderObject.cpp 2014-10-08 11:15:51 UTC (rev 174430)
+++ releases/WebKitGTK/webkit-2.6/Source/WebCore/accessibility/AccessibilityRenderObject.cpp 2014-10-08 11:19:08 UTC (rev 174431)
</span><span class="lines">@@ -2199,6 +2199,8 @@
</span><span class="cx"> if (!m_renderer || !m_renderer->hasLayer())
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><ins>+ m_renderer->document().updateLayout();
+
</ins><span class="cx"> RenderLayer* layer = toRenderBox(m_renderer)->layer();
</span><span class="cx">
</span><span class="cx"> HitTestRequest request(HitTestRequest::ReadOnly | HitTestRequest::Active | HitTestRequest::AccessibilityHitTest);
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26SourceWebCoreeditingFrameSelectioncpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/WebCore/editing/FrameSelection.cpp (174430 => 174431)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/WebCore/editing/FrameSelection.cpp 2014-10-08 11:15:51 UTC (rev 174430)
+++ releases/WebKitGTK/webkit-2.6/Source/WebCore/editing/FrameSelection.cpp 2014-10-08 11:19:08 UTC (rev 174431)
</span><span class="lines">@@ -1589,16 +1589,16 @@
</span><span class="cx">
</span><span class="cx"> bool FrameSelection::contains(const LayoutPoint& point)
</span><span class="cx"> {
</span><del>- Document* document = m_frame->document();
-
</del><span class="cx"> // Treat a collapsed selection like no selection.
</span><span class="cx"> if (!isRange())
</span><span class="cx"> return false;
</span><del>- if (!document->renderView())
</del><ins>+
+ RenderView* renderView = m_frame->contentRenderer();
+ if (!renderView)
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> HitTestResult result(point);
</span><del>- document->renderView()->hitTest(HitTestRequest(), result);
</del><ins>+ renderView->hitTest(HitTestRequest(), result);
</ins><span class="cx"> Node* innerNode = result.innerNode();
</span><span class="cx"> if (!innerNode || !innerNode->renderer())
</span><span class="cx"> return false;
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26SourceWebCorepageEventHandlercpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/WebCore/page/EventHandler.cpp (174430 => 174431)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/WebCore/page/EventHandler.cpp 2014-10-08 11:15:51 UTC (rev 174430)
+++ releases/WebKitGTK/webkit-2.6/Source/WebCore/page/EventHandler.cpp 2014-10-08 11:19:08 UTC (rev 174431)
</span><span class="lines">@@ -850,8 +850,8 @@
</span><span class="cx"> // This is a pre-flight check of whether the event might lead to a drag being started. Be careful
</span><span class="cx"> // that its logic needs to stay in sync with handleMouseMoveEvent() and the way we setMouseDownMayStartDrag
</span><span class="cx"> // in handleMousePressEvent
</span><del>-
- if (!m_frame.contentRenderer() || !m_frame.contentRenderer()->hasLayer())
</del><ins>+ RenderView* renderView = m_frame.contentRenderer();
+ if (!renderView)
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> if (event.button() != LeftButton || event.clickCount() != 1)
</span><span class="lines">@@ -871,7 +871,7 @@
</span><span class="cx"> updateDragSourceActionsAllowed();
</span><span class="cx"> HitTestRequest request(HitTestRequest::ReadOnly | HitTestRequest::DisallowShadowContent);
</span><span class="cx"> HitTestResult result(view->windowToContents(event.position()));
</span><del>- m_frame.contentRenderer()->hitTest(request, result);
</del><ins>+ renderView->hitTest(request, result);
</ins><span class="cx"> DragState state;
</span><span class="cx"> return result.innerElement() && page->dragController().draggableElement(&m_frame, result.innerElement(), result.roundedPointInInnerNodeFrame(), state);
</span><span class="cx"> }
</span><span class="lines">@@ -881,13 +881,13 @@
</span><span class="cx"> FrameView* view = m_frame.view();
</span><span class="cx"> if (!view)
</span><span class="cx"> return;
</span><del>- RenderView* renderer = m_frame.contentRenderer();
- if (!renderer)
</del><ins>+ RenderView* renderView = m_frame.contentRenderer();
+ if (!renderView)
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> HitTestRequest request(HitTestRequest::ReadOnly | HitTestRequest::Active | HitTestRequest::Move | HitTestRequest::DisallowShadowContent);
</span><span class="cx"> HitTestResult result(view->windowToContents(m_lastKnownMousePosition));
</span><del>- renderer->hitTest(request, result);
</del><ins>+ renderView->hitTest(request, result);
</ins><span class="cx"> updateSelectionForMouseDrag(result);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1127,14 +1127,13 @@
</span><span class="cx">
</span><span class="cx"> HitTestResult result(point, padding.height(), padding.width(), padding.height(), padding.width());
</span><span class="cx">
</span><del>- if (!m_frame.contentRenderer())
</del><ins>+ RenderView* renderView = m_frame.contentRenderer();
+ if (!renderView)
</ins><span class="cx"> return result;
</span><del>-
- m_frame.document()->updateLayout();
</del><span class="cx">
</span><span class="cx"> // hitTestResultAtPoint is specifically used to hitTest into all frames, thus it always allows child frame content.
</span><span class="cx"> HitTestRequest request(hitType | HitTestRequest::AllowChildFrameContent);
</span><del>- m_frame.contentRenderer()->hitTest(request, result);
</del><ins>+ renderView->hitTest(request, result);
</ins><span class="cx"> if (!request.readOnly())
</span><span class="cx"> m_frame.document()->updateHoverActiveState(request, result.innerElement());
</span><span class="cx">
</span><span class="lines">@@ -1339,8 +1338,6 @@
</span><span class="cx"> bool metaKey;
</span><span class="cx"> PlatformKeyboardEvent::getCurrentModifierState(shiftKey, ctrlKey, altKey, metaKey);
</span><span class="cx">
</span><del>- m_frame.document()->updateLayout();
-
</del><span class="cx"> HitTestRequest request(HitTestRequest::ReadOnly);
</span><span class="cx"> HitTestResult result(view->windowToContents(m_lastKnownMousePosition));
</span><span class="cx"> renderView->hitTest(request, result);
</span><span class="lines">@@ -2662,8 +2659,8 @@
</span><span class="cx">
</span><span class="cx"> bool EventHandler::handleWheelEvent(const PlatformWheelEvent& event)
</span><span class="cx"> {
</span><del>- Document* document = m_frame.document();
- if (!document->renderView())
</del><ins>+ RenderView* renderView = m_frame.contentRenderer();
+ if (!renderView)
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> RefPtr<FrameView> protector(m_frame.view());
</span><span class="lines">@@ -2677,7 +2674,7 @@
</span><span class="cx">
</span><span class="cx"> HitTestRequest request(HitTestRequest::ReadOnly | HitTestRequest::DisallowShadowContent);
</span><span class="cx"> HitTestResult result(view->windowToContents(event.position()));
</span><del>- document->renderView()->hitTest(request, result);
</del><ins>+ renderView->hitTest(request, result);
</ins><span class="cx">
</span><span class="cx"> RefPtr<Element> element = result.innerElement();
</span><span class="cx"> RefPtr<ContainerNode> scrollableContainer;
</span><span class="lines">@@ -2687,9 +2684,7 @@
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(MAC)
</span><span class="cx"> if (event.phase() == PlatformWheelEventPhaseNone && event.momentumPhase() == PlatformWheelEventPhaseNone)
</span><del>- {
</del><span class="cx"> m_frame.mainFrame().latchingState()->clear();
</span><del>- }
</del><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> // FIXME: It should not be necessary to do this mutation here.
</span><span class="lines">@@ -2985,11 +2980,11 @@
</span><span class="cx">
</span><span class="cx"> ASSERT(m_frame.document());
</span><span class="cx">
</span><del>- if (RenderView* renderer = m_frame.contentRenderer()) {
</del><ins>+ if (RenderView* renderView = m_frame.contentRenderer()) {
</ins><span class="cx"> if (FrameView* view = m_frame.view()) {
</span><span class="cx"> HitTestRequest request(HitTestRequest::Move | HitTestRequest::DisallowShadowContent);
</span><span class="cx"> HitTestResult result(view->windowToContents(m_lastKnownMousePosition));
</span><del>- renderer->hitTest(request, result);
</del><ins>+ renderView->hitTest(request, result);
</ins><span class="cx"> m_frame.document()->updateHoverActiveState(request, result.innerElement());
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -3763,6 +3758,7 @@
</span><span class="cx">
</span><span class="cx"> if (!frame || !frame->contentRenderer())
</span><span class="cx"> return result;
</span><ins>+
</ins><span class="cx"> if (frame->view()) {
</span><span class="cx"> IntRect rect = frame->view()->visibleContentRect();
</span><span class="cx"> if (!rect.contains(roundedIntPoint(point)))
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26SourceWebCorepageFramecpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/WebCore/page/Frame.cpp (174430 => 174431)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/WebCore/page/Frame.cpp 2014-10-08 11:15:51 UTC (rev 174430)
+++ releases/WebKitGTK/webkit-2.6/Source/WebCore/page/Frame.cpp 2014-10-08 11:19:08 UTC (rev 174431)
</span><span class="lines">@@ -727,7 +727,7 @@
</span><span class="cx">
</span><span class="cx"> RenderView* Frame::contentRenderer() const
</span><span class="cx"> {
</span><del>- return document() ? document()->renderView() : 0;
</del><ins>+ return document() ? document()->renderView() : nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RenderWidget* Frame::ownerRenderer() const
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26SourceWebCorerenderingRenderLayercpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/WebCore/rendering/RenderLayer.cpp (174430 => 174431)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/WebCore/rendering/RenderLayer.cpp 2014-10-08 11:15:51 UTC (rev 174430)
+++ releases/WebKitGTK/webkit-2.6/Source/WebCore/rendering/RenderLayer.cpp 2014-10-08 11:19:08 UTC (rev 174431)
</span><span class="lines">@@ -4641,9 +4641,8 @@
</span><span class="cx"> bool RenderLayer::hitTest(const HitTestRequest& request, const HitTestLocation& hitTestLocation, HitTestResult& result)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(isSelfPaintingLayer() || hasSelfPaintingLayerDescendant());
</span><ins>+ ASSERT(!renderer().view().needsLayout());
</ins><span class="cx">
</span><del>- renderer().document().updateLayout();
-
</del><span class="cx"> LayoutRect hitTestArea = isOutOfFlowRenderFlowThread() ? toRenderFlowThread(&renderer())->visualOverflowRect() : renderer().view().documentRect();
</span><span class="cx"> if (!request.ignoreClipping())
</span><span class="cx"> hitTestArea.intersect(renderer().view().frameView().visibleContentRect(LegacyIOSDocumentVisibleRect));
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26SourceWebCorerenderingRenderViewcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/WebCore/rendering/RenderView.cpp (174430 => 174431)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/WebCore/rendering/RenderView.cpp 2014-10-08 11:15:51 UTC (rev 174430)
+++ releases/WebKitGTK/webkit-2.6/Source/WebCore/rendering/RenderView.cpp 2014-10-08 11:19:08 UTC (rev 174431)
</span><span class="lines">@@ -174,6 +174,8 @@
</span><span class="cx">
</span><span class="cx"> bool RenderView::hitTest(const HitTestRequest& request, const HitTestLocation& location, HitTestResult& result)
</span><span class="cx"> {
</span><ins>+ document().updateLayout();
+
</ins><span class="cx"> if (layer()->hitTest(request, location, result))
</span><span class="cx"> return true;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>