<!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>[162827] trunk/Source/WebCore</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/162827">162827</a></dd>
<dt>Author</dt> <dd>timothy_horton@apple.com</dd>
<dt>Date</dt> <dd>2014-01-26 23:16:13 -0800 (Sun, 26 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>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.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsBitmapImageh">trunk/Source/WebCore/platform/graphics/BitmapImage.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsImageh">trunk/Source/WebCore/platform/graphics/Image.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationAVTrackPrivateAVFObjCImplmm">trunk/Source/WebCore/platform/graphics/avfoundation/AVTrackPrivateAVFObjCImpl.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationobjcInbandTextTrackPrivateLegacyAVFObjCmm">trunk/Source/WebCore/platform/graphics/avfoundation/objc/InbandTextTrackPrivateLegacyAVFObjC.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateAVFoundationObjCmm">trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscgBitmapImageCGcpp">trunk/Source/WebCore/platform/graphics/cg/BitmapImageCG.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscgFloatPointCGcpp">trunk/Source/WebCore/platform/graphics/cg/FloatPointCG.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscgFloatRectCGcpp">trunk/Source/WebCore/platform/graphics/cg/FloatRectCG.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscgFloatSizeCGcpp">trunk/Source/WebCore/platform/graphics/cg/FloatSizeCG.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscgGradientCGcpp">trunk/Source/WebCore/platform/graphics/cg/GradientCG.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscgGraphicsContextCGcpp">trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscgImageBufferCGcpp">trunk/Source/WebCore/platform/graphics/cg/ImageBufferCG.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscgImageCGcpp">trunk/Source/WebCore/platform/graphics/cg/ImageCG.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscgIntPointCGcpp">trunk/Source/WebCore/platform/graphics/cg/IntPointCG.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscgIntRectCGcpp">trunk/Source/WebCore/platform/graphics/cg/IntRectCG.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscgIntSizeCGcpp">trunk/Source/WebCore/platform/graphics/cg/IntSizeCG.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscgPathCGcpp">trunk/Source/WebCore/platform/graphics/cg/PathCG.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscgPatternCGcpp">trunk/Source/WebCore/platform/graphics/cg/PatternCG.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscocoaFontPlatformDataCocoamm">trunk/Source/WebCore/platform/graphics/cocoa/FontPlatformDataCocoa.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsmacColorMach">trunk/Source/WebCore/platform/graphics/mac/ColorMac.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsmacFontCustomPlatformDatacpp">trunk/Source/WebCore/platform/graphics/mac/FontCustomPlatformData.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsmacImageMacmm">trunk/Source/WebCore/platform/graphics/mac/ImageMac.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsmacWebLayermm">trunk/Source/WebCore/platform/graphics/mac/WebLayer.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (162826 => 162827)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,52 @@
</span><ins>+2014-01-26 Tim Horton <timothy_horton@apple.com>
+
+ 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.
+
</ins><span class="cx"> 2014-01-26 David Hyatt <hyatt@apple.com>
</span><span class="cx">
</span><span class="cx"> [New Multicolumn] Change the axis property to be a boolean like other isInline checks
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsBitmapImageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/BitmapImage.h (162826 => 162827)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -36,9 +36,10 @@
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(MAC)
</span><span class="cx"> #include <wtf/RetainPtr.h>
</span><del>-#if !PLATFORM(IOS)
</del><ins>+#endif
+
+#if USE(APPKIT)
</ins><span class="cx"> OBJC_CLASS NSImage;
</span><del>-#endif // PLATFORM(IOS)
</del><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(WIN)
</span><span class="lines">@@ -156,11 +157,13 @@
</span><span class="cx"> virtual void drawPattern(GraphicsContext*, const FloatRect& srcRect, const AffineTransform& patternTransform,
</span><span class="cx"> const FloatPoint& phase, ColorSpace styleColorSpace, CompositeOperator, const FloatRect& destRect, BlendMode = BlendModeNormal) override;
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><span class="cx"> // Accessors for native image formats.
</span><del>-#if !PLATFORM(IOS)
</del><ins>+
+#if USE(APPKIT)
</ins><span class="cx"> virtual NSImage* getNSImage() override;
</span><span class="cx"> #endif
</span><ins>+
+#if PLATFORM(MAC)
</ins><span class="cx"> virtual CFDataRef getTIFFRepresentation() override;
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -313,10 +316,10 @@
</span><span class="cx"> int m_repetitionsComplete; // How many repetitions we've finished.
</span><span class="cx"> double m_desiredFrameStartTime; // The system time at which we hope to see the next call to startAnimation().
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
-#if !PLATFORM(IOS)
</del><ins>+#if USE(APPKIT)
</ins><span class="cx"> mutable RetainPtr<NSImage> m_nsImage; // A cached NSImage of frame 0. Only built lazily if someone actually queries for one.
</span><span class="cx"> #endif
</span><ins>+#if USE(CG)
</ins><span class="cx"> mutable RetainPtr<CFDataRef> m_tiffRep; // Cached TIFF rep for frame 0. Only built lazily if someone queries for one.
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsImageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/Image.h (162826 => 162827)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -141,10 +141,14 @@
</span><span class="cx">
</span><span class="cx"> virtual PassNativeImagePtr nativeImageForCurrentFrame() { return 0; }
</span><span class="cx"> virtual ImageOrientation orientationForCurrentFrame() { return ImageOrientation(); }
</span><del>-
-#if PLATFORM(MAC)
</del><ins>+
</ins><span class="cx"> // Accessors for native image formats.
</span><ins>+
+#if USE(APPKIT)
</ins><span class="cx"> virtual NSImage* getNSImage() { return 0; }
</span><ins>+#endif
+
+#if PLATFORM(MAC)
</ins><span class="cx"> virtual CFDataRef getTIFFRepresentation() { return 0; }
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationAVTrackPrivateAVFObjCImplmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/AVTrackPrivateAVFObjCImpl.mm (162826 => 162827)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -115,11 +115,7 @@
</span><span class="cx"> return emptyAtom;
</span><span class="cx">
</span><span class="cx"> // If possible, return a title in one of the user's preferred languages.
</span><del>-#if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080
</del><span class="cx"> NSArray *titlesForPreferredLanguages = [AVMetadataItem metadataItemsFromArray:titles filteredAndSortedAccordingToPreferredLanguages:[NSLocale preferredLanguages]];
</span><del>-#else
- NSArray *titlesForPreferredLanguages = [AVMetadataItem metadataItemsFromArray:titles withLocale:[NSLocale currentLocale]];
-#endif
</del><span class="cx"> if ([titlesForPreferredLanguages count])
</span><span class="cx"> return [[titlesForPreferredLanguages objectAtIndex:0] stringValue];
</span><span class="cx"> return [[titles objectAtIndex:0] stringValue];
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcInbandTextTrackPrivateLegacyAVFObjCmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/InbandTextTrackPrivateLegacyAVFObjC.mm (162826 => 162827)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -104,12 +104,8 @@
</span><span class="cx">
</span><span class="cx"> NSArray *titles = [AVMetadataItem metadataItemsFromArray:[[m_playerItemTrack assetTrack] commonMetadata] withKey:AVMetadataCommonKeyTitle keySpace:AVMetadataKeySpaceCommon];
</span><span class="cx"> if ([titles count]) {
</span><del>-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080
</del><span class="cx"> // If possible, return a title in one of the user's preferred languages.
</span><span class="cx"> NSArray *titlesForPreferredLanguages = [AVMetadataItem metadataItemsFromArray:titles filteredAndSortedAccordingToPreferredLanguages:[NSLocale preferredLanguages]];
</span><del>-#else
- NSArray *titlesForPreferredLanguages = [AVMetadataItem metadataItemsFromArray:titles withLocale:[NSLocale currentLocale]];
-#endif
</del><span class="cx"> if ([titlesForPreferredLanguages count])
</span><span class="cx"> title = [[titlesForPreferredLanguages objectAtIndex:0] stringValue];
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateAVFoundationObjCmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm (162826 => 162827)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -476,7 +476,6 @@
</span><span class="cx">
</span><span class="cx"> [options.get() setObject:[NSNumber numberWithInt:AVAssetReferenceRestrictionForbidRemoteReferenceToLocal | AVAssetReferenceRestrictionForbidLocalReferenceToRemote] forKey:AVURLAssetReferenceRestrictionsKey];
</span><span class="cx">
</span><del>-#if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080
</del><span class="cx"> RetainPtr<NSMutableDictionary> headerFields = adoptNS([[NSMutableDictionary alloc] init]);
</span><span class="cx">
</span><span class="cx"> String referrer = player()->referrer();
</span><span class="lines">@@ -489,7 +488,6 @@
</span><span class="cx">
</span><span class="cx"> if ([headerFields.get() count])
</span><span class="cx"> [options.get() setObject:headerFields.get() forKey:@"AVURLAssetHTTPHeaderFieldsKey"];
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> NSURL *cocoaURL = URL(ParsedURLString, url);
</span><span class="cx"> m_avAsset = adoptNS([[AVURLAsset alloc] initWithURL:cocoaURL options:options.get()]);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscgBitmapImageCGcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cg/BitmapImageCG.cpp (162826 => 162827)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -32,12 +32,11 @@
</span><span class="cx"> #include "GraphicsContextCG.h"
</span><span class="cx"> #include "ImageObserver.h"
</span><span class="cx"> #include "SubimageCacheWithTimer.h"
</span><del>-#if !PLATFORM(IOS)
</del><ins>+#include <wtf/RetainPtr.h>
+
+#if USE(APPKIT)
</ins><span class="cx"> #include <ApplicationServices/ApplicationServices.h>
</span><del>-#else
-#include <CoreGraphics/CGContextPrivate.h>
</del><span class="cx"> #endif
</span><del>-#include <wtf/RetainPtr.h>
</del><span class="cx">
</span><span class="cx"> #if PLATFORM(MAC)
</span><span class="cx"> #include "WebCoreSystemInterface.h"
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscgFloatPointCGcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cg/FloatPointCG.cpp (162826 => 162827)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -29,11 +29,7 @@
</span><span class="cx">
</span><span class="cx"> #if USE(CG)
</span><span class="cx">
</span><del>-#if !PLATFORM(IOS)
-#include <ApplicationServices/ApplicationServices.h>
-#else
</del><span class="cx"> #include <CoreGraphics/CoreGraphics.h>
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscgFloatRectCGcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cg/FloatRectCG.cpp (162826 => 162827)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -29,11 +29,7 @@
</span><span class="cx">
</span><span class="cx"> #if USE(CG)
</span><span class="cx">
</span><del>-#if !PLATFORM(IOS)
-#include <ApplicationServices/ApplicationServices.h>
-#else
</del><span class="cx"> #include <CoreGraphics/CoreGraphics.h>
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscgFloatSizeCGcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cg/FloatSizeCG.cpp (162826 => 162827)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -29,11 +29,7 @@
</span><span class="cx">
</span><span class="cx"> #if USE(CG)
</span><span class="cx">
</span><del>-#if !PLATFORM(IOS)
-#include <ApplicationServices/ApplicationServices.h>
-#else
</del><span class="cx"> #include <CoreGraphics/CoreGraphics.h>
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscgGradientCGcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cg/GradientCG.cpp (162826 => 162827)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -28,11 +28,7 @@
</span><span class="cx"> #include "Gradient.h"
</span><span class="cx">
</span><span class="cx"> #include "GraphicsContextCG.h"
</span><del>-#if !PLATFORM(IOS)
-#include <ApplicationServices/ApplicationServices.h>
-#else
</del><span class="cx"> #include <CoreGraphics/CoreGraphics.h>
</span><del>-#endif
</del><span class="cx"> #include <wtf/RetainPtr.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscgGraphicsContextCGcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp (162826 => 162827)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1017,10 +1017,8 @@
</span><span class="cx"> if (context.isAcceleratedContext())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080
</del><span class="cx"> if (wkCGContextDrawsWithCorrectShadowOffsets(context.platformContext()))
</span><span class="cx"> return;
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> // Work around <rdar://problem/5539388> by ensuring that the offsets will get truncated
</span><span class="cx"> // to the desired integer. Also see: <rdar://problem/10056277>
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscgImageBufferCGcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cg/ImageBufferCG.cpp (162826 => 162827)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -34,12 +34,8 @@
</span><span class="cx"> #include "ImageData.h"
</span><span class="cx"> #include "MIMETypeRegistry.h"
</span><span class="cx"> #include <math.h>
</span><del>-#if !PLATFORM(IOS)
-#include <ApplicationServices/ApplicationServices.h>
-#else
</del><span class="cx"> #include <CoreGraphics/CoreGraphics.h>
</span><span class="cx"> #include <ImageIO/ImageIO.h>
</span><del>-#endif
</del><span class="cx"> #include <wtf/Assertions.h>
</span><span class="cx"> #include <wtf/CheckedArithmetic.h>
</span><span class="cx"> #include <wtf/MainThread.h>
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscgImageCGcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cg/ImageCG.cpp (162826 => 162827)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -32,11 +32,7 @@
</span><span class="cx"> #include "FloatRect.h"
</span><span class="cx"> #include "GraphicsContextCG.h"
</span><span class="cx"> #include "ImageObserver.h"
</span><del>-#if !PLATFORM(IOS)
-#include <ApplicationServices/ApplicationServices.h>
-#else
</del><span class="cx"> #include <CoreGraphics/CoreGraphics.h>
</span><del>-#endif
</del><span class="cx"> #include <wtf/RetainPtr.h>
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(MAC)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscgIntPointCGcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cg/IntPointCG.cpp (162826 => 162827)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -28,11 +28,7 @@
</span><span class="cx">
</span><span class="cx"> #if USE(CG)
</span><span class="cx">
</span><del>-#if !PLATFORM(IOS)
-#include <ApplicationServices/ApplicationServices.h>
-#else
</del><span class="cx"> #include <CoreGraphics/CoreGraphics.h>
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscgIntRectCGcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cg/IntRectCG.cpp (162826 => 162827)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -28,11 +28,7 @@
</span><span class="cx">
</span><span class="cx"> #if USE(CG)
</span><span class="cx">
</span><del>-#if !PLATFORM(IOS)
-#include <ApplicationServices/ApplicationServices.h>
-#else
</del><span class="cx"> #include <CoreGraphics/CoreGraphics.h>
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscgIntSizeCGcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cg/IntSizeCG.cpp (162826 => 162827)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -28,11 +28,7 @@
</span><span class="cx">
</span><span class="cx"> #if USE(CG)
</span><span class="cx">
</span><del>-#if !PLATFORM(IOS)
-#include <ApplicationServices/ApplicationServices.h>
-#else
</del><span class="cx"> #include <CoreGraphics/CoreGraphics.h>
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscgPathCGcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cg/PathCG.cpp (162826 => 162827)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -34,12 +34,7 @@
</span><span class="cx"> #include "GraphicsContext.h"
</span><span class="cx"> #include "IntRect.h"
</span><span class="cx"> #include "StrokeStyleApplier.h"
</span><del>-#if !PLATFORM(IOS)
-#include <ApplicationServices/ApplicationServices.h>
-#else
-#include <CoreGraphics/CGPathPrivate.h>
</del><span class="cx"> #include <CoreGraphics/CoreGraphics.h>
</span><del>-#endif
</del><span class="cx"> #include <wtf/MathExtras.h>
</span><span class="cx"> #include <wtf/RetainPtr.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="lines">@@ -325,9 +320,6 @@
</span><span class="cx"> return CGPathGetCurrentPoint(m_path);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-// MARK: -
-// MARK: Path Management
-
</del><span class="cx"> struct PathApplierInfo {
</span><span class="cx"> void* info;
</span><span class="cx"> PathApplierFunction function;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscgPatternCGcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cg/PatternCG.cpp (162826 => 162827)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -30,11 +30,7 @@
</span><span class="cx"> #include "AffineTransform.h"
</span><span class="cx"> #include "GraphicsContext.h"
</span><span class="cx">
</span><del>-#if !PLATFORM(IOS)
-#include <ApplicationServices/ApplicationServices.h>
-#else
</del><span class="cx"> #include <CoreGraphics/CoreGraphics.h>
</span><del>-#endif
</del><span class="cx"> #include <wtf/MainThread.h>
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(MAC)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscocoaFontPlatformDataCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cocoa/FontPlatformDataCocoa.mm (162826 => 162827)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -79,9 +79,7 @@
</span><span class="cx"> {
</span><span class="cx"> CTFontSymbolicTraits traits = CTFontGetSymbolicTraits(toCTFontRef(m_font));
</span><span class="cx"> m_isColorBitmapFont = traits & kCTFontColorGlyphsTrait;
</span><del>-#if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080
</del><span class="cx"> m_isCompositeFontReference = traits & kCTFontCompositeTrait;
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (m_font)
</span><span class="lines">@@ -194,9 +192,7 @@
</span><span class="cx"> {
</span><span class="cx"> CTFontSymbolicTraits traits = CTFontGetSymbolicTraits(toCTFontRef(m_font));
</span><span class="cx"> m_isColorBitmapFont = traits & kCTFontColorGlyphsTrait;
</span><del>-#if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080
</del><span class="cx"> m_isCompositeFontReference = traits & kCTFontCompositeTrait;
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx"> m_CTFont = 0;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsmacColorMach"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/mac/ColorMac.h (162826 => 162827)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -31,13 +31,13 @@
</span><span class="cx">
</span><span class="cx"> #include "Color.h"
</span><span class="cx">
</span><del>-#if !PLATFORM(IOS)
</del><ins>+#if USE(APPKIT)
</ins><span class="cx"> OBJC_CLASS NSColor;
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-#if !PLATFORM(IOS)
</del><ins>+#if USE(APPKIT)
</ins><span class="cx"> // These functions assume NSColors are in DeviceRGB colorspace
</span><span class="cx"> Color colorFromNSColor(NSColor *);
</span><span class="cx"> NSColor *nsColor(const Color&);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsmacFontCustomPlatformDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/mac/FontCustomPlatformData.cpp (162826 => 162827)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -23,11 +23,7 @@
</span><span class="cx">
</span><span class="cx"> #include "FontPlatformData.h"
</span><span class="cx"> #include "SharedBuffer.h"
</span><del>-#if !PLATFORM(IOS)
-#include <ApplicationServices/ApplicationServices.h>
-#else
</del><span class="cx"> #include <CoreGraphics/CoreGraphics.h>
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsmacImageMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/mac/ImageMac.mm (162826 => 162827)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -56,7 +56,7 @@
</span><span class="cx"> if (m_frames.size() != 1)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>-#if !PLATFORM(IOS)
</del><ins>+#if USE(APPKIT)
</ins><span class="cx"> m_nsImage = 0;
</span><span class="cx"> #endif
</span><span class="cx"> m_tiffRep = 0;
</span><span class="lines">@@ -84,9 +84,9 @@
</span><span class="cx"> {
</span><span class="cx"> if (m_tiffRep)
</span><span class="cx"> return m_tiffRep.get();
</span><del>-
</del><ins>+
</ins><span class="cx"> unsigned numFrames = frameCount();
</span><del>-
</del><ins>+
</ins><span class="cx"> // If numFrames is zero, we know for certain this image doesn't have valid data
</span><span class="cx"> // Even though the call to CGImageDestinationCreateWithData will fail and we'll handle it gracefully,
</span><span class="cx"> // in certain circumstances that call will spam the console with an error message
</span><span class="lines">@@ -101,13 +101,13 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> unsigned numValidFrames = images.size();
</span><del>-
</del><ins>+
</ins><span class="cx"> RetainPtr<CFMutableDataRef> data = adoptCF(CFDataCreateMutable(0, 0));
</span><span class="cx"> RetainPtr<CGImageDestinationRef> destination = adoptCF(CGImageDestinationCreateWithData(data.get(), kUTTypeTIFF, numValidFrames, 0));
</span><span class="cx">
</span><span class="cx"> if (!destination)
</span><span class="cx"> return 0;
</span><del>-
</del><ins>+
</ins><span class="cx"> for (unsigned i = 0; i < numValidFrames; ++i)
</span><span class="cx"> CGImageDestinationAddImage(destination.get(), images[i], 0);
</span><span class="cx">
</span><span class="lines">@@ -117,7 +117,7 @@
</span><span class="cx"> return m_tiffRep.get();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if !PLATFORM(IOS)
</del><ins>+#if USE(APPKIT)
</ins><span class="cx"> NSImage* BitmapImage::getNSImage()
</span><span class="cx"> {
</span><span class="cx"> if (m_nsImage)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsmacWebLayermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/mac/WebLayer.mm (162826 => 162827)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -32,9 +32,6 @@
</span><span class="cx"> #import "GraphicsContext.h"
</span><span class="cx"> #import "GraphicsLayerCA.h"
</span><span class="cx"> #import "PlatformCALayer.h"
</span><del>-#if !PLATFORM(IOS)
-#import "ThemeMac.h"
-#endif
</del><span class="cx"> #import <QuartzCore/QuartzCore.h>
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="lines">@@ -43,6 +40,10 @@
</span><span class="cx"> #import "WebCoreThread.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if !PLATFORM(IOS)
+#import "ThemeMac.h"
+#endif
+
</ins><span class="cx"> @interface CALayer(WebCoreCALayerPrivate)
</span><span class="cx"> - (void)reloadValueForKeyPath:(NSString *)keyPath;
</span><span class="cx"> @end
</span></span></pre>
</div>
</div>
</body>
</html>