<!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>[165454] 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/165454">165454</a></dd>
<dt>Author</dt> <dd>bdakin@apple.com</dd>
<dt>Date</dt> <dd>2014-03-11 16:00:19 -0700 (Tue, 11 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>_pageExtendedBackgroundColor should not be exposed on WKWebView
https://bugs.webkit.org/show_bug.cgi?id=130093
Reviewed by Simon Fraser.
Added comment indicating that _pageExtendedBackgroundColor is deprecated.
* UIProcess/API/Cocoa/WKViewPrivate.h:
_pageExtendedBackgroundColor now returns nil, but the conversation functionality
is maintained with a convenience method pageExtendedBackgroundColor.
* UIProcess/API/Cocoa/WKWebView.mm:
(-[WKWebView pageExtendedBackgroundColor]):
(-[WKWebView _didCommitLayerTree:WebKit::]):
(-[WKWebView _pageExtendedBackgroundColor]):
Added comment indicating that _pageExtendedBackgroundColor is deprecated.
* UIProcess/API/Cocoa/WKWebViewPrivate.h:
Return nil.
* UIProcess/API/ios/WKViewIOS.mm:
(-[WKView _pageExtendedBackgroundColor]):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKViewPrivateh">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKViewPrivate.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKWebViewPrivateh">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIiosWKViewIOSmm">trunk/Source/WebKit2/UIProcess/API/ios/WKViewIOS.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (165453 => 165454)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-03-11 21:51:42 UTC (rev 165453)
+++ trunk/Source/WebKit2/ChangeLog 2014-03-11 23:00:19 UTC (rev 165454)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2014-03-11 Beth Dakin <bdakin@apple.com>
+
+ _pageExtendedBackgroundColor should not be exposed on WKWebView
+ https://bugs.webkit.org/show_bug.cgi?id=130093
+
+ Reviewed by Simon Fraser.
+
+ Added comment indicating that _pageExtendedBackgroundColor is deprecated.
+ * UIProcess/API/Cocoa/WKViewPrivate.h:
+
+ _pageExtendedBackgroundColor now returns nil, but the conversation functionality
+ is maintained with a convenience method pageExtendedBackgroundColor.
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView pageExtendedBackgroundColor]):
+ (-[WKWebView _didCommitLayerTree:WebKit::]):
+ (-[WKWebView _pageExtendedBackgroundColor]):
+
+ Added comment indicating that _pageExtendedBackgroundColor is deprecated.
+ * UIProcess/API/Cocoa/WKWebViewPrivate.h:
+
+ Return nil.
+ * UIProcess/API/ios/WKViewIOS.mm:
+ (-[WKView _pageExtendedBackgroundColor]):
+
</ins><span class="cx"> 2014-03-11 Jae Hyun Park <jaepark@webkit.org>
</span><span class="cx">
</span><span class="cx"> [GTK][CMake] Add HARFBUZZ_INCLUDE_DIRS to WebKit and WebKit2
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKViewPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKViewPrivate.h (165453 => 165454)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKViewPrivate.h 2014-03-11 21:51:42 UTC (rev 165453)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKViewPrivate.h 2014-03-11 23:00:19 UTC (rev 165454)
</span><span class="lines">@@ -48,6 +48,8 @@
</span><span class="cx"> @property (nonatomic, setter=_setObscuredInsets:) UIEdgeInsets _obscuredInsets;
</span><span class="cx">
</span><span class="cx"> @property (nonatomic, setter=_setBackgroundExtendsBeyondPage:) BOOL _backgroundExtendsBeyondPage;
</span><ins>+
+// This is deprecated and should be removed entirely: <rdar://problem/16294704>.
</ins><span class="cx"> @property (readonly) UIColor *_pageExtendedBackgroundColor;
</span><span class="cx">
</span><span class="cx"> - (void)_beginInteractiveObscuredInsetsChange;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (165453 => 165454)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2014-03-11 21:51:42 UTC (rev 165453)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2014-03-11 23:00:19 UTC (rev 165454)
</span><span class="lines">@@ -375,6 +375,16 @@
</span><span class="cx"> _isWaitingForNewLayerTreeAfterDidCommitLoad = YES;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+// This is a convenience method that will convert _page->pageExtendedBackgroundColor() from a WebCore::Color to a UIColor *.
+- (UIColor *)pageExtendedBackgroundColor
+{
+ WebCore::Color color = _page->pageExtendedBackgroundColor();
+ if (!color.isValid())
+ return nil;
+
+ return [UIColor colorWithRed:(color.red() / 255.0) green:(color.green() / 255.0) blue:(color.blue() / 255.0) alpha:(color.alpha() / 255.0)];
+}
+
</ins><span class="cx"> - (void)_didCommitLayerTree:(const WebKit::RemoteLayerTreeTransaction&)layerTreeTransaction
</span><span class="cx"> {
</span><span class="cx"> ASSERT(!_customContentView);
</span><span class="lines">@@ -386,7 +396,7 @@
</span><span class="cx"> if (!layerTreeTransaction.scaleWasSetByUIProcess() && ![_scrollView isZooming] && ![_scrollView isZoomBouncing] && ![_scrollView _isAnimatingZoom])
</span><span class="cx"> [_scrollView setZoomScale:layerTreeTransaction.pageScaleFactor()];
</span><span class="cx">
</span><del>- if (UIColor *pageExtendedBackgroundColor = [self _pageExtendedBackgroundColor]) {
</del><ins>+ if (UIColor *pageExtendedBackgroundColor = [self pageExtendedBackgroundColor]) {
</ins><span class="cx"> if ([self _backgroundExtendsBeyondPage])
</span><span class="cx"> [_scrollView setBackgroundColor:pageExtendedBackgroundColor];
</span><span class="cx"> }
</span><span class="lines">@@ -903,11 +913,8 @@
</span><span class="cx">
</span><span class="cx"> - (UIColor *)_pageExtendedBackgroundColor
</span><span class="cx"> {
</span><del>- WebCore::Color color = _page->pageExtendedBackgroundColor();
- if (!color.isValid())
- return nil;
-
- return [UIColor colorWithRed:(color.red() / 255.0) green:(color.green() / 255.0) blue:(color.blue() / 255.0) alpha:(color.alpha() / 255.0)];
</del><ins>+ // This is deprecated.
+ return nil;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)_setBackgroundExtendsBeyondPage:(BOOL)backgroundExtends
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h (165453 => 165454)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h 2014-03-11 21:51:42 UTC (rev 165453)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h 2014-03-11 23:00:19 UTC (rev 165454)
</span><span class="lines">@@ -72,6 +72,8 @@
</span><span class="cx"> @property (nonatomic, setter=_setObscuredInsets:) UIEdgeInsets _obscuredInsets;
</span><span class="cx">
</span><span class="cx"> @property (nonatomic, setter=_setBackgroundExtendsBeyondPage:) BOOL _backgroundExtendsBeyondPage;
</span><ins>+
+// This is deprecated and should be removed entirely: <rdar://problem/16294704>.
</ins><span class="cx"> @property (readonly) UIColor *_pageExtendedBackgroundColor;
</span><span class="cx">
</span><span class="cx"> - (void)_beginInteractiveObscuredInsetsChange;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIiosWKViewIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/ios/WKViewIOS.mm (165453 => 165454)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/ios/WKViewIOS.mm 2014-03-11 21:51:42 UTC (rev 165453)
+++ trunk/Source/WebKit2/UIProcess/API/ios/WKViewIOS.mm 2014-03-11 23:00:19 UTC (rev 165454)
</span><span class="lines">@@ -368,11 +368,8 @@
</span><span class="cx">
</span><span class="cx"> - (UIColor *)_pageExtendedBackgroundColor
</span><span class="cx"> {
</span><del>- WebCore::Color color = [_contentView page]->pageExtendedBackgroundColor();
- if (!color.isValid())
- return nil;
-
- return [UIColor colorWithRed:(color.red() / 255.0) green:(color.green() / 255.0) blue:(color.blue() / 255.0) alpha:(color.alpha() / 255.0)];
</del><ins>+ // This is deprecated.
+ return nil;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)_setBackgroundExtendsBeyondPage:(BOOL)backgroundExtends
</span></span></pre>
</div>
</div>
</body>
</html>