Title: [191861] trunk/Source/WebCore
- Revision
- 191861
- Author
- akl...@apple.com
- Date
- 2015-11-01 13:59:42 -0800 (Sun, 01 Nov 2015)
Log Message
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):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (191860 => 191861)
--- 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)
@@ -1,3 +1,21 @@
+2015-11-01 Andreas Kling <akl...@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):
+
2015-11-01 Philip Chimento <philip.chime...@gmail.com>
[GTK] Fix combinations of PLATFORM(GTK) and OS(DARWIN)
Modified: trunk/Source/WebCore/page/ResourceUsageOverlay.cpp (191860 => 191861)
--- 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)
@@ -39,12 +39,11 @@
: m_page(page)
, m_overlay(PageOverlay::create(*this, PageOverlay::OverlayType::View))
{
- m_overlay->setFrame(IntRect(80, 80, 500, 120));
- m_overlay->setShouldIgnoreMouseEventsOutsideBounds(false);
-
- m_page.mainFrame().pageOverlayController().installPageOverlay(m_overlay.get(), PageOverlay::FadeMode::DoNotFade);
-
- platformInitialize();
+ // Let the event loop cycle before continuing with initialization.
+ // This way we'll have access to the FrameView's dimensions.
+ callOnMainThread([this] {
+ initialize();
+ });
}
ResourceUsageOverlay::~ResourceUsageOverlay()
@@ -56,6 +55,18 @@
m_page.mainFrame().pageOverlayController().uninstallPageOverlay(m_overlay.get(), PageOverlay::FadeMode::DoNotFade);
}
+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();
+}
+
bool ResourceUsageOverlay::mouseEvent(PageOverlay&, const PlatformMouseEvent& event)
{
if (event.button() != LeftButton)
Modified: trunk/Source/WebCore/page/ResourceUsageOverlay.h (191860 => 191861)
--- 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)
@@ -64,6 +64,8 @@
bool mouseEvent(PageOverlay&, const PlatformMouseEvent&) override;
void didScrollFrame(PageOverlay&, Frame&) override { }
+ void initialize();
+
void platformInitialize();
void platformDestroy();
@@ -76,6 +78,9 @@
ThreadIdentifier m_threadID { 0 };
RetainPtr<CALayer> m_layer;
#endif
+
+ static const int normalWidth = 500;
+ static const int normalHeight = 120;
};
}
Modified: trunk/Source/WebCore/page/cocoa/ResourceUsageOverlayCocoa.mm (191860 => 191861)
--- 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)
@@ -170,7 +170,7 @@
[m_layer.get() setContentsScale:2.0];
[m_layer.get() setBackgroundColor:adoptCF(CGColorCreateGenericRGB(0, 0, 0, 0.8)).get()];
- [m_layer.get() setFrame:CGRectMake(0, 0, 500, 120)];
+ [m_layer.get() setFrame:CGRectMake(0, 0, normalWidth, normalHeight)];
data.overlayLayers.add(m_layer.get());
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
