Attachment 214408 Details for Bug 91566 – Patch

[patch] Patch

bug-91566-20131017091704.patch (text/plain), 44.84 KB, created by Gyuyoung Kim on 2013-10-16 17:17:06 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Gyuyoung Kim

Created: 2013-10-16 17:17:06 PDT

Size: 44.84 KB

patch

obsolete

>Subversion Revision: 157542
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 36399714cff83f1551e38351ef497747083c4cae..ff857b900c4fbc25b4ff4e338ee0119e279ef531 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,76 @@
>+2013-10-16  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
>+
>+        <https://webkit.org/b/91566> Integrate css3-images image-orientation with existing EXIF support
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Original patch by David Barr(davidbarr@chromium.org).
>+
>+        This patch passes an information of image orientation into existing EXIF support functions
>+        (draw() functions of image classes mainly). We need to let the functions to know the information
>+        in order to meet the image-orientation requirement.
>+
>+        Spec: http://dev.w3.org/csswg/css-images-3/#the-image-orientation
>+        The css3-images module specification is at last call.
>+
>+        Test: fast/css/image-orientation/image-orientation.html
>+        Image orientation test is to check if incorrect rotation value can be fixed with correct orientation.
>+
>+        * loader/cache/CachedImage.cpp:
>+        (WebCore::CachedImage::imageSizeForRenderer):
>+        * page/DragController.cpp:
>+        (WebCore::DragController::doImageDrag):
>+        * page/Frame.cpp:
>+        (WebCore::Frame::nodeImage):
>+        * platform/graphics/BitmapImage.cpp:
>+        (WebCore::BitmapImage::updateSize):
>+        (WebCore::BitmapImage::sizeRespectingOrientation):
>+        (WebCore::BitmapImage::drawPattern):
>+        * platform/graphics/BitmapImage.h:
>+        * platform/graphics/CrossfadeGeneratedImage.cpp:
>+        (WebCore::CrossfadeGeneratedImage::draw):
>+        * platform/graphics/CrossfadeGeneratedImage.h:
>+        * platform/graphics/GeneratedImage.h:
>+        * platform/graphics/GradientImage.cpp:
>+        (WebCore::GradientImage::draw):
>+        * platform/graphics/GradientImage.h:
>+        * platform/graphics/Image.cpp:
>+        (WebCore::Image::draw):
>+        (WebCore::Image::drawTiled):
>+        * platform/graphics/Image.h:
>+        * platform/graphics/blackberry/ImageBlackBerry.cpp:
>+        * platform/graphics/cairo/BitmapImageCairo.cpp:
>+        (WebCore::BitmapImage::draw):
>+        * platform/graphics/cg/BitmapImageCG.cpp:
>+        * platform/graphics/cg/PDFDocumentImage.cpp:
>+        (WebCore::PDFDocumentImage::draw):
>+        * platform/graphics/cg/PDFDocumentImage.h:
>+        * platform/graphics/win/ImageCGWin.cpp:
>+        (WebCore::BitmapImage::getHBITMAPOfSize):
>+        (WebCore::BitmapImage::drawFrameMatchingSourceSize):
>+        * platform/graphics/wince/ImageBufferWinCE.cpp:
>+        (WebCore::BufferedImage::draw):
>+        * platform/graphics/wince/ImageWinCE.cpp:
>+        (WebCore::BitmapImage::draw):
>+        * platform/mac/DragImageMac.mm:
>+        (WebCore::createDragImageFromImage):
>+        * rendering/RenderEmbeddedObject.cpp:
>+        (WebCore::RenderEmbeddedObject::paintSnapshotImage):
>+        * rendering/RenderImage.cpp:
>+        (WebCore::RenderImage::styleDidChange):
>+        * rendering/RenderSnapshottedPlugIn.cpp:
>+        (WebCore::RenderSnapshottedPlugIn::paintSnapshot):
>+        * rendering/style/RenderStyle.cpp:
>+        (WebCore::RenderStyle::changeRequiresLayout):
>+        * svg/graphics/SVGImage.cpp:
>+        (WebCore::SVGImage::drawForContainer):
>+        (WebCore::SVGImage::nativeImageForCurrentFrame):
>+        (WebCore::SVGImage::draw):
>+        * svg/graphics/SVGImage.h:
>+        * svg/graphics/SVGImageForContainer.cpp:
>+        (WebCore::SVGImageForContainer::draw):
>+        * svg/graphics/SVGImageForContainer.h:
>+
> 2013-10-16  Andreas Kling  <akling@apple.com>
> 
>         Take RenderObjects out of the arena.
>diff --git a/Source/WebCore/loader/cache/CachedImage.cpp b/Source/WebCore/loader/cache/CachedImage.cpp
>index 927dcf3c90f05a2dc6358865cc43679e22568884..319cb7e45298b5b2e53aeef02809a58edb82a1ec 100644
>--- a/Source/WebCore/loader/cache/CachedImage.cpp
>+++ b/Source/WebCore/loader/cache/CachedImage.cpp
>@@ -260,8 +260,21 @@ LayoutSize CachedImage::imageSizeForRenderer(const RenderObject* renderer, float
> 
>     LayoutSize imageSize;
> 
>+#if ENABLE(CSS_IMAGE_ORIENTATION)
>+    if (!renderer)
>+        return IntSize();
>+
>+    ImageOrientationDescription orientationDescription(renderer->shouldRespectImageOrientation());
>+    orientationDescription.setImageOrientationEnum(renderer->style()->imageOrientation());
>+
>+    if (m_image->isBitmapImage()
>+        && (orientationDescription.respectImageOrientation() == RespectImageOrientation && orientationDescription.imageOrientation() != DefaultImageOrientation))
>+        imageSize = static_cast<BitmapImage*>(m_image.get())->sizeRespectingOrientation(orientationDescription);
>+#else
>     if (m_image->isBitmapImage() && (renderer && renderer->shouldRespectImageOrientation() == RespectImageOrientation))
>         imageSize = static_cast<BitmapImage*>(m_image.get())->sizeRespectingOrientation();
>+#endif
>+
> #if ENABLE(SVG)
>     else if (m_image->isSVGImage() && sizeType == UsedSize) {
>         imageSize = m_svgImageCache->imageSizeForRenderer(renderer);
>diff --git a/Source/WebCore/page/DragController.cpp b/Source/WebCore/page/DragController.cpp
>index f120d2c87e9d40add672d1f17b3be52b6203a1d6..693795fd4ba4edfa5b9fddaf9dc03112d4e84e4a 100644
>--- a/Source/WebCore/page/DragController.cpp
>+++ b/Source/WebCore/page/DragController.cpp
>@@ -854,9 +854,17 @@ void DragController::doImageDrag(Element& element, const IntPoint& dragOrigin, c
>     DragImageRef dragImage = 0;
>     IntPoint origin;
> 
>+    if (!element.renderer())
>+        return;
>+
>+    ImageOrientationDescription orientationDescription(element.renderer()->shouldRespectImageOrientation());
>+#if ENABLE(CSS_IMAGE_ORIENTATION)
>+    orientationDescription.setImageOrientationEnum(element.renderer()->style()->imageOrientation());
>+#endif
>+
>     Image* image = getImage(element);
>     if (image && image->size().height() * image->size().width() <= MaxOriginalImageArea
>-        && (dragImage = createDragImageFromImage(image, element.renderer() ? ImageOrientationDescription(element.renderer()->shouldRespectImageOrientation()) : ImageOrientationDescription()))) {
>+        && (dragImage = createDragImageFromImage(image, element.renderer() ? orientationDescription : ImageOrientationDescription()))) {
>         IntSize originalSize = rect.size();
>         origin = rect.location();
> 
>diff --git a/Source/WebCore/page/Frame.cpp b/Source/WebCore/page/Frame.cpp
>index 3ba148baf61c66e64a9325189f94034095c4870c..f354b038f39f0a878c23500c4ded321dcadd5cba 100644
>--- a/Source/WebCore/page/Frame.cpp
>+++ b/Source/WebCore/page/Frame.cpp
>@@ -1033,7 +1033,12 @@ DragImageRef Frame::nodeImage(Node* node)
>     m_view->paintContents(buffer->context(), paintingRect);
> 
>     RefPtr<Image> image = buffer->copyImage();
>-    return createDragImageFromImage(image.get(), ImageOrientationDescription(renderer->shouldRespectImageOrientation()));
>+
>+    ImageOrientationDescription orientationDescription(renderer->shouldRespectImageOrientation());
>+#if ENABLE(CSS_IMAGE_ORIENTATION)
>+    orientationDescription.setImageOrientationEnum(renderer->style()->imageOrientation());
>+#endif
>+    return createDragImageFromImage(image.get(), orientationDescription);
> }
> 
> DragImageRef Frame::dragImageForSelection()
>diff --git a/Source/WebCore/platform/graphics/BitmapImage.cpp b/Source/WebCore/platform/graphics/BitmapImage.cpp
>index 8005d8ebb3a35559809b11a1c0b79fdedffa78da..4935bad61c68b76bc0f329da2bf497e2890a9fc4 100644
>--- a/Source/WebCore/platform/graphics/BitmapImage.cpp
>+++ b/Source/WebCore/platform/graphics/BitmapImage.cpp
>@@ -180,13 +180,20 @@ void BitmapImage::didDecodeProperties() const
>         imageObserver()->decodedSizeChanged(this, deltaBytes);
> }
> 
>-void BitmapImage::updateSize() const
>+void BitmapImage::updateSize(ImageOrientationDescription description) const
> {
>-    if (!m_sizeAvailable || m_haveSize)
>+    if (!m_sizeAvailable || (m_haveSize
>+#if ENABLE(CSS_IMAGE_ORIENTATION)
>+        && description.imageOrientation() == static_cast<ImageOrientationEnum>(m_imageOrientation)
>+        && description.respectImageOrientation() == static_cast<RespectImageOrientationEnum>(m_shouldRespectImageOrientation)
>+#endif
>+        ))
>         return;
> 
>-    m_size = m_source.size();
>-    m_sizeRespectingOrientation = m_source.size(ImageOrientationDescription(RespectImageOrientation));
>+    m_size = m_source.size(description);
>+    m_sizeRespectingOrientation = m_source.size(ImageOrientationDescription(RespectImageOrientation, description.imageOrientation()));
>+    m_imageOrientation = static_cast<unsigned>(description.imageOrientation());
>+    m_shouldRespectImageOrientation = static_cast<unsigned>(description.respectImageOrientation());
>     m_haveSize = true;
>     didDecodeProperties();
> }
>@@ -197,9 +204,9 @@ IntSize BitmapImage::size() const
>     return m_size;
> }
> 
>-IntSize BitmapImage::sizeRespectingOrientation() const
>+IntSize BitmapImage::sizeRespectingOrientation(ImageOrientationDescription description) const
> {
>-    updateSize();
>+    updateSize(description);
>     return m_sizeRespectingOrientation;
> }
> 
>@@ -518,7 +525,7 @@ void BitmapImage::drawPattern(GraphicsContext* ctxt, const FloatRect& tileRect,
>         // Temporarily reset image observer, we don't want to receive any changeInRect() calls due to this relayout.
>         setImageObserver(0);
> 
>-        draw(buffer->context(), tileRect, tileRect, styleColorSpace, op, blendMode);
>+        draw(buffer->context(), tileRect, tileRect, styleColorSpace, op, blendMode, ImageOrientationDescription());
> 
>         setImageObserver(observer);
>         buffer->convertToLuminanceMask();
>diff --git a/Source/WebCore/platform/graphics/BitmapImage.h b/Source/WebCore/platform/graphics/BitmapImage.h
>index fecc7bfdb06055b8ca399c7863852c799d3ec5d5..82667464931693ec183d81a085a6d0710a744a74 100644
>--- a/Source/WebCore/platform/graphics/BitmapImage.h
>+++ b/Source/WebCore/platform/graphics/BitmapImage.h
>@@ -121,7 +121,7 @@ public:
>     virtual bool hasSingleSecurityOrigin() const OVERRIDE;
> 
>     virtual IntSize size() const OVERRIDE;
>-    IntSize sizeRespectingOrientation() const;
>+    IntSize sizeRespectingOrientation(ImageOrientationDescription = ImageOrientationDescription()) const;
>     IntSize currentFrameSize() const;
>     virtual bool getHotSpot(IntPoint&) const OVERRIDE;
> 
>@@ -172,7 +172,7 @@ public:
>     bool canAnimate();
> 
> private:
>-    void updateSize() const;
>+    void updateSize(ImageOrientationDescription = ImageOrientationDescription()) const;
> 
> protected:
>     enum RepetitionCountStatus {
>@@ -187,10 +187,7 @@ protected:
> #if PLATFORM(WIN)
>     virtual void drawFrameMatchingSourceSize(GraphicsContext*, const FloatRect& dstRect, const IntSize& srcSize, ColorSpace styleColorSpace, CompositeOperator) OVERRIDE;
> #endif
>-    virtual void draw(GraphicsContext*, const FloatRect& dstRect, const FloatRect& srcRect, ColorSpace styleColorSpace, CompositeOperator, BlendMode) OVERRIDE;
>-#if USE(CG) || USE(CAIRO) || PLATFORM(BLACKBERRY)
>     virtual void draw(GraphicsContext*, const FloatRect& dstRect, const FloatRect& srcRect, ColorSpace styleColorSpace, CompositeOperator, BlendMode, ImageOrientationDescription) OVERRIDE;
>-#endif
> 
> #if USE(WINGDI)
>     virtual void drawPattern(GraphicsContext*, const FloatRect& srcRect, const AffineTransform& patternTransform,
>@@ -268,6 +265,8 @@ private:
>     ImageSource m_source;
>     mutable IntSize m_size; // The size to use for the overall image (will just be the size of the first image).
>     mutable IntSize m_sizeRespectingOrientation;
>+    mutable unsigned m_imageOrientation : 4; // ImageOrientationEnum
>+    mutable unsigned m_shouldRespectImageOrientation : 1; // RespectImageOrientationEnum
> 
>     size_t m_currentFrame; // The index of the current frame of animation.
>     Vector<FrameData, 1> m_frames; // An array of the cached frames of the animation. We have to ref frames to pin them in the cache.
>diff --git a/Source/WebCore/platform/graphics/CrossfadeGeneratedImage.cpp b/Source/WebCore/platform/graphics/CrossfadeGeneratedImage.cpp
>index 6f87bfc85f2332c44b6133b41ab1a749604f3481..2e158dfef8e8a8870105aa0a94400368f1b2de0b 100644
>--- a/Source/WebCore/platform/graphics/CrossfadeGeneratedImage.cpp
>+++ b/Source/WebCore/platform/graphics/CrossfadeGeneratedImage.cpp
>@@ -85,7 +85,7 @@ void CrossfadeGeneratedImage::drawCrossfade(GraphicsContext* context)
>     context->endTransparencyLayer();
> }
> 
>-void CrossfadeGeneratedImage::draw(GraphicsContext* context, const FloatRect& dstRect, const FloatRect& srcRect, ColorSpace, CompositeOperator compositeOp, BlendMode)
>+void CrossfadeGeneratedImage::draw(GraphicsContext* context, const FloatRect& dstRect, const FloatRect& srcRect, ColorSpace, CompositeOperator compositeOp, BlendMode, ImageOrientationDescription)
> {
>     GraphicsContextStateSaver stateSaver(*context);
>     context->setCompositeOperation(compositeOp);
>diff --git a/Source/WebCore/platform/graphics/CrossfadeGeneratedImage.h b/Source/WebCore/platform/graphics/CrossfadeGeneratedImage.h
>index 07548ad371b5cf6d06eb80637f707bd4946ba247..2499c3eadab749f40bae8901873f89f27fc7d6f2 100644
>--- a/Source/WebCore/platform/graphics/CrossfadeGeneratedImage.h
>+++ b/Source/WebCore/platform/graphics/CrossfadeGeneratedImage.h
>@@ -51,7 +51,7 @@ public:
>     virtual IntSize size() const OVERRIDE { return m_crossfadeSize; }
> 
> protected:
>-    virtual void draw(GraphicsContext*, const FloatRect& dstRect, const FloatRect& srcRect, ColorSpace styleColorSpace, CompositeOperator, BlendMode) OVERRIDE;
>+    virtual void draw(GraphicsContext*, const FloatRect& dstRect, const FloatRect& srcRect, ColorSpace styleColorSpace, CompositeOperator, BlendMode, ImageOrientationDescription) OVERRIDE;
>     virtual void drawPattern(GraphicsContext*, const FloatRect& srcRect, const AffineTransform& patternTransform, const FloatPoint& phase, ColorSpace styleColorSpace, CompositeOperator, const FloatRect& dstRect, BlendMode) OVERRIDE;
> 
>     CrossfadeGeneratedImage(Image* fromImage, Image* toImage, float percentage, IntSize crossfadeSize, const IntSize&);
>diff --git a/Source/WebCore/platform/graphics/GeneratedImage.h b/Source/WebCore/platform/graphics/GeneratedImage.h
>index f189f7484acee0a49b48894834eab610fcac12a2..666e79518fa3fa478fe8cdac3b6d4a4b72eb6486 100644
>--- a/Source/WebCore/platform/graphics/GeneratedImage.h
>+++ b/Source/WebCore/platform/graphics/GeneratedImage.h
>@@ -50,7 +50,7 @@ public:
>     virtual unsigned decodedSize() const OVERRIDE { return 0; }
> 
> protected:
>-    virtual void draw(GraphicsContext*, const FloatRect& dstRect, const FloatRect& srcRect, ColorSpace styleColorSpace, CompositeOperator, BlendMode) OVERRIDE = 0;
>+    virtual void draw(GraphicsContext*, const FloatRect& dstRect, const FloatRect& srcRect, ColorSpace styleColorSpace, CompositeOperator, BlendMode, ImageOrientationDescription) OVERRIDE = 0;
>     virtual void drawPattern(GraphicsContext*, const FloatRect& srcRect, const AffineTransform& patternTransform,
>         const FloatPoint& phase, ColorSpace styleColorSpace, CompositeOperator, const FloatRect& destRect, BlendMode) OVERRIDE = 0;
> 
>diff --git a/Source/WebCore/platform/graphics/GradientImage.cpp b/Source/WebCore/platform/graphics/GradientImage.cpp
>index 9b2d15ccf602434c3f7b3779f6035f192cb9083c..ff6aa3667f85a520c7e9b3bca7e96cd303fa231b 100644
>--- a/Source/WebCore/platform/graphics/GradientImage.cpp
>+++ b/Source/WebCore/platform/graphics/GradientImage.cpp
>@@ -32,7 +32,7 @@
> 
> namespace WebCore {
> 
>-void GradientImage::draw(GraphicsContext* destContext, const FloatRect& destRect, const FloatRect& srcRect, ColorSpace, CompositeOperator compositeOp, BlendMode blendMode)
>+void GradientImage::draw(GraphicsContext* destContext, const FloatRect& destRect, const FloatRect& srcRect, ColorSpace, CompositeOperator compositeOp, BlendMode blendMode, ImageOrientationDescription)
> {
>     GraphicsContextStateSaver stateSaver(*destContext);
>     destContext->setCompositeOperation(compositeOp, blendMode);
>diff --git a/Source/WebCore/platform/graphics/GradientImage.h b/Source/WebCore/platform/graphics/GradientImage.h
>index f78ba2a51db96afcf225f729a4e672f856fd33ff..aaba27327c60ac801af7687037a354a0559f4e85 100644
>--- a/Source/WebCore/platform/graphics/GradientImage.h
>+++ b/Source/WebCore/platform/graphics/GradientImage.h
>@@ -45,7 +45,7 @@ public:
>     virtual ~GradientImage() { }
> 
> protected:
>-    virtual void draw(GraphicsContext*, const FloatRect& dstRect, const FloatRect& srcRect, ColorSpace styleColorSpace, CompositeOperator, BlendMode) OVERRIDE;
>+    virtual void draw(GraphicsContext*, const FloatRect& dstRect, const FloatRect& srcRect, ColorSpace styleColorSpace, CompositeOperator, BlendMode, ImageOrientationDescription) OVERRIDE;
>     virtual void drawPattern(GraphicsContext*, const FloatRect& srcRect, const AffineTransform& patternTransform,
>         const FloatPoint& phase, ColorSpace styleColorSpace, CompositeOperator, const FloatRect& destRect, BlendMode) OVERRIDE;
> 
>diff --git a/Source/WebCore/platform/graphics/Image.cpp b/Source/WebCore/platform/graphics/Image.cpp
>index 0abe883ec4275da8b3ee532c7d248842fa48f97f..e5283424438186e36df9c5a09e2268be540b68d6 100644
>--- a/Source/WebCore/platform/graphics/Image.cpp
>+++ b/Source/WebCore/platform/graphics/Image.cpp
>@@ -90,9 +90,9 @@ void Image::fillWithSolidColor(GraphicsContext* ctxt, const FloatRect& dstRect,
>     ctxt->setCompositeOperation(previousOperator);
> }
> 
>-void Image::draw(GraphicsContext* ctx, const FloatRect& dstRect, const FloatRect& srcRect, ColorSpace styleColorSpace, CompositeOperator op, BlendMode blendMode, ImageOrientationDescription)
>+void Image::draw(GraphicsContext* ctx, const FloatRect& dstRect, const FloatRect& srcRect, ColorSpace styleColorSpace, CompositeOperator op, BlendMode blendMode, ImageOrientationDescription description)
> {
>-    draw(ctx, dstRect, srcRect, styleColorSpace, op, blendMode);
>+    draw(ctx, dstRect, srcRect, styleColorSpace, op, blendMode, description);
> }
> 
> void Image::drawTiled(GraphicsContext* ctxt, const FloatRect& destRect, const FloatPoint& srcPoint, const FloatSize& scaledTileSize, ColorSpace styleColorSpace, CompositeOperator op, BlendMode blendMode)
>@@ -126,7 +126,7 @@ void Image::drawTiled(GraphicsContext* ctxt, const FloatRect& destRect, const Fl
>         visibleSrcRect.setY((destRect.y() - oneTileRect.y()) / scale.height());
>         visibleSrcRect.setWidth(destRect.width() / scale.width());
>         visibleSrcRect.setHeight(destRect.height() / scale.height());
>-        draw(ctxt, destRect, visibleSrcRect, styleColorSpace, op, blendMode);
>+        draw(ctxt, destRect, visibleSrcRect, styleColorSpace, op, blendMode, ImageOrientationDescription());
>         return;
>     }
> 
>diff --git a/Source/WebCore/platform/graphics/Image.h b/Source/WebCore/platform/graphics/Image.h
>index a8701999c185ed09a13d6324bf9fc88af06ed398..cb77c6fff4405b17c9b4035a9ee46d6a819ad970 100644
>--- a/Source/WebCore/platform/graphics/Image.h
>+++ b/Source/WebCore/platform/graphics/Image.h
>@@ -195,7 +195,6 @@ protected:
> #if PLATFORM(WIN)
>     virtual void drawFrameMatchingSourceSize(GraphicsContext*, const FloatRect& dstRect, const IntSize& srcSize, ColorSpace styleColorSpace, CompositeOperator) { }
> #endif
>-    virtual void draw(GraphicsContext*, const FloatRect& dstRect, const FloatRect& srcRect, ColorSpace styleColorSpace, CompositeOperator, BlendMode) = 0;
>     virtual void draw(GraphicsContext*, const FloatRect& dstRect, const FloatRect& srcRect, ColorSpace styleColorSpace, CompositeOperator, BlendMode, ImageOrientationDescription);
>     void drawTiled(GraphicsContext*, const FloatRect& dstRect, const FloatPoint& srcPoint, const FloatSize& tileSize, ColorSpace styleColorSpace,
>         CompositeOperator , BlendMode);
>diff --git a/Source/WebCore/platform/graphics/blackberry/ImageBlackBerry.cpp b/Source/WebCore/platform/graphics/blackberry/ImageBlackBerry.cpp
>index d0968780194c8e267a4096322e52b8816dae4fc0..b3c174db1660ace05232abaa5b6deaf768a591d8 100644
>--- a/Source/WebCore/platform/graphics/blackberry/ImageBlackBerry.cpp
>+++ b/Source/WebCore/platform/graphics/blackberry/ImageBlackBerry.cpp
>@@ -119,10 +119,6 @@ void BitmapImage::invalidatePlatformData()
> {
> }
> 
>-void BitmapImage::draw(GraphicsContext* context, const FloatRect& dstRect, const FloatRect& srcRect, ColorSpace styleColorSpace, CompositeOperator op, BlendMode blendMode)
>-{
>-    draw(context, dstRect, srcRect, styleColorSpace, op, blendMode, ImageOrientationDescription());
>-
> void BitmapImage::draw(GraphicsContext* context, const FloatRect& dstRect, const FloatRect& srcRect, ColorSpace, CompositeOperator op, BlendMode, ImageOrientationDescription description)
> {
>     startAnimation();
>diff --git a/Source/WebCore/platform/graphics/cairo/BitmapImageCairo.cpp b/Source/WebCore/platform/graphics/cairo/BitmapImageCairo.cpp
>index 8e5627fe6c6926da4387540e76574615dc10f3b0..4611a306afcd4d7f1d047421a59af4a8036d5193 100644
>--- a/Source/WebCore/platform/graphics/cairo/BitmapImageCairo.cpp
>+++ b/Source/WebCore/platform/graphics/cairo/BitmapImageCairo.cpp
>@@ -61,11 +61,6 @@ BitmapImage::BitmapImage(PassRefPtr<cairo_surface_t> nativeImage, ImageObserver*
>     checkForSolidColor();
> }
> 
>-void BitmapImage::draw(GraphicsContext* context, const FloatRect& dst, const FloatRect& src, ColorSpace styleColorSpace, CompositeOperator op, BlendMode blendMode)
>-{
>-    draw(context, dst, src, styleColorSpace, op, blendMode, ImageOrientationDescription());
>-}
>-
> void BitmapImage::draw(GraphicsContext* context, const FloatRect& dst, const FloatRect& src, ColorSpace styleColorSpace, CompositeOperator op,
>     BlendMode blendMode, ImageOrientationDescription description)
> {
>@@ -98,18 +93,18 @@ void BitmapImage::draw(GraphicsContext* context, const FloatRect& dst, const Flo
>     FloatRect adjustedSrcRect(src);
> #endif
> 
>-    ImageOrientation orientation;
>+    ImageOrientation frameOrientation(description.imageOrientation());
>     if (description.respectImageOrientation() == RespectImageOrientation)
>-        orientation = frameOrientationAtIndex(m_currentFrame);
>+        frameOrientation = frameOrientationAtIndex(m_currentFrame);
> 
>     FloatRect dstRect = dst;
> 
>-    if (orientation != DefaultImageOrientation) {
>+    if (frameOrientation != DefaultImageOrientation) {
>         // ImageOrientation expects the origin to be at (0, 0).
>         context->translate(dstRect.x(), dstRect.y());
>         dstRect.setLocation(FloatPoint());
>-        context->concatCTM(orientation.transformFromDefault(dstRect.size()));
>-        if (orientation.usesWidthAsHeight()) {
>+        context->concatCTM(frameOrientation.transformFromDefault(dstRect.size()));
>+        if (frameOrientation.usesWidthAsHeight()) {
>             // The destination rectangle will have it's width and height already reversed for the orientation of
>             // the image, as it was needed for page layout, so we need to reverse it back here.
>             dstRect = FloatRect(dstRect.x(), dstRect.y(), dstRect.height(), dstRect.width());
>diff --git a/Source/WebCore/platform/graphics/cg/BitmapImageCG.cpp b/Source/WebCore/platform/graphics/cg/BitmapImageCG.cpp
>index 92ccfda3a6033254e098cbfd800204d8abe03090..36e9f2e04161ef0c13c67454f8fb0cd219cb581e 100644
>--- a/Source/WebCore/platform/graphics/cg/BitmapImageCG.cpp
>+++ b/Source/WebCore/platform/graphics/cg/BitmapImageCG.cpp
>@@ -160,11 +160,6 @@ RetainPtr<CFArrayRef> BitmapImage::getCGImageArray()
>     return adoptCF(array);
> }
> 
>-void BitmapImage::draw(GraphicsContext* ctx, const FloatRect& dstRect, const FloatRect& srcRect, ColorSpace styleColorSpace, CompositeOperator op, BlendMode blendMode)
>-{
>-    draw(ctx, dstRect, srcRect, styleColorSpace, op, blendMode, ImageOrientationDescription());
>-}
>-
> void BitmapImage::draw(GraphicsContext* ctxt, const FloatRect& destRect, const FloatRect& srcRect, ColorSpace styleColorSpace, CompositeOperator compositeOp, BlendMode blendMode, ImageOrientationDescription description)
> {
>     startAnimation();
>diff --git a/Source/WebCore/platform/graphics/cg/PDFDocumentImage.cpp b/Source/WebCore/platform/graphics/cg/PDFDocumentImage.cpp
>index 5fec01f46f6731d7c34857c59bd0d3d00e392e30..906b597c6fb352bc44879e869435d474cbc3dccb 100644
>--- a/Source/WebCore/platform/graphics/cg/PDFDocumentImage.cpp
>+++ b/Source/WebCore/platform/graphics/cg/PDFDocumentImage.cpp
>@@ -176,7 +176,7 @@ void PDFDocumentImage::updateCachedImageIfNeeded(GraphicsContext* context, const
>     }
> }
> 
>-void PDFDocumentImage::draw(GraphicsContext* context, const FloatRect& dstRect, const FloatRect& srcRect, ColorSpace, CompositeOperator op, BlendMode)
>+void PDFDocumentImage::draw(GraphicsContext* context, const FloatRect& dstRect, const FloatRect& srcRect, ColorSpace, CompositeOperator op, BlendMode, ImageOrientationDescription)
> {
>     if (!m_document || !m_hasPage)
>         return;
>diff --git a/Source/WebCore/platform/graphics/cg/PDFDocumentImage.h b/Source/WebCore/platform/graphics/cg/PDFDocumentImage.h
>index 19418db702145ef2afe2f97f697baba5dd22e8e6..f58f3b0cedb4e56945412e7da169cc921e9145d2 100644
>--- a/Source/WebCore/platform/graphics/cg/PDFDocumentImage.h
>+++ b/Source/WebCore/platform/graphics/cg/PDFDocumentImage.h
>@@ -70,7 +70,7 @@ private:
>     virtual void computeIntrinsicDimensions(Length& intrinsicWidth, Length& intrinsicHeight, FloatSize& intrinsicRatio) OVERRIDE;
>     virtual IntSize size() const OVERRIDE;
> 
>-    virtual void draw(GraphicsContext*, const FloatRect& dstRect, const FloatRect& srcRect, ColorSpace styleColorSpace, CompositeOperator, BlendMode) OVERRIDE;
>+    virtual void draw(GraphicsContext*, const FloatRect& dstRect, const FloatRect& srcRect, ColorSpace styleColorSpace, CompositeOperator, BlendMode, ImageOrientationDescription) OVERRIDE;
> 
>     // FIXME: Implement this to be less conservative.
>     virtual bool currentFrameKnownToBeOpaque() OVERRIDE { return false; }
>diff --git a/Source/WebCore/platform/graphics/win/ImageCGWin.cpp b/Source/WebCore/platform/graphics/win/ImageCGWin.cpp
>index 591a1975b3e7c45559c4a7bf495dcc15187e3daf..046ad81563bca633f47e071cb907ba81cf340500 100644
>--- a/Source/WebCore/platform/graphics/win/ImageCGWin.cpp
>+++ b/Source/WebCore/platform/graphics/win/ImageCGWin.cpp
>@@ -78,7 +78,7 @@ bool BitmapImage::getHBITMAPOfSize(HBITMAP bmp, const IntSize* size)
>     if (size)
>         drawFrameMatchingSourceSize(&gc, FloatRect(0.0f, 0.0f, bmpInfo.bmWidth, bmpInfo.bmHeight), *size, ColorSpaceDeviceRGB, CompositeCopy);
>     else
>-        draw(&gc, FloatRect(0.0f, 0.0f, bmpInfo.bmWidth, bmpInfo.bmHeight), FloatRect(0.0f, 0.0f, imageSize.width(), imageSize.height()), ColorSpaceDeviceRGB, CompositeCopy, BlendModeNormal);
>+        draw(&gc, FloatRect(0.0f, 0.0f, bmpInfo.bmWidth, bmpInfo.bmHeight), FloatRect(0.0f, 0.0f, imageSize.width(), imageSize.height()), ColorSpaceDeviceRGB, CompositeCopy, BlendModeNormal, ImageOrientationDescription());
> 
>     // Do cleanup
>     CGContextRelease(cgContext);
>@@ -94,7 +94,7 @@ void BitmapImage::drawFrameMatchingSourceSize(GraphicsContext* ctxt, const Float
>         if (image && CGImageGetHeight(image) == static_cast<size_t>(srcSize.height()) && CGImageGetWidth(image) == static_cast<size_t>(srcSize.width())) {
>             size_t currentFrame = m_currentFrame;
>             m_currentFrame = i;
>-            draw(ctxt, dstRect, FloatRect(0.0f, 0.0f, srcSize.width(), srcSize.height()), styleColorSpace, compositeOp, BlendModeNormal);
>+            draw(ctxt, dstRect, FloatRect(0.0f, 0.0f, srcSize.width(), srcSize.height()), styleColorSpace, compositeOp, BlendModeNormal, ImageOrientationDescription());
>             m_currentFrame = currentFrame;
>             return;
>         }
>@@ -102,7 +102,7 @@ void BitmapImage::drawFrameMatchingSourceSize(GraphicsContext* ctxt, const Float
> 
>     // No image of the correct size was found, fallback to drawing the current frame
>     IntSize imageSize = BitmapImage::size();
>-    draw(ctxt, dstRect, FloatRect(0.0f, 0.0f, imageSize.width(), imageSize.height()), styleColorSpace, compositeOp, BlendModeNormal);
>+    draw(ctxt, dstRect, FloatRect(0.0f, 0.0f, imageSize.width(), imageSize.height()), styleColorSpace, compositeOp, BlendModeNormal, ImageOrientationDescription());
> }
> 
> } // namespace WebCore
>diff --git a/Source/WebCore/platform/graphics/wince/ImageBufferWinCE.cpp b/Source/WebCore/platform/graphics/wince/ImageBufferWinCE.cpp
>index ccab3ebbd471c3fad2fbe2902484d58f284898ff..271d1120f89bb8551bd79c5410f7dfb7b4aafe25 100644
>--- a/Source/WebCore/platform/graphics/wince/ImageBufferWinCE.cpp
>+++ b/Source/WebCore/platform/graphics/wince/ImageBufferWinCE.cpp
>@@ -41,14 +41,14 @@ public:
>     virtual IntSize size() const { return IntSize(m_data->m_bitmap->width(), m_data->m_bitmap->height()); }
>     virtual void destroyDecodedData(bool destroyAll = true) {}
>     virtual unsigned decodedSize() const { return 0; }
>-    virtual void draw(GraphicsContext*, const FloatRect& dstRect, const FloatRect& srcRect, ColorSpace styleColorSpace, CompositeOperator, BlendMode);
>+    virtual void draw(GraphicsContext*, const FloatRect& dstRect, const FloatRect& srcRect, ColorSpace styleColorSpace, CompositeOperator, BlendMode, ImageOrientationDescription);
>     virtual void drawPattern(GraphicsContext*, const FloatRect& srcRect, const AffineTransform& patternTransform,
>                              const FloatPoint& phase, ColorSpace styleColorSpace, CompositeOperator, const FloatRect& destRect);
> 
>     const ImageBufferData* m_data;
> };
> 
>-void BufferedImage::draw(GraphicsContext* ctxt, const FloatRect& dstRect, const FloatRect& srcRect, ColorSpace styleColorSpace, CompositeOperator compositeOp, BlendMode blendMode)
>+void BufferedImage::draw(GraphicsContext* ctxt, const FloatRect& dstRect, const FloatRect& srcRect, ColorSpace styleColorSpace, CompositeOperator compositeOp, BlendMode blendMode, ImageOrientationDescription)
> {
>     IntRect intDstRect = enclosingIntRect(dstRect);
>     IntRect intSrcRect(srcRect);
>diff --git a/Source/WebCore/platform/graphics/wince/ImageWinCE.cpp b/Source/WebCore/platform/graphics/wince/ImageWinCE.cpp
>index 1f75275dce3f21ef00cff9f97f49e5e1e5d04a55..d7c614c995a8c139d819e945ecb936965f71dd70 100644
>--- a/Source/WebCore/platform/graphics/wince/ImageWinCE.cpp
>+++ b/Source/WebCore/platform/graphics/wince/ImageWinCE.cpp
>@@ -108,7 +108,7 @@ void BitmapImage::drawFrameMatchingSourceSize(GraphicsContext* ctxt, const Float
>     draw(ctxt, dstRect, FloatRect(0, 0, imageSize.width(), imageSize.height()), styleColorSpace, compositeOp, BlendModeNormal);
> }
> 
>-void BitmapImage::draw(GraphicsContext* ctxt, const FloatRect& dstRect, const FloatRect& srcRectIn, ColorSpace styleColorSpace, CompositeOperator compositeOp, BlendMode blendMode)
>+void BitmapImage::draw(GraphicsContext* ctxt, const FloatRect& dstRect, const FloatRect& srcRectIn, ColorSpace styleColorSpace, CompositeOperator compositeOp, BlendMode blendMode, ImageOrientationDescription)
> {
>     if (!m_source.initialized())
>         return;
>diff --git a/Source/WebCore/platform/mac/DragImageMac.mm b/Source/WebCore/platform/mac/DragImageMac.mm
>index 4d41b20c3c24f252865cacb9ae61d0a0c90a9ee3..63a53560fc95d88b6fbf606fc56f944b30291c94 100644
>--- a/Source/WebCore/platform/mac/DragImageMac.mm
>+++ b/Source/WebCore/platform/mac/DragImageMac.mm
>@@ -87,7 +87,7 @@ RetainPtr<NSImage> createDragImageFromImage(Image* image, ImageOrientationDescri
>     if (image->isBitmapImage()) {
>         ImageOrientation orientation;
>         BitmapImage* bitmapImage = static_cast<BitmapImage *>(image);
>-        IntSize sizeRespectingOrientation = bitmapImage->sizeRespectingOrientation();
>+        IntSize sizeRespectingOrientation = bitmapImage->sizeRespectingOrientation(description);
> 
>         if (description.respectImageOrientation() == RespectImageOrientation)
>             orientation = bitmapImage->orientationForCurrentFrame();
>diff --git a/Source/WebCore/rendering/RenderEmbeddedObject.cpp b/Source/WebCore/rendering/RenderEmbeddedObject.cpp
>index b70fcd247afd84bda1ac05ea4ecda810565b96b4..8b397534575c6c07c6ae58ef4efe0a25ca3762e4 100644
>--- a/Source/WebCore/rendering/RenderEmbeddedObject.cpp
>+++ b/Source/WebCore/rendering/RenderEmbeddedObject.cpp
>@@ -206,7 +206,11 @@ void RenderEmbeddedObject::paintSnapshotImage(PaintInfo& paintInfo, const Layout
>         return;
> 
>     bool useLowQualityScaling = shouldPaintAtLowQuality(context, image, image, alignedRect.size());
>-    context->drawImage(image, style()->colorSpace(), alignedRect, CompositeSourceOver, ImageOrientationDescription(shouldRespectImageOrientation()), useLowQualityScaling);
>+    ImageOrientationDescription orientationDescription(shouldRespectImageOrientation());
>+#if ENABLE(CSS_IMAGE_ORIENTATION)
>+    orientationDescription.setImageOrientationEnum(style()->imageOrientation());
>+#endif
>+    context->drawImage(image, style()->colorSpace(), alignedRect, CompositeSourceOver, orientationDescription, useLowQualityScaling);
> }
> 
> void RenderEmbeddedObject::paintContents(PaintInfo& paintInfo, const LayoutPoint& paintOffset)
>diff --git a/Source/WebCore/rendering/RenderImage.cpp b/Source/WebCore/rendering/RenderImage.cpp
>index 72fb6dccfd189c020f6b6d0b52bc4b3d168eddff..c3304bc938c1e837876d0d173d4d1122080f02d6 100644
>--- a/Source/WebCore/rendering/RenderImage.cpp
>+++ b/Source/WebCore/rendering/RenderImage.cpp
>@@ -160,6 +160,11 @@ void RenderImage::styleDidChange(StyleDifference diff, const RenderStyle* oldSty
>             imageDimensionsChanged(true /* imageSizeChanged */);
>         m_needsToSetSizeForAltText = false;
>     }
>+#if ENABLE(CSS_IMAGE_ORIENTATION)
>+    if (diff == StyleDifferenceLayout && oldStyle->imageOrientation() != style()->imageOrientation())
>+        return imageDimensionsChanged(true /* imageSizeChanged */);
>+#endif
>+
> #if ENABLE(CSS_IMAGE_RESOLUTION)
>     if (diff == StyleDifferenceLayout
>         && (oldStyle->imageResolution() != style()->imageResolution()
>diff --git a/Source/WebCore/rendering/RenderSnapshottedPlugIn.cpp b/Source/WebCore/rendering/RenderSnapshottedPlugIn.cpp
>index dd54d45abbeff611226746105f434ab6ca5445be..91e73bea66efcc52d54daf25481be34f7014db7f 100644
>--- a/Source/WebCore/rendering/RenderSnapshottedPlugIn.cpp
>+++ b/Source/WebCore/rendering/RenderSnapshottedPlugIn.cpp
>@@ -139,7 +139,7 @@ void RenderSnapshottedPlugIn::paintSnapshot(PaintInfo& paintInfo, const LayoutPo
> 
>     bool useLowQualityScaling = shouldPaintAtLowQuality(context, image, image, alignedRect.size());
> 
>-    ImageOrientationDescription orientationDescription;
>+    ImageOrientationDescription orientationDescription(shouldRespectImageOrientation());
> #if ENABLE(CSS_IMAGE_ORIENTATION)
>     orientationDescription.setImageOrientationEnum(style()->imageOrientation());
> #endif
>diff --git a/Source/WebCore/rendering/style/RenderStyle.cpp b/Source/WebCore/rendering/style/RenderStyle.cpp
>index 5e1ff7e4787ee30340da626aecc6e60cd0683b17..c2677e78e816d1b8805e5dda03ad5960301b5976 100644
>--- a/Source/WebCore/rendering/style/RenderStyle.cpp
>+++ b/Source/WebCore/rendering/style/RenderStyle.cpp
>@@ -563,6 +563,9 @@ bool RenderStyle::changeRequiresLayout(const RenderStyle* other, unsigned& chang
>             || rareInheritedData->m_tabSize != other->rareInheritedData->m_tabSize
>             || rareInheritedData->m_lineBoxContain != other->rareInheritedData->m_lineBoxContain
>             || rareInheritedData->m_lineGrid != other->rareInheritedData->m_lineGrid
>+#if ENABLE(CSS_IMAGE_ORIENTATION)
>+            || rareInheritedData->m_imageOrientation != other->rareInheritedData->m_imageOrientation
>+#endif
> #if ENABLE(CSS_IMAGE_RESOLUTION)
>             || rareInheritedData->m_imageResolutionSource != other->rareInheritedData->m_imageResolutionSource
>             || rareInheritedData->m_imageResolutionSnap != other->rareInheritedData->m_imageResolutionSnap
>diff --git a/Source/WebCore/svg/graphics/SVGImage.cpp b/Source/WebCore/svg/graphics/SVGImage.cpp
>index ad7aeb2e81dcfc83cdd0a843dae1a633b0f976b9..1ecaa6f1f23e17465792a84e373d1c85bce90db5 100644
>--- a/Source/WebCore/svg/graphics/SVGImage.cpp
>+++ b/Source/WebCore/svg/graphics/SVGImage.cpp
>@@ -157,7 +157,7 @@ void SVGImage::drawForContainer(GraphicsContext* context, const FloatSize contai
>     adjustedSrcSize.scale(roundedContainerSize.width() / containerSize.width(), roundedContainerSize.height() / containerSize.height());
>     scaledSrc.setSize(adjustedSrcSize);
> 
>-    draw(context, dstRect, scaledSrc, colorSpace, compositeOp, blendMode);
>+    draw(context, dstRect, scaledSrc, colorSpace, compositeOp, blendMode, ImageOrientationDescription());
> 
>     setImageObserver(observer);
> }
>@@ -174,7 +174,7 @@ PassNativeImagePtr SVGImage::nativeImageForCurrentFrame()
>     if (!buffer) // failed to allocate image
>         return 0;
> 
>-    draw(buffer->context(), rect(), rect(), ColorSpaceDeviceRGB, CompositeSourceOver, BlendModeNormal);
>+    draw(buffer->context(), rect(), rect(), ColorSpaceDeviceRGB, CompositeSourceOver, BlendModeNormal, ImageOrientationDescription());
> 
>     // FIXME: WK(Bug 113657): We should use DontCopyBackingStore here.
>     return buffer->copyImage(CopyBackingStore)->nativeImageForCurrentFrame();
>@@ -216,7 +216,7 @@ void SVGImage::drawPatternForContainer(GraphicsContext* context, const FloatSize
>     image->drawPattern(context, scaledSrcRect, unscaledPatternTransform, phase, colorSpace, compositeOp, dstRect);
> }
> 
>-void SVGImage::draw(GraphicsContext* context, const FloatRect& dstRect, const FloatRect& srcRect, ColorSpace, CompositeOperator compositeOp, BlendMode blendMode)
>+void SVGImage::draw(GraphicsContext* context, const FloatRect& dstRect, const FloatRect& srcRect, ColorSpace, CompositeOperator compositeOp, BlendMode blendMode, ImageOrientationDescription)
> {
>     if (!m_page)
>         return;
>diff --git a/Source/WebCore/svg/graphics/SVGImage.h b/Source/WebCore/svg/graphics/SVGImage.h
>index 974b3991bc5fb29fa6443cdaba8eec96442a8b15..88676caa772bd6c42113a9024eb21dda5501a110 100644
>--- a/Source/WebCore/svg/graphics/SVGImage.h
>+++ b/Source/WebCore/svg/graphics/SVGImage.h
>@@ -91,7 +91,7 @@ private:
>     virtual bool currentFrameKnownToBeOpaque() OVERRIDE { return false; }
> 
>     SVGImage(ImageObserver*);
>-    virtual void draw(GraphicsContext*, const FloatRect& fromRect, const FloatRect& toRect, ColorSpace styleColorSpace, CompositeOperator, BlendMode) OVERRIDE;
>+    virtual void draw(GraphicsContext*, const FloatRect& fromRect, const FloatRect& toRect, ColorSpace styleColorSpace, CompositeOperator, BlendMode, ImageOrientationDescription) OVERRIDE;
>     void drawForContainer(GraphicsContext*, const FloatSize, float, const FloatRect&, const FloatRect&, ColorSpace, CompositeOperator, BlendMode);
>     void drawPatternForContainer(GraphicsContext*, const FloatSize, float, const FloatRect&, const AffineTransform&, const FloatPoint&, ColorSpace,
>         CompositeOperator, const FloatRect&);
>diff --git a/Source/WebCore/svg/graphics/SVGImageForContainer.cpp b/Source/WebCore/svg/graphics/SVGImageForContainer.cpp
>index ddf4c68ab1e9e2fd5dc40704cee91351a9e4578e..3f45209914c96486a35ffb1a5dd6e7bffc3caf64 100644
>--- a/Source/WebCore/svg/graphics/SVGImageForContainer.cpp
>+++ b/Source/WebCore/svg/graphics/SVGImageForContainer.cpp
>@@ -37,7 +37,7 @@ IntSize SVGImageForContainer::size() const
> }
> 
> void SVGImageForContainer::draw(GraphicsContext* context, const FloatRect& dstRect,
>-    const FloatRect& srcRect, ColorSpace colorSpace, CompositeOperator compositeOp, BlendMode blendMode)
>+    const FloatRect& srcRect, ColorSpace colorSpace, CompositeOperator compositeOp, BlendMode blendMode, ImageOrientationDescription)
> {
>     m_image->drawForContainer(context, m_containerSize, m_zoom, dstRect, srcRect, colorSpace, compositeOp, blendMode);
> }
>diff --git a/Source/WebCore/svg/graphics/SVGImageForContainer.h b/Source/WebCore/svg/graphics/SVGImageForContainer.h
>index c73d8c574842bfba176bbd8f2d13be1245240cf0..af003d1acc1a3a28ad82dd95b61c8d1628601d14 100644
>--- a/Source/WebCore/svg/graphics/SVGImageForContainer.h
>+++ b/Source/WebCore/svg/graphics/SVGImageForContainer.h
>@@ -55,7 +55,7 @@ public:
>         m_image->computeIntrinsicDimensions(intrinsicWidth, intrinsicHeight, intrinsicRatio);
>     }
> 
>-    virtual void draw(GraphicsContext*, const FloatRect&, const FloatRect&, ColorSpace, CompositeOperator, BlendMode) OVERRIDE;
>+    virtual void draw(GraphicsContext*, const FloatRect&, const FloatRect&, ColorSpace, CompositeOperator, BlendMode, ImageOrientationDescription) OVERRIDE;
> 
>     virtual void drawPattern(GraphicsContext*, const FloatRect&, const AffineTransform&, const FloatPoint&, ColorSpace, CompositeOperator, const FloatRect&, BlendMode) OVERRIDE;
> 
>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
>index f7822c1ee998f768b6c06b7530f9f4ac21b33ee5..0102a3d9a6c1e3f686b40a94132f02ab7bd5e710 100644
>--- a/LayoutTests/ChangeLog
>+++ b/LayoutTests/ChangeLog
>@@ -1,3 +1,12 @@
>+2013-10-16  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
>+
>+        <https://webkit.org/b/91566> Integrate css3-images image-orientation with existing EXIF support
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * fast/css/image-orientation/image-orientation-expected.txt: Fixed wrong description.
>+        * fast/css/image-orientation/image-orientation.html: Remove a space.
>+
> 2013-10-16  Commit Queue  <commit-queue@webkit.org>
> 
>         Unreviewed, rolling out r157529.
>diff --git a/LayoutTests/fast/css/image-orientation/image-orientation-expected.txt b/LayoutTests/fast/css/image-orientation/image-orientation-expected.txt
>index 9a5138488df84cb8767653bf896cc086ab8841ef..b3c680d1fc019a049bdfdfb09e12d7a4e6ed40a2 100644
>--- a/LayoutTests/fast/css/image-orientation/image-orientation-expected.txt
>+++ b/LayoutTests/fast/css/image-orientation/image-orientation-expected.txt
>@@ -1,41 +1,41 @@
>-Apply image-resolution property and check computed style.
>+Apply image-orientation property and check computed style.
> 
> On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
> 
> 
>-PASS p.style.cssText is "image-orientation: -360deg; "
>+PASS p.style.cssText is "image-orientation: -360deg;"
> PASS getComputedStyle(p).imageOrientation is "0deg"
>-PASS p.style.cssText is "image-orientation: -315deg; "
>+PASS p.style.cssText is "image-orientation: -315deg;"
> PASS getComputedStyle(p).imageOrientation is "0deg"
>-PASS p.style.cssText is "image-orientation: 0deg; "
>+PASS p.style.cssText is "image-orientation: 0deg;"
> PASS getComputedStyle(p).imageOrientation is "0deg"
>-PASS p.style.cssText is "image-orientation: 315deg; "
>+PASS p.style.cssText is "image-orientation: 315deg;"
> PASS getComputedStyle(p).imageOrientation is "0deg"
>-PASS p.style.cssText is "image-orientation: 360deg; "
>+PASS p.style.cssText is "image-orientation: 360deg;"
> PASS getComputedStyle(p).imageOrientation is "0deg"
>-PASS p.style.cssText is "image-orientation: -270deg; "
>+PASS p.style.cssText is "image-orientation: -270deg;"
> PASS getComputedStyle(p).imageOrientation is "90deg"
>-PASS p.style.cssText is "image-orientation: -225deg; "
>+PASS p.style.cssText is "image-orientation: -225deg;"
> PASS getComputedStyle(p).imageOrientation is "90deg"
>-PASS p.style.cssText is "image-orientation: 45deg; "
>+PASS p.style.cssText is "image-orientation: 45deg;"
> PASS getComputedStyle(p).imageOrientation is "90deg"
>-PASS p.style.cssText is "image-orientation: 90deg; "
>+PASS p.style.cssText is "image-orientation: 90deg;"
> PASS getComputedStyle(p).imageOrientation is "90deg"
>-PASS p.style.cssText is "image-orientation: -180deg; "
>+PASS p.style.cssText is "image-orientation: -180deg;"
> PASS getComputedStyle(p).imageOrientation is "180deg"
>-PASS p.style.cssText is "image-orientation: -135deg; "
>+PASS p.style.cssText is "image-orientation: -135deg;"
> PASS getComputedStyle(p).imageOrientation is "180deg"
>-PASS p.style.cssText is "image-orientation: 135deg; "
>+PASS p.style.cssText is "image-orientation: 135deg;"
> PASS getComputedStyle(p).imageOrientation is "180deg"
>-PASS p.style.cssText is "image-orientation: -180deg; "
>+PASS p.style.cssText is "image-orientation: -180deg;"
> PASS getComputedStyle(p).imageOrientation is "180deg"
>-PASS p.style.cssText is "image-orientation: -90deg; "
>+PASS p.style.cssText is "image-orientation: -90deg;"
> PASS getComputedStyle(p).imageOrientation is "270deg"
>-PASS p.style.cssText is "image-orientation: -45deg; "
>+PASS p.style.cssText is "image-orientation: -45deg;"
> PASS getComputedStyle(p).imageOrientation is "270deg"
>-PASS p.style.cssText is "image-orientation: 225deg; "
>+PASS p.style.cssText is "image-orientation: 225deg;"
> PASS getComputedStyle(p).imageOrientation is "270deg"
>-PASS p.style.cssText is "image-orientation: 270deg; "
>+PASS p.style.cssText is "image-orientation: 270deg;"
> PASS getComputedStyle(p).imageOrientation is "270deg"
> PASS successfullyParsed is true
> 
>diff --git a/LayoutTests/fast/css/image-orientation/image-orientation.html b/LayoutTests/fast/css/image-orientation/image-orientation.html
>index 67900ea27660649c922b8661dba0d1b8d026c286..e384818be938e5df8b1cda8fd3ecc596cf343de7 100644
>--- a/LayoutTests/fast/css/image-orientation/image-orientation.html
>+++ b/LayoutTests/fast/css/image-orientation/image-orientation.html
>@@ -5,7 +5,7 @@
> </head>
> <body>
> <script>
>-description('Apply image-resolution property and check computed style.');
>+description('Apply image-orientation property and check computed style.');
> 
> var expectations = {
>     '0deg': ['-360deg', '-315deg', '0deg', '315deg', '360deg'],
>@@ -19,7 +19,7 @@ for (expected in expectations) {
>     expectations[expected].forEach(function(test) {
>         p.style.imageOrientation = '';
>         p.style.imageOrientation = test;
>-        shouldBe('p.style.cssText', '"image-orientation: ' + test + '; "');
>+        shouldBe('p.style.cssText', '"image-orientation: ' + test + ';"');
>         shouldBe('getComputedStyle(p).imageOrientation', '"' + expected + '"');
>     });
> }

Actions: View | Formatted Diff | Diff

Attachments on bug 91566: 153729 | 154275 | 154546 | 154550 | 207077 | 209324 | 209328 | 209360 | 209624 | 209628 | 209633 | 209941 | 209948 | 209949 | 209950 | 209972 | 209985 | 210038 | 210224 | 210257 | 210262 | 211496 | 211527 | 211530 | 212048 | 212070 | 212077 | 212089 | 212254 | 212259 | 212267 | 213510 | 213532 | 213537 | 213543 | 214355 | 214408 | 214413