<!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>[189974] trunk/Source</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/189974">189974</a></dd>
<dt>Author</dt> <dd>bfulgham@apple.com</dd>
<dt>Date</dt> <dd>2015-09-18 11:23:29 -0700 (Fri, 18 Sep 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[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:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorepageFrameh">trunk/Source/WebCore/page/Frame.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscaGraphicsLayerCAcpp">trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscawinPlatformCALayerWincpp">trunk/Source/WebCore/platform/graphics/ca/win/PlatformCALayerWin.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscawinWebTiledBackingLayerWincpp">trunk/Source/WebCore/platform/graphics/ca/win/WebTiledBackingLayerWin.cpp</a></li>
<li><a href="#trunkSourceWebKitwinChangeLog">trunk/Source/WebKit/win/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitwinWebCoreSupportWebChromeClientcpp">trunk/Source/WebKit/win/WebCoreSupport/WebChromeClient.cpp</a></li>
<li><a href="#trunkSourceWebKitwinWebCoreSupportWebChromeClienth">trunk/Source/WebKit/win/WebCoreSupport/WebChromeClient.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (189973 => 189974)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-09-18 18:00:32 UTC (rev 189973)
+++ trunk/Source/WebCore/ChangeLog 2015-09-18 18:23:29 UTC (rev 189974)
</span><span class="lines">@@ -1,3 +1,32 @@
</span><ins>+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.
+
</ins><span class="cx"> 2015-09-18 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Drop support for Entity Node type
</span></span></pre></div>
<a id="trunkSourceWebCorepageFrameh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Frame.h (189973 => 189974)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Frame.h 2015-09-18 18:00:32 UTC (rev 189973)
+++ trunk/Source/WebCore/page/Frame.h 2015-09-18 18:23:29 UTC (rev 189974)
</span><span class="lines">@@ -138,7 +138,7 @@
</span><span class="cx"> void disconnectOwnerElement();
</span><span class="cx">
</span><span class="cx"> MainFrame& mainFrame() const;
</span><del>- bool isMainFrame() const;
</del><ins>+ WEBCORE_EXPORT bool isMainFrame() const;
</ins><span class="cx">
</span><span class="cx"> Page* page() const;
</span><span class="cx"> HTMLFrameOwnerElement* ownerElement() const;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscaGraphicsLayerCAcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp (189973 => 189974)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp 2015-09-18 18:00:32 UTC (rev 189973)
+++ trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp 2015-09-18 18:23:29 UTC (rev 189974)
</span><span class="lines">@@ -3248,7 +3248,11 @@
</span><span class="cx"> {
</span><span class="cx"> if (isPageTiledBackingLayer()) {
</span><span class="cx"> color = Color(0, 0, 128, 128); // tile cache layer: dark blue
</span><ins>+#if OS(WINDOWS)
+ width = 1.0;
+#else
</ins><span class="cx"> width = 0.5;
</span><ins>+#endif
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscawinPlatformCALayerWincpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/win/PlatformCALayerWin.cpp (189973 => 189974)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/win/PlatformCALayerWin.cpp 2015-09-18 18:00:32 UTC (rev 189973)
+++ trunk/Source/WebCore/platform/graphics/ca/win/PlatformCALayerWin.cpp 2015-09-18 18:23:29 UTC (rev 189974)
</span><span class="lines">@@ -29,6 +29,7 @@
</span><span class="cx">
</span><span class="cx"> #include "AbstractCACFLayerTreeHost.h"
</span><span class="cx"> #include "FontCascade.h"
</span><ins>+#include "GDIUtilities.h"
</ins><span class="cx"> #include "GraphicsContext.h"
</span><span class="cx"> #include "PlatformCAAnimationWin.h"
</span><span class="cx"> #include "PlatformCALayerWinInternal.h"
</span><span class="lines">@@ -46,7 +47,7 @@
</span><span class="cx">
</span><span class="cx"> PassRefPtr<PlatformCALayer> PlatformCALayerWin::create(LayerType layerType, PlatformCALayerClient* owner)
</span><span class="cx"> {
</span><del>- return adoptRef(new PlatformCALayerWin(layerType, 0, owner));
</del><ins>+ return adoptRef(new PlatformCALayerWin(layerType, nullptr, owner));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> PassRefPtr<PlatformCALayer> PlatformCALayerWin::create(PlatformLayer* platformLayer, PlatformCALayerClient* owner)
</span><span class="lines">@@ -65,7 +66,7 @@
</span><span class="cx"> case PlatformCALayer::Linear: return kCACFFilterLinear;
</span><span class="cx"> case PlatformCALayer::Nearest: return kCACFFilterNearest;
</span><span class="cx"> case PlatformCALayer::Trilinear: return kCACFFilterTrilinear;
</span><del>- default: return 0;
</del><ins>+ default: return nullptr;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -74,7 +75,7 @@
</span><span class="cx"> // We need the AbstractCACFLayerTreeHost associated with this layer, which is stored in the UserData of the CACFContext
</span><span class="cx"> void* userData = wkCACFLayerGetContextUserData(layer->platformLayer());
</span><span class="cx"> if (!userData)
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx">
</span><span class="cx"> return static_cast<AbstractCACFLayerTreeHost*>(userData);
</span><span class="cx"> }
</span><span class="lines">@@ -92,10 +93,10 @@
</span><span class="cx"> PlatformCALayer* PlatformCALayer::platformCALayer(void* platformLayer)
</span><span class="cx"> {
</span><span class="cx"> if (!platformLayer)
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx">
</span><span class="cx"> PlatformCALayerWinInternal* layerIntern = intern(platformLayer);
</span><del>- return layerIntern ? layerIntern->owner() : 0;
</del><ins>+ return layerIntern ? layerIntern->owner() : nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> PlatformCALayer::RepaintRectList PlatformCALayer::collectRectsToPaint(CGContextRef, PlatformCALayer*)
</span><span class="lines">@@ -141,7 +142,7 @@
</span><span class="cx"> m_layer = adoptCF(CACFLayerCreate(toCACFLayerType(layerType)));
</span><span class="cx">
</span><span class="cx"> #if HAVE(CACFLAYER_SETCONTENTSSCALE)
</span><del>- CACFLayerSetContentsScale(m_layer.get(), owner ? owner->platformCALayerDeviceScaleFactor() : 1.0f);
</del><ins>+ CACFLayerSetContentsScale(m_layer.get(), owner ? owner->platformCALayerDeviceScaleFactor() : deviceScaleFactorForWindow(nullptr));
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> // Create the PlatformCALayerWinInternal object and point to it in the userdata.
</span><span class="lines">@@ -354,7 +355,7 @@
</span><span class="cx"> {
</span><span class="cx"> HashMap<String, RefPtr<PlatformCAAnimation> >::iterator it = m_animations.find(key);
</span><span class="cx"> if (it == m_animations.end())
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx">
</span><span class="cx"> return it->value;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscawinWebTiledBackingLayerWincpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/win/WebTiledBackingLayerWin.cpp (189973 => 189974)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/win/WebTiledBackingLayerWin.cpp 2015-09-18 18:00:32 UTC (rev 189973)
+++ trunk/Source/WebCore/platform/graphics/ca/win/WebTiledBackingLayerWin.cpp 2015-09-18 18:23:29 UTC (rev 189974)
</span><span class="lines">@@ -82,7 +82,7 @@
</span><span class="cx">
</span><span class="cx"> CGRect layerBounds = owner()->bounds();
</span><span class="cx"> PlatformCALayer::LayerType layerType = owner()->layerType();
</span><del>- ASSERT(layerType == PlatformCALayer::LayerTypeTiledBackingLayer);
</del><ins>+ ASSERT(layerType == PlatformCALayer::LayerTypeTiledBackingLayer || layerType == PlatformCALayer::LayerTypePageTiledBackingLayer);
</ins><span class="cx">
</span><span class="cx"> PlatformCALayerClient* client = owner()->owner();
</span><span class="cx"> GraphicsLayer::CompositingCoordinatesOrientation orientation = client->platformCALayerContentsOrientation();
</span></span></pre></div>
<a id="trunkSourceWebKitwinChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/ChangeLog (189973 => 189974)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/ChangeLog 2015-09-18 18:00:32 UTC (rev 189973)
+++ trunk/Source/WebKit/win/ChangeLog 2015-09-18 18:23:29 UTC (rev 189974)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+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:
+
</ins><span class="cx"> 2015-09-17 Brian Burg <bburg@apple.com>
</span><span class="cx">
</span><span class="cx"> ASSERT(!m_frontendRouter->hasLocalFrontend()) when running Web Inspector tests
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebCoreSupportWebChromeClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebCoreSupport/WebChromeClient.cpp (189973 => 189974)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebCoreSupport/WebChromeClient.cpp 2015-09-18 18:00:32 UTC (rev 189973)
+++ trunk/Source/WebKit/win/WebCoreSupport/WebChromeClient.cpp 2015-09-18 18:23:29 UTC (rev 189974)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2006, 2007, 2008, 2013 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2006-2008, 2013, 2015 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -850,3 +850,8 @@
</span><span class="cx"> if (delegate)
</span><span class="cx"> delegate->fireFrameLoadFinishedEvents();
</span><span class="cx"> }
</span><ins>+
+bool WebChromeClient::shouldUseTiledBackingForFrameView(const FrameView* frameView) const
+{
+ return frameView && frameView->frame().isMainFrame();
+}
</ins></span></pre></div>
<a id="trunkSourceWebKitwinWebCoreSupportWebChromeClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebCoreSupport/WebChromeClient.h (189973 => 189974)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebCoreSupport/WebChromeClient.h 2015-09-18 18:00:32 UTC (rev 189973)
+++ trunk/Source/WebKit/win/WebCoreSupport/WebChromeClient.h 2015-09-18 18:23:29 UTC (rev 189974)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2006-2009, 2015 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -171,6 +171,8 @@
</span><span class="cx"> virtual void AXStartFrameLoad();
</span><span class="cx"> virtual void AXFinishFrameLoad();
</span><span class="cx">
</span><ins>+ bool shouldUseTiledBackingForFrameView(const WebCore::FrameView*) const override;
+
</ins><span class="cx"> private:
</span><span class="cx"> COMPtr<IWebUIDelegate> uiDelegate();
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>