<!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>[214483] 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/214483">214483</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2017-03-28 11:29:40 -0700 (Tue, 28 Mar 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Enhance the touch region debug overlay to show regions for the different events
https://bugs.webkit.org/show_bug.cgi?id=170162
Reviewed by Tim Horton.
Have NonFastScrollableRegionOverlay use a different color for each region in EventTrackingRegions,
and to draw a legend showing what the colors mean.
On Mac, this overlay displays the non-fast scrollable region (which we don't keep separate from the wheel event
region).
* page/DebugPageOverlays.cpp:
(WebCore::NonFastScrollableRegionOverlay::updateRegion):
(WebCore::touchEventRegionColors):
(WebCore::drawRightAlignedText):
(WebCore::NonFastScrollableRegionOverlay::drawRect):
(WebCore::RegionOverlay::drawRect):
(WebCore::RegionOverlay::drawRegion):</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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (214482 => 214483)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-03-28 18:29:37 UTC (rev 214482)
+++ trunk/Source/WebCore/ChangeLog 2017-03-28 18:29:40 UTC (rev 214483)
</span><span class="lines">@@ -1,5 +1,26 @@
</span><span class="cx"> 2017-03-27 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><ins>+ Enhance the touch region debug overlay to show regions for the different events
+ https://bugs.webkit.org/show_bug.cgi?id=170162
+
+ Reviewed by Tim Horton.
+
+ Have NonFastScrollableRegionOverlay use a different color for each region in EventTrackingRegions,
+ and to draw a legend showing what the colors mean.
+
+ On Mac, this overlay displays the non-fast scrollable region (which we don't keep separate from the wheel event
+ region).
+
+ * page/DebugPageOverlays.cpp:
+ (WebCore::NonFastScrollableRegionOverlay::updateRegion):
+ (WebCore::touchEventRegionColors):
+ (WebCore::drawRightAlignedText):
+ (WebCore::NonFastScrollableRegionOverlay::drawRect):
+ (WebCore::RegionOverlay::drawRect):
+ (WebCore::RegionOverlay::drawRegion):
+
+2017-03-27 Simon Fraser <simon.fraser@apple.com>
+
</ins><span class="cx"> Make sure the non-fast scrolling debug overlay is correctly updated
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=170142
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepageDebugPageOverlayscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/DebugPageOverlays.cpp (214482 => 214483)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/DebugPageOverlays.cpp 2017-03-28 18:29:37 UTC (rev 214482)
+++ trunk/Source/WebCore/page/DebugPageOverlays.cpp 2017-03-28 18:29:40 UTC (rev 214483)
</span><span class="lines">@@ -55,7 +55,7 @@
</span><span class="cx"> private:
</span><span class="cx"> void willMoveToPage(PageOverlay&, Page*) final;
</span><span class="cx"> void didMoveToPage(PageOverlay&, Page*) final;
</span><del>- void drawRect(PageOverlay&, GraphicsContext&, const IntRect& dirtyRect) final;
</del><ins>+ void drawRect(PageOverlay&, GraphicsContext&, const IntRect& dirtyRect) override;
</ins><span class="cx"> bool mouseEvent(PageOverlay&, const PlatformMouseEvent&) final;
</span><span class="cx"> void didScrollFrame(PageOverlay&, Frame&) final;
</span><span class="cx">
</span><span class="lines">@@ -62,6 +62,7 @@
</span><span class="cx"> protected:
</span><span class="cx"> // Returns true if the region changed.
</span><span class="cx"> virtual bool updateRegion() = 0;
</span><ins>+ void drawRegion(GraphicsContext&, const Region&, const Color&, const IntRect& dirtyRect);
</ins><span class="cx">
</span><span class="cx"> MainFrame& m_frame;
</span><span class="cx"> RefPtr<PageOverlay> m_overlay;
</span><span class="lines">@@ -119,25 +120,111 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool updateRegion() override;
</span><ins>+ void drawRect(PageOverlay&, GraphicsContext&, const IntRect& dirtyRect) final;
+
+ EventTrackingRegions m_eventTrackingRegions;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> bool NonFastScrollableRegionOverlay::updateRegion()
</span><span class="cx"> {
</span><del>- auto region = std::make_unique<Region>();
</del><ins>+ bool regionChanged = false;
</ins><span class="cx">
</span><span class="cx"> if (Page* page = m_frame.page()) {
</span><span class="cx"> if (ScrollingCoordinator* scrollingCoordinator = page->scrollingCoordinator()) {
</span><span class="cx"> EventTrackingRegions eventTrackingRegions = scrollingCoordinator->absoluteEventTrackingRegions();
</span><del>- for (const auto& synchronousEventRegion : eventTrackingRegions.eventSpecificSynchronousDispatchRegions)
- region->unite(synchronousEventRegion.value);
</del><ins>+
+ if (eventTrackingRegions != m_eventTrackingRegions) {
+ m_eventTrackingRegions = eventTrackingRegions;
+ regionChanged = true;
+ }
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- bool regionChanged = !m_region || !(*m_region == *region);
- m_region = WTFMove(region);
</del><span class="cx"> return regionChanged;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static HashMap<String, Color>& touchEventRegionColors()
+{
+ static NeverDestroyed<HashMap<String, Color>> regionColors;
+
+ if (regionColors.get().isEmpty()) {
+ regionColors.get().add("touchstart", Color(191, 191, 63, 80));
+ regionColors.get().add("touchmove", Color(63, 191, 191, 80));
+ regionColors.get().add("touchend", Color(191, 63, 127, 80));
+ regionColors.get().add("touchforcechange", Color(63, 63, 191, 80));
+ regionColors.get().add("wheel", Color(255, 128, 0, 80));
+ }
+
+ return regionColors;
+}
+
+static void drawRightAlignedText(const String& text, GraphicsContext& context, const FontCascade& font, const FloatPoint& boxLocation)
+{
+ float textGap = 10;
+ float textBaselineFromTop = 14;
+
+ TextRun textRun = TextRun(StringView(text));
+ context.setFillColor(Color::transparent);
+ float textWidth = context.drawText(font, textRun, { });
+ context.setFillColor(Color::black);
+ context.drawText(font, textRun, boxLocation + FloatSize(-(textWidth + textGap), textBaselineFromTop));
+}
+
+void NonFastScrollableRegionOverlay::drawRect(PageOverlay& pageOverlay, GraphicsContext& context, const IntRect&)
+{
+ IntRect bounds = pageOverlay.bounds();
+
+ context.clearRect(bounds);
+
+ FloatRect legendRect = { bounds.maxX() - 30.0f, 10, 20, 20 };
+
+ FontCascadeDescription fontDescription;
+ fontDescription.setOneFamily("Helvetica");
+ fontDescription.setSpecifiedSize(12);
+ fontDescription.setComputedSize(12);
+ fontDescription.setWeight(FontSelectionValue(500));
+ FontCascade font(fontDescription, 0, 0);
+ font.update(nullptr);
+
+#if ENABLE(TOUCH_EVENTS)
+ context.setFillColor(touchEventRegionColors().get("touchstart"));
+ context.fillRect(legendRect);
+ drawRightAlignedText("touchstart", context, font, legendRect.location());
+
+ legendRect.move(0, 30);
+ context.setFillColor(touchEventRegionColors().get("touchmove"));
+ context.fillRect(legendRect);
+ drawRightAlignedText("touchmove", context, font, legendRect.location());
+
+ legendRect.move(0, 30);
+ context.setFillColor(touchEventRegionColors().get("touchend"));
+ context.fillRect(legendRect);
+ drawRightAlignedText("touchend", context, font, legendRect.location());
+
+ legendRect.move(0, 30);
+ context.setFillColor(touchEventRegionColors().get("touchforcechange"));
+ context.fillRect(legendRect);
+ drawRightAlignedText("touchforcechange", context, font, legendRect.location());
+
+ legendRect.move(0, 30);
+ context.setFillColor(m_color);
+ context.fillRect(legendRect);
+ drawRightAlignedText("passive listeners", context, font, legendRect.location());
+#else
+ // On desktop platforms, the "wheel" region includes the non-fast scrollable region.
+ context.setFillColor(touchEventRegionColors().get("wheel"));
+ context.fillRect(legendRect);
+ drawRightAlignedText("non-fast region", context, font, legendRect.location());
+#endif
+
+ for (const auto& synchronousEventRegion : m_eventTrackingRegions.eventSpecificSynchronousDispatchRegions) {
+ Color regionColor = touchEventRegionColors().get(synchronousEventRegion.key);
+ drawRegion(context, synchronousEventRegion.value, regionColor, bounds);
+ }
+
+ drawRegion(context, m_eventTrackingRegions.asynchronousDispatchRegion, m_color, bounds);
+}
+
</ins><span class="cx"> Ref<RegionOverlay> RegionOverlay::create(MainFrame& frame, DebugPageOverlays::RegionType regionType)
</span><span class="cx"> {
</span><span class="cx"> switch (regionType) {
</span><span class="lines">@@ -182,9 +269,14 @@
</span><span class="cx"> if (!m_region)
</span><span class="cx"> return;
</span><span class="cx">
</span><ins>+ drawRegion(context, *m_region, m_color, dirtyRect);
+}
+
+void RegionOverlay::drawRegion(GraphicsContext& context, const Region& region, const Color& color, const IntRect& dirtyRect)
+{
</ins><span class="cx"> GraphicsContextStateSaver saver(context);
</span><del>- context.setFillColor(m_color);
- for (auto rect : m_region->rects()) {
</del><ins>+ context.setFillColor(color);
+ for (auto rect : region.rects()) {
</ins><span class="cx"> if (rect.intersects(dirtyRect))
</span><span class="cx"> context.fillRect(rect);
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>