Changeset 189974 in webkit

Timestamp:

Sep 18, 2015 11:23:29 AM (9 years ago)

Author:

Brent Fulgham

Message:

[Win] Use tiled drawing for main background layer
​https://bugs.webkit.org/show_bug.cgi?id=149347
<rdar://problem/22759632>

Reviewed by Alex Christensen.

Source/WebCore:

Turn on tiled drawing for the root layer when using
accelerated compositing on Windows.

• page/Frame.h: Export the 'isMainFrame' method so that

it can be used by WebKit.dll.

• platform/graphics/ca/GraphicsLayerCA.cpp:

(WebCore::GraphicsLayerCA::getDebugBorderInfo): Use a full
pixel width on Windows, since it doesn't support High DPI (yet).

• platform/graphics/ca/win/PlatformCALayerWin.cpp:

(PlatformCALayerWin::create): Use nullptr.
(toCACFFilterType): Ditto.
(layerTreeHostForLayer): Ditto.
(PlatformCALayer::platformCALayer): Ditto.

(PlatformCALayerWin::PlatformCALayerWin): Use the correct contents scaling

factor for new layers.
(PlatformCALayerWin::animationForKey): Use nullptr.

• platform/graphics/ca/win/WebTiledBackingLayerWin.cpp:

(WebTiledBackingLayerWin::displayCallback): Update assertion to
recognize LayerTypePageTiledBackingLayer as a valid layer to be used
in this display routine.

Source/WebKit/win:

Instruct WebCore to use tiled drawing for the root layer
of the display.

• WebCoreSupport/WebChromeClient.cpp:

(WebChromeClient::shouldUseTiledBackingForFrameView): Added.

• WebCoreSupport/WebChromeClient.h:

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/page/Frame.h (modified) (1 diff)
• WebCore/platform/graphics/ca/GraphicsLayerCA.cpp (modified) (1 diff)
• WebCore/platform/graphics/ca/win/PlatformCALayerWin.cpp (modified) (7 diffs)
• WebCore/platform/graphics/ca/win/WebTiledBackingLayerWin.cpp (modified) (1 diff)
• WebKit/win/ChangeLog (modified) (1 diff)
• WebKit/win/WebCoreSupport/WebChromeClient.cpp (modified) (2 diffs)
• WebKit/win/WebCoreSupport/WebChromeClient.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-09-18  Brent Fulgham  <bfulgham@apple.com>
+
+        [Win] Use tiled drawing for main background layer
+        https://bugs.webkit.org/show_bug.cgi?id=149347
+        <rdar://problem/22759632>
+
+        Reviewed by Alex Christensen.
+
+        Turn on tiled drawing for the root layer when using
+        accelerated compositing on Windows. 
+
+        * page/Frame.h: Export the 'isMainFrame' method so that
+        it can be used by WebKit.dll.
+        * platform/graphics/ca/GraphicsLayerCA.cpp:
+        (WebCore::GraphicsLayerCA::getDebugBorderInfo): Use a full
+        pixel width on Windows, since it doesn't support High DPI (yet).
+        * platform/graphics/ca/win/PlatformCALayerWin.cpp:
+        (PlatformCALayerWin::create): Use nullptr.
+        (toCACFFilterType): Ditto.
+        (layerTreeHostForLayer): Ditto.
+        (PlatformCALayer::platformCALayer): Ditto.
+         (PlatformCALayerWin::PlatformCALayerWin): Use the correct contents scaling
+        factor for new layers.
+        (PlatformCALayerWin::animationForKey): Use nullptr.
+        * platform/graphics/ca/win/WebTiledBackingLayerWin.cpp:
+        (WebTiledBackingLayerWin::displayCallback): Update assertion to
+        recognize LayerTypePageTiledBackingLayer as a valid layer to be used
+        in this display routine.
+
 2015-09-18  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebCore/page/Frame.h

@@ -139 +139 @@
 
         MainFrame& mainFrame() const;
-        bool isMainFrame() const;
+        WEBCORE_EXPORT bool isMainFrame() const;
 
         Page* page() const;

trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp

@@ -3249 +3249 @@
     if (isPageTiledBackingLayer()) {
         color = Color(0, 0, 128, 128); // tile cache layer: dark blue
+#if OS(WINDOWS)
+        width = 1.0;
+#else
         width = 0.5;
+#endif
         return;
     }

trunk/Source/WebCore/platform/graphics/ca/win/PlatformCALayerWin.cpp

