Title: [117656] trunk/Source/WebCore
Revision
117656
Author
psola...@apple.com
Date
2012-05-18 16:34:45 -0700 (Fri, 18 May 2012)

Log Message

BitmapImage::BitmapImage(CGImageRef, ImageObserver*) needs to set m_sizeRespectingOrientation
https://bugs.webkit.org/show_bug.cgi?id=86915

Reviewed by Oliver Hunt.

Set m_sizeRespectingOrientation to be the same as m_size. Otherwise it stays at 0x0 since
this constructor also sets m_haveSize to true for the BitmapImage.

* platform/graphics/cg/ImageCG.cpp:
(WebCore::BitmapImage::BitmapImage):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (117655 => 117656)


--- trunk/Source/WebCore/ChangeLog	2012-05-18 23:28:43 UTC (rev 117655)
+++ trunk/Source/WebCore/ChangeLog	2012-05-18 23:34:45 UTC (rev 117656)
@@ -1,3 +1,16 @@
+2012-05-18  Pratik Solanki  <psola...@apple.com>
+
+        BitmapImage::BitmapImage(CGImageRef, ImageObserver*) needs to set m_sizeRespectingOrientation
+        https://bugs.webkit.org/show_bug.cgi?id=86915
+
+        Reviewed by Oliver Hunt.
+
+        Set m_sizeRespectingOrientation to be the same as m_size. Otherwise it stays at 0x0 since
+        this constructor also sets m_haveSize to true for the BitmapImage.
+
+        * platform/graphics/cg/ImageCG.cpp:
+        (WebCore::BitmapImage::BitmapImage):
+
 2012-05-18  Dan Bernstein  <m...@apple.com>
 
         Build fix after r117607.

Modified: trunk/Source/WebCore/platform/graphics/cg/ImageCG.cpp (117655 => 117656)


--- trunk/Source/WebCore/platform/graphics/cg/ImageCG.cpp	2012-05-18 23:28:43 UTC (rev 117655)
+++ trunk/Source/WebCore/platform/graphics/cg/ImageCG.cpp	2012-05-18 23:34:45 UTC (rev 117656)
@@ -91,6 +91,10 @@
     m_decodedSize = width * height * 4;
     m_size = IntSize(width, height);
 
+    // Since we don't have a decoder, we can't figure out the image orientation.
+    // Set m_sizeRespectingOrientation to be the same as m_size so it's not 0x0.
+    m_sizeRespectingOrientation = IntSize(width, height);
+
     m_frames.grow(1);
     m_frames[0].m_frame = cgImage;
     m_frames[0].m_hasAlpha = true;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to