Changeset 158900 in webkit for trunk/Source/WebCore/rendering/RenderImage.cpp

Timestamp:

Nov 7, 2013, 7:55:30 PM (12 years ago)

Author:

[email protected]

Message:

REGRESSION (r154375): Image is oriented incorrectly
​https://bugs.webkit.org/show_bug.cgi?id=123831

Reviewed by Antonio Gomes.

r154375 made that shouldRespectImageOrientation() isn't used by drawImage().
It causes an image isn't oriented correctly. This patch sets shouldRespectImageOrientation()
value by default.

• rendering/RenderImage.cpp:

(WebCore::RenderImage::paintReplaced):
(WebCore::RenderImage::paintIntoRect):

File:

• trunk/Source/WebCore/rendering/RenderImage.cpp (modified) (2 diffs)

trunk/Source/WebCore/rendering/RenderImage.cpp

@@ -392 +392 @@
                 imageOffset = LayoutSize(leftBorder + leftPad + centerX + borderWidth, topBorder + topPad + centerY + borderWidth);
 
-                ImageOrientationDescription orientationDescription;
+                ImageOrientationDescription orientationDescription(shouldRespectImageOrientation());
 #if ENABLE(CSS_IMAGE_ORIENTATION)
                 orientationDescription.setImageOrientationEnum(style().imageOrientation());
-                orientationDescription.setRespectImageOrientation(shouldRespectImageOrientation());
 #endif
                 context->drawImage(image.get(), style().colorSpace(), pixelSnappedIntRect(LayoutRect(paintOffset + imageOffset, imageSize)), CompositeSourceOver, orientationDescription);
@@ -524 +523 @@
     Image* image = m_imageResource->image().get();
     bool useLowQualityScaling = shouldPaintAtLowQuality(context, image, image, alignedRect.size());
-    ImageOrientationDescription orientationDescription;
+    ImageOrientationDescription orientationDescription(shouldRespectImageOrientation());
 #if ENABLE(CSS_IMAGE_ORIENTATION)
     orientationDescription.setImageOrientationEnum(style().imageOrientation());
-    orientationDescription.setRespectImageOrientation(shouldRespectImageOrientation());
 #endif
     context->drawImage(m_imageResource->image(alignedRect.width(), alignedRect.height()).get(), style().colorSpace(), alignedRect, compositeOperator, orientationDescription, useLowQualityScaling);