<!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>[287452] trunk</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/287452">287452</a></dd>
<dt>Author</dt> <dd>weinig@apple.com</dd>
<dt>Date</dt> <dd>2021-12-26 16:46:40 -0800 (Sun, 26 Dec 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>Replace WebKit/CocoaColor.h with WebCore/ColorCocoa.h, not confusing at all
https://bugs.webkit.org/show_bug.cgi?id=234693

Reviewed by Simon Fraser.

Source/WebKit:

We don't need both. The WebCore one can work for both.

* Platform/cocoa/CocoaColor.h: Removed.
* Shared/Cocoa/ArgumentCodersCocoa.mm:
(IPC::typeFromObject):
(IPC::encodeColorInternal):
(IPC::encodeObject):
* UIProcess/API/Cocoa/WKWebView.mm:
(-[WKWebView themeColor]):
(-[WKWebView underPageBackgroundColor]):
(-[WKWebView setUnderPageBackgroundColor:]):
(-[WKWebView _themeColor]):
(-[WKWebView _pageExtendedBackgroundColor]):
(-[WKWebView _sampledPageTopColor]):
* UIProcess/API/Cocoa/_WKApplicationManifest.mm:
(-[_WKApplicationManifest initWithCoder:]):
(-[_WKApplicationManifest themeColor]):
* UIProcess/Cocoa/WKSafeBrowsingWarning.h:
* UIProcess/Cocoa/WKSafeBrowsingWarning.mm:
(colorForItem):
(-[WKSafeBrowsingBox setSafeBrowsingBackgroundColor:]):
(-[WKSafeBrowsingWarning showDetailsClicked]):
(-[WKSafeBrowsingTextView initWithAttributedString:forWarning:]):
* WebKit.xcodeproj/project.pbxproj:
* WebProcess/Plugins/PDF/PDFPlugin.mm:
(WebKit::PDFPlugin::PDFPlugin):

Tools:

Use WebCore/ColorCocoa.h instead.

* TestWebKitAPI/Tests/WebKitCocoa/CopyHTML.mm:
* TestWebKitAPI/Tests/WebKitCocoa/WKWebViewThemeColor.mm:
* TestWebKitAPI/Tests/WebKitCocoa/WKWebViewUnderPageBackgroundColor.mm:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitSharedCocoaArgumentCodersCocoamm">trunk/Source/WebKit/Shared/Cocoa/ArgumentCodersCocoa.mm</a></li>
<li><a href="#trunkSourceWebKitUIProcessAPICocoaWKWebViewmm">trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm</a></li>
<li><a href="#trunkSourceWebKitUIProcessAPICocoa_WKApplicationManifestmm">trunk/Source/WebKit/UIProcess/API/Cocoa/_WKApplicationManifest.mm</a></li>
<li><a href="#trunkSourceWebKitUIProcessCocoaWKSafeBrowsingWarningh">trunk/Source/WebKit/UIProcess/Cocoa/WKSafeBrowsingWarning.h</a></li>
<li><a href="#trunkSourceWebKitUIProcessCocoaWKSafeBrowsingWarningmm">trunk/Source/WebKit/UIProcess/Cocoa/WKSafeBrowsingWarning.mm</a></li>
<li><a href="#trunkSourceWebKitWebKitxcodeprojprojectpbxproj">trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebKitWebProcessPluginsPDFPDFPluginmm">trunk/Source/WebKit/WebProcess/Plugins/PDF/PDFPlugin.mm</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKitCocoaCopyHTMLmm">trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/CopyHTML.mm</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKitCocoaWKWebViewThemeColormm">trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/WKWebViewThemeColor.mm</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKitCocoaWKWebViewUnderPageBackgroundColormm">trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/WKWebViewUnderPageBackgroundColor.mm</a></li>
</ul>

<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitPlatformcocoaCocoaColorh">trunk/Source/WebKit/Platform/cocoa/CocoaColor.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (287451 => 287452)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog    2021-12-27 00:03:41 UTC (rev 287451)
+++ trunk/Source/WebKit/ChangeLog       2021-12-27 00:46:40 UTC (rev 287452)
</span><span class="lines">@@ -1,3 +1,37 @@
</span><ins>+2021-12-26  Sam Weinig  <weinig@apple.com>
+
+        Replace WebKit/CocoaColor.h with WebCore/ColorCocoa.h, not confusing at all
+        https://bugs.webkit.org/show_bug.cgi?id=234693
+
+        Reviewed by Simon Fraser.
+
+        We don't need both. The WebCore one can work for both.
+
+        * Platform/cocoa/CocoaColor.h: Removed.
+        * Shared/Cocoa/ArgumentCodersCocoa.mm:
+        (IPC::typeFromObject):
+        (IPC::encodeColorInternal):
+        (IPC::encodeObject):
+        * UIProcess/API/Cocoa/WKWebView.mm:
+        (-[WKWebView themeColor]):
+        (-[WKWebView underPageBackgroundColor]):
+        (-[WKWebView setUnderPageBackgroundColor:]):
+        (-[WKWebView _themeColor]):
+        (-[WKWebView _pageExtendedBackgroundColor]):
+        (-[WKWebView _sampledPageTopColor]):
+        * UIProcess/API/Cocoa/_WKApplicationManifest.mm:
+        (-[_WKApplicationManifest initWithCoder:]):
+        (-[_WKApplicationManifest themeColor]):
+        * UIProcess/Cocoa/WKSafeBrowsingWarning.h:
+        * UIProcess/Cocoa/WKSafeBrowsingWarning.mm:
+        (colorForItem):
+        (-[WKSafeBrowsingBox setSafeBrowsingBackgroundColor:]):
+        (-[WKSafeBrowsingWarning showDetailsClicked]):
+        (-[WKSafeBrowsingTextView initWithAttributedString:forWarning:]):
+        * WebKit.xcodeproj/project.pbxproj:
+        * WebProcess/Plugins/PDF/PDFPlugin.mm:
+        (WebKit::PDFPlugin::PDFPlugin):
+
</ins><span class="cx"> 2021-12-26  Yousuke Kimoto  <Yousuke.Kimoto@sony.com>
</span><span class="cx"> 
</span><span class="cx">         RemoteInspectorProtocolHandler::inspect() expects ConnectionID as uint32_t
</span></span></pre></div>
<a id="trunkSourceWebKitPlatformcocoaCocoaColorh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit/Platform/cocoa/CocoaColor.h (287451 => 287452)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/Platform/cocoa/CocoaColor.h  2021-12-27 00:03:41 UTC (rev 287451)
+++ trunk/Source/WebKit/Platform/cocoa/CocoaColor.h     2021-12-27 00:46:40 UTC (rev 287452)
</span><span class="lines">@@ -1,36 +0,0 @@
</span><del>-/*
-* Copyright (C) 2020 Apple Inc. All rights reserved.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions
-* are met:
-* 1. Redistributions of source code must retain the above copyright
-*    notice, this list of conditions and the following disclaimer.
-* 2. Redistributions in binary form must reproduce the above copyright
-*    notice, this list of conditions and the following disclaimer in the
-*    documentation and/or other materials provided with the distribution.
-*
-* THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
-* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-* THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
-* BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
-* THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-#pragma once
-
-#include <wtf/Compiler.h>
-
-#if USE(APPKIT)
-OBJC_CLASS NSColor;
-using CocoaColor = NSColor;
-#else
-OBJC_CLASS UIColor;
-using CocoaColor = UIColor;
-#endif
</del></span></pre></div>
<a id="trunkSourceWebKitSharedCocoaArgumentCodersCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/Shared/Cocoa/ArgumentCodersCocoa.mm (287451 => 287452)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/Shared/Cocoa/ArgumentCodersCocoa.mm  2021-12-27 00:03:41 UTC (rev 287451)
+++ trunk/Source/WebKit/Shared/Cocoa/ArgumentCodersCocoa.mm     2021-12-27 00:46:40 UTC (rev 287452)
</span><span class="lines">@@ -29,7 +29,6 @@
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> 
</span><span class="cx"> #import "ArgumentCodersCF.h"
</span><del>-#import "CocoaColor.h"
</del><span class="cx"> #import "CocoaFont.h"
</span><span class="cx"> #import "CoreTextHelpers.h"
</span><span class="cx"> #import <CoreText/CTFont.h>
</span><span class="lines">@@ -172,7 +171,7 @@
</span><span class="cx">     // Specific classes handled.
</span><span class="cx">     if ([object isKindOfClass:[NSArray class]])
</span><span class="cx">         return NSType::Array;
</span><del>-    if ([object isKindOfClass:[CocoaColor class]])
</del><ins>+    if ([object isKindOfClass:[WebCore::CocoaColor class]])
</ins><span class="cx">         return NSType::Color;
</span><span class="cx">     if ([object isKindOfClass:[NSData class]])
</span><span class="cx">         return NSType::Data;
</span><span class="lines">@@ -261,7 +260,7 @@
</span><span class="cx"> 
</span><span class="cx"> #pragma mark - NSColor / UIColor
</span><span class="cx"> 
</span><del>-static inline void encodeColorInternal(Encoder& encoder, CocoaColor *color)
</del><ins>+static inline void encodeColorInternal(Encoder& encoder, WebCore::CocoaColor *color)
</ins><span class="cx"> {
</span><span class="cx">     encoder << colorFromCocoaColor(color);
</span><span class="cx"> }
</span><span class="lines">@@ -491,7 +490,7 @@
</span><span class="cx">         encodeArrayInternal(encoder, static_cast<NSArray *>(object));
</span><span class="cx">         return;
</span><span class="cx">     case NSType::Color:
</span><del>-        encodeColorInternal(encoder, static_cast<CocoaColor *>(object));
</del><ins>+        encodeColorInternal(encoder, static_cast<WebCore::CocoaColor *>(object));
</ins><span class="cx">         return;
</span><span class="cx">     case NSType::Dictionary:
</span><span class="cx">         encodeDictionaryInternal(encoder, static_cast<NSDictionary *>(object));
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessAPICocoaWKWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm (287451 => 287452)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm     2021-12-27 00:03:41 UTC (rev 287451)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm        2021-12-27 00:46:40 UTC (rev 287452)
</span><span class="lines">@@ -30,7 +30,6 @@
</span><span class="cx"> #import "APIFrameTreeNode.h"
</span><span class="cx"> #import "APIPageConfiguration.h"
</span><span class="cx"> #import "APISerializedScriptValue.h"
</span><del>-#import "CocoaColor.h"
</del><span class="cx"> #import "CocoaImage.h"
</span><span class="cx"> #import "CompletionHandlerCallChecker.h"
</span><span class="cx"> #import "ContentAsStringIncludesChildFrames.h"
</span><span class="lines">@@ -1776,17 +1775,17 @@
</span><span class="cx">     return wrapper(_page->loadFile(URL.absoluteString, readAccessURL.absoluteString, isAppInitiated));
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-- (CocoaColor *)themeColor
</del><ins>+- (WebCore::CocoaColor *)themeColor
</ins><span class="cx"> {
</span><span class="cx">     return cocoaColorOrNil(_page->themeColor()).autorelease();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-- (CocoaColor *)underPageBackgroundColor
</del><ins>+- (WebCore::CocoaColor *)underPageBackgroundColor
</ins><span class="cx"> {
</span><span class="cx">     return cocoaColor(_page->underPageBackgroundColor()).autorelease();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-- (void)setUnderPageBackgroundColor:(CocoaColor *)underPageBackgroundColorOverride
</del><ins>+- (void)setUnderPageBackgroundColor:(WebCore::CocoaColor *)underPageBackgroundColorOverride
</ins><span class="cx"> {
</span><span class="cx">     _page->setUnderPageBackgroundColorOverride(WebCore::roundAndClampToSRGBALossy(underPageBackgroundColorOverride.CGColor));
</span><span class="cx"> }
</span><span class="lines">@@ -3326,18 +3325,18 @@
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> // FIXME: Remove old `-[WKWebView _themeColor]` SPI <rdar://76662644>
</span><del>-- (CocoaColor *)_themeColor
</del><ins>+- (WebCore::CocoaColor *)_themeColor
</ins><span class="cx"> {
</span><span class="cx">     return [self themeColor];
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> // FIXME: Remove old `-[WKWebView _pageExtendedBackgroundColor]` SPI <rdar://77789732>
</span><del>-- (CocoaColor *)_pageExtendedBackgroundColor
</del><ins>+- (WebCore::CocoaColor *)_pageExtendedBackgroundColor
</ins><span class="cx"> {
</span><span class="cx">     return cocoaColorOrNil(_page->pageExtendedBackgroundColor()).autorelease();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-- (CocoaColor *)_sampledPageTopColor
</del><ins>+- (WebCore::CocoaColor *)_sampledPageTopColor
</ins><span class="cx"> {
</span><span class="cx">     return cocoaColorOrNil(_page->sampledPageTopColor()).autorelease();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessAPICocoa_WKApplicationManifestmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/_WKApplicationManifest.mm (287451 => 287452)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/API/Cocoa/_WKApplicationManifest.mm        2021-12-27 00:03:41 UTC (rev 287451)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/_WKApplicationManifest.mm   2021-12-27 00:46:40 UTC (rev 287452)
</span><span class="lines">@@ -26,7 +26,6 @@
</span><span class="cx"> #import "config.h"
</span><span class="cx"> #import "_WKApplicationManifestInternal.h"
</span><span class="cx"> 
</span><del>-#import "CocoaColor.h"
</del><span class="cx"> #import <WebCore/ApplicationManifest.h>
</span><span class="cx"> #import <WebCore/ApplicationManifestParser.h>
</span><span class="cx"> #import <WebCore/Color.h>
</span><span class="lines">@@ -156,7 +155,7 @@
</span><span class="cx">     URL scopeURL = [aDecoder decodeObjectOfClass:[NSURL class] forKey:@"scope"];
</span><span class="cx">     NSInteger display = [aDecoder decodeIntegerForKey:@"display"];
</span><span class="cx">     URL startURL = [aDecoder decodeObjectOfClass:[NSURL class] forKey:@"start_url"];
</span><del>-    CocoaColor *themeColor = [aDecoder decodeObjectOfClass:[CocoaColor class] forKey:@"theme_color"];
</del><ins>+    WebCore::CocoaColor *themeColor = [aDecoder decodeObjectOfClass:[WebCore::CocoaColor class] forKey:@"theme_color"];
</ins><span class="cx">     NSArray<_WKApplicationManifestIcon *> *icons = [aDecoder decodeObjectOfClasses:[NSSet setWithArray:@[[NSArray class], [_WKApplicationManifestIcon class]]] forKey:@"icons"];
</span><span class="cx"> 
</span><span class="cx">     WebCore::ApplicationManifest coreApplicationManifest {
</span><span class="lines">@@ -238,7 +237,7 @@
</span><span class="cx">     return _applicationManifest->applicationManifest().startURL;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-- (CocoaColor *)themeColor
</del><ins>+- (WebCore::CocoaColor *)themeColor
</ins><span class="cx"> {
</span><span class="cx">     return cocoaColor(_applicationManifest->applicationManifest().themeColor).autorelease();
</span><span class="cx"> }
</span><span class="lines">@@ -313,7 +312,7 @@
</span><span class="cx">     return nil;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-- (CocoaColor *)themeColor
</del><ins>+- (WebCore::CocoaColor *)themeColor
</ins><span class="cx"> {
</span><span class="cx">     return nil;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessCocoaWKSafeBrowsingWarningh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/Cocoa/WKSafeBrowsingWarning.h (287451 => 287452)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/Cocoa/WKSafeBrowsingWarning.h      2021-12-27 00:03:41 UTC (rev 287451)
+++ trunk/Source/WebKit/UIProcess/Cocoa/WKSafeBrowsingWarning.h 2021-12-27 00:46:40 UTC (rev 287452)
</span><span class="lines">@@ -23,8 +23,8 @@
</span><span class="cx">  * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx">  */
</span><span class="cx"> 
</span><del>-#import "CocoaColor.h"
</del><span class="cx"> #import "WKFoundation.h"
</span><ins>+#import <WebCore/ColorCocoa.h>
</ins><span class="cx"> #import <variant>
</span><span class="cx"> #import <wtf/CompletionHandler.h>
</span><span class="cx"> #import <wtf/RefPtr.h>
</span><span class="lines">@@ -55,10 +55,10 @@
</span><span class="cx"> @interface WKSafeBrowsingBox : ViewType {
</span><span class="cx"> @package
</span><span class="cx"> #if PLATFORM(MAC)
</span><del>-    RetainPtr<CocoaColor> _backgroundColor;
</del><ins>+    RetainPtr<WebCore::CocoaColor> _backgroundColor;
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><del>-- (void)setSafeBrowsingBackgroundColor:(CocoaColor *)color;
</del><ins>+- (void)setSafeBrowsingBackgroundColor:(WebCore::CocoaColor *)color;
</ins><span class="cx"> @end
</span><span class="cx"> 
</span><span class="cx"> #if PLATFORM(MAC)
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessCocoaWKSafeBrowsingWarningmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/Cocoa/WKSafeBrowsingWarning.mm (287451 => 287452)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/Cocoa/WKSafeBrowsingWarning.mm     2021-12-27 00:03:41 UTC (rev 287451)
+++ trunk/Source/WebKit/UIProcess/Cocoa/WKSafeBrowsingWarning.mm        2021-12-27 00:46:40 UTC (rev 287452)
</span><span class="lines">@@ -103,12 +103,12 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-static CocoaColor *colorForItem(WarningItem item, ViewType *warning)
</del><ins>+static WebCore::CocoaColor *colorForItem(WarningItem item, ViewType *warning)
</ins><span class="cx"> {
</span><span class="cx">     ASSERT([warning isKindOfClass:[WKSafeBrowsingWarning class]]);
</span><span class="cx"> #if PLATFORM(MAC)
</span><span class="cx"> 
</span><del>-    auto colorNamed = [] (NSString *name) -> CocoaColor * {
</del><ins>+    auto colorNamed = [] (NSString *name) -> WebCore::CocoaColor * {
</ins><span class="cx"> #if HAVE(SAFE_BROWSING)
</span><span class="cx">         return [NSColor colorNamed:name bundle:[NSBundle bundleWithIdentifier:@"com.apple.WebKit"]];
</span><span class="cx"> #else
</span><span class="lines">@@ -262,7 +262,7 @@
</span><span class="cx"> 
</span><span class="cx"> @implementation WKSafeBrowsingBox
</span><span class="cx"> 
</span><del>-- (void)setSafeBrowsingBackgroundColor:(CocoaColor *)color
</del><ins>+- (void)setSafeBrowsingBackgroundColor:(WebCore::CocoaColor *)color
</ins><span class="cx"> {
</span><span class="cx"> #if PLATFORM(MAC)
</span><span class="cx">     _backgroundColor = color;
</span><span class="lines">@@ -436,7 +436,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="cx">     auto line = adoptNS([WKSafeBrowsingBox new]);
</span><del>-    [line setSafeBrowsingBackgroundColor:[CocoaColor lightGrayColor]];
</del><ins>+    [line setSafeBrowsingBackgroundColor:[WebCore::CocoaColor lightGrayColor]];
</ins><span class="cx">     for (ViewType *view in @[details.get(), bottom.get(), line.get()])
</span><span class="cx">         view.translatesAutoresizingMaskIntoConstraints = NO;
</span><span class="cx"> 
</span><span class="lines">@@ -573,7 +573,7 @@
</span><span class="cx">     self->_warning = warning;
</span><span class="cx">     self.delegate = warning;
</span><span class="cx"> 
</span><del>-    CocoaColor *foregroundColor = colorForItem(WarningItem::MessageText, warning);
</del><ins>+    auto *foregroundColor = colorForItem(WarningItem::MessageText, warning);
</ins><span class="cx">     auto string = adoptNS([attributedString mutableCopy]);
</span><span class="cx">     [string addAttributes:@{ NSForegroundColorAttributeName : foregroundColor } range:NSMakeRange(0, [string length])];
</span><span class="cx">     [self setBackgroundColor:colorForItem(WarningItem::BoxBackground, warning)];
</span></span></pre></div>
<a id="trunkSourceWebKitWebKitxcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj (287451 => 287452)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj     2021-12-27 00:03:41 UTC (rev 287451)
+++ trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj        2021-12-27 00:46:40 UTC (rev 287452)
</span><span class="lines">@@ -2016,7 +2016,6 @@
</span><span class="cx">          F4DBC0C1276AA6CA0001D169 /* _WKModalContainerInfoInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = F4DBC0C0276AA6CA0001D169 /* _WKModalContainerInfoInternal.h */; };
</span><span class="cx">          F4EB4AFD269CD7F300D297AE /* OSStateSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = F4EB4AFC269CD23600D297AE /* OSStateSPI.h */; };
</span><span class="cx">          F4EC94E32356CC57000BB614 /* ApplicationServicesSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 29D04E2821F7C73D0076741D /* ApplicationServicesSPI.h */; };
</span><del>-               F4FE0A3B24632B60002631E1 /* CocoaColor.h in Headers */ = {isa = PBXBuildFile; fileRef = F4FE0A3A24632B10002631E1 /* CocoaColor.h */; };
</del><span class="cx">           F6113E25126CE1820057D0A7 /* APIUserContentURLPattern.h in Headers */ = {isa = PBXBuildFile; fileRef = F6113E24126CE1820057D0A7 /* APIUserContentURLPattern.h */; };
</span><span class="cx">          F6113E29126CE19B0057D0A7 /* WKUserContentURLPattern.h in Headers */ = {isa = PBXBuildFile; fileRef = F6113E27126CE19B0057D0A7 /* WKUserContentURLPattern.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx">          F634445612A885C8000612D8 /* APISecurityOrigin.h in Headers */ = {isa = PBXBuildFile; fileRef = F634445512A885C8000612D8 /* APISecurityOrigin.h */; };
</span><span class="lines">@@ -6447,7 +6446,6 @@
</span><span class="cx">          F4EB4AFC269CD23600D297AE /* OSStateSPI.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OSStateSPI.h; sourceTree = "<group>"; };
</span><span class="cx">          F4F59AD32065A5C9006CAA46 /* WKSelectMenuListViewController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = WKSelectMenuListViewController.mm; path = ios/forms/WKSelectMenuListViewController.mm; sourceTree = "<group>"; };
</span><span class="cx">          F4F59AD42065A5CA006CAA46 /* WKSelectMenuListViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WKSelectMenuListViewController.h; path = ios/forms/WKSelectMenuListViewController.h; sourceTree = "<group>"; };
</span><del>-               F4FE0A3A24632B10002631E1 /* CocoaColor.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CocoaColor.h; sourceTree = "<group>"; };
</del><span class="cx">           F4FE0A3C24635667002631E1 /* CocoaFont.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CocoaFont.h; sourceTree = "<group>"; };
</span><span class="cx">          F6113E24126CE1820057D0A7 /* APIUserContentURLPattern.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = APIUserContentURLPattern.h; sourceTree = "<group>"; };
</span><span class="cx">          F6113E26126CE19B0057D0A7 /* WKUserContentURLPattern.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKUserContentURLPattern.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -9169,7 +9167,6 @@
</span><span class="cx">          4450AEBE1DC3FAAC009943F2 /* cocoa */ = {
</span><span class="cx">                  isa = PBXGroup;
</span><span class="cx">                  children = (
</span><del>-                               F4FE0A3A24632B10002631E1 /* CocoaColor.h */,
</del><span class="cx">                           F4FE0A3C24635667002631E1 /* CocoaFont.h */,
</span><span class="cx">                          4482734624528F6000A95493 /* CocoaImage.h */,
</span><span class="cx">                          BCE0937614FB128B001138D9 /* LayerHostingContext.h */,
</span><span class="lines">@@ -12840,7 +12837,6 @@
</span><span class="cx">                          4659F25F275FF6B200BBB369 /* CaptivePortalModeObserver.h in Headers */,
</span><span class="cx">                          BCE579A62634836700F5C5E9 /* CGDisplayListImageBufferBackend.h in Headers */,
</span><span class="cx">                          57B4B46020B504AC00D4AD79 /* ClientCertificateAuthenticationXPCConstants.h in Headers */,
</span><del>-                               F4FE0A3B24632B60002631E1 /* CocoaColor.h in Headers */,
</del><span class="cx">                           4482734724528F6000A95493 /* CocoaImage.h in Headers */,
</span><span class="cx">                          CE11AD521CBC482F00681EE5 /* CodeSigning.h in Headers */,
</span><span class="cx">                          37BEC4E119491486008B4286 /* CompletionHandlerCallChecker.h in Headers */,
</span></span></pre></div>
<a id="trunkSourceWebKitWebProcessPluginsPDFPDFPluginmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebProcess/Plugins/PDF/PDFPlugin.mm (287451 => 287452)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/WebProcess/Plugins/PDF/PDFPlugin.mm  2021-12-27 00:03:41 UTC (rev 287451)
+++ trunk/Source/WebKit/WebProcess/Plugins/PDF/PDFPlugin.mm     2021-12-27 00:46:40 UTC (rev 287452)
</span><span class="lines">@@ -29,7 +29,6 @@
</span><span class="cx"> #if ENABLE(PDFKIT_PLUGIN)
</span><span class="cx"> 
</span><span class="cx"> #import "ArgumentCoders.h"
</span><del>-#import "CocoaColor.h"
</del><span class="cx"> #import "DataReference.h"
</span><span class="cx"> #import "FrameInfoData.h"
</span><span class="cx"> #import "Logging.h"
</span><span class="lines">@@ -62,6 +61,7 @@
</span><span class="cx"> #import <WebCore/CSSPropertyNames.h>
</span><span class="cx"> #import <WebCore/Chrome.h>
</span><span class="cx"> #import <WebCore/Color.h>
</span><ins>+#import <WebCore/ColorCocoa.h>
</ins><span class="cx"> #import <WebCore/ColorSerialization.h>
</span><span class="cx"> #import <WebCore/Cursor.h>
</span><span class="cx"> #import <WebCore/DictionaryLookup.h>
</span><span class="lines">@@ -656,7 +656,7 @@
</span><span class="cx">         auto* document = frame.coreFrame()->document();
</span><span class="cx"> 
</span><span class="cx">         // FIXME: <rdar://problem/75332948> get the background color from PDFKit instead of hardcoding it
</span><del>-        document->bodyOrFrameset()->setInlineStyleProperty(WebCore::CSSPropertyBackgroundColor, WebCore::serializationForHTML(WebCore::roundAndClampToSRGBALossy([CocoaColor grayColor].CGColor)));
</del><ins>+        document->bodyOrFrameset()->setInlineStyleProperty(WebCore::CSSPropertyBackgroundColor, WebCore::serializationForHTML(WebCore::roundAndClampToSRGBALossy([WebCore::CocoaColor grayColor].CGColor)));
</ins><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     if (supportsForms()) {
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (287451 => 287452)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog    2021-12-27 00:03:41 UTC (rev 287451)
+++ trunk/Tools/ChangeLog       2021-12-27 00:46:40 UTC (rev 287452)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2021-12-26  Sam Weinig  <weinig@apple.com>
+
+        Replace WebKit/CocoaColor.h with WebCore/ColorCocoa.h, not confusing at all
+        https://bugs.webkit.org/show_bug.cgi?id=234693
+
+        Reviewed by Simon Fraser.
+
+        Use WebCore/ColorCocoa.h instead.
+
+        * TestWebKitAPI/Tests/WebKitCocoa/CopyHTML.mm:
+        * TestWebKitAPI/Tests/WebKitCocoa/WKWebViewThemeColor.mm:
+        * TestWebKitAPI/Tests/WebKitCocoa/WKWebViewUnderPageBackgroundColor.mm:
+
</ins><span class="cx"> 2021-12-24  Carlos Garcia Campos  <cgarcia@igalia.com>
</span><span class="cx"> 
</span><span class="cx">         [GTK][a11y] Expose live region attributes with ATSPI
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKitCocoaCopyHTMLmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/CopyHTML.mm (287451 => 287452)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/CopyHTML.mm  2021-12-27 00:03:41 UTC (rev 287451)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/CopyHTML.mm     2021-12-27 00:46:40 UTC (rev 287452)
</span><span class="lines">@@ -28,10 +28,10 @@
</span><span class="cx"> 
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> 
</span><del>-#import "CocoaColor.h"
</del><span class="cx"> #import "PasteboardUtilities.h"
</span><span class="cx"> #import "PlatformUtilities.h"
</span><span class="cx"> #import "TestWKWebView.h"
</span><ins>+#import <WebCore/ColorCocoa.h>
</ins><span class="cx"> #import <WebKit/WKPreferencesPrivate.h>
</span><span class="cx"> #import <wtf/RetainPtr.h>
</span><span class="cx"> #import <wtf/text/WTFString.h>
</span><span class="lines">@@ -153,7 +153,7 @@
</span><span class="cx">         EXPECT_WK_STREQ("我叫謝文昇", [attributedString string]);
</span><span class="cx"> 
</span><span class="cx">         __block BOOL foundColorAttribute = NO;
</span><del>-        [attributedString enumerateAttribute:NSForegroundColorAttributeName inRange:NSMakeRange(0, 5) options:0 usingBlock:^(CocoaColor *color, NSRange range, BOOL*) {
</del><ins>+        [attributedString enumerateAttribute:NSForegroundColorAttributeName inRange:NSMakeRange(0, 5) options:0 usingBlock:^(WebCore::CocoaColor *color, NSRange range, BOOL*) {
</ins><span class="cx">             CGFloat redComponent = 0;
</span><span class="cx">             CGFloat greenComponent = 0;
</span><span class="cx">             CGFloat blueComponent = 0;
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKitCocoaWKWebViewThemeColormm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/WKWebViewThemeColor.mm (287451 => 287452)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/WKWebViewThemeColor.mm       2021-12-27 00:03:41 UTC (rev 287451)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/WKWebViewThemeColor.mm  2021-12-27 00:46:40 UTC (rev 287452)
</span><span class="lines">@@ -25,7 +25,6 @@
</span><span class="cx"> 
</span><span class="cx"> #import "config.h"
</span><span class="cx"> 
</span><del>-#import "CocoaColor.h"
</del><span class="cx"> #import "TestCocoa.h"
</span><span class="cx"> #import "TestWKWebView.h"
</span><span class="cx"> #import <WebKit/WKPreferencesPrivate.h>
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKitCocoaWKWebViewUnderPageBackgroundColormm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/WKWebViewUnderPageBackgroundColor.mm (287451 => 287452)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/WKWebViewUnderPageBackgroundColor.mm 2021-12-27 00:03:41 UTC (rev 287451)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/WKWebViewUnderPageBackgroundColor.mm    2021-12-27 00:46:40 UTC (rev 287452)
</span><span class="lines">@@ -25,9 +25,9 @@
</span><span class="cx"> 
</span><span class="cx"> #import "config.h"
</span><span class="cx"> 
</span><del>-#import "CocoaColor.h"
</del><span class="cx"> #import "TestCocoa.h"
</span><span class="cx"> #import "TestWKWebView.h"
</span><ins>+#import <WebCore/ColorCocoa.h>
</ins><span class="cx"> #import <WebKit/WKWebViewPrivate.h>
</span><span class="cx"> #import <wtf/RetainPtr.h>
</span><span class="cx"> 
</span><span class="lines">@@ -46,7 +46,7 @@
</span><span class="cx"> #elif HAVE(OS_DARK_MODE_SUPPORT) && PLATFORM(IOS_FAMILY)
</span><span class="cx">     auto color = retainPtr(UIColor.systemBackgroundColor);
</span><span class="cx"> #else
</span><del>-    auto color = retainPtr([CocoaColor whiteColor]);
</del><ins>+    auto color = retainPtr([WebCore::CocoaColor whiteColor]);
</ins><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="cx">     // Some of the above can sometimes be a monochrome color, so convert it to sRGB so the comparisons below work.
</span><span class="lines">@@ -196,7 +196,7 @@
</span><span class="cx">     EXPECT_TRUE(CGColorEqualToColor([webView underPageBackgroundColor].CGColor, redColor.get()));
</span><span class="cx"> 
</span><span class="cx">     [underPageBackgroundColorObserver setState:@"should-not-change"];
</span><del>-    [webView setUnderPageBackgroundColor:[CocoaColor colorWithCGColor:redColor.get()]];
</del><ins>+    [webView setUnderPageBackgroundColor:[WebCore::CocoaColor colorWithCGColor:redColor.get()]];
</ins><span class="cx">     EXPECT_NSSTRING_EQ("should-not-change", [underPageBackgroundColorObserver state]);
</span><span class="cx">     EXPECT_TRUE(CGColorEqualToColor([webView underPageBackgroundColor].CGColor, redColor.get()));
</span><span class="cx"> 
</span><span class="lines">@@ -212,7 +212,7 @@
</span><span class="cx">     EXPECT_TRUE(CGColorEqualToColor([webView underPageBackgroundColor].CGColor, blueColor.get()));
</span><span class="cx"> 
</span><span class="cx">     [underPageBackgroundColorObserver setState:@"should-not-change"];
</span><del>-    [webView setUnderPageBackgroundColor:[CocoaColor colorWithCGColor:blueColor.get()]];
</del><ins>+    [webView setUnderPageBackgroundColor:[WebCore::CocoaColor colorWithCGColor:blueColor.get()]];
</ins><span class="cx">     EXPECT_NSSTRING_EQ("should-not-change", [underPageBackgroundColorObserver state]);
</span><span class="cx">     EXPECT_TRUE(CGColorEqualToColor([webView underPageBackgroundColor].CGColor, blueColor.get()));
</span><span class="cx"> 
</span><span class="lines">@@ -228,7 +228,7 @@
</span><span class="cx">     EXPECT_TRUE(CGColorEqualToColor([webView underPageBackgroundColor].CGColor, defaultBackgroundColor().get()));
</span><span class="cx"> 
</span><span class="cx">     [underPageBackgroundColorObserver setState:@"should-not-change"];
</span><del>-    [webView setUnderPageBackgroundColor:[CocoaColor colorWithCGColor:defaultBackgroundColor().get()]];
</del><ins>+    [webView setUnderPageBackgroundColor:[WebCore::CocoaColor colorWithCGColor:defaultBackgroundColor().get()]];
</ins><span class="cx">     EXPECT_NSSTRING_EQ("should-not-change", [underPageBackgroundColorObserver state]);
</span><span class="cx">     EXPECT_TRUE(CGColorEqualToColor([webView underPageBackgroundColor].CGColor, defaultBackgroundColor().get()));
</span><span class="cx"> 
</span><span class="lines">@@ -238,12 +238,12 @@
</span><span class="cx">     EXPECT_TRUE(CGColorEqualToColor([webView underPageBackgroundColor].CGColor, defaultBackgroundColor().get()));
</span><span class="cx"> 
</span><span class="cx">     [underPageBackgroundColorObserver setState:@"before-nonnull-override"];
</span><del>-    [webView setUnderPageBackgroundColor:[CocoaColor colorWithCGColor:redColor.get()]];
</del><ins>+    [webView setUnderPageBackgroundColor:[WebCore::CocoaColor colorWithCGColor:redColor.get()]];
</ins><span class="cx">     EXPECT_NSSTRING_EQ("after-nonnull-override", [underPageBackgroundColorObserver state]);
</span><span class="cx">     EXPECT_TRUE(CGColorEqualToColor([webView underPageBackgroundColor].CGColor, redColor.get()));
</span><span class="cx"> 
</span><span class="cx">     [underPageBackgroundColorObserver setState:@"should-not-change"];
</span><del>-    [webView setUnderPageBackgroundColor:[CocoaColor colorWithCGColor:redColor.get()]];
</del><ins>+    [webView setUnderPageBackgroundColor:[WebCore::CocoaColor colorWithCGColor:redColor.get()]];
</ins><span class="cx">     EXPECT_NSSTRING_EQ("should-not-change", [underPageBackgroundColorObserver state]);
</span><span class="cx">     EXPECT_TRUE(CGColorEqualToColor([webView underPageBackgroundColor].CGColor, redColor.get()));
</span><span class="cx"> 
</span><span class="lines">@@ -293,13 +293,13 @@
</span><span class="cx">     EXPECT_TRUE(CGColorEqualToColor([webView scrollView].backgroundColor.CGColor, redColor.get()));
</span><span class="cx">     EXPECT_EQ([webView scrollView].indicatorStyle, UIScrollViewIndicatorStyleWhite);
</span><span class="cx"> 
</span><del>-    [webView setUnderPageBackgroundColor:[CocoaColor colorWithCGColor:blueColor.get()]];
</del><ins>+    [webView setUnderPageBackgroundColor:[WebCore::CocoaColor colorWithCGColor:blueColor.get()]];
</ins><span class="cx">     [webView waitForNextPresentationUpdate];
</span><span class="cx">     EXPECT_TRUE(CGColorEqualToColor([webView underPageBackgroundColor].CGColor, blueColor.get()));
</span><span class="cx">     EXPECT_TRUE(CGColorEqualToColor([webView scrollView].backgroundColor.CGColor, blueColor.get()));
</span><span class="cx">     EXPECT_EQ([webView scrollView].indicatorStyle, UIScrollViewIndicatorStyleWhite);
</span><span class="cx"> 
</span><del>-    [webView setUnderPageBackgroundColor:[CocoaColor colorWithCGColor:whiteColor.get()]];
</del><ins>+    [webView setUnderPageBackgroundColor:[WebCore::CocoaColor colorWithCGColor:whiteColor.get()]];
</ins><span class="cx">     [webView waitForNextPresentationUpdate];
</span><span class="cx">     EXPECT_TRUE(CGColorEqualToColor([webView underPageBackgroundColor].CGColor, whiteColor.get()));
</span><span class="cx">     EXPECT_TRUE(CGColorEqualToColor([webView scrollView].backgroundColor.CGColor, whiteColor.get()));
</span></span></pre>
</div>
</div>

</body>
</html>