Changeset 171119 in webkit

Timestamp:

Jul 15, 2014, 3:25:50 PM (11 years ago)

Author:

Simon Fraser

Message:

[iOS] Fix issues drawing subsampled image elements and CSS images
​https://bugs.webkit.org/show_bug.cgi?id=134944
<rdar://problem/17634095>

Reviewed by Dean Jackson.

After r170675 it is important for BitmapImage::draw() to be given a srcRect computed
using the original size of the image, not the subsampled size.

So fix various code paths that end up in image drawing to use the originalSize(),
which requires giving Image a virtual function that just returns size(), and hence has
a FloatSize return value.

Tested by setting a very low subsampling threshold and browsing various sites.

A better longterm fix will happen via bug 134916.

• platform/graphics/BitmapImage.cpp:

(WebCore::BitmapImage::originalSize):

• platform/graphics/BitmapImage.h:
• platform/graphics/GraphicsContext.cpp:

(WebCore::GraphicsContext::drawImage):

• platform/graphics/Image.cpp:

(WebCore::Image::drawTiled):
(WebCore::Image::computeIntrinsicDimensions):

• platform/graphics/Image.h:

(WebCore::Image::originalSize):

• platform/graphics/cg/BitmapImageCG.cpp:

(WebCore::BitmapImage::BitmapImage): Just use m_size for initializing the other members.
(WebCore::BitmapImage::draw):

• platform/graphics/cg/GraphicsContext3DCG.cpp:

(WebCore::GraphicsContext3D::ImageExtractor::extractImage):

• platform/graphics/cg/ImageCG.cpp:

(WebCore::Image::drawPattern):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/BitmapImage.cpp (modified) (1 diff)
• platform/graphics/BitmapImage.h (modified) (1 diff)
• platform/graphics/GraphicsContext.cpp (modified) (1 diff)
• platform/graphics/Image.cpp (modified) (2 diffs)
• platform/graphics/Image.h (modified) (1 diff)
• platform/graphics/cg/BitmapImageCG.cpp (modified) (2 diffs)
• platform/graphics/cg/GraphicsContext3DCG.cpp (modified) (1 diff)
• platform/graphics/cg/ImageCG.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-07-15  Simon Fraser  <simon.fraser@apple.com>
+
+        [iOS] Fix issues drawing subsampled image elements and CSS images
+        https://bugs.webkit.org/show_bug.cgi?id=134944
+        <rdar://problem/17634095>
+
+        Reviewed by Dean Jackson.
+
+        After r170675 it is important for BitmapImage::draw() to be given a srcRect computed
+        using the original size of the image, not the subsampled size.
+        
+        So fix various code paths that end up in image drawing to use the originalSize(),
+        which requires giving Image a virtual function that just returns size(), and hence has
+        a FloatSize return value.
+        
+        Tested by setting a very low subsampling threshold and browsing various sites.
+        
+        A better longterm fix will happen via bug 134916.
+
+        * platform/graphics/BitmapImage.cpp:
+        (WebCore::BitmapImage::originalSize):
+        * platform/graphics/BitmapImage.h:
+        * platform/graphics/GraphicsContext.cpp:
+        (WebCore::GraphicsContext::drawImage):
+        * platform/graphics/Image.cpp:
+        (WebCore::Image::drawTiled):
+        (WebCore::Image::computeIntrinsicDimensions):
+        * platform/graphics/Image.h:
+        (WebCore::Image::originalSize):
+        * platform/graphics/cg/BitmapImageCG.cpp:
+        (WebCore::BitmapImage::BitmapImage): Just use m_size for initializing the other members.
+        (WebCore::BitmapImage::draw):
+        * platform/graphics/cg/GraphicsContext3DCG.cpp:
+        (WebCore::GraphicsContext3D::ImageExtractor::extractImage):
+        * platform/graphics/cg/ImageCG.cpp:
+        (WebCore::Image::drawPattern):
+
 2014-07-15  Brent Fulgham  <bfulgham@apple.com>
 

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

@@ -262 +262 @@
 
 #if PLATFORM(IOS)
