<!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>[173321] 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/173321">173321</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2014-09-05 11:57:06 -0700 (Fri, 05 Sep 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove some PLATFORM(IOS) code in Color.h/cpp
https://bugs.webkit.org/show_bug.cgi?id=136582
Reviewed by Dan Bates.
Source/WebCore:
Remove Color::tap which is unused, and remove createCGColorWithDeviceWhite()
which was only called in one file in WebKit.
* WebCore.exp.in:
* platform/graphics/Color.h:
* platform/graphics/cg/ColorCG.cpp:
(WebCore::createCGColorWithDeviceWhite): Deleted.
Source/WebKit/ios:
createCGColorWithDeviceWhite() is only used here so make it a local static function.
* WebView/WebPDFViewIOS.mm:
(createCGColorWithDeviceWhite):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreWebCoreexpin">trunk/Source/WebCore/WebCore.exp.in</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsColorh">trunk/Source/WebCore/platform/graphics/Color.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscgColorCGcpp">trunk/Source/WebCore/platform/graphics/cg/ColorCG.cpp</a></li>
<li><a href="#trunkSourceWebKitiosChangeLog">trunk/Source/WebKit/ios/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitiosWebViewWebPDFViewIOSmm">trunk/Source/WebKit/ios/WebView/WebPDFViewIOS.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (173320 => 173321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-09-05 18:54:37 UTC (rev 173320)
+++ trunk/Source/WebCore/ChangeLog 2014-09-05 18:57:06 UTC (rev 173321)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2014-09-05 Simon Fraser <simon.fraser@apple.com>
+
+ Remove some PLATFORM(IOS) code in Color.h/cpp
+ https://bugs.webkit.org/show_bug.cgi?id=136582
+
+ Reviewed by Dan Bates.
+
+ Remove Color::tap which is unused, and remove createCGColorWithDeviceWhite()
+ which was only called in one file in WebKit.
+
+ * WebCore.exp.in:
+ * platform/graphics/Color.h:
+ * platform/graphics/cg/ColorCG.cpp:
+ (WebCore::createCGColorWithDeviceWhite): Deleted.
+
</ins><span class="cx"> 2014-09-05 Beth Dakin <bdakin@apple.com>
</span><span class="cx">
</span><span class="cx"> ScrollablArea::handleWheelEvent() should return early if the ScrollableArea is not
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCoreexpin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.exp.in (173320 => 173321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.exp.in 2014-09-05 18:54:37 UTC (rev 173320)
+++ trunk/Source/WebCore/WebCore.exp.in 2014-09-05 18:57:06 UTC (rev 173321)
</span><span class="lines">@@ -2811,14 +2811,6 @@
</span><span class="cx"> __ZN7WebCore20ResourceHandleClient22willCacheResponseAsyncEPNS_14ResourceHandleEPK20_CFCachedURLResponse
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(IOS) && defined(__LP64__) && __LP64__
-__ZN7WebCore28createCGColorWithDeviceWhiteEdd
-#endif
-
-#if PLATFORM(IOS) && !(defined(__LP64__) && __LP64__)
-__ZN7WebCore28createCGColorWithDeviceWhiteEff
-#endif
-
</del><span class="cx"> #if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
</span><span class="cx"> __ZN7WebCore15ProtectionSpace28encodingRequiresPlatformDataEP20NSURLProtectionSpace
</span><span class="cx"> __ZN7WebCore16DiskCacheMonitorC2ERKNS_15ResourceRequestENS_9SessionIDEPK20_CFCachedURLResponse
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsColorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/Color.h (173320 => 173321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/Color.h 2014-09-05 18:54:37 UTC (rev 173320)
+++ trunk/Source/WebCore/platform/graphics/Color.h 2014-09-05 18:57:06 UTC (rev 173321)
</span><span class="lines">@@ -153,8 +153,6 @@
</span><span class="cx"> static const RGBA32 cyan = 0xFF00FFFF;
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><del>- static const RGBA32 tap = 0x4D1A1A1A;
-
</del><span class="cx"> // FIXME: This color shouldn't be iOS-specific. Once we fix up its usage in InlineTextBox::paintCompositionBackground()
</span><span class="cx"> // we should move it outside the PLATFORM(IOS)-guard. See <https://bugs.webkit.org/show_bug.cgi?id=126296>.
</span><span class="cx"> static const RGBA32 compositionFill = 0x3CAFC0E3;
</span><span class="lines">@@ -189,9 +187,6 @@
</span><span class="cx">
</span><span class="cx"> #if USE(CG)
</span><span class="cx"> WEBCORE_EXPORT CGColorRef cachedCGColor(const Color&, ColorSpace);
</span><del>-#if PLATFORM(IOS)
-WEBCORE_EXPORT CGColorRef createCGColorWithDeviceWhite(CGFloat white, CGFloat alpha);
-#endif // PLATFORM(IOS)
</del><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscgColorCGcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cg/ColorCG.cpp (173320 => 173321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cg/ColorCG.cpp 2014-09-05 18:54:37 UTC (rev 173320)
+++ trunk/Source/WebCore/platform/graphics/cg/ColorCG.cpp 2014-09-05 18:57:06 UTC (rev 173321)
</span><span class="lines">@@ -42,13 +42,6 @@
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><del>-CGColorRef createCGColorWithDeviceWhite(CGFloat white, CGFloat alpha)
-{
- static CGColorSpaceRef graySpace = CGColorSpaceCreateDeviceGray();
- const CGFloat components[] = { white, alpha };
- return CGColorCreate(graySpace, components);
-}
-
</del><span class="cx"> static CGColorRef createCGColorWithDeviceRGBA(CGColorRef sourceColor)
</span><span class="cx"> {
</span><span class="cx"> if (!sourceColor || CFEqual(CGColorGetColorSpace(sourceColor), deviceRGBColorSpaceRef()))
</span></span></pre></div>
<a id="trunkSourceWebKitiosChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ios/ChangeLog (173320 => 173321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ios/ChangeLog 2014-09-05 18:54:37 UTC (rev 173320)
+++ trunk/Source/WebKit/ios/ChangeLog 2014-09-05 18:57:06 UTC (rev 173321)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-09-05 Simon Fraser <simon.fraser@apple.com>
+
+ Remove some PLATFORM(IOS) code in Color.h/cpp
+ https://bugs.webkit.org/show_bug.cgi?id=136582
+
+ Reviewed by Dan Bates.
+
+ createCGColorWithDeviceWhite() is only used here so make it a local static function.
+
+ * WebView/WebPDFViewIOS.mm:
+ (createCGColorWithDeviceWhite):
+
</ins><span class="cx"> 2014-09-04 Pratik Solanki <psolanki@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove iOS specific disk image cache
</span></span></pre></div>
<a id="trunkSourceWebKitiosWebViewWebPDFViewIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ios/WebView/WebPDFViewIOS.mm (173320 => 173321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ios/WebView/WebPDFViewIOS.mm 2014-09-05 18:54:37 UTC (rev 173320)
+++ trunk/Source/WebKit/ios/WebView/WebPDFViewIOS.mm 2014-09-05 18:57:06 UTC (rev 173321)
</span><span class="lines">@@ -61,6 +61,13 @@
</span><span class="cx"> static const float PAGE_WIDTH_INSET = 4.0 * 2.0;
</span><span class="cx"> static const float PAGE_HEIGHT_INSET = 4.0 * 2.0;
</span><span class="cx">
</span><ins>+static CGColorRef createCGColorWithDeviceWhite(CGFloat white, CGFloat alpha)
+{
+ static CGColorSpaceRef graySpace = CGColorSpaceCreateDeviceGray();
+ const CGFloat components[] = { white, alpha };
+ return CGColorCreate(graySpace, components);
+}
+
</ins><span class="cx"> @implementation WebPDFView
</span><span class="cx">
</span><span class="cx"> + (NSArray *)supportedMIMETypes
</span></span></pre>
</div>
</div>
</body>
</html>