<!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>[171445] branches/safari-600.1-branch/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/171445">171445</a></dd>
<dt>Author</dt> <dd>dburkart@apple.com</dd>
<dt>Date</dt> <dd>2014-07-23 00:03:32 -0700 (Wed, 23 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/171321">r171321</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6001branchSourceWebCoreChangeLog">branches/safari-600.1-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari6001branchSourceWebCorecssStyleResolvercpp">branches/safari-600.1-branch/Source/WebCore/css/StyleResolver.cpp</a></li>
<li><a href="#branchessafari6001branchSourceWebCorepageChromeClienth">branches/safari-600.1-branch/Source/WebCore/page/ChromeClient.h</a></li>
<li><a href="#branchessafari6001branchSourceWebCorerenderingRenderLayerCompositorcpp">branches/safari-600.1-branch/Source/WebCore/rendering/RenderLayerCompositor.cpp</a></li>
<li><a href="#branchessafari6001branchSourceWebKitmacChangeLog">branches/safari-600.1-branch/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#branchessafari6001branchSourceWebKitmacWebCoreSupportWebChromeClienth">branches/safari-600.1-branch/Source/WebKit/mac/WebCoreSupport/WebChromeClient.h</a></li>
<li><a href="#branchessafari6001branchSourceWebKitmacWebCoreSupportWebChromeClientmm">branches/safari-600.1-branch/Source/WebKit/mac/WebCoreSupport/WebChromeClient.mm</a></li>
<li><a href="#branchessafari6001branchSourceWebKitmacWebViewWebViewmm">branches/safari-600.1-branch/Source/WebKit/mac/WebView/WebView.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6001branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebCore/ChangeLog (171444 => 171445)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebCore/ChangeLog 2014-07-23 06:59:34 UTC (rev 171444)
+++ branches/safari-600.1-branch/Source/WebCore/ChangeLog 2014-07-23 07:03:32 UTC (rev 171445)
</span><span class="lines">@@ -1,5 +1,27 @@
</span><span class="cx"> 2014-07-22 Dana Burkart <dburkart@apple.com>
</span><span class="cx">
</span><ins>+ Merge r171321.
+
+ 2014-07-21 Beth Dakin <bdakin@apple.com>
+
+ WK1 should always setAcceleratedCompositingForFixedPositionEnabled(true) on
+ Yosemite
+ https://bugs.webkit.org/show_bug.cgi?id=135135
+
+ Reviewed by Darin Adler.
+
+ This patch gets rid of the ChromeClient function that was introduced with
+ http://trac.webkit.org/changeset/171308 We’ll just enable the Setting instead.
+ * css/StyleResolver.cpp:
+ (WebCore::StyleResolver::adjustRenderStyle):
+ (WebCore::fixedPositionCreatesStackingContext): Deleted.
+ * page/ChromeClient.h:
+ (WebCore::ChromeClient::requiresAcceleratedCompositingForViewportConstrainedPosition): Deleted.
+ * rendering/RenderLayerCompositor.cpp:
+ (WebCore::RenderLayerCompositor::requiresCompositingForPosition):
+
+2014-07-22 Dana Burkart <dburkart@apple.com>
+
</ins><span class="cx"> Merge r171320.
</span><span class="cx">
</span><span class="cx"> 2014-07-21 Simon Fraser <simon.fraser@apple.com>
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebCorecssStyleResolvercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebCore/css/StyleResolver.cpp (171444 => 171445)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebCore/css/StyleResolver.cpp 2014-07-23 06:59:34 UTC (rev 171444)
+++ branches/safari-600.1-branch/Source/WebCore/css/StyleResolver.cpp 2014-07-23 07:03:32 UTC (rev 171445)
</span><span class="lines">@@ -59,8 +59,6 @@
</span><span class="cx"> #include "CachedSVGDocument.h"
</span><span class="cx"> #include "CachedSVGDocumentReference.h"
</span><span class="cx"> #include "CalculationValue.h"
</span><del>-#include "Chrome.h"
-#include "ChromeClient.h"
</del><span class="cx"> #include "ContentData.h"
</span><span class="cx"> #include "Counter.h"
</span><span class="cx"> #include "CounterContent.h"
</span><span class="lines">@@ -1149,19 +1147,6 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-static inline bool fixedPositionCreatesStackingContext(Element* element)
-{
- if (!element)
- return false;
-
- Page* page = element->document().page();
- if (!page)
- return false;
-
- return page->settings().fixedPositionCreatesStackingContext()
- || page->chrome().client().requiresAcceleratedCompositingForViewportConstrainedPosition();
-}
-
</del><span class="cx"> void StyleResolver::adjustRenderStyle(RenderStyle& style, const RenderStyle& parentStyle, Element *e)
</span><span class="cx"> {
</span><span class="cx"> // Cache our original display.
</span><span class="lines">@@ -1270,7 +1255,7 @@
</span><span class="cx"> || style.hasBlendMode()
</span><span class="cx"> || style.hasIsolation()
</span><span class="cx"> || style.position() == StickyPosition
</span><del>- || (style.position() == FixedPosition && fixedPositionCreatesStackingContext(e))
</del><ins>+ || (style.position() == FixedPosition && e && e->document().page() && e->document().page()->settings().fixedPositionCreatesStackingContext())
</ins><span class="cx"> || style.hasFlowFrom()
</span><span class="cx"> ))
</span><span class="cx"> style.setZIndex(0);
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebCorepageChromeClienth"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebCore/page/ChromeClient.h (171444 => 171445)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebCore/page/ChromeClient.h 2014-07-23 06:59:34 UTC (rev 171444)
+++ branches/safari-600.1-branch/Source/WebCore/page/ChromeClient.h 2014-07-23 07:03:32 UTC (rev 171445)
</span><span class="lines">@@ -427,8 +427,6 @@
</span><span class="cx">
</span><span class="cx"> virtual bool shouldUseTiledBackingForFrameView(const FrameView*) const { return false; }
</span><span class="cx">
</span><del>- virtual bool requiresAcceleratedCompositingForViewportConstrainedPosition() const { return false; }
-
</del><span class="cx"> #if ENABLE(SUBTLE_CRYPTO)
</span><span class="cx"> virtual bool wrapCryptoKey(const Vector<uint8_t>&, Vector<uint8_t>&) const { return false; }
</span><span class="cx"> virtual bool unwrapCryptoKey(const Vector<uint8_t>&, Vector<uint8_t>&) const { return false; }
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebCorerenderingRenderLayerCompositorcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebCore/rendering/RenderLayerCompositor.cpp (171444 => 171445)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebCore/rendering/RenderLayerCompositor.cpp 2014-07-23 06:59:34 UTC (rev 171444)
+++ branches/safari-600.1-branch/Source/WebCore/rendering/RenderLayerCompositor.cpp 2014-07-23 07:03:32 UTC (rev 171445)
</span><span class="lines">@@ -2610,9 +2610,7 @@
</span><span class="cx">
</span><span class="cx"> // FIXME: acceleratedCompositingForFixedPositionEnabled should probably be renamed acceleratedCompositingForViewportConstrainedPositionEnabled().
</span><span class="cx"> const Settings& settings = m_renderView.frameView().frame().settings();
</span><del>- Page* page = this->page();
- bool clientRequiresCompositing = page && page->chrome().client().requiresAcceleratedCompositingForViewportConstrainedPosition();
- if (!(settings.acceleratedCompositingForFixedPositionEnabled() || clientRequiresCompositing))
</del><ins>+ if (!settings.acceleratedCompositingForFixedPositionEnabled())
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> if (isSticky)
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebKit/mac/ChangeLog (171444 => 171445)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit/mac/ChangeLog 2014-07-23 06:59:34 UTC (rev 171444)
+++ branches/safari-600.1-branch/Source/WebKit/mac/ChangeLog 2014-07-23 07:03:32 UTC (rev 171445)
</span><span class="lines">@@ -1,5 +1,24 @@
</span><span class="cx"> 2014-07-22 Dana Burkart <dburkart@apple.com>
</span><span class="cx">
</span><ins>+ Merge r171321.
+
+ 2014-07-21 Beth Dakin <bdakin@apple.com>
+
+ WK1 should always setAcceleratedCompositingForFixedPositionEnabled(true) on
+ Yosemite
+ https://bugs.webkit.org/show_bug.cgi?id=135135
+
+ Reviewed by Darin Adler.
+
+ Get rid of the ChromeClient function, and enable the Setting instead.
+ * WebCoreSupport/WebChromeClient.h:
+ * WebCoreSupport/WebChromeClient.mm:
+ (WebChromeClient::requiresAcceleratedCompositingForViewportConstrainedPosition): Deleted.
+ * WebView/WebView.mm:
+ (-[WebView _preferencesChanged:]):
+
+2014-07-22 Dana Burkart <dburkart@apple.com>
+
</ins><span class="cx"> Merge r171308.
</span><span class="cx">
</span><span class="cx"> 2014-07-21 Beth Dakin <bdakin@apple.com>
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebKitmacWebCoreSupportWebChromeClienth"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebKit/mac/WebCoreSupport/WebChromeClient.h (171444 => 171445)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit/mac/WebCoreSupport/WebChromeClient.h 2014-07-23 06:59:34 UTC (rev 171444)
+++ branches/safari-600.1-branch/Source/WebKit/mac/WebCoreSupport/WebChromeClient.h 2014-07-23 07:03:32 UTC (rev 171445)
</span><span class="lines">@@ -211,7 +211,6 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- virtual bool requiresAcceleratedCompositingForViewportConstrainedPosition() const override;
</del><span class="cx">
</span><span class="cx"> WebView *m_webView;
</span><span class="cx"> };
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebKitmacWebCoreSupportWebChromeClientmm"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebKit/mac/WebCoreSupport/WebChromeClient.mm (171444 => 171445)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit/mac/WebCoreSupport/WebChromeClient.mm 2014-07-23 06:59:34 UTC (rev 171444)
+++ branches/safari-600.1-branch/Source/WebKit/mac/WebCoreSupport/WebChromeClient.mm 2014-07-23 07:03:32 UTC (rev 171445)
</span><span class="lines">@@ -1009,12 +1009,6 @@
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(FULLSCREEN_API)
</span><span class="cx">
</span><del>-bool WebChromeClient::requiresAcceleratedCompositingForViewportConstrainedPosition() const
-{
- NSView<WebDocumentView> *documentView = [[[m_webView _selectedOrMainFrame] frameView] documentView];
- return [documentView isKindOfClass:[WebHTMLView class]] && documentView.layer;
-}
-
</del><span class="cx"> #if ENABLE(SUBTLE_CRYPTO)
</span><span class="cx"> bool WebChromeClient::wrapCryptoKey(const Vector<uint8_t>& key, Vector<uint8_t>& wrappedKey) const
</span><span class="cx"> {
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebKitmacWebViewWebViewmm"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebKit/mac/WebView/WebView.mm (171444 => 171445)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit/mac/WebView/WebView.mm 2014-07-23 06:59:34 UTC (rev 171444)
+++ branches/safari-600.1-branch/Source/WebKit/mac/WebView/WebView.mm 2014-07-23 07:03:32 UTC (rev 171445)
</span><span class="lines">@@ -2298,6 +2298,9 @@
</span><span class="cx"> settings.setPlugInSnapshottingEnabled([preferences plugInSnapshottingEnabled]);
</span><span class="cx">
</span><span class="cx"> settings.setFixedPositionCreatesStackingContext(true);
</span><ins>+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 10100
+ settings.setAcceleratedCompositingForFixedPositionEnabled(true);
+#endif
</ins><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> settings.setStandalone([preferences _standalone]);
</span></span></pre>
</div>
</div>
</body>
</html>