-IntSize BitmapImage::originalSize() const
+FloatSize BitmapImage::originalSize() const
 {
     updateSize();

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

@@ -139 +139 @@
     IntSize sizeRespectingOrientation(ImageOrientationDescription = ImageOrientationDescription()) const;
 #if PLATFORM(IOS)
-    virtual IntSize originalSize() const;
+    virtual FloatSize originalSize() const override;
     IntSize originalSizeRespectingOrientation() const;
 #endif

trunk/Source/WebCore/platform/graphics/GraphicsContext.cpp

@@ -582 +582 @@
     if (!image)
         return;
-    drawImage(image, colorSpace, destination, FloatRect(FloatPoint(), image->size()), imagePaintingOptions);
+    
+#if PLATFORM(IOS)
+    FloatRect srcRect(FloatPoint(), image->originalSize());
+#else
+    FloatRect srcRect(FloatPoint(), image->size());
+#endif
+        
+    drawImage(image, colorSpace, destination, srcRect, imagePaintingOptions);
 }
 

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

@@ -104 +104 @@
     ASSERT(!isBitmapImage() || notSolidColor());
 
+#if PLATFORM(IOS)
+    FloatSize intrinsicTileSize = originalSize();
+#else
     FloatSize intrinsicTileSize = size();
+#endif
     if (hasRelativeWidth())
         intrinsicTileSize.setWidth(scaledTileSize.width());
@@ -258 +262 @@
 void Image::computeIntrinsicDimensions(Length& intrinsicWidth, Length& intrinsicHeight, FloatSize& intrinsicRatio)
 {
+#if PLATFORM(IOS)
+    intrinsicRatio = originalSize();
+#else
     intrinsicRatio = size();
+#endif
     intrinsicWidth = Length(intrinsicRatio.width(), Fixed);
     intrinsicHeight = Length(intrinsicRatio.height(), Fixed);

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

@@ -104 +104 @@
     virtual bool getHotSpot(IntPoint&) const { return false; }
 
+#if PLATFORM(IOS)
+    virtual FloatSize originalSize() const { return size(); }
+#endif
+
     bool setData(PassRefPtr<SharedBuffer> data, bool allDataReceived);
     virtual bool dataChanged(bool /*allDataReceived*/) { return false; }

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

@@ -102 +102 @@
     // 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);
-
-#if PLATFORM(IOS)
-    m_originalSize = IntSize(width, height);
-    m_originalSizeRespectingOrientation = IntSize(width, height);
+    m_sizeRespectingOrientation = m_size;
+
+#if PLATFORM(IOS)
+    m_originalSize = m_size;
+    m_originalSizeRespectingOrientation = m_size;
 #endif
 
@@ -203 +203 @@
 
 #if PLATFORM(IOS)
-    if (m_originalSize.width() && m_originalSize.height())
+    if (m_originalSize != m_size && !m_originalSize.isEmpty())
         srcRectForCurrentFrame.scale(m_size.width() / static_cast<float>(m_originalSize.width()), m_size.height() / static_cast<float>(m_originalSize.height()));
 

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

@@ -336 +336 @@
         float scaleHint = 1;
         if (m_image->isBitmapImage()) {
-            IntSize originalSize = toBitmapImage(m_image)->originalSize();
-            if (originalSize.width() && originalSize.height())
-                scaleHint = std::min<float>(1.0f, std::max(m_image->size().width() / originalSize.width(), m_image->size().width() / originalSize.height()));
+            FloatSize originalSize = toBitmapImage(m_image)->originalSize();
+            if (!originalSize.isEmpty())
+                scaleHint = std::min<float>(1, std::max(m_image->size().width() / originalSize.width(), m_image->size().width() / originalSize.height()));
         }
         m_decodedImage = adoptCF(decoder.createFrameAtIndex(0, &scaleHint));

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

@@ -117 +117 @@
 
     RetainPtr<CGImageRef> subImage;
-    if (tileRect.size() == size())
+#if PLATFORM(IOS)
+    FloatSize imageSize = originalSize();
+#else
+    FloatSize imageSize = size();
+#endif
+    if (tileRect.size() == imageSize)
         subImage = tileImage;
     else {