@@ -30 +30 @@
 #include "AbstractCACFLayerTreeHost.h"
 #include "FontCascade.h"
+#include "GDIUtilities.h"
 #include "GraphicsContext.h"
 #include "PlatformCAAnimationWin.h"
@@ -47 +48 @@
 PassRefPtr<PlatformCALayer> PlatformCALayerWin::create(LayerType layerType, PlatformCALayerClient* owner)
 {
-    return adoptRef(new PlatformCALayerWin(layerType, 0, owner));
+    return adoptRef(new PlatformCALayerWin(layerType, nullptr, owner));
 }
 
@@ -66 +67 @@
     case PlatformCALayer::Nearest: return kCACFFilterNearest;
     case PlatformCALayer::Trilinear: return kCACFFilterTrilinear;
-    default: return 0;
+    default: return nullptr;
     }
 }
@@ -75 +76 @@
     void* userData = wkCACFLayerGetContextUserData(layer->platformLayer());
     if (!userData)
-        return 0;
+        return nullptr;
 
     return static_cast<AbstractCACFLayerTreeHost*>(userData);
@@ -93 +94 @@
 {
     if (!platformLayer)
-        return 0;
+        return nullptr;
     
     PlatformCALayerWinInternal* layerIntern = intern(platformLayer);
-    return layerIntern ? layerIntern->owner() : 0;
+    return layerIntern ? layerIntern->owner() : nullptr;
 }
 
@@ -142 +143 @@
 
 #if HAVE(CACFLAYER_SETCONTENTSSCALE)
-    CACFLayerSetContentsScale(m_layer.get(), owner ? owner->platformCALayerDeviceScaleFactor() : 1.0f);
+    CACFLayerSetContentsScale(m_layer.get(), owner ? owner->platformCALayerDeviceScaleFactor() : deviceScaleFactorForWindow(nullptr));
 #endif
 
@@ -355 +356 @@
     HashMap<String, RefPtr<PlatformCAAnimation> >::iterator it = m_animations.find(key);
     if (it == m_animations.end())
-        return 0;
+        return nullptr;
 
     return it->value;

trunk/Source/WebCore/platform/graphics/ca/win/WebTiledBackingLayerWin.cpp

@@ -83 +83 @@
     CGRect layerBounds = owner()->bounds();
     PlatformCALayer::LayerType layerType = owner()->layerType();
-    ASSERT(layerType == PlatformCALayer::LayerTypeTiledBackingLayer);
+    ASSERT(layerType == PlatformCALayer::LayerTypeTiledBackingLayer || layerType == PlatformCALayer::LayerTypePageTiledBackingLayer);
 
     PlatformCALayerClient* client = owner()->owner();

trunk/Source/WebKit/win/ChangeLog

@@ +1 @@
+2015-09-18  Brent Fulgham  <bfulgham@apple.com>
+
+        [Win] Use tiled drawing for main background layer
+        https://bugs.webkit.org/show_bug.cgi?id=149347
+        <rdar://problem/22759632>
+
+        Reviewed by Alex Christensen.
+
+        Instruct WebCore to use tiled drawing for the root layer
+        of the display.
+
+        * WebCoreSupport/WebChromeClient.cpp:
+        (WebChromeClient::shouldUseTiledBackingForFrameView): Added.
+        * WebCoreSupport/WebChromeClient.h:
+
 2015-09-17  Brian Burg  <bburg@apple.com>
 

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

@@ -1 +1 @@
 /*
- * Copyright (C) 2006, 2007, 2008, 2013 Apple Inc. All rights reserved.
+ * Copyright (C) 2006-2008, 2013, 2015 Apple Inc. All rights reserved.
  * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
  *
@@ -851 +851 @@
         delegate->fireFrameLoadFinishedEvents();
 }
+
+bool WebChromeClient::shouldUseTiledBackingForFrameView(const FrameView* frameView) const
+{
+    return frameView && frameView->frame().isMainFrame();
+}

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

@@ -1 +1 @@
 /*
- * Copyright (C) 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
+ * Copyright (C) 2006-2009, 2015 Apple Inc. All rights reserved.
  * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
  *
@@ -172 +172 @@
     virtual void AXFinishFrameLoad();
 
+    bool shouldUseTiledBackingForFrameView(const WebCore::FrameView*) const override;
+
 private:
     COMPtr<IWebUIDelegate> uiDelegate();