Title: [161264] trunk/Source/WebCore
- Revision
- 161264
- Author
- [email protected]
- Date
- 2014-01-03 09:21:35 -0800 (Fri, 03 Jan 2014)
Log Message
[WinCairo] Compile error.
https://bugs.webkit.org/show_bug.cgi?id=126428
Patch by [email protected] <[email protected]> on 2014-01-03
Reviewed by Brent Fulgham.
The NativeImagePtr type is not an CGImageRef on WinCairo, cannot use CFRetain.
* loader/cache/MemoryCache.cpp: Replace USE(CF) with USE(CG).
* loader/cache/MemoryCache.h: Ditto.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (161263 => 161264)
--- trunk/Source/WebCore/ChangeLog 2014-01-03 17:03:10 UTC (rev 161263)
+++ trunk/Source/WebCore/ChangeLog 2014-01-03 17:21:35 UTC (rev 161264)
@@ -1,3 +1,15 @@
+2014-01-03 [email protected] <[email protected]>
+
+ [WinCairo] Compile error.
+ https://bugs.webkit.org/show_bug.cgi?id=126428
+
+ Reviewed by Brent Fulgham.
+
+ The NativeImagePtr type is not an CGImageRef on WinCairo, cannot use CFRetain.
+
+ * loader/cache/MemoryCache.cpp: Replace USE(CF) with USE(CG).
+ * loader/cache/MemoryCache.h: Ditto.
+
2014-01-03 Hans Muller <[email protected]>
[CSS Shapes] Simplify FloatRoundedRect, BoxShape construction
Modified: trunk/Source/WebCore/loader/cache/MemoryCache.cpp (161263 => 161264)
--- trunk/Source/WebCore/loader/cache/MemoryCache.cpp 2014-01-03 17:03:10 UTC (rev 161263)
+++ trunk/Source/WebCore/loader/cache/MemoryCache.cpp 2014-01-03 17:21:35 UTC (rev 161264)
@@ -212,8 +212,8 @@
return m_capacity - deadCapacity();
}
-#if USE(CF)
-// FIXME: Remove the USE(CF) once we either make NativeImagePtr a smart pointer on all platforms or
+#if USE(CG)
+// FIXME: Remove the USE(CG) once we either make NativeImagePtr a smart pointer on all platforms or
// remove the usage of CFRetain() in MemoryCache::addImageToCache() so as to make the code platform-independent.
bool MemoryCache::addImageToCache(NativeImagePtr image, const URL& url, const String& cachePartition)
{
Modified: trunk/Source/WebCore/loader/cache/MemoryCache.h (161263 => 161264)
--- trunk/Source/WebCore/loader/cache/MemoryCache.h 2014-01-03 17:03:10 UTC (rev 161263)
+++ trunk/Source/WebCore/loader/cache/MemoryCache.h 2014-01-03 17:21:35 UTC (rev 161264)
@@ -188,8 +188,8 @@
unsigned liveSize() const { return m_liveSize; }
unsigned deadSize() const { return m_deadSize; }
-#if USE(CF)
- // FIXME: Remove the USE(CF) once we either make NativeImagePtr a smart pointer on all platforms or
+#if USE(CG)
+ // FIXME: Remove the USE(CG) once we either make NativeImagePtr a smart pointer on all platforms or
// remove the usage of CFRetain() in MemoryCache::addImageToCache() so as to make the code platform-independent.
bool addImageToCache(NativeImagePtr, const URL&, const String& cachePartition);
void removeImageFromCache(const URL&, const String& cachePartition);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
