<!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>[181617] trunk/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/181617">181617</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2015-03-16 22:30:46 -0700 (Mon, 16 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Update the debug overlays after layout
https://bugs.webkit.org/show_bug.cgi?id=142768
Reviewed by Zalan Bujtas.
The debug overlays need to be updated after layout, in case elements with wheel event handlers
moved around.
DebugPageOverlays::didLayout() is cheap if there are no overlays.
Call DebugPageOverlays::didLayout() for all frames, not just the main frame, since subframes can contribute
to the main frame's event handler region.
* page/DebugPageOverlays.cpp:
(WebCore::DebugPageOverlays::regionChanged):
* page/DebugPageOverlays.h:
(WebCore::DebugPageOverlays::didLayout):
(WebCore::DebugPageOverlays::didChangeEventHandlers):
* page/FrameView.cpp:
(WebCore::FrameView::layout):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorepageDebugPageOverlayscpp">trunk/Source/WebCore/page/DebugPageOverlays.cpp</a></li>
<li><a href="#trunkSourceWebCorepageDebugPageOverlaysh">trunk/Source/WebCore/page/DebugPageOverlays.h</a></li>
<li><a href="#trunkSourceWebCorepageFrameViewcpp">trunk/Source/WebCore/page/FrameView.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (181616 => 181617)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-03-17 05:15:41 UTC (rev 181616)
+++ trunk/Source/WebCore/ChangeLog 2015-03-17 05:30:46 UTC (rev 181617)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2015-03-16 Simon Fraser <simon.fraser@apple.com>
+
+ Update the debug overlays after layout
+ https://bugs.webkit.org/show_bug.cgi?id=142768
+
+ Reviewed by Zalan Bujtas.
+
+ The debug overlays need to be updated after layout, in case elements with wheel event handlers
+ moved around.
+
+ DebugPageOverlays::didLayout() is cheap if there are no overlays.
+
+ Call DebugPageOverlays::didLayout() for all frames, not just the main frame, since subframes can contribute
+ to the main frame's event handler region.
+
+ * page/DebugPageOverlays.cpp:
+ (WebCore::DebugPageOverlays::regionChanged):
+ * page/DebugPageOverlays.h:
+ (WebCore::DebugPageOverlays::didLayout):
+ (WebCore::DebugPageOverlays::didChangeEventHandlers):
+ * page/FrameView.cpp:
+ (WebCore::FrameView::layout):
+
</ins><span class="cx"> 2015-03-16 Jon Lee <jonlee@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed fix for crash after r181608.
</span></span></pre></div>
<a id="trunkSourceWebCorepageDebugPageOverlayscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/DebugPageOverlays.cpp (181616 => 181617)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/DebugPageOverlays.cpp 2015-03-17 05:15:41 UTC (rev 181616)
+++ trunk/Source/WebCore/page/DebugPageOverlays.cpp 2015-03-17 05:30:46 UTC (rev 181617)
</span><span class="lines">@@ -262,9 +262,9 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void DebugPageOverlays::regionChanged(MainFrame& frame, RegionType regionType)
</del><ins>+void DebugPageOverlays::regionChanged(Frame& frame, RegionType regionType)
</ins><span class="cx"> {
</span><del>- if (RegionOverlay* visualizer = regionOverlayForFrame(frame, regionType))
</del><ins>+ if (RegionOverlay* visualizer = regionOverlayForFrame(frame.mainFrame(), regionType))
</ins><span class="cx"> visualizer->recomputeRegion();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepageDebugPageOverlaysh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/DebugPageOverlays.h (181616 => 181617)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/DebugPageOverlays.h 2015-03-17 05:15:41 UTC (rev 181616)
+++ trunk/Source/WebCore/page/DebugPageOverlays.h 2015-03-17 05:30:46 UTC (rev 181617)
</span><span class="lines">@@ -26,6 +26,7 @@
</span><span class="cx"> #ifndef DebugPageOverlays_h
</span><span class="cx"> #define DebugPageOverlays_h
</span><span class="cx">
</span><ins>+#include "Frame.h"
</ins><span class="cx"> #include "Settings.h"
</span><span class="cx"> #include <wtf/HashMap.h>
</span><span class="cx"> #include <wtf/Vector.h>
</span><span class="lines">@@ -45,7 +46,9 @@
</span><span class="cx"> };
</span><span class="cx"> static const unsigned NumberOfRegionTypes = NonFastScrollableRegion + 1;
</span><span class="cx">
</span><del>- static void didLayout(MainFrame&);
</del><ins>+ static void didLayout(Frame&);
+ static void didChangeEventHandlers(Frame&);
+
</ins><span class="cx"> WEBCORE_EXPORT static void settingsChanged(MainFrame&);
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="lines">@@ -54,7 +57,7 @@
</span><span class="cx"> void showRegionOverlay(MainFrame&, RegionType);
</span><span class="cx"> void hideRegionOverlay(MainFrame&, RegionType);
</span><span class="cx">
</span><del>- void regionChanged(MainFrame&, RegionType);
</del><ins>+ void regionChanged(Frame&, RegionType);
</ins><span class="cx">
</span><span class="cx"> bool hasOverlaysForFrame(MainFrame& frame) const
</span><span class="cx"> {
</span><span class="lines">@@ -81,14 +84,22 @@
</span><span class="cx"> return sharedDebugOverlays->hasOverlaysForFrame(frame);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline void DebugPageOverlays::didLayout(MainFrame& frame)
</del><ins>+inline void DebugPageOverlays::didLayout(Frame& frame)
</ins><span class="cx"> {
</span><del>- FAST_RETURN_IF_NO_OVERLAYS(frame);
</del><ins>+ FAST_RETURN_IF_NO_OVERLAYS(frame.mainFrame());
</ins><span class="cx">
</span><span class="cx"> sharedDebugOverlays->regionChanged(frame, RegionType::WheelEventHandlers);
</span><span class="cx"> sharedDebugOverlays->regionChanged(frame, RegionType::NonFastScrollableRegion);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+inline void DebugPageOverlays::didChangeEventHandlers(Frame& frame)
+{
+ FAST_RETURN_IF_NO_OVERLAYS(frame.mainFrame());
+
+ sharedDebugOverlays->regionChanged(frame, RegionType::WheelEventHandlers);
+ sharedDebugOverlays->regionChanged(frame, RegionType::NonFastScrollableRegion);
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+}
+
</ins><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCorepageFrameViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/FrameView.cpp (181616 => 181617)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/FrameView.cpp 2015-03-17 05:15:41 UTC (rev 181616)
+++ trunk/Source/WebCore/page/FrameView.cpp 2015-03-17 05:30:46 UTC (rev 181617)
</span><span class="lines">@@ -1404,8 +1404,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> InspectorInstrumentation::didLayout(cookie, root);
</span><del>- if (frame().isMainFrame())
- DebugPageOverlays::didLayout(frame().mainFrame());
</del><ins>+ DebugPageOverlays::didLayout(frame());
</ins><span class="cx">
</span><span class="cx"> --m_nestedLayoutCount;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>