Title: [148249] trunk/Source/WebKit2
- Revision
- 148249
- Author
- [email protected]
- Date
- 2013-04-11 16:51:51 -0700 (Thu, 11 Apr 2013)
Log Message
WebKit should set the header and footer layers' contentsScale when the device
scale factor changes
https://bugs.webkit.org/show_bug.cgi?id=114471
-and corresponding-
<rdar://problem/13621288>
Reviewed by Simon Fraser.
Update the header and footer contentsScale when the device scale factor has
changed.
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::setDeviceScaleFactor):
* WebProcess/WebPage/WebPage.h:
* WebProcess/WebPage/mac/WebPageMac.mm:
(WebKit::WebPage::updateHeaderAndFooterLayersForDeviceScaleChange):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (148248 => 148249)
--- trunk/Source/WebKit2/ChangeLog 2013-04-11 23:46:33 UTC (rev 148248)
+++ trunk/Source/WebKit2/ChangeLog 2013-04-11 23:51:51 UTC (rev 148249)
@@ -1,3 +1,22 @@
+2013-04-11 Beth Dakin <[email protected]>
+
+ WebKit should set the header and footer layers' contentsScale when the device
+ scale factor changes
+ https://bugs.webkit.org/show_bug.cgi?id=114471
+ -and corresponding-
+ <rdar://problem/13621288>
+
+ Reviewed by Simon Fraser.
+
+ Update the header and footer contentsScale when the device scale factor has
+ changed.
+
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::setDeviceScaleFactor):
+ * WebProcess/WebPage/WebPage.h:
+ * WebProcess/WebPage/mac/WebPageMac.mm:
+ (WebKit::WebPage::updateHeaderAndFooterLayersForDeviceScaleChange):
+
2013-04-11 Anders Carlsson <[email protected]>
Implement removing storage area items
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (148248 => 148249)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2013-04-11 23:46:33 UTC (rev 148248)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2013-04-11 23:51:51 UTC (rev 148249)
@@ -1232,6 +1232,8 @@
#if PLATFORM(MAC)
for (HashSet<PluginView*>::const_iterator it = m_pluginViews.begin(), end = m_pluginViews.end(); it != end; ++it)
(*it)->setDeviceScaleFactor(scaleFactor);
+
+ updateHeaderAndFooterLayersForDeviceScaleChange(scaleFactor);
#endif
if (m_findController.isShowingOverlay()) {
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h (148248 => 148249)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2013-04-11 23:46:33 UTC (rev 148248)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2013-04-11 23:51:51 UTC (rev 148249)
@@ -372,6 +372,8 @@
void setHeaderLayerWithHeight(CALayer *, int);
CALayer *getFooterLayer() const;
void setFooterLayerWithHeight(CALayer *, int);
+
+ void updateHeaderAndFooterLayersForDeviceScaleChange(float scaleFactor);
#endif
bool windowIsFocused() const;
Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm (148248 => 148249)
--- trunk/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm 2013-04-11 23:46:33 UTC (rev 148248)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm 2013-04-11 23:51:51 UTC (rev 148249)
@@ -865,6 +865,19 @@
[parentLayer->platformLayer() addSublayer:m_footerLayer.get()];
}
+void WebPage::updateHeaderAndFooterLayersForDeviceScaleChange(float scaleFactor)
+{
+ if (m_headerLayer) {
+ m_headerLayer.get().contentsScale = scaleFactor;
+ [m_headerLayer.get() setNeedsDisplay];
+ }
+
+ if (m_footerLayer) {
+ m_footerLayer.get().contentsScale = scaleFactor;
+ [m_footerLayer.get() setNeedsDisplay];
+ }
+}
+
void WebPage::computePagesForPrintingPDFDocument(uint64_t frameID, const PrintInfo& printInfo, Vector<IntRect>& resultPageRects)
{
ASSERT(resultPageRects.isEmpty());
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
