Changeset 188537 in webkit

Timestamp:

Aug 17, 2015 1:22:35 PM (9 years ago)

Author:

peavo@outlook.com

Message:

[WinCairo] Accelerated compositing does not respect device scale factor.
​https://bugs.webkit.org/show_bug.cgi?id=148085

Reviewed by Brent Fulgham.

Scale root layer's transformation matrix with device scale factor.

• WebCoreSupport/AcceleratedCompositingContext.cpp:

(AcceleratedCompositingContext::initialize):
(AcceleratedCompositingContext::startedAnimation):
(AcceleratedCompositingContext::applyDeviceScaleFactor):
(AcceleratedCompositingContext::compositeLayersToContext):
(AcceleratedCompositingContext::resizeRootLayer):
(AcceleratedCompositingContext::flushAndRenderLayers):
(AcceleratedCompositingContext::paintContents):
(AcceleratedCompositingContext::deviceScaleFactor):

• WebCoreSupport/AcceleratedCompositingContext.h:
• WebView.cpp:

(WebView::repaint):

Location:

trunk/Source/WebKit/win

Files:

• ChangeLog (modified) (1 diff)
• WebCoreSupport/AcceleratedCompositingContext.cpp (modified) (5 diffs)
• WebCoreSupport/AcceleratedCompositingContext.h (modified) (2 diffs)
• WebView.cpp (modified) (1 diff)

trunk/Source/WebKit/win/ChangeLog

@@ +1 @@
+2015-08-17  Per Arne Vollan  <peavo@outlook.com>
+
+        [WinCairo] Accelerated compositing does not respect device scale factor.
+        https://bugs.webkit.org/show_bug.cgi?id=148085
+
+        Reviewed by Brent Fulgham.
+
+        Scale root layer's transformation matrix with device scale factor.
+
+        * WebCoreSupport/AcceleratedCompositingContext.cpp:
+        (AcceleratedCompositingContext::initialize):
+        (AcceleratedCompositingContext::startedAnimation):
+        (AcceleratedCompositingContext::applyDeviceScaleFactor):
+        (AcceleratedCompositingContext::compositeLayersToContext):
+        (AcceleratedCompositingContext::resizeRootLayer):
+        (AcceleratedCompositingContext::flushAndRenderLayers):
+        (AcceleratedCompositingContext::paintContents):
+        (AcceleratedCompositingContext::deviceScaleFactor):
+        * WebCoreSupport/AcceleratedCompositingContext.h:
+        * WebView.cpp:
+        (WebView::repaint):
+
 2015-08-17  Sungmann Cho  <sungmann.cho@navercorp.com>
 

trunk/Source/WebKit/win/WebCoreSupport/AcceleratedCompositingContext.cpp

@@ -83 +83 @@
     m_rootLayer->setSize(pageSize);
 
+    applyDeviceScaleFactor();
+
     // The non-composited contents are a child of the root layer.
     m_nonCompositedContentLayer = GraphicsLayer::create(nullptr, *this);
@@ -151 +153 @@
 }
 
+void AcceleratedCompositingContext::applyDeviceScaleFactor()
+{
+    if (!m_rootLayer)
+        return;
+
+    const FloatSize& size = m_rootLayer->size();
+
+    TransformationMatrix m;
+    m.scale(deviceScaleFactor());
+    // Center view
+    double tx = (size.width() - size.width() / deviceScaleFactor()) / 2.0;
+    double ty = (size.height() - size.height() / deviceScaleFactor()) / 2.0;
+    m.translate(tx, ty);
+    m_rootLayer->setTransform(m);
+}
+
 void AcceleratedCompositingContext::compositeLayersToContext(CompositePurpose purpose)
 {
@@ -222 +240 @@
 
     m_rootLayer->setSize(newSize);
+
+    applyDeviceScaleFactor();
 
     // If the newSize exposes new areas of the non-composited content a setNeedsDisplay is needed
@@ -359 +379 @@
     if (!frame.contentRenderer() || !frame.view())
         return;
+
     frame.view()->updateLayoutAndStyleIfNeededRecursive();
 
@@ -390 +411 @@
 }
 
+float AcceleratedCompositingContext::deviceScaleFactor() const
+{
+    return m_webView.deviceScaleFactor();
+}
+
 #endif // USE(TEXTURE_MAPPER_GL)

trunk/Source/WebKit/win/WebCoreSupport/AcceleratedCompositingContext.h

@@ -53 +53 @@
 
     // GraphicsLayerClient
-    virtual void paintContents(const WebCore::GraphicsLayer*, WebCore::GraphicsContext&, WebCore::GraphicsLayerPaintingPhase, const WebCore::FloatRect& rectToPaint);
+    void paintContents(const WebCore::GraphicsLayer*, WebCore::GraphicsContext&, WebCore::GraphicsLayerPaintingPhase, const WebCore::FloatRect& rectToPaint) override;
+    float deviceScaleFactor() const override;
 
     void initialize();
@@ -96 +97 @@
     bool prepareForRendering();
     bool startedAnimation(WebCore::GraphicsLayer*);
+    void applyDeviceScaleFactor();
 };
 

trunk/Source/WebKit/win/WebView.cpp

@@ -839 +839 @@
         // The contentChanged, immediate, and repaintContentOnly parameters are all based on a non-
         // compositing painting/scrolling model.
-        addToDirtyRegion(windowRect);
+        addToDirtyRegion(logicalWindowRect);
         return;
     }