<!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>[170935] 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/170935">170935</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-07-09 15:06:29 -0700 (Wed, 09 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Support transparent WKWebViews
https://bugs.webkit.org/show_bug.cgi?id=134779
<rdar://problem/17351058>
Reviewed by Tim Horton.
Source/WebCore:
Schedule rebuilding the compositing layers if a FrameView's transparency changes.
* page/FrameView.cpp:
(WebCore::FrameView::setTransparent):
Source/WebKit2:
* UIProcess/API/Cocoa/WKWebView.mm:
(-[WKWebView initWithFrame:configuration:]):
Call _updateScrollViewBackground instead of setting the background color.
(contentZoomScale):
Use dot notation.
(scrollViewBackgroundColor):
Helper function that returns the scroll view background color.
If the web view isn't opaque, we want the scroll view to be transparent.
(-[WKWebView _updateScrollViewBackground]):
Call scrollViewBackgroundColor.
(-[WKWebView setOpaque:]):
Call WebPageProxy::setDrawsBackground and update the scroll view background.
(-[WKWebView setBackgroundColor:]):
Call setBackgroundColor on the content view.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorepageFrameViewcpp">trunk/Source/WebCore/page/FrameView.cpp</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (170934 => 170935)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-07-09 21:58:13 UTC (rev 170934)
+++ trunk/Source/WebCore/ChangeLog 2014-07-09 22:06:29 UTC (rev 170935)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2014-07-09 Anders Carlsson <andersca@apple.com>
+
+ Support transparent WKWebViews
+ https://bugs.webkit.org/show_bug.cgi?id=134779
+ <rdar://problem/17351058>
+
+ Reviewed by Tim Horton.
+
+ Schedule rebuilding the compositing layers if a FrameView's transparency changes.
+
+ * page/FrameView.cpp:
+ (WebCore::FrameView::setTransparent):
+
</ins><span class="cx"> 2014-07-09 Javier Fernandez <jfernandez@igalia.com>
</span><span class="cx"> CSS canvas color parsing accepts invalid color identifiers
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=134661
</span></span></pre></div>
<a id="trunkSourceWebCorepageFrameViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/FrameView.cpp (170934 => 170935)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/FrameView.cpp 2014-07-09 21:58:13 UTC (rev 170934)
+++ trunk/Source/WebCore/page/FrameView.cpp 2014-07-09 22:06:29 UTC (rev 170935)
</span><span class="lines">@@ -2523,7 +2523,18 @@
</span><span class="cx">
</span><span class="cx"> void FrameView::setTransparent(bool isTransparent)
</span><span class="cx"> {
</span><ins>+ if (m_isTransparent == isTransparent)
+ return;
+
</ins><span class="cx"> m_isTransparent = isTransparent;
</span><ins>+
+ RenderView* renderView = this->renderView();
+ if (!renderView)
+ return;
+
+ RenderLayerCompositor& compositor = renderView->compositor();
+ compositor.setCompositingLayersNeedRebuild();
+ compositor.scheduleCompositingLayerUpdate();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool FrameView::hasOpaqueBackground() const
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (170934 => 170935)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-07-09 21:58:13 UTC (rev 170934)
+++ trunk/Source/WebKit2/ChangeLog 2014-07-09 22:06:29 UTC (rev 170935)
</span><span class="lines">@@ -1,3 +1,31 @@
</span><ins>+2014-07-09 Anders Carlsson <andersca@apple.com>
+
+ Support transparent WKWebViews
+ https://bugs.webkit.org/show_bug.cgi?id=134779
+ <rdar://problem/17351058>
+
+ Reviewed by Tim Horton.
+
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView initWithFrame:configuration:]):
+ Call _updateScrollViewBackground instead of setting the background color.
+
+ (contentZoomScale):
+ Use dot notation.
+
+ (scrollViewBackgroundColor):
+ Helper function that returns the scroll view background color.
+ If the web view isn't opaque, we want the scroll view to be transparent.
+
+ (-[WKWebView _updateScrollViewBackground]):
+ Call scrollViewBackgroundColor.
+
+ (-[WKWebView setOpaque:]):
+ Call WebPageProxy::setDrawsBackground and update the scroll view background.
+
+ (-[WKWebView setBackgroundColor:]):
+ Call setBackgroundColor on the content view.
+
</ins><span class="cx"> 2014-07-09 Andy Estes <aestes@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] WebKit can crash under QuickLookDocumentData::encode() when viewing a QuickLook preview
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (170934 => 170935)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2014-07-09 21:58:13 UTC (rev 170934)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2014-07-09 22:06:29 UTC (rev 170935)
</span><span class="lines">@@ -277,7 +277,6 @@
</span><span class="cx"> [_scrollView setBouncesZoom:YES];
</span><span class="cx">
</span><span class="cx"> [self addSubview:_scrollView.get()];
</span><del>- [_scrollView setBackgroundColor:[UIColor whiteColor]];
</del><span class="cx">
</span><span class="cx"> _contentView = adoptNS([[WKContentView alloc] initWithFrame:bounds context:context configuration:WTF::move(webPageConfiguration) webView:self]);
</span><span class="cx">
</span><span class="lines">@@ -287,8 +286,9 @@
</span><span class="cx">
</span><span class="cx"> [_contentView layer].anchorPoint = CGPointZero;
</span><span class="cx"> [_contentView setFrame:bounds];
</span><del>- [_scrollView addSubview:_contentView.get()];
</del><span class="cx"> [_scrollView addSubview:[_contentView unscaledView]];
</span><ins>+ [self _updateScrollViewBackground];
+
</ins><span class="cx"> _viewportMetaTagWidth = -1;
</span><span class="cx">
</span><span class="cx"> [self _frameOrBoundsChanged];
</span><span class="lines">@@ -654,29 +654,40 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static CGFloat contentZoomScale(WKWebView* webView)
</del><ins>+static CGFloat contentZoomScale(WKWebView *webView)
</ins><span class="cx"> {
</span><del>- CGFloat scale = [[webView._currentContentView layer] affineTransform].a;
</del><ins>+ CGFloat scale = webView._currentContentView.layer.affineTransform.a;
</ins><span class="cx"> ASSERT(scale == [webView->_scrollView zoomScale]);
</span><span class="cx"> return scale;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (void)_updateScrollViewBackground
</del><ins>+static WebCore::Color scrollViewBackgroundColor(WKWebView *webView)
</ins><span class="cx"> {
</span><ins>+ if (!webView.opaque)
+ return WebCore::Color::transparent;
+
</ins><span class="cx"> WebCore::Color color;
</span><del>- if (_customContentView)
- color = [_customContentView backgroundColor].CGColor;
</del><ins>+
+ if (webView->_customContentView)
+ color = [webView->_customContentView backgroundColor].CGColor;
</ins><span class="cx"> else
</span><del>- color = _page->pageExtendedBackgroundColor();
</del><ins>+ color = webView->_page->pageExtendedBackgroundColor();
</ins><span class="cx">
</span><del>- CGFloat zoomScale = contentZoomScale(self);
- CGFloat minimumZoomScale = [_scrollView minimumZoomScale];
</del><ins>+ CGFloat zoomScale = contentZoomScale(webView);
+ CGFloat minimumZoomScale = [webView->_scrollView minimumZoomScale];
</ins><span class="cx"> if (zoomScale < minimumZoomScale) {
</span><span class="cx"> CGFloat slope = 12;
</span><span class="cx"> CGFloat opacity = std::max<CGFloat>(1 - slope * (minimumZoomScale - zoomScale), 0);
</span><span class="cx"> color = WebCore::colorWithOverrideAlpha(color.rgb(), opacity);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ return color;
+}
+
+- (void)_updateScrollViewBackground
+{
+ WebCore::Color color = scrollViewBackgroundColor(self);
+
</ins><span class="cx"> if (_scrollViewBackgroundColor == color)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -1160,6 +1171,26 @@
</span><span class="cx"> _page->viewStateDidChange(WebCore::ViewState::IsInWindow);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (void)setOpaque:(BOOL)opaque
+{
+ BOOL oldOpaque = self.opaque;
+
+ [super setOpaque:opaque];
+ [_contentView setOpaque:opaque];
+
+ if (oldOpaque == opaque)
+ return;
+
+ _page->setDrawsBackground(opaque);
+ [self _updateScrollViewBackground];
+}
+
+- (void)setBackgroundColor:(UIColor *)backgroundColor
+{
+ [super setBackgroundColor:backgroundColor];
+ [_contentView setBackgroundColor:backgroundColor];
+}
+
</ins><span class="cx"> #pragma mark - UIScrollViewDelegate
</span><span class="cx">
</span><span class="cx"> - (BOOL)usesStandardContentView
</span></span></pre>
</div>
</div>
</body>
</html>