Changeset 83091 in webkit

Timestamp:

Apr 6, 2011 1:31:39 PM (13 years ago)

Author:

beidson@apple.com

Message:

​https://bugs.webkit.org/show_bug.cgi?id=57973 and ​https://bugs.webkit.org/show_bug.cgi?id=57973
WK2 icon database should be able to get a CGImage of a specific size

Reviewed by Anders Carlsson.

../WebCore:

• platform/graphics/BitmapImage.h:
• platform/graphics/Image.h:

(WebCore::Image::getFirstCGImageRefOfSize):

• platform/graphics/cg/ImageCG.cpp:

(WebCore::BitmapImage::getFirstCGImageRefOfSize): Walk the frames of the image until reaching the

first frame of the requested size.

../WebKit2:

• UIProcess/API/C/cg/WKIconDatabaseCG.cpp:

(WKIconDatabaseTryGetCGImageForURL): Change this API to take a requested size, and find the first matching

CGImage in the icon.

• UIProcess/API/C/cg/WKIconDatabaseCG.h:

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/graphics/BitmapImage.h (modified) (1 diff)
• WebCore/platform/graphics/Image.h (modified) (1 diff)
• WebCore/platform/graphics/cg/ImageCG.cpp (modified) (1 diff)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/UIProcess/API/C/cg/WKIconDatabaseCG.cpp (modified) (1 diff)
• WebKit2/UIProcess/API/C/cg/WKIconDatabaseCG.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-04-06  Brady Eidson  <beidson@apple.com>
+
+        Reviewed by Anders Carlsson.
+
+        https://bugs.webkit.org/show_bug.cgi?id=57973 and https://bugs.webkit.org/show_bug.cgi?id=57973
+        WK2 icon database should be able to get a CGImage of a specific size
+
+        * platform/graphics/BitmapImage.h:
+        * platform/graphics/Image.h:
+        (WebCore::Image::getFirstCGImageRefOfSize):
+        
+        * platform/graphics/cg/ImageCG.cpp:
+        (WebCore::BitmapImage::getFirstCGImageRefOfSize): Walk the frames of the image until reaching the
+          first frame of the requested size.
+
 2011-04-06  Malcolm MacLeod  <malcolm.macleod@tshwanedje.com>
 

trunk/Source/WebCore/platform/graphics/BitmapImage.h

@@ -142 +142 @@
 #if PLATFORM(CG)
     virtual CGImageRef getCGImageRef();
+    virtual CGImageRef getFirstCGImageRefOfSize(const IntSize&);
 #endif
 

trunk/Source/WebCore/platform/graphics/Image.h

@@ -139 +139 @@
 #if PLATFORM(CG)
     virtual CGImageRef getCGImageRef() { return 0; }
+    virtual CGImageRef getFirstCGImageRefOfSize(const IntSize&) { return 0; }
 #endif
 

trunk/Source/WebCore/platform/graphics/cg/ImageCG.cpp

@@ -155 +155 @@
 }
 
+CGImageRef BitmapImage::getFirstCGImageRefOfSize(const IntSize& size)
+{
+    for (size_t i = 0; i < m_frames.size(); ++i) {
+        CGImageRef cgImage = frameAtIndex(i);
+        if (IntSize(CGImageGetWidth(cgImage), CGImageGetHeight(cgImage)) == size)
+            return cgImage;
+    }
+
+    // Fallback to the default CGImageRef if we can't find the right size
+    return getCGImageRef();
+}
+
 void BitmapImage::draw(GraphicsContext* ctxt, const FloatRect& destRect, const FloatRect& srcRect, ColorSpace styleColorSpace, CompositeOperator compositeOp)
 {

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-04-06  Brady Eidson  <beidson@apple.com>
+
+        Reviewed by Anders Carlsson.
+
+        https://bugs.webkit.org/show_bug.cgi?id=57973 and https://bugs.webkit.org/show_bug.cgi?id=57973
+        WK2 icon database should be able to get a CGImage of a specific size
+
+        * UIProcess/API/C/cg/WKIconDatabaseCG.cpp:
+        (WKIconDatabaseTryGetCGImageForURL): Change this API to take a requested size, and find the first matching
+          CGImage in the icon.
+        * UIProcess/API/C/cg/WKIconDatabaseCG.h:
+
 2011-04-06  Jessie Berlin  <jberlin@apple.com>
 

trunk/Source/WebKit2/UIProcess/API/C/cg/WKIconDatabaseCG.cpp

@@ -35 +35 @@
 using namespace WebCore;
 
-CGImageRef WKIconDatabaseTryGetCGImageForURL(WKIconDatabaseRef iconDatabaseRef, WKURLRef urlRef)
+CGImageRef WKIconDatabaseTryGetCGImageForURL(WKIconDatabaseRef iconDatabaseRef, WKURLRef urlRef, WKSize size)
 {
     Image* image = toImpl(iconDatabaseRef)->imageForPageURL(toWTFString(urlRef));
-    return image ? image->getCGImageRef() : 0;
+    return image ? image->getFirstCGImageRefOfSize(IntSize(static_cast<int>(size.width), static_cast<int>(size.height))) : 0;
 }

trunk/Source/WebKit2/UIProcess/API/C/cg/WKIconDatabaseCG.h

@@ -29 +29 @@
 #include <CoreGraphics/CGImage.h>
 #include <WebKit2/WKBase.h>
+#include <WebKit2/WKGeometry.h>
 
 #ifdef __cplusplus
@@ -34 +35 @@
 #endif
 
-WK_EXPORT CGImageRef WKIconDatabaseTryGetCGImageForURL(WKIconDatabaseRef iconDatabase, WKURLRef urlString);
+WK_EXPORT CGImageRef WKIconDatabaseTryGetCGImageForURL(WKIconDatabaseRef iconDatabase, WKURLRef urlString, WKSize size);
 
 #ifdef __cplusplus