<!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>[191861] 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/191861">191861</a></dd>
<dt>Author</dt> <dd>akling@apple.com</dd>
<dt>Date</dt> <dd>2015-11-01 13:59:42 -0800 (Sun, 01 Nov 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Move the ResourceUsageOverlay out of the way by default.
<https://webkit.org/b/150776>
Reviewed by Darin Adler.
Have the ResourceUsageOverlay show up in the bottom center of the viewport
by default, instead of the top left. This way, you won't have to drag it
out of the way all the time.
* page/ResourceUsageOverlay.cpp:
(WebCore::ResourceUsageOverlay::ResourceUsageOverlay):
(WebCore::ResourceUsageOverlay::initialize):
* page/ResourceUsageOverlay.h:
* page/cocoa/ResourceUsageOverlayCocoa.mm:
(WebCore::ResourceUsageOverlay::platformInitialize):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorepageResourceUsageOverlaycpp">trunk/Source/WebCore/page/ResourceUsageOverlay.cpp</a></li>
<li><a href="#trunkSourceWebCorepageResourceUsageOverlayh">trunk/Source/WebCore/page/ResourceUsageOverlay.h</a></li>
<li><a href="#trunkSourceWebCorepagecocoaResourceUsageOverlayCocoamm">trunk/Source/WebCore/page/cocoa/ResourceUsageOverlayCocoa.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (191860 => 191861)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-11-01 19:42:51 UTC (rev 191860)
+++ trunk/Source/WebCore/ChangeLog 2015-11-01 21:59:42 UTC (rev 191861)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2015-11-01 Andreas Kling <akling@apple.com>
+
+ Move the ResourceUsageOverlay out of the way by default.
+ <https://webkit.org/b/150776>
+
+ Reviewed by Darin Adler.
+
+ Have the ResourceUsageOverlay show up in the bottom center of the viewport
+ by default, instead of the top left. This way, you won't have to drag it
+ out of the way all the time.
+
+ * page/ResourceUsageOverlay.cpp:
+ (WebCore::ResourceUsageOverlay::ResourceUsageOverlay):
+ (WebCore::ResourceUsageOverlay::initialize):
+ * page/ResourceUsageOverlay.h:
+ * page/cocoa/ResourceUsageOverlayCocoa.mm:
+ (WebCore::ResourceUsageOverlay::platformInitialize):
+
</ins><span class="cx"> 2015-11-01 Philip Chimento <philip.chimento@gmail.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Fix combinations of PLATFORM(GTK) and OS(DARWIN)
</span></span></pre></div>
<a id="trunkSourceWebCorepageResourceUsageOverlaycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/ResourceUsageOverlay.cpp (191860 => 191861)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/ResourceUsageOverlay.cpp 2015-11-01 19:42:51 UTC (rev 191860)
+++ trunk/Source/WebCore/page/ResourceUsageOverlay.cpp 2015-11-01 21:59:42 UTC (rev 191861)
</span><span class="lines">@@ -39,12 +39,11 @@
</span><span class="cx"> : m_page(page)
</span><span class="cx"> , m_overlay(PageOverlay::create(*this, PageOverlay::OverlayType::View))
</span><span class="cx"> {
</span><del>- m_overlay->setFrame(IntRect(80, 80, 500, 120));
- m_overlay->setShouldIgnoreMouseEventsOutsideBounds(false);
-
- m_page.mainFrame().pageOverlayController().installPageOverlay(m_overlay.get(), PageOverlay::FadeMode::DoNotFade);
-
- platformInitialize();
</del><ins>+ // Let the event loop cycle before continuing with initialization.
+ // This way we'll have access to the FrameView's dimensions.
+ callOnMainThread([this] {
+ initialize();
+ });
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ResourceUsageOverlay::~ResourceUsageOverlay()
</span><span class="lines">@@ -56,6 +55,18 @@
</span><span class="cx"> m_page.mainFrame().pageOverlayController().uninstallPageOverlay(m_overlay.get(), PageOverlay::FadeMode::DoNotFade);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void ResourceUsageOverlay::initialize()
+{
+ if (!m_page.mainFrame().view())
+ return;
+
+ FrameView& frameView = *m_page.mainFrame().view();
+ m_overlay->setFrame(IntRect(frameView.width() / 2 - normalWidth / 2, frameView.height() - normalHeight - 20, normalWidth, normalHeight));
+ m_overlay->setShouldIgnoreMouseEventsOutsideBounds(false);
+ m_page.mainFrame().pageOverlayController().installPageOverlay(m_overlay.get(), PageOverlay::FadeMode::DoNotFade);
+ platformInitialize();
+}
+
</ins><span class="cx"> bool ResourceUsageOverlay::mouseEvent(PageOverlay&, const PlatformMouseEvent& event)
</span><span class="cx"> {
</span><span class="cx"> if (event.button() != LeftButton)
</span></span></pre></div>
<a id="trunkSourceWebCorepageResourceUsageOverlayh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/ResourceUsageOverlay.h (191860 => 191861)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/ResourceUsageOverlay.h 2015-11-01 19:42:51 UTC (rev 191860)
+++ trunk/Source/WebCore/page/ResourceUsageOverlay.h 2015-11-01 21:59:42 UTC (rev 191861)
</span><span class="lines">@@ -64,6 +64,8 @@
</span><span class="cx"> bool mouseEvent(PageOverlay&, const PlatformMouseEvent&) override;
</span><span class="cx"> void didScrollFrame(PageOverlay&, Frame&) override { }
</span><span class="cx">
</span><ins>+ void initialize();
+
</ins><span class="cx"> void platformInitialize();
</span><span class="cx"> void platformDestroy();
</span><span class="cx">
</span><span class="lines">@@ -76,6 +78,9 @@
</span><span class="cx"> ThreadIdentifier m_threadID { 0 };
</span><span class="cx"> RetainPtr<CALayer> m_layer;
</span><span class="cx"> #endif
</span><ins>+
+ static const int normalWidth = 500;
+ static const int normalHeight = 120;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorepagecocoaResourceUsageOverlayCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/cocoa/ResourceUsageOverlayCocoa.mm (191860 => 191861)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/cocoa/ResourceUsageOverlayCocoa.mm 2015-11-01 19:42:51 UTC (rev 191860)
+++ trunk/Source/WebCore/page/cocoa/ResourceUsageOverlayCocoa.mm 2015-11-01 21:59:42 UTC (rev 191861)
</span><span class="lines">@@ -170,7 +170,7 @@
</span><span class="cx">
</span><span class="cx"> [m_layer.get() setContentsScale:2.0];
</span><span class="cx"> [m_layer.get() setBackgroundColor:adoptCF(CGColorCreateGenericRGB(0, 0, 0, 0.8)).get()];
</span><del>- [m_layer.get() setFrame:CGRectMake(0, 0, 500, 120)];
</del><ins>+ [m_layer.get() setFrame:CGRectMake(0, 0, normalWidth, normalHeight)];
</ins><span class="cx">
</span><span class="cx"> data.overlayLayers.add(m_layer.get());
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>