Diff
Modified: trunk/Source/WebCore/ChangeLog (162826 => 162827)
--- trunk/Source/WebCore/ChangeLog 2014-01-27 06:23:11 UTC (rev 162826)
+++ trunk/Source/WebCore/ChangeLog 2014-01-27 07:16:13 UTC (rev 162827)
@@ -1,3 +1,52 @@
+2014-01-26 Tim Horton <[email protected]>
+
+ Start cleaning up iOS upstreaming #ifs in platform/graphics
+ https://bugs.webkit.org/show_bug.cgi?id=127641
+
+ Reviewed by Sam Weinig.
+
+ * platform/graphics/BitmapImage.h:
+ * platform/graphics/mac/ColorMac.h:
+ Use USE(APPKIT) instead of PLATFORM(MAC) && !PLATFORM(IOS) for NSImage/getNSImage().
+
+ * platform/graphics/avfoundation/AVTrackPrivateAVFObjCImpl.mm:
+ (WebCore::AVTrackPrivateAVFObjCImpl::label):
+ * platform/graphics/avfoundation/objc/InbandTextTrackPrivateLegacyAVFObjC.mm:
+ (WebCore::InbandTextTrackPrivateLegacyAVFObjC::label):
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::createAVAssetForURL):
+ Remove some code that was only used on OS X on Lion or below.
+
+ * platform/graphics/cg/GraphicsContextCG.cpp:
+ (WebCore::GraphicsContext::platformInit):
+ ToT WebKit doesn't build on Lion or earlier anymore, so this code can always run.
+
+ * platform/graphics/cg/FloatPointCG.cpp:
+ * platform/graphics/cg/FloatRectCG.cpp:
+ * platform/graphics/cg/FloatSizeCG.cpp:
+ * platform/graphics/cg/GradientCG.cpp:
+ * platform/graphics/cg/ImageBufferCG.cpp:
+ * platform/graphics/cg/ImageCG.cpp:
+ * platform/graphics/cg/IntPointCG.cpp:
+ * platform/graphics/cg/IntRectCG.cpp:
+ * platform/graphics/cg/PathCG.cpp:
+ * platform/graphics/cg/PatternCG.cpp:
+ * platform/graphics/mac/FontCustomPlatformData.cpp:
+ Use CoreGraphics/CoreGraphics.h instead of ApplicationServices/ApplicationServices.h
+ even on Mac, so we can share the include.
+
+ * platform/graphics/cg/IntSizeCG.cpp:
+ Remove a random comment of a style we don't tend to use in WebKit,
+ and from a file not large enough to need it.
+
+ * platform/graphics/cocoa/FontPlatformDataCocoa.mm:
+ (WebCore::FontPlatformData::FontPlatformData):
+ (WebCore::FontPlatformData::setFont):
+ Remove some more always-true #ifs.
+
+ * platform/graphics/mac/WebLayer.mm:
+ Move a #if'd include out to its own block as per the style guide.
+
2014-01-26 David Hyatt <[email protected]>
[New Multicolumn] Change the axis property to be a boolean like other isInline checks
Modified: trunk/Source/WebCore/platform/graphics/BitmapImage.h (162826 => 162827)
--- trunk/Source/WebCore/platform/graphics/BitmapImage.h 2014-01-27 06:23:11 UTC (rev 162826)
+++ trunk/Source/WebCore/platform/graphics/BitmapImage.h 2014-01-27 07:16:13 UTC (rev 162827)
@@ -36,9 +36,10 @@
#if PLATFORM(MAC)
#include <wtf/RetainPtr.h>
-#if !PLATFORM(IOS)
+#endif
+
+#if USE(APPKIT)
OBJC_CLASS NSImage;
-#endif // PLATFORM(IOS)
#endif
#if PLATFORM(WIN)
@@ -156,11 +157,13 @@
virtual void drawPattern(GraphicsContext*, const FloatRect& srcRect, const AffineTransform& patternTransform,
const FloatPoint& phase, ColorSpace styleColorSpace, CompositeOperator, const FloatRect& destRect, BlendMode = BlendModeNormal) override;
-#if PLATFORM(MAC)
// Accessors for native image formats.
-#if !PLATFORM(IOS)
+
+#if USE(APPKIT)
virtual NSImage* getNSImage() override;
#endif
+
+#if PLATFORM(MAC)
virtual CFDataRef getTIFFRepresentation() override;
#endif
@@ -313,10 +316,10 @@
int m_repetitionsComplete; // How many repetitions we've finished.
double m_desiredFrameStartTime; // The system time at which we hope to see the next call to startAnimation().
-#if PLATFORM(MAC)
-#if !PLATFORM(IOS)
+#if USE(APPKIT)
mutable RetainPtr<NSImage> m_nsImage; // A cached NSImage of frame 0. Only built lazily if someone actually queries for one.
#endif
+#if USE(CG)
mutable RetainPtr<CFDataRef> m_tiffRep; // Cached TIFF rep for frame 0. Only built lazily if someone queries for one.
#endif
Modified: trunk/Source/WebCore/platform/graphics/Image.h (162826 => 162827)
--- trunk/Source/WebCore/platform/graphics/Image.h 2014-01-27 06:23:11 UTC (rev 162826)
+++ trunk/Source/WebCore/platform/graphics/Image.h 2014-01-27 07:16:13 UTC (rev 162827)
@@ -141,10 +141,14 @@
virtual PassNativeImagePtr nativeImageForCurrentFrame() { return 0; }
virtual ImageOrientation orientationForCurrentFrame() { return ImageOrientation(); }
-
-#if PLATFORM(MAC)
+
// Accessors for native image formats.
+
+#if USE(APPKIT)
virtual NSImage* getNSImage() { return 0; }
+#endif
+
+#if PLATFORM(MAC)
virtual CFDataRef getTIFFRepresentation() { return 0; }
#endif
Modified: trunk/Source/WebCore/platform/graphics/avfoundation/AVTrackPrivateAVFObjCImpl.mm (162826 => 162827)
--- trunk/Source/WebCore/platform/graphics/avfoundation/AVTrackPrivateAVFObjCImpl.mm 2014-01-27 06:23:11 UTC (rev 162826)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/AVTrackPrivateAVFObjCImpl.mm 2014-01-27 07:16:13 UTC (rev 162827)
@@ -115,11 +115,7 @@
return emptyAtom;
// If possible, return a title in one of the user's preferred languages.
-#if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080
NSArray *titlesForPreferredLanguages = [AVMetadataItem metadataItemsFromArray:titles filteredAndSortedAccordingToPreferredLanguages:[NSLocale preferredLanguages]];
-#else
- NSArray *titlesForPreferredLanguages = [AVMetadataItem metadataItemsFromArray:titles withLocale:[NSLocale currentLocale]];
-#endif
if ([titlesForPreferredLanguages count])
return [[titlesForPreferredLanguages objectAtIndex:0] stringValue];
return [[titles objectAtIndex:0] stringValue];
Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/InbandTextTrackPrivateLegacyAVFObjC.mm (162826 => 162827)
--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/InbandTextTrackPrivateLegacyAVFObjC.mm 2014-01-27 06:23:11 UTC (rev 162826)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/InbandTextTrackPrivateLegacyAVFObjC.mm 2014-01-27 07:16:13 UTC (rev 162827)
@@ -104,12 +104,8 @@
NSArray *titles = [AVMetadataItem metadataItemsFromArray:[[m_playerItemTrack assetTrack] commonMetadata] withKey:AVMetadataCommonKeyTitle keySpace:AVMetadataKeySpaceCommon];
if ([titles count]) {
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080
// If possible, return a title in one of the user's preferred languages.
NSArray *titlesForPreferredLanguages = [AVMetadataItem metadataItemsFromArray:titles filteredAndSortedAccordingToPreferredLanguages:[NSLocale preferredLanguages]];
-#else
- NSArray *titlesForPreferredLanguages = [AVMetadataItem metadataItemsFromArray:titles withLocale:[NSLocale currentLocale]];
-#endif
if ([titlesForPreferredLanguages count])
title = [[titlesForPreferredLanguages objectAtIndex:0] stringValue];
Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm (162826 => 162827)
--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2014-01-27 06:23:11 UTC (rev 162826)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2014-01-27 07:16:13 UTC (rev 162827)
@@ -476,7 +476,6 @@
[options.get() setObject:[NSNumber numberWithInt:AVAssetReferenceRestrictionForbidRemoteReferenceToLocal | AVAssetReferenceRestrictionForbidLocalReferenceToRemote] forKey:AVURLAssetReferenceRestrictionsKey];
-#if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080
RetainPtr<NSMutableDictionary> headerFields = adoptNS([[NSMutableDictionary alloc] init]);
String referrer = player()->referrer();
@@ -489,7 +488,6 @@
if ([headerFields.get() count])
[options.get() setObject:headerFields.get() forKey:@"AVURLAssetHTTPHeaderFieldsKey"];
-#endif
NSURL *cocoaURL = URL(ParsedURLString, url);
m_avAsset = adoptNS([[AVURLAsset alloc] initWithURL:cocoaURL options:options.get()]);
Modified: trunk/Source/WebCore/platform/graphics/cg/BitmapImageCG.cpp (162826 => 162827)
--- trunk/Source/WebCore/platform/graphics/cg/BitmapImageCG.cpp 2014-01-27 06:23:11 UTC (rev 162826)
+++ trunk/Source/WebCore/platform/graphics/cg/BitmapImageCG.cpp 2014-01-27 07:16:13 UTC (rev 162827)
@@ -32,12 +32,11 @@
#include "GraphicsContextCG.h"
#include "ImageObserver.h"
#include "SubimageCacheWithTimer.h"
-#if !PLATFORM(IOS)
+#include <wtf/RetainPtr.h>
+
+#if USE(APPKIT)
#include <ApplicationServices/ApplicationServices.h>
-#else
-#include <CoreGraphics/CGContextPrivate.h>
#endif
-#include <wtf/RetainPtr.h>
#if PLATFORM(MAC)
#include "WebCoreSystemInterface.h"
Modified: trunk/Source/WebCore/platform/graphics/cg/FloatPointCG.cpp (162826 => 162827)
--- trunk/Source/WebCore/platform/graphics/cg/FloatPointCG.cpp 2014-01-27 06:23:11 UTC (rev 162826)
+++ trunk/Source/WebCore/platform/graphics/cg/FloatPointCG.cpp 2014-01-27 07:16:13 UTC (rev 162827)
@@ -29,11 +29,7 @@
#if USE(CG)
-#if !PLATFORM(IOS)
-#include <ApplicationServices/ApplicationServices.h>
-#else
#include <CoreGraphics/CoreGraphics.h>
-#endif
namespace WebCore {
Modified: trunk/Source/WebCore/platform/graphics/cg/FloatRectCG.cpp (162826 => 162827)
--- trunk/Source/WebCore/platform/graphics/cg/FloatRectCG.cpp 2014-01-27 06:23:11 UTC (rev 162826)
+++ trunk/Source/WebCore/platform/graphics/cg/FloatRectCG.cpp 2014-01-27 07:16:13 UTC (rev 162827)
@@ -29,11 +29,7 @@
#if USE(CG)
-#if !PLATFORM(IOS)
-#include <ApplicationServices/ApplicationServices.h>
-#else
#include <CoreGraphics/CoreGraphics.h>
-#endif
namespace WebCore {
Modified: trunk/Source/WebCore/platform/graphics/cg/FloatSizeCG.cpp (162826 => 162827)
--- trunk/Source/WebCore/platform/graphics/cg/FloatSizeCG.cpp 2014-01-27 06:23:11 UTC (rev 162826)
+++ trunk/Source/WebCore/platform/graphics/cg/FloatSizeCG.cpp 2014-01-27 07:16:13 UTC (rev 162827)
@@ -29,11 +29,7 @@
#if USE(CG)
-#if !PLATFORM(IOS)
-#include <ApplicationServices/ApplicationServices.h>
-#else
#include <CoreGraphics/CoreGraphics.h>
-#endif
namespace WebCore {
Modified: trunk/Source/WebCore/platform/graphics/cg/GradientCG.cpp (162826 => 162827)
--- trunk/Source/WebCore/platform/graphics/cg/GradientCG.cpp 2014-01-27 06:23:11 UTC (rev 162826)
+++ trunk/Source/WebCore/platform/graphics/cg/GradientCG.cpp 2014-01-27 07:16:13 UTC (rev 162827)
@@ -28,11 +28,7 @@
#include "Gradient.h"
#include "GraphicsContextCG.h"
-#if !PLATFORM(IOS)
-#include <ApplicationServices/ApplicationServices.h>
-#else
#include <CoreGraphics/CoreGraphics.h>
-#endif
#include <wtf/RetainPtr.h>
namespace WebCore {
Modified: trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp (162826 => 162827)
--- trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp 2014-01-27 06:23:11 UTC (rev 162826)
+++ trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp 2014-01-27 07:16:13 UTC (rev 162827)
@@ -1017,10 +1017,8 @@
if (context.isAcceleratedContext())
return;
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080
if (wkCGContextDrawsWithCorrectShadowOffsets(context.platformContext()))
return;
-#endif
// Work around <rdar://problem/5539388> by ensuring that the offsets will get truncated
// to the desired integer. Also see: <rdar://problem/10056277>
Modified: trunk/Source/WebCore/platform/graphics/cg/ImageBufferCG.cpp (162826 => 162827)
--- trunk/Source/WebCore/platform/graphics/cg/ImageBufferCG.cpp 2014-01-27 06:23:11 UTC (rev 162826)
+++ trunk/Source/WebCore/platform/graphics/cg/ImageBufferCG.cpp 2014-01-27 07:16:13 UTC (rev 162827)
@@ -34,12 +34,8 @@
#include "ImageData.h"
#include "MIMETypeRegistry.h"
#include <math.h>
-#if !PLATFORM(IOS)
-#include <ApplicationServices/ApplicationServices.h>
-#else
#include <CoreGraphics/CoreGraphics.h>
#include <ImageIO/ImageIO.h>
-#endif
#include <wtf/Assertions.h>
#include <wtf/CheckedArithmetic.h>
#include <wtf/MainThread.h>
Modified: trunk/Source/WebCore/platform/graphics/cg/ImageCG.cpp (162826 => 162827)
--- trunk/Source/WebCore/platform/graphics/cg/ImageCG.cpp 2014-01-27 06:23:11 UTC (rev 162826)
+++ trunk/Source/WebCore/platform/graphics/cg/ImageCG.cpp 2014-01-27 07:16:13 UTC (rev 162827)
@@ -32,11 +32,7 @@
#include "FloatRect.h"
#include "GraphicsContextCG.h"
#include "ImageObserver.h"
-#if !PLATFORM(IOS)
-#include <ApplicationServices/ApplicationServices.h>
-#else
#include <CoreGraphics/CoreGraphics.h>
-#endif
#include <wtf/RetainPtr.h>
#if PLATFORM(MAC)
Modified: trunk/Source/WebCore/platform/graphics/cg/IntPointCG.cpp (162826 => 162827)
--- trunk/Source/WebCore/platform/graphics/cg/IntPointCG.cpp 2014-01-27 06:23:11 UTC (rev 162826)
+++ trunk/Source/WebCore/platform/graphics/cg/IntPointCG.cpp 2014-01-27 07:16:13 UTC (rev 162827)
@@ -28,11 +28,7 @@
#if USE(CG)
-#if !PLATFORM(IOS)
-#include <ApplicationServices/ApplicationServices.h>
-#else
#include <CoreGraphics/CoreGraphics.h>
-#endif
namespace WebCore {
Modified: trunk/Source/WebCore/platform/graphics/cg/IntRectCG.cpp (162826 => 162827)
--- trunk/Source/WebCore/platform/graphics/cg/IntRectCG.cpp 2014-01-27 06:23:11 UTC (rev 162826)
+++ trunk/Source/WebCore/platform/graphics/cg/IntRectCG.cpp 2014-01-27 07:16:13 UTC (rev 162827)
@@ -28,11 +28,7 @@
#if USE(CG)
-#if !PLATFORM(IOS)
-#include <ApplicationServices/ApplicationServices.h>
-#else
#include <CoreGraphics/CoreGraphics.h>
-#endif
namespace WebCore {
Modified: trunk/Source/WebCore/platform/graphics/cg/IntSizeCG.cpp (162826 => 162827)
--- trunk/Source/WebCore/platform/graphics/cg/IntSizeCG.cpp 2014-01-27 06:23:11 UTC (rev 162826)
+++ trunk/Source/WebCore/platform/graphics/cg/IntSizeCG.cpp 2014-01-27 07:16:13 UTC (rev 162827)
@@ -28,11 +28,7 @@
#if USE(CG)
-#if !PLATFORM(IOS)
-#include <ApplicationServices/ApplicationServices.h>
-#else
#include <CoreGraphics/CoreGraphics.h>
-#endif
namespace WebCore {
Modified: trunk/Source/WebCore/platform/graphics/cg/PathCG.cpp (162826 => 162827)
--- trunk/Source/WebCore/platform/graphics/cg/PathCG.cpp 2014-01-27 06:23:11 UTC (rev 162826)
+++ trunk/Source/WebCore/platform/graphics/cg/PathCG.cpp 2014-01-27 07:16:13 UTC (rev 162827)
@@ -34,12 +34,7 @@
#include "GraphicsContext.h"
#include "IntRect.h"
#include "StrokeStyleApplier.h"
-#if !PLATFORM(IOS)
-#include <ApplicationServices/ApplicationServices.h>
-#else
-#include <CoreGraphics/CGPathPrivate.h>
#include <CoreGraphics/CoreGraphics.h>
-#endif
#include <wtf/MathExtras.h>
#include <wtf/RetainPtr.h>
#include <wtf/text/WTFString.h>
@@ -325,9 +320,6 @@
return CGPathGetCurrentPoint(m_path);
}
-// MARK: -
-// MARK: Path Management
-
struct PathApplierInfo {
void* info;
PathApplierFunction function;
Modified: trunk/Source/WebCore/platform/graphics/cg/PatternCG.cpp (162826 => 162827)
--- trunk/Source/WebCore/platform/graphics/cg/PatternCG.cpp 2014-01-27 06:23:11 UTC (rev 162826)
+++ trunk/Source/WebCore/platform/graphics/cg/PatternCG.cpp 2014-01-27 07:16:13 UTC (rev 162827)
@@ -30,11 +30,7 @@
#include "AffineTransform.h"
#include "GraphicsContext.h"
-#if !PLATFORM(IOS)
-#include <ApplicationServices/ApplicationServices.h>
-#else
#include <CoreGraphics/CoreGraphics.h>
-#endif
#include <wtf/MainThread.h>
#if PLATFORM(MAC)
Modified: trunk/Source/WebCore/platform/graphics/cocoa/FontPlatformDataCocoa.mm (162826 => 162827)
--- trunk/Source/WebCore/platform/graphics/cocoa/FontPlatformDataCocoa.mm 2014-01-27 06:23:11 UTC (rev 162826)
+++ trunk/Source/WebCore/platform/graphics/cocoa/FontPlatformDataCocoa.mm 2014-01-27 07:16:13 UTC (rev 162827)
@@ -79,9 +79,7 @@
{
CTFontSymbolicTraits traits = CTFontGetSymbolicTraits(toCTFontRef(m_font));
m_isColorBitmapFont = traits & kCTFontColorGlyphsTrait;
-#if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080
m_isCompositeFontReference = traits & kCTFontCompositeTrait;
-#endif
}
if (m_font)
@@ -194,9 +192,7 @@
{
CTFontSymbolicTraits traits = CTFontGetSymbolicTraits(toCTFontRef(m_font));
m_isColorBitmapFont = traits & kCTFontColorGlyphsTrait;
-#if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080
m_isCompositeFontReference = traits & kCTFontCompositeTrait;
-#endif
}
m_CTFont = 0;
}
Modified: trunk/Source/WebCore/platform/graphics/mac/ColorMac.h (162826 => 162827)
--- trunk/Source/WebCore/platform/graphics/mac/ColorMac.h 2014-01-27 06:23:11 UTC (rev 162826)
+++ trunk/Source/WebCore/platform/graphics/mac/ColorMac.h 2014-01-27 07:16:13 UTC (rev 162827)
@@ -31,13 +31,13 @@
#include "Color.h"
-#if !PLATFORM(IOS)
+#if USE(APPKIT)
OBJC_CLASS NSColor;
#endif
namespace WebCore {
-#if !PLATFORM(IOS)
+#if USE(APPKIT)
// These functions assume NSColors are in DeviceRGB colorspace
Color colorFromNSColor(NSColor *);
NSColor *nsColor(const Color&);
Modified: trunk/Source/WebCore/platform/graphics/mac/FontCustomPlatformData.cpp (162826 => 162827)
--- trunk/Source/WebCore/platform/graphics/mac/FontCustomPlatformData.cpp 2014-01-27 06:23:11 UTC (rev 162826)
+++ trunk/Source/WebCore/platform/graphics/mac/FontCustomPlatformData.cpp 2014-01-27 07:16:13 UTC (rev 162827)
@@ -23,11 +23,7 @@
#include "FontPlatformData.h"
#include "SharedBuffer.h"
-#if !PLATFORM(IOS)
-#include <ApplicationServices/ApplicationServices.h>
-#else
#include <CoreGraphics/CoreGraphics.h>
-#endif
namespace WebCore {
Modified: trunk/Source/WebCore/platform/graphics/mac/ImageMac.mm (162826 => 162827)
--- trunk/Source/WebCore/platform/graphics/mac/ImageMac.mm 2014-01-27 06:23:11 UTC (rev 162826)
+++ trunk/Source/WebCore/platform/graphics/mac/ImageMac.mm 2014-01-27 07:16:13 UTC (rev 162827)
@@ -56,7 +56,7 @@
if (m_frames.size() != 1)
return;
-#if !PLATFORM(IOS)
+#if USE(APPKIT)
m_nsImage = 0;
#endif
m_tiffRep = 0;
@@ -84,9 +84,9 @@
{
if (m_tiffRep)
return m_tiffRep.get();
-
+
unsigned numFrames = frameCount();
-
+
// If numFrames is zero, we know for certain this image doesn't have valid data
// Even though the call to CGImageDestinationCreateWithData will fail and we'll handle it gracefully,
// in certain circumstances that call will spam the console with an error message
@@ -101,13 +101,13 @@
}
unsigned numValidFrames = images.size();
-
+
RetainPtr<CFMutableDataRef> data = "" 0));
RetainPtr<CGImageDestinationRef> destination = adoptCF(CGImageDestinationCreateWithData(data.get(), kUTTypeTIFF, numValidFrames, 0));
if (!destination)
return 0;
-
+
for (unsigned i = 0; i < numValidFrames; ++i)
CGImageDestinationAddImage(destination.get(), images[i], 0);
@@ -117,7 +117,7 @@
return m_tiffRep.get();
}
-#if !PLATFORM(IOS)
+#if USE(APPKIT)
NSImage* BitmapImage::getNSImage()
{
if (m_nsImage)
Modified: trunk/Source/WebCore/platform/graphics/mac/WebLayer.mm (162826 => 162827)
--- trunk/Source/WebCore/platform/graphics/mac/WebLayer.mm 2014-01-27 06:23:11 UTC (rev 162826)
+++ trunk/Source/WebCore/platform/graphics/mac/WebLayer.mm 2014-01-27 07:16:13 UTC (rev 162827)
@@ -32,9 +32,6 @@
#import "GraphicsContext.h"
#import "GraphicsLayerCA.h"
#import "PlatformCALayer.h"
-#if !PLATFORM(IOS)
-#import "ThemeMac.h"
-#endif
#import <QuartzCore/QuartzCore.h>
#if PLATFORM(IOS)
@@ -43,6 +40,10 @@
#import "WebCoreThread.h"
#endif
+#if !PLATFORM(IOS)
+#import "ThemeMac.h"
+#endif
+
@interface CALayer(WebCoreCALayerPrivate)
- (void)reloadValueForKeyPath:(NSString *)keyPath;
@end
