Changeset 165454 in webkit

Timestamp:

Mar 11, 2014, 4:00:19 PM (11 years ago)

Author:

Beth Dakin

Message:

_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]):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/Cocoa/WKViewPrivate.h (modified) (1 diff)
• UIProcess/API/Cocoa/WKWebView.mm (modified) (3 diffs)
• UIProcess/API/Cocoa/WKWebViewPrivate.h (modified) (1 diff)
• UIProcess/API/ios/WKViewIOS.mm (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+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]):
+
 2014-03-11  Jae Hyun Park  <jaepark@webkit.org>
 

trunk/Source/WebKit2/UIProcess/API/Cocoa/WKViewPrivate.h

@@ -49 +49 @@
 
 @property (nonatomic, setter=_setBackgroundExtendsBeyondPage:) BOOL _backgroundExtendsBeyondPage;
+
+// This is deprecated and should be removed entirely: <rdar://problem/16294704>.
 @property (readonly) UIColor *_pageExtendedBackgroundColor;
 

trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm

@@ -376 +376 @@
 }
 
+// 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)];
+}
+
 - (void)_didCommitLayerTree:(const WebKit::RemoteLayerTreeTransaction&)layerTreeTransaction
 {
@@ -387 +397 @@
         [_scrollView setZoomScale:layerTreeTransaction.pageScaleFactor()];
 
-    if (UIColor *pageExtendedBackgroundColor = [self _pageExtendedBackgroundColor]) {
+    if (UIColor *pageExtendedBackgroundColor = [self pageExtendedBackgroundColor]) {
         if ([self _backgroundExtendsBeyondPage])
             [_scrollView setBackgroundColor:pageExtendedBackgroundColor];
@@ -904 +914 @@
 - (UIColor *)_pageExtendedBackgroundColor
 {
+    // This is deprecated.
+    return nil;
+}
+
+- (void)_setBackgroundExtendsBeyondPage:(BOOL)backgroundExtends
+{
+    _page->setBackgroundExtendsBeyondPage(backgroundExtends);
+}
+
+- (BOOL)_backgroundExtendsBeyondPage
+{
+    return _page->backgroundExtendsBeyondPage();
+}
+
+- (void)_beginInteractiveObscuredInsetsChange
+{
+    ASSERT(!_isChangingObscuredInsetsInteractively);
+    _isChangingObscuredInsetsInteractively = YES;
+}
+
+- (void)_endInteractiveObscuredInsetsChange
+{
+    ASSERT(_isChangingObscuredInsetsInteractively);
+    _isChangingObscuredInsetsInteractively = NO;
+    [self _updateVisibleContentRects];
+}
+
+#else
+
+#pragma mark - OS X-specific methods
+
+- (NSColor *)_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)];
-}
-
-- (void)_setBackgroundExtendsBeyondPage:(BOOL)backgroundExtends
-{
-    _page->setBackgroundExtendsBeyondPage(backgroundExtends);
-}
-
-- (BOOL)_backgroundExtendsBeyondPage
-{
-    return _page->backgroundExtendsBeyondPage();
-}
-
-- (void)_beginInteractiveObscuredInsetsChange
-{
-    ASSERT(!_isChangingObscuredInsetsInteractively);
-    _isChangingObscuredInsetsInteractively = YES;
-}
-
-- (void)_endInteractiveObscuredInsetsChange
-{
-    ASSERT(_isChangingObscuredInsetsInteractively);
-    _isChangingObscuredInsetsInteractively = NO;
-    [self _updateVisibleContentRects];
-}
-
-#else
-
-#pragma mark - OS X-specific methods
-
-- (NSColor *)_pageExtendedBackgroundColor
-{
-    WebCore::Color color = _page->pageExtendedBackgroundColor();
-    if (!color.isValid())
-        return nil;
-
     return nsColor(color);
 }

trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h

@@ -73 +73 @@
 
 @property (nonatomic, setter=_setBackgroundExtendsBeyondPage:) BOOL _backgroundExtendsBeyondPage;
+
+// This is deprecated and should be removed entirely: <rdar://problem/16294704>.
 @property (readonly) UIColor *_pageExtendedBackgroundColor;
 

trunk/Source/WebKit2/UIProcess/API/ios/WKViewIOS.mm

@@ -369 +369 @@
 - (UIColor *)_pageExtendedBackgroundColor
 {
-    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)];
+    // This is deprecated. 
+    return nil;
 }