<!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>[194108] trunk/Source/WebKit2</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/194108">194108</a></dd>
<dt>Author</dt> <dd>dbates@webkit.org</dd>
<dt>Date</dt> <dd>2015-12-15 10:40:30 -0800 (Tue, 15 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Guard code that uses class LayerTreeHost with USE(COORDINATED_GRAPHICS) or USE(TEXTURE_MAPPER)
https://bugs.webkit.org/show_bug.cgi?id=152265
Reviewed by Tim Horton.
We neither make use of LayerTreeHost on Mac nor on iOS. We should guard code that makes
use of this class as applicable. This also fixes the iOS Simulator build when using
Apple Internal software.
* WebProcess/WebCoreSupport/WebChromeClient.cpp: Guard code that used LayerTreeHost.
* WebProcess/WebPage/LayerTreeHost.cpp: Guard contents of file with USE(COORDINATED_GRAPHICS) || USE(TEXTURE_MAPPER).
* WebProcess/WebPage/LayerTreeHost.h: Ditto.
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::scalePage): Ditto.
(WebKit::WebPage::setDeviceScaleFactor): Ditto.
* WebProcess/WebPage/WebPage.h: Substitute header LayerTreeContext.h for LayerTreeHost.h since we make use
of the enum class LayerHostingMode.
* WebProcess/WebPage/ios/WebPageIOS.mm:
(WebKit::WebPage::updateVisibleContentRects): Remove unnecessary code; DrawingArea::layerTreeHost() always
returns nullptr on iOS.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebChromeClientcpp">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageLayerTreeHostcpp">trunk/Source/WebKit2/WebProcess/WebPage/LayerTreeHost.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageLayerTreeHosth">trunk/Source/WebKit2/WebProcess/WebPage/LayerTreeHost.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagecpp">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPageh">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageiosWebPageIOSmm">trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (194107 => 194108)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-12-15 17:58:04 UTC (rev 194107)
+++ trunk/Source/WebKit2/ChangeLog 2015-12-15 18:40:30 UTC (rev 194108)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2015-12-15 Daniel Bates <dabates@apple.com>
+
+ Guard code that uses class LayerTreeHost with USE(COORDINATED_GRAPHICS) or USE(TEXTURE_MAPPER)
+ https://bugs.webkit.org/show_bug.cgi?id=152265
+
+ Reviewed by Tim Horton.
+
+ We neither make use of LayerTreeHost on Mac nor on iOS. We should guard code that makes
+ use of this class as applicable. This also fixes the iOS Simulator build when using
+ Apple Internal software.
+
+ * WebProcess/WebCoreSupport/WebChromeClient.cpp: Guard code that used LayerTreeHost.
+ * WebProcess/WebPage/LayerTreeHost.cpp: Guard contents of file with USE(COORDINATED_GRAPHICS) || USE(TEXTURE_MAPPER).
+ * WebProcess/WebPage/LayerTreeHost.h: Ditto.
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::scalePage): Ditto.
+ (WebKit::WebPage::setDeviceScaleFactor): Ditto.
+ * WebProcess/WebPage/WebPage.h: Substitute header LayerTreeContext.h for LayerTreeHost.h since we make use
+ of the enum class LayerHostingMode.
+ * WebProcess/WebPage/ios/WebPageIOS.mm:
+ (WebKit::WebPage::updateVisibleContentRects): Remove unnecessary code; DrawingArea::layerTreeHost() always
+ returns nullptr on iOS.
+
</ins><span class="cx"> 2015-12-15 Zan Dobersek <zdobersek@igalia.com>
</span><span class="cx">
</span><span class="cx"> [TexMap] Operate with a reference to the TextureMapper wherever possible
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebChromeClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp (194107 => 194108)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp 2015-12-15 17:58:04 UTC (rev 194107)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp 2015-12-15 18:40:30 UTC (rev 194108)
</span><span class="lines">@@ -33,7 +33,6 @@
</span><span class="cx"> #include "HangDetectionDisabler.h"
</span><span class="cx"> #include "InjectedBundleNavigationAction.h"
</span><span class="cx"> #include "InjectedBundleNodeHandle.h"
</span><del>-#include "LayerTreeHost.h"
</del><span class="cx"> #include "NavigationActionData.h"
</span><span class="cx"> #include "PageBanner.h"
</span><span class="cx"> #include "UserData.h"
</span><span class="lines">@@ -84,6 +83,10 @@
</span><span class="cx"> #include "RemoteScrollingCoordinator.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if USE(COORDINATED_GRAPHICS)
+#include "LayerTreeHost.h"
+#endif
+
</ins><span class="cx"> #if PLATFORM(GTK)
</span><span class="cx"> #include "PrinterListGtk.h"
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageLayerTreeHostcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/LayerTreeHost.cpp (194107 => 194108)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/LayerTreeHost.cpp 2015-12-15 17:58:04 UTC (rev 194107)
+++ trunk/Source/WebKit2/WebProcess/WebPage/LayerTreeHost.cpp 2015-12-15 18:40:30 UTC (rev 194108)
</span><span class="lines">@@ -24,6 +24,9 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> #include "config.h"
</span><ins>+
+#if USE(COORDINATED_GRAPHICS) || USE(TEXTURE_MAPPER)
+
</ins><span class="cx"> #include "LayerTreeHost.h"
</span><span class="cx">
</span><span class="cx"> #if USE(COORDINATED_GRAPHICS_MULTIPROCESS)
</span><span class="lines">@@ -62,3 +65,5 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span><ins>+
+#endif // USE(COORDINATED_GRAPHICS) || USE(TEXTURE_MAPPER)
</ins></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageLayerTreeHosth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/LayerTreeHost.h (194107 => 194108)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/LayerTreeHost.h 2015-12-15 17:58:04 UTC (rev 194107)
+++ trunk/Source/WebKit2/WebProcess/WebPage/LayerTreeHost.h 2015-12-15 18:40:30 UTC (rev 194108)
</span><span class="lines">@@ -26,6 +26,8 @@
</span><span class="cx"> #ifndef LayerTreeHost_h
</span><span class="cx"> #define LayerTreeHost_h
</span><span class="cx">
</span><ins>+#if USE(COORDINATED_GRAPHICS) || USE(TEXTURE_MAPPER)
+
</ins><span class="cx"> #include "LayerTreeContext.h"
</span><span class="cx"> #include <WebCore/Color.h>
</span><span class="cx"> #include <wtf/PassRefPtr.h>
</span><span class="lines">@@ -106,4 +108,6 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span><span class="cx">
</span><ins>+#endif // USE(COORDINATED_GRAPHICS) || USE(TEXTURE_MAPPER)
+
</ins><span class="cx"> #endif // LayerTreeHost_h
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (194107 => 194108)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2015-12-15 17:58:04 UTC (rev 194107)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2015-12-15 18:40:30 UTC (rev 194108)
</span><span class="lines">@@ -40,7 +40,6 @@
</span><span class="cx"> #include "EventDispatcher.h"
</span><span class="cx"> #include "InjectedBundle.h"
</span><span class="cx"> #include "InjectedBundleBackForwardList.h"
</span><del>-#include "LayerTreeHost.h"
</del><span class="cx"> #include "Logging.h"
</span><span class="cx"> #include "NetscapePlugin.h"
</span><span class="cx"> #include "NotificationPermissionRequestManager.h"
</span><span class="lines">@@ -212,6 +211,10 @@
</span><span class="cx"> #include <wtf/RefCountedLeakCounter.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if USE(COORDINATED_GRAPHICS) || USE(TEXTURE_MAPPER)
+#include "LayerTreeHost.h"
+#endif
+
</ins><span class="cx"> #if USE(COORDINATED_GRAPHICS_MULTIPROCESS)
</span><span class="cx"> #include "CoordinatedLayerTreeHostMessages.h"
</span><span class="cx"> #endif
</span><span class="lines">@@ -1459,8 +1462,10 @@
</span><span class="cx"> for (auto* pluginView : m_pluginViews)
</span><span class="cx"> pluginView->pageScaleFactorDidChange();
</span><span class="cx">
</span><ins>+#if USE(COORDINATED_GRAPHICS) || USE(TEXTURE_MAPPER)
</ins><span class="cx"> if (m_drawingArea->layerTreeHost())
</span><span class="cx"> m_drawingArea->layerTreeHost()->deviceOrPageScaleFactorChanged();
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> send(Messages::WebPageProxy::PageScaleFactorDidChange(scale));
</span><span class="cx"> }
</span><span class="lines">@@ -1535,8 +1540,10 @@
</span><span class="cx"> m_findController.deviceScaleFactorDidChange();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if USE(COORDINATED_GRAPHICS) || USE(TEXTURE_MAPPER)
</ins><span class="cx"> if (m_drawingArea->layerTreeHost())
</span><span class="cx"> m_drawingArea->layerTreeHost()->deviceOrPageScaleFactorChanged();
</span><ins>+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> float WebPage::deviceScaleFactor() const
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h (194107 => 194108)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2015-12-15 17:58:04 UTC (rev 194107)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2015-12-15 18:40:30 UTC (rev 194108)
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx"> #include "InjectedBundlePageLoaderClient.h"
</span><span class="cx"> #include "InjectedBundlePagePolicyClient.h"
</span><span class="cx"> #include "InjectedBundlePageResourceLoadClient.h"
</span><del>-#include "LayerTreeHost.h"
</del><ins>+#include "LayerTreeContext.h"
</ins><span class="cx"> #include "MessageReceiver.h"
</span><span class="cx"> #include "MessageSender.h"
</span><span class="cx"> #include "Plugin.h"
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageiosWebPageIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm (194107 => 194108)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2015-12-15 17:58:04 UTC (rev 194107)
+++ trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2015-12-15 18:40:30 UTC (rev 194108)
</span><span class="lines">@@ -2924,9 +2924,6 @@
</span><span class="cx">
</span><span class="cx"> m_page->setPageScaleFactor(floatBoundedScale, scrollPosition, m_isInStableState);
</span><span class="cx"> hasSetPageScale = true;
</span><del>-
- if (LayerTreeHost* layerTreeHost = m_drawingArea->layerTreeHost())
- layerTreeHost->deviceOrPageScaleFactorChanged();
</del><span class="cx"> send(Messages::WebPageProxy::PageScaleFactorDidChange(floatBoundedScale));
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>