Title: [173321] trunk/Source
- Revision
- 173321
- Author
- [email protected]
- Date
- 2014-09-05 11:57:06 -0700 (Fri, 05 Sep 2014)
Log Message
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):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (173320 => 173321)
--- 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)
@@ -1,3 +1,18 @@
+2014-09-05 Simon Fraser <[email protected]>
+
+ 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.
+
2014-09-05 Beth Dakin <[email protected]>
ScrollablArea::handleWheelEvent() should return early if the ScrollableArea is not
Modified: trunk/Source/WebCore/WebCore.exp.in (173320 => 173321)
--- 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)
@@ -2811,14 +2811,6 @@
__ZN7WebCore20ResourceHandleClient22willCacheResponseAsyncEPNS_14ResourceHandleEPK20_CFCachedURLResponse
#endif
-#if PLATFORM(IOS) && defined(__LP64__) && __LP64__
-__ZN7WebCore28createCGColorWithDeviceWhiteEdd
-#endif
-
-#if PLATFORM(IOS) && !(defined(__LP64__) && __LP64__)
-__ZN7WebCore28createCGColorWithDeviceWhiteEff
-#endif
-
#if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
__ZN7WebCore15ProtectionSpace28encodingRequiresPlatformDataEP20NSURLProtectionSpace
__ZN7WebCore16DiskCacheMonitorC2ERKNS_15ResourceRequestENS_9SessionIDEPK20_CFCachedURLResponse
Modified: trunk/Source/WebCore/platform/graphics/Color.h (173320 => 173321)
--- 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)
@@ -153,8 +153,6 @@
static const RGBA32 cyan = 0xFF00FFFF;
#if PLATFORM(IOS)
- static const RGBA32 tap = 0x4D1A1A1A;
-
// FIXME: This color shouldn't be iOS-specific. Once we fix up its usage in InlineTextBox::paintCompositionBackground()
// we should move it outside the PLATFORM(IOS)-guard. See <https://bugs.webkit.org/show_bug.cgi?id=126296>.
static const RGBA32 compositionFill = 0x3CAFC0E3;
@@ -189,9 +187,6 @@
#if USE(CG)
WEBCORE_EXPORT CGColorRef cachedCGColor(const Color&, ColorSpace);
-#if PLATFORM(IOS)
-WEBCORE_EXPORT CGColorRef createCGColorWithDeviceWhite(CGFloat white, CGFloat alpha);
-#endif // PLATFORM(IOS)
#endif
} // namespace WebCore
Modified: trunk/Source/WebCore/platform/graphics/cg/ColorCG.cpp (173320 => 173321)
--- 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)
@@ -42,13 +42,6 @@
namespace WebCore {
#if PLATFORM(IOS)
-CGColorRef createCGColorWithDeviceWhite(CGFloat white, CGFloat alpha)
-{
- static CGColorSpaceRef graySpace = CGColorSpaceCreateDeviceGray();
- const CGFloat components[] = { white, alpha };
- return CGColorCreate(graySpace, components);
-}
-
static CGColorRef createCGColorWithDeviceRGBA(CGColorRef sourceColor)
{
if (!sourceColor || CFEqual(CGColorGetColorSpace(sourceColor), deviceRGBColorSpaceRef()))
Modified: trunk/Source/WebKit/ios/ChangeLog (173320 => 173321)
--- 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)
@@ -1,3 +1,15 @@
+2014-09-05 Simon Fraser <[email protected]>
+
+ 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):
+
2014-09-04 Pratik Solanki <[email protected]>
Remove iOS specific disk image cache
Modified: trunk/Source/WebKit/ios/WebView/WebPDFViewIOS.mm (173320 => 173321)
--- 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)
@@ -61,6 +61,13 @@
static const float PAGE_WIDTH_INSET = 4.0 * 2.0;
static const float PAGE_HEIGHT_INSET = 4.0 * 2.0;
+static CGColorRef createCGColorWithDeviceWhite(CGFloat white, CGFloat alpha)
+{
+ static CGColorSpaceRef graySpace = CGColorSpaceCreateDeviceGray();
+ const CGFloat components[] = { white, alpha };
+ return CGColorCreate(graySpace, components);
+}
+
@implementation WebPDFView
+ (NSArray *)supportedMIMETypes
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
