Attachment 207077 Details for Bug 91566 – Updated patch

[patch] Updated patch

bug-91566-20130719195605.patch (text/plain), 42.29 KB, created by Gyuyoung Kim on 2013-07-19 03:56:07 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Gyuyoung Kim

Created: 2013-07-19 03:56:07 PDT

Size: 42.29 KB

patch

obsolete

>Subversion Revision: 152889
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 0dd93c9eb99db3ffcdfd196bd0d968f9b07ee6ad..e2837f0689579b06544cdf68eda8f301765bce31 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,69 @@
>+2013-07-19  David Barr <davidbarr@chromium.org>, Gyuyoung Kim  <gyuyoung.kim@samsung.com>
>+
>+        Integrate css3-images image-orientation with existing EXIF support
>+        https://bugs.webkit.org/show_bug.cgi?id=91566
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        http://www.w3.org/TR/2012/CR-css3-images-20120417/#the-image-orientation
>+        The css3-images module is at candidate recommendation.
>+
>+        Test: fast/css/image-orientation/image-orientation.html
>+
>+        * html/HTMLCanvasElement.cpp:
>+        (WebCore::HTMLCanvasElement::paint):
>+        * 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):
>+        * platform/graphics/BitmapImage.h:
>+        * platform/graphics/CrossfadeGeneratedImage.cpp:
>+        (WebCore::CrossfadeGeneratedImage::draw):
>+        * platform/graphics/CrossfadeGeneratedImage.h:
>+        * platform/graphics/GeneratedImage.h:
>+        * platform/graphics/GeneratorGeneratedImage.cpp:
>+        (WebCore::GeneratorGeneratedImage::draw):
>+        * platform/graphics/cairo/BitmapImageCairo.cpp:
>+        (WebCore::BitmapImage::draw):
>+        * platform/graphics/cairo/ImageBufferCairo.cpp:
>+        (WebCore::ImageBuffer::draw):
>+        * platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp:
>+        (WebCore::MediaPlayerPrivateGStreamerBase::paint):
>+        * platform/graphics/qt/StillImageQt.h:
>+        * platform/gtk/ClipboardGtk.cpp:
>+        (WebCore::Clipboard::createDragImage):
>+        * platform/gtk/DragImageGtk.cpp:
>+        (WebCore::createDragImageFromImage):
>+        * platform/mac/DragImageMac.mm:
>+        (WebCore::createDragImageFromImage):
>+        * platform/qt/DragImageQt.cpp:
>+        (WebCore::createDragImageFromImage):
>+        * platform/win/DragImageCGWin.cpp:
>+        (WebCore::createDragImageFromImage):
>+        * platform/win/DragImageCairoWin.cpp:
>+        (WebCore::createDragImageFromImage):
>+        * rendering/RenderEmbeddedObject.cpp:
>+        (WebCore::RenderEmbeddedObject::paintSnapshotImage):
>+        * rendering/RenderImage.cpp:
>+        (WebCore::RenderImage::styleDidChange):
>+        (WebCore::RenderImage::paintReplaced):
>+        (WebCore::RenderImage::paintIntoRect):
>+        * rendering/RenderSnapshottedPlugIn.cpp:
>+        (WebCore::RenderSnapshottedPlugIn::paintSnapshot):
>+        * rendering/style/RenderStyle.cpp:
>+        (WebCore::RenderStyle::changeRequiresLayout):
>+        * svg/graphics/SVGImage.cpp:
>+        (WebCore::SVGImage::draw):
>+        * svg/graphics/SVGImage.h:
>+        * svg/graphics/SVGImageForContainer.cpp:
>+        (WebCore::SVGImageForContainer::draw):
>+        * svg/graphics/SVGImageForContainer.h:
>+
> 2013-07-19  Kangil Han  <kangil.han@samsung.com>
> 
>         Use explicit HTMLFrameElementBase cast and introduce toHTMLFrameElementBase
>diff --git a/Source/WebCore/html/HTMLCanvasElement.cpp b/Source/WebCore/html/HTMLCanvasElement.cpp
>index 7299e14d143ea8cc4ac978b12ccaa94e1f1b1ab0..4e0e228dd7d54df888711267b46d743ac37d82cd 100644
>--- a/Source/WebCore/html/HTMLCanvasElement.cpp
>+++ b/Source/WebCore/html/HTMLCanvasElement.cpp
>@@ -404,9 +404,13 @@ void HTMLCanvasElement::paint(GraphicsContext* context, const LayoutRect& r, boo
>     if (hasCreatedImageBuffer()) {
>         ImageBuffer* imageBuffer = buffer();
>         if (imageBuffer) {
>-            if (m_presentedImage)
>-                context->drawImage(m_presentedImage.get(), ColorSpaceDeviceRGB, pixelSnappedIntRect(r), CompositeSourceOver, DoNotRespectImageOrientation, useLowQualityScale);
>-            else
>+            if (m_presentedImage) {
>+                ImageOrientationEnum orientation = DefaultImageOrientation;
>+#if ENABLE(CSS_IMAGE_ORIENTATION)
>+                orientation = renderer()->style()->imageOrientation();
>+#endif
>+                context->drawImage(m_presentedImage.get(), ColorSpaceDeviceRGB, pixelSnappedIntRect(r), CompositeSourceOver, orientation, DoNotRespectImageOrientation, useLowQualityScale);
>+            } else
>                 context->drawImageBuffer(imageBuffer, ColorSpaceDeviceRGB, pixelSnappedIntRect(r), CompositeSourceOver, BlendModeNormal, useLowQualityScale);
>         }
>     }
>diff --git a/Source/WebCore/loader/cache/CachedImage.cpp b/Source/WebCore/loader/cache/CachedImage.cpp
>index 77158feee3b553e2eed73efdc66c518f62108772..ffafee5e8a8f4c9be78aa08b3c57c1d5afca7e9a 100644
>--- a/Source/WebCore/loader/cache/CachedImage.cpp
>+++ b/Source/WebCore/loader/cache/CachedImage.cpp
>@@ -254,8 +254,18 @@ LayoutSize CachedImage::imageSizeForRenderer(const RenderObject* renderer, float
> 
>     LayoutSize imageSize;
> 
>-    if (m_image->isBitmapImage() && (renderer && renderer->shouldRespectImageOrientation() == RespectImageOrientation))
>-        imageSize = static_cast<BitmapImage*>(m_image.get())->sizeRespectingOrientation();
>+    RespectImageOrientationEnum shouldRespectImageOrientation = DoNotRespectImageOrientation;
>+    if (renderer)
>+        shouldRespectImageOrientation = renderer->shouldRespectImageOrientation();
>+
>+    ImageOrientationEnum orientation = DefaultImageOrientation;
>+#if ENABLE(CSS_IMAGE_ORIENTATION)
>+    if (renderer && renderer->style())
>+        orientation = renderer->style()->imageOrientation();
>+#endif
>+    if (m_image->isBitmapImage() && (shouldRespectImageOrientation == RespectImageOrientation || orientation != DefaultImageOrientation))
>+        imageSize = static_cast<BitmapImage*>(m_image.get())->sizeRespectingOrientation(orientation, shouldRespectImageOrientation);
>+
> #if ENABLE(SVG)
>     else if (m_image->isSVGImage()) {
>         imageSize = m_svgImageCache->imageSizeForRenderer(renderer);
>diff --git a/Source/WebCore/page/DragController.cpp b/Source/WebCore/page/DragController.cpp
>index 2537040d8c5709cdcc59dcc202614a8bc24e51af..359b901952a8f9a463381ef6e0877fa37e79106d 100644
>--- a/Source/WebCore/page/DragController.cpp
>+++ b/Source/WebCore/page/DragController.cpp
>@@ -878,8 +878,13 @@ void DragController::doImageDrag(Element* element, const IntPoint& dragOrigin, c
>     IntPoint origin;
> 
>     Image* image = getImage(element);
>+    ImageOrientationEnum orientation = DefaultImageOrientation;
>+#if ENABLE(CSS_IMAGE_ORIENTATION)
>+    if (element->renderer() && element->renderer()->style())
>+        orientation = element->renderer()->style()->imageOrientation();
>+#endif
>     if (image && image->size().height() * image->size().width() <= MaxOriginalImageArea
>-        && (dragImage = createDragImageFromImage(image, element->renderer() ? element->renderer()->shouldRespectImageOrientation() : DoNotRespectImageOrientation))) {
>+        && (dragImage = createDragImageFromImage(image, orientation, element->renderer() ? element->renderer()->shouldRespectImageOrientation() : DoNotRespectImageOrientation))) {
>         IntSize originalSize = rect.size();
>         origin = rect.location();
> 
>diff --git a/Source/WebCore/page/Frame.cpp b/Source/WebCore/page/Frame.cpp
>index f67384632e86cdc9a820a86722b78eed02fd79ef..2641f6b926ffcfa29004437b11141a7df394c977 100644
>--- a/Source/WebCore/page/Frame.cpp
>+++ b/Source/WebCore/page/Frame.cpp
>@@ -1093,7 +1093,13 @@ DragImageRef Frame::nodeImage(Node* node)
>     m_view->paintContents(buffer->context(), paintingRect);
> 
>     RefPtr<Image> image = buffer->copyImage();
>-    return createDragImageFromImage(image.get(), renderer->shouldRespectImageOrientation());
>+
>+    ImageOrientationEnum orientation = DefaultImageOrientation;
>+#if ENABLE(CSS_IMAGE_ORIENTATION)
>+    if (renderer->style())
>+        orientation = renderer->style()->imageOrientation();
>+#endif
>+    return createDragImageFromImage(image.get(), orientation, renderer->shouldRespectImageOrientation());
> }
> 
> DragImageRef Frame::dragImageForSelection()
>diff --git a/Source/WebCore/platform/graphics/BitmapImage.cpp b/Source/WebCore/platform/graphics/BitmapImage.cpp
>index 07610d2d83ee068b5eaadfe6736a27f7a5cb8539..aa19a3d03812e434d830680b697b5c1dfe0657b0 100644
>--- a/Source/WebCore/platform/graphics/BitmapImage.cpp
>+++ b/Source/WebCore/platform/graphics/BitmapImage.cpp
>@@ -179,13 +179,17 @@ void BitmapImage::didDecodeProperties() const
>         imageObserver()->decodedSizeChanged(this, deltaBytes);
> }
> 
>-void BitmapImage::updateSize() const
>+void BitmapImage::updateSize(ImageOrientationEnum orientation, RespectImageOrientationEnum shouldRespectImageOrientation) const
> {
>-    if (!m_sizeAvailable || m_haveSize)
>+    if (!m_sizeAvailable || (m_haveSize
>+        && orientation == static_cast<ImageOrientationEnum>(m_orientation)
>+        && shouldRespectImageOrientation == static_cast<RespectImageOrientationEnum>(m_shouldRespectImageOrientation)))
>         return;
> 
>     m_size = m_source.size();
>-    m_sizeRespectingOrientation = m_source.size(RespectImageOrientation);
>+    m_sizeRespectingOrientation = m_source.size(orientation, shouldRespectImageOrientation);
>+    m_orientation = static_cast<unsigned>(orientation);
>+    m_shouldRespectImageOrientation = static_cast<unsigned>(shouldRespectImageOrientation);
>     m_haveSize = true;
>     didDecodeProperties();
> }
>@@ -196,9 +200,9 @@ IntSize BitmapImage::size() const
>     return m_size;
> }
> 
>-IntSize BitmapImage::sizeRespectingOrientation() const
>+IntSize BitmapImage::sizeRespectingOrientation(ImageOrientationEnum orientation, RespectImageOrientationEnum shouldRespectImageOrientation) const
> {
>-    updateSize();
>+    updateSize(orientation, shouldRespectImageOrientation);
>     return m_sizeRespectingOrientation;
> }
> 
>diff --git a/Source/WebCore/platform/graphics/BitmapImage.h b/Source/WebCore/platform/graphics/BitmapImage.h
>index 752fe44649cec89f6bc2ae26ab5bd2627c545d2f..3052239328c7a730a8362bd34279cd917c77538a 100644
>--- a/Source/WebCore/platform/graphics/BitmapImage.h
>+++ b/Source/WebCore/platform/graphics/BitmapImage.h
>@@ -118,7 +118,7 @@ public:
>     virtual bool hasSingleSecurityOrigin() const;
> 
>     virtual IntSize size() const;
>-    IntSize sizeRespectingOrientation() const;
>+    IntSize sizeRespectingOrientation(ImageOrientationEnum, RespectImageOrientationEnum) const;
>     IntSize currentFrameSize() const;
>     virtual bool getHotSpot(IntPoint&) const;
> 
>@@ -174,7 +174,7 @@ public:
>     bool canAnimate();
> 
> private:
>-    void updateSize() const;
>+    void updateSize(ImageOrientationEnum = DefaultImageOrientation, RespectImageOrientationEnum = DoNotRespectImageOrientation) const;
> 
> protected:
>     enum RepetitionCountStatus {
>@@ -189,9 +189,9 @@ 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);
>+    virtual void draw(GraphicsContext*, const FloatRect& dstRect, const FloatRect& srcRect, ColorSpace styleColorSpace, CompositeOperator, BlendMode, ImageOrientationEnum = DefaultImageOrientation);
> #if USE(CG) || USE(CAIRO) || PLATFORM(BLACKBERRY)
>-    virtual void draw(GraphicsContext*, const FloatRect& dstRect, const FloatRect& srcRect, ColorSpace styleColorSpace, CompositeOperator, BlendMode, RespectImageOrientationEnum) OVERRIDE;
>+    virtual void draw(GraphicsContext*, const FloatRect& dstRect, const FloatRect& srcRect, ColorSpace styleColorSpace, CompositeOperator, BlendMode, ImageOrientationEnum = DefaultImageOrientation, RespectImageOrientationEnum = DoNotRespectImageOrientation) OVERRIDE;
> #endif
> 
> #if USE(WINGDI)
>@@ -265,6 +265,8 @@ protected:
>     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_orientation : 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 1f41aa6faed3b010d1a804d1f06484a5ccd162ff..49d11fda782d72b2c18821aed7391411489abf51 100644
>--- a/Source/WebCore/platform/graphics/CrossfadeGeneratedImage.cpp
>+++ b/Source/WebCore/platform/graphics/CrossfadeGeneratedImage.cpp
>@@ -80,7 +80,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, ImageOrientationEnum)
> {
>     GraphicsContextStateSaver stateSaver(*context);
>     context->setCompositeOperation(compositeOp);
>diff --git a/Source/WebCore/platform/graphics/CrossfadeGeneratedImage.h b/Source/WebCore/platform/graphics/CrossfadeGeneratedImage.h
>index f1da2ca14d3bd9dd8abd83cd3dba27dd0ddc1073..a909c260b3c439622e97b980401d0f394c7c04e3 100644
>--- a/Source/WebCore/platform/graphics/CrossfadeGeneratedImage.h
>+++ b/Source/WebCore/platform/graphics/CrossfadeGeneratedImage.h
>@@ -52,7 +52,7 @@ public:
> 
> protected:
>     virtual void draw(GraphicsContext*, const FloatRect& dstRect, const FloatRect& srcRect, ColorSpace styleColorSpace, CompositeOperator, BlendMode);
>-    virtual void drawPattern(GraphicsContext*, const FloatRect& srcRect, const AffineTransform& patternTransform, const FloatPoint& phase, ColorSpace styleColorSpace, CompositeOperator, const FloatRect& dstRect, BlendMode);
>+    virtual void drawPattern(GraphicsContext*, const FloatRect& srcRect, const AffineTransform& patternTransform, const FloatPoint& phase, ColorSpace styleColorSpace, CompositeOperator, const FloatRect& dstRect, BlendMode, ImageOrientationEnum);
> 
>     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 bd46588826ab6cc5d3d1afcabfab7006383bcea4..6c7a872e4275062e935b2727049007c964650ea4 100644
>--- a/Source/WebCore/platform/graphics/GeneratedImage.h
>+++ b/Source/WebCore/platform/graphics/GeneratedImage.h
>@@ -50,7 +50,7 @@ public:
>     virtual unsigned decodedSize() const { return 0; }
> 
> protected:
>-    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, ImageOrientationEnum) = 0;
>     virtual void drawPattern(GraphicsContext*, const FloatRect& srcRect, const AffineTransform& patternTransform,
>         const FloatPoint& phase, ColorSpace styleColorSpace, CompositeOperator, const FloatRect& destRect, BlendMode) = 0;
> 
>diff --git a/Source/WebCore/platform/graphics/GeneratorGeneratedImage.cpp b/Source/WebCore/platform/graphics/GeneratorGeneratedImage.cpp
>index a7fc565cf0903dc8c56f12f44e5160e2f6aba813..b4d4b75a140e5efca35e4b02e39a5da2e98c64dd 100644
>--- a/Source/WebCore/platform/graphics/GeneratorGeneratedImage.cpp
>+++ b/Source/WebCore/platform/graphics/GeneratorGeneratedImage.cpp
>@@ -32,7 +32,7 @@
> 
> namespace WebCore {
> 
>-void GeneratorGeneratedImage::draw(GraphicsContext* destContext, const FloatRect& destRect, const FloatRect& srcRect, ColorSpace, CompositeOperator compositeOp, BlendMode blendMode)
>+void GeneratorGeneratedImage::draw(GraphicsContext* destContext, const FloatRect& destRect, const FloatRect& srcRect, ColorSpace, CompositeOperator compositeOp, BlendMode blendMode, ImageOrientationEnum)
> {
>     GraphicsContextStateSaver stateSaver(*destContext);
>     destContext->setCompositeOperation(compositeOp, blendMode);
>diff --git a/Source/WebCore/platform/graphics/cairo/BitmapImageCairo.cpp b/Source/WebCore/platform/graphics/cairo/BitmapImageCairo.cpp
>index 56077318b56fcb2c02f400988a7a24e4aeaa8429..8dc68fb8c65e1c1ba71be5eda9b3f9da12590d75 100644
>--- a/Source/WebCore/platform/graphics/cairo/BitmapImageCairo.cpp
>+++ b/Source/WebCore/platform/graphics/cairo/BitmapImageCairo.cpp
>@@ -64,13 +64,13 @@ 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)
>+void BitmapImage::draw(GraphicsContext* context, const FloatRect& dst, const FloatRect& src, ColorSpace styleColorSpace, CompositeOperator op, BlendMode blendMode, OrientationEnum orientation)
> {
>-    draw(context, dst, src, styleColorSpace, op, blendMode, DoNotRespectImageOrientation);
>+    draw(context, dst, src, styleColorSpace, op, blendMode, DoNotRespectImageOrientation, orientation);
> }
> 
> void BitmapImage::draw(GraphicsContext* context, const FloatRect& dst, const FloatRect& src, ColorSpace styleColorSpace, CompositeOperator op,
>-    BlendMode blendMode, RespectImageOrientationEnum shouldRespectImageOrientation)
>+    BlendMode blendMode, ImageOrientationEnum orientation, RespectImageOrientationEnum shouldRespectImageOrientation)
> {
>     if (!dst.width() || !dst.height() || !src.width() || !src.height())
>         return;
>@@ -101,18 +101,18 @@ void BitmapImage::draw(GraphicsContext* context, const FloatRect& dst, const Flo
>     FloatRect adjustedSrcRect(src);
> #endif
> 
>-    ImageOrientation orientation = DefaultImageOrientation;
>+    ImageOrientation frameOrientation(orientation);
>     if (shouldRespectImageOrientation == 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/cairo/ImageBufferCairo.cpp b/Source/WebCore/platform/graphics/cairo/ImageBufferCairo.cpp
>index 3cfc2f4d1abaaf03a3807afa3f6333b1fd6a2965..b18b7ef7fd413c04e07bac3f2833a6ee49223461 100644
>--- a/Source/WebCore/platform/graphics/cairo/ImageBufferCairo.cpp
>+++ b/Source/WebCore/platform/graphics/cairo/ImageBufferCairo.cpp
>@@ -147,7 +147,7 @@ void ImageBuffer::draw(GraphicsContext* destinationContext, ColorSpace styleColo
> {
>     BackingStoreCopy copyMode = destinationContext == context() ? CopyBackingStore : DontCopyBackingStore;
>     RefPtr<Image> image = copyImage(copyMode);
>-    destinationContext->drawImage(image.get(), styleColorSpace, destRect, srcRect, op, blendMode, DoNotRespectImageOrientation, useLowQualityScale);
>+    destinationContext->drawImage(image.get(), styleColorSpace, destRect, srcRect, op, blendMode, DefaultImageOrientation, DoNotRespectImageOrientation, useLowQualityScale);
> }
> 
> void ImageBuffer::drawPattern(GraphicsContext* context, const FloatRect& srcRect, const AffineTransform& patternTransform,
>diff --git a/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp b/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp
>index 2a02afbab3fced0c20f3899f835c5146c84b7d79..c6dd202efcf04b5954b7b1a31e97e9905f28fbd6 100644
>--- a/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp
>+++ b/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp
>@@ -444,7 +444,7 @@ void MediaPlayerPrivateGStreamerBase::paint(GraphicsContext* context, const IntR
>     }
> 
>     context->drawImage(reinterpret_cast<Image*>(gstImage->image().get()), ColorSpaceSRGB,
>-        rect, gstImage->rect(), CompositeCopy, DoNotRespectImageOrientation, false);
>+        rect, gstImage->rect(), CompositeCopy, DefaultImageOrientation, DoNotRespectImageOrientation, false);
>     g_mutex_unlock(m_bufferMutex);
> }
> 
>diff --git a/Source/WebCore/platform/graphics/qt/StillImageQt.h b/Source/WebCore/platform/graphics/qt/StillImageQt.h
>index 1e9e2197d663b62d35172a5f69780799f97d4c83..65946839aafc407c5df9fc7bf6fbf84e51d28562 100644
>--- a/Source/WebCore/platform/graphics/qt/StillImageQt.h
>+++ b/Source/WebCore/platform/graphics/qt/StillImageQt.h
>@@ -53,7 +53,7 @@ namespace WebCore {
> 
>         virtual IntSize size() const;
>         virtual PassNativeImagePtr nativeImageForCurrentFrame();
>-        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, ImageOrientationEnum);
> 
>     private:
>         StillImage(const QPixmap&);
>diff --git a/Source/WebCore/platform/gtk/ClipboardGtk.cpp b/Source/WebCore/platform/gtk/ClipboardGtk.cpp
>index d388b5b6c170f7cd35ec407ef1aaeaf4c4f6b279..a60a3ef7c2f8c85ad98ddee717e377c4a323dabb 100644
>--- a/Source/WebCore/platform/gtk/ClipboardGtk.cpp
>+++ b/Source/WebCore/platform/gtk/ClipboardGtk.cpp
>@@ -31,7 +31,7 @@ DragImageRef Clipboard::createDragImage(IntPoint& location) const
>     location = m_dragLoc;
> 
>     if (m_dragImage)
>-        return createDragImageFromImage(m_dragImage->image());
>+        return createDragImageFromImage(m_dragImage->image(), DefaultImageOrientation);
> 
>     if (m_dragImageElement) {
>         Document* document = m_dragImageElement->document();
>diff --git a/Source/WebCore/platform/gtk/DragImageGtk.cpp b/Source/WebCore/platform/gtk/DragImageGtk.cpp
>index 9801b19042bc0cdb55c74363eaed69d01d29308a..20d5854980e44fe72c1c6c1157f67cfe521598c0 100644
>--- a/Source/WebCore/platform/gtk/DragImageGtk.cpp
>+++ b/Source/WebCore/platform/gtk/DragImageGtk.cpp
>@@ -76,7 +76,7 @@ DragImageRef dissolveDragImageToFraction(DragImageRef image, float fraction)
>     return image;
> }
> 
>-DragImageRef createDragImageFromImage(Image* image, RespectImageOrientationEnum)
>+DragImageRef createDragImageFromImage(Image* image, ImageOrientationEnum, RespectImageOrientationEnum)
> {
>     return image->nativeImageForCurrentFrame().leakRef();
> }
>diff --git a/Source/WebCore/platform/mac/DragImageMac.mm b/Source/WebCore/platform/mac/DragImageMac.mm
>index 1e1583d51cccc4d265785a338fe235513bb1f37f..6e67b95ef15d2046b14d071f8e89b38a21ac7ca0 100644
>--- a/Source/WebCore/platform/mac/DragImageMac.mm
>+++ b/Source/WebCore/platform/mac/DragImageMac.mm
>@@ -77,19 +77,19 @@ RetainPtr<NSImage> dissolveDragImageToFraction(RetainPtr<NSImage> image, float d
>     return dissolvedImage;
> }
>         
>-RetainPtr<NSImage> createDragImageFromImage(Image* image, RespectImageOrientationEnum shouldRespectImageOrientation)
>+RetainPtr<NSImage> createDragImageFromImage(Image* image, ImageOrientationEnum orientation, RespectImageOrientationEnum shouldRespectImageOrientation)
> {
>     IntSize size = image->size();
> 
>     if (image->isBitmapImage()) {
>-        ImageOrientation orientation = DefaultImageOrientation;
>+        ImageOrientation frameOrientation(orientation);
>         BitmapImage* bitmapImage = static_cast<BitmapImage *>(image);
>-        IntSize sizeRespectingOrientation = bitmapImage->sizeRespectingOrientation();
>+        IntSize sizeRespectingOrientation = bitmapImage->sizeRespectingOrientation(orientation, shouldRespectImageOrientation);
> 
>-        if (shouldRespectImageOrientation == RespectImageOrientation)
>-            orientation = bitmapImage->currentFrameOrientation();
>+        if (orientation == OriginTopLeft && shouldRespectImageOrientation == RespectImageOrientation)
>+            frameOrientation = bitmapImage->currentFrameOrientation();
> 
>-        if (orientation != DefaultImageOrientation) {
>+        if (frameOrientation != DefaultImageOrientation) {
>             // Construct a correctly-rotated copy of the image to use as the drag image.
>             FloatRect destRect(FloatPoint(), sizeRespectingOrientation);
> 
>@@ -99,9 +99,9 @@ RetainPtr<NSImage> createDragImageFromImage(Image* image, RespectImageOrientatio
>             // ImageOrientation uses top-left coordinates, need to flip to bottom-left, apply...
>             CGAffineTransform transform = CGAffineTransformMakeTranslation(0, destRect.height());
>             transform = CGAffineTransformScale(transform, 1, -1);
>-            transform = CGAffineTransformConcat(orientation.transformFromDefault(sizeRespectingOrientation), transform);
>+            transform = CGAffineTransformConcat(frameOrientation.transformFromDefault(sizeRespectingOrientation), transform);
> 
>-            if (orientation.usesWidthAsHeight())
>+            if (frameOrientation.usesWidthAsHeight())
>                 destRect = FloatRect(destRect.x(), destRect.y(), destRect.height(), destRect.width());
> 
>             // ...and flip back.
>diff --git a/Source/WebCore/platform/qt/DragImageQt.cpp b/Source/WebCore/platform/qt/DragImageQt.cpp
>index d388f39dc2538687caf307fddcc6c51693a40998..dab210006fec7f64b0594cd706d2880c7c0ea379 100644
>--- a/Source/WebCore/platform/qt/DragImageQt.cpp
>+++ b/Source/WebCore/platform/qt/DragImageQt.cpp
>@@ -60,7 +60,7 @@ DragImageRef dissolveDragImageToFraction(DragImageRef image, float)
>     return image;
> }
> 
>-DragImageRef createDragImageFromImage(Image* image, RespectImageOrientationEnum)
>+DragImageRef createDragImageFromImage(Image* image, ImageOrientationEnum, RespectImageOrientationEnum)
> {
>     if (!image || !image->nativeImageForCurrentFrame())
>         return 0;
>diff --git a/Source/WebCore/platform/win/DragImageCGWin.cpp b/Source/WebCore/platform/win/DragImageCGWin.cpp
>index 93025b7f950c97027727d3202721d714ad0ff9a6..d2419733ae242b72bb991e6e2c6a79b78b733921 100644
>--- a/Source/WebCore/platform/win/DragImageCGWin.cpp
>+++ b/Source/WebCore/platform/win/DragImageCGWin.cpp
>@@ -120,7 +120,7 @@ exit:
>     return hbmp;
> }
>     
>-DragImageRef createDragImageFromImage(Image* img, RespectImageOrientationEnum)
>+DragImageRef createDragImageFromImage(Image* img, ImageOrientationEnum, RespectImageOrientationEnum)
> {
>     HBITMAP hbmp = 0;
>     HWndDC dc(0);
>diff --git a/Source/WebCore/platform/win/DragImageCairoWin.cpp b/Source/WebCore/platform/win/DragImageCairoWin.cpp
>index 681ccfe7cc126133afed2f3caf827315deb46628..a6404b2e65e3fdb8dd625105f850dcab579364c7 100644
>--- a/Source/WebCore/platform/win/DragImageCairoWin.cpp
>+++ b/Source/WebCore/platform/win/DragImageCairoWin.cpp
>@@ -150,7 +150,7 @@ exit:
>     return hbmp;
> }
>     
>-DragImageRef createDragImageFromImage(Image* img, RespectImageOrientationEnum)
>+DragImageRef createDragImageFromImage(Image* img, ImageOrientationEnum, RespectImageOrientationEnum)
> {
>     HBITMAP hbmp = 0;
>     HDC dc = GetDC(0);
>diff --git a/Source/WebCore/rendering/RenderEmbeddedObject.cpp b/Source/WebCore/rendering/RenderEmbeddedObject.cpp
>index 38c0a8714d6263705aba1219985971a5d50a4969..122c8dc0416784ae3eb0946b8bb61c6b4ddc0c18 100644
>--- a/Source/WebCore/rendering/RenderEmbeddedObject.cpp
>+++ b/Source/WebCore/rendering/RenderEmbeddedObject.cpp
>@@ -196,7 +196,11 @@ void RenderEmbeddedObject::paintSnapshotImage(PaintInfo& paintInfo, const Layout
>         return;
> 
>     bool useLowQualityScaling = shouldPaintAtLowQuality(context, image, image, alignedRect.size());
>-    context->drawImage(image, style()->colorSpace(), alignedRect, CompositeSourceOver, shouldRespectImageOrientation(), useLowQualityScaling);
>+    ImageOrientationEnum orientation = DefaultImageOrientation;
>+#if ENABLE(CSS_IMAGE_ORIENTATION)
>+    orientation = style()->imageOrientation();
>+#endif
>+    context->drawImage(image, style()->colorSpace(), alignedRect, CompositeSourceOver, orientation, shouldRespectImageOrientation(), useLowQualityScaling);
> }
> 
> void RenderEmbeddedObject::paintContents(PaintInfo& paintInfo, const LayoutPoint& paintOffset)
>diff --git a/Source/WebCore/rendering/RenderImage.cpp b/Source/WebCore/rendering/RenderImage.cpp
>index 698894bb98c5cf855af94a78d4ebb18748eec03a..4fb1bdb6adb3ee1d994578051915d28445540051 100644
>--- a/Source/WebCore/rendering/RenderImage.cpp
>+++ b/Source/WebCore/rendering/RenderImage.cpp
>@@ -146,6 +146,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()
>@@ -353,7 +358,11 @@ void RenderImage::paintReplaced(PaintInfo& paintInfo, const LayoutPoint& paintOf
>                 if (centerY < 0)
>                     centerY = 0;
>                 imageOffset = LayoutSize(leftBorder + leftPad + centerX + borderWidth, topBorder + topPad + centerY + borderWidth);
>-                context->drawImage(image.get(), style()->colorSpace(), pixelSnappedIntRect(LayoutRect(paintOffset + imageOffset, imageSize)), CompositeSourceOver, shouldRespectImageOrientation());
>+                ImageOrientationEnum orientation = DefaultImageOrientation;
>+#if ENABLE(CSS_IMAGE_ORIENTATION)
>+                orientation = style()->imageOrientation();
>+#endif
>+                context->drawImage(image.get(), style()->colorSpace(), pixelSnappedIntRect(LayoutRect(paintOffset + imageOffset, imageSize)), CompositeSourceOver, orientation, shouldRespectImageOrientation());
>                 errorPictureDrawn = true;
>             }
> 
>@@ -475,7 +484,11 @@ void RenderImage::paintIntoRect(GraphicsContext* context, const LayoutRect& rect
>     CompositeOperator compositeOperator = imageElt ? imageElt->compositeOperator() : CompositeSourceOver;
>     Image* image = m_imageResource->image().get();
>     bool useLowQualityScaling = shouldPaintAtLowQuality(context, image, image, alignedRect.size());
>-    context->drawImage(m_imageResource->image(alignedRect.width(), alignedRect.height()).get(), style()->colorSpace(), alignedRect, compositeOperator, shouldRespectImageOrientation(), useLowQualityScaling);
>+    ImageOrientationEnum orientation = DefaultImageOrientation;
>+#if ENABLE(CSS_IMAGE_ORIENTATION)
>+    orientation = style()->imageOrientation();
>+#endif
>+    context->drawImage(m_imageResource->image(alignedRect.width(), alignedRect.height()).get(), style()->colorSpace(), alignedRect, compositeOperator, orientation, shouldRespectImageOrientation(), useLowQualityScaling);
> }
> 
> bool RenderImage::boxShadowShouldBeAppliedToBackground(BackgroundBleedAvoidance bleedAvoidance, InlineFlowBox*) const
>diff --git a/Source/WebCore/rendering/RenderSnapshottedPlugIn.cpp b/Source/WebCore/rendering/RenderSnapshottedPlugIn.cpp
>index 075910abe9d0346739d699e913fb33f18ddfa123..5416196bfc14299c02995b45987204829c9dc50a 100644
>--- a/Source/WebCore/rendering/RenderSnapshottedPlugIn.cpp
>+++ b/Source/WebCore/rendering/RenderSnapshottedPlugIn.cpp
>@@ -138,8 +138,12 @@ void RenderSnapshottedPlugIn::paintSnapshot(PaintInfo& paintInfo, const LayoutPo
>     if (alignedRect.width() <= 0 || alignedRect.height() <= 0)
>         return;
> 
>-    bool useLowQualityScaling = shouldPaintAtLowQuality(context, image, image, alignedRect.size());
>-    context->drawImage(image, style()->colorSpace(), alignedRect, CompositeSourceOver, shouldRespectImageOrientation(), useLowQualityScaling);
>+    bool useLowQualityScaling = shouldPaintAtLowQuality(context, image, image, alignedRect.size())
>+    ImageOrientationEnum orientation = DefaultImageOrientation;
>+#if ENABLE(CSS_IMAGE_ORIENTATION)
>+    orientation = style()->imageOrientation();
>+#endif
>+    context->drawImage(image, style()->colorSpace(), alignedRect, CompositeSourceOver, orientation, shouldRespectImageOrientation(), useLowQualityScaling);
> }
> 
> CursorDirective RenderSnapshottedPlugIn::getCursor(const LayoutPoint& point, Cursor& overrideCursor) const
>diff --git a/Source/WebCore/rendering/style/RenderStyle.cpp b/Source/WebCore/rendering/style/RenderStyle.cpp
>index 364fc1271843d7831ed9c67a59c82adffdba23e2..1adef6de192eee8b10ecc03f064bbde04c8c897c 100644
>--- a/Source/WebCore/rendering/style/RenderStyle.cpp
>+++ b/Source/WebCore/rendering/style/RenderStyle.cpp
>@@ -493,6 +493,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 fc14b7616a79a85f8d1bea34a709169622c29134..bb96e7f59015df3c21d85ac4f738916ecb01da8a 100644
>--- a/Source/WebCore/svg/graphics/SVGImage.cpp
>+++ b/Source/WebCore/svg/graphics/SVGImage.cpp
>@@ -191,7 +191,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, ImageOrientationEnum)
> {
>     if (!m_page)
>         return;
>diff --git a/Source/WebCore/svg/graphics/SVGImage.h b/Source/WebCore/svg/graphics/SVGImage.h
>index 660a37b9d45b0f47468dbe92e392c70479adf1b4..2f29f4e7b2a120752f5288555b3125784c1c9673 100644
>--- a/Source/WebCore/svg/graphics/SVGImage.h
>+++ b/Source/WebCore/svg/graphics/SVGImage.h
>@@ -88,7 +88,7 @@ private:
>     virtual bool currentFrameKnownToBeOpaque() OVERRIDE { return false; }
> 
>     SVGImage(ImageObserver*);
>-    virtual void draw(GraphicsContext*, const FloatRect& fromRect, const FloatRect& toRect, ColorSpace styleColorSpace, CompositeOperator, BlendMode);
>+    virtual void draw(GraphicsContext*, const FloatRect& fromRect, const FloatRect& toRect, ColorSpace styleColorSpace, CompositeOperator, BlendMode, ImageOrientationEnum = DefaultImageOrientation);
>     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 e9e2728c79640ac1a6214b4150446c6af02302c8..2a2fdd79b2ba87ac6d05e73ba7f13d174666b6c8 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, ImageOrientationEnum)
> {
>     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 a2f15e4d65d6a076ef909c90286436ae0b55808c..970e025f407eb78064b19b1318d0255fbff21b39 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, ImageOrientationEnum) 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 eb21e64c126a01119ae9b1edfa325e2139cbfb19..8b0361ab5c639df317b2ee50f903fcedf0d4efc2 100644
>--- a/LayoutTests/ChangeLog
>+++ b/LayoutTests/ChangeLog
>@@ -1,3 +1,15 @@
>+2013-07-19  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
>+
>+        Integrate css3-images image-orientation with existing EXIF support
>+        https://bugs.webkit.org/show_bug.cgi?id=91566
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Update image-orientation.html test.
>+
>+        * fast/css/image-orientation/image-orientation-expected.txt:
>+        * fast/css/image-orientation/image-orientation.html:
>+
> 2013-07-19  Gabor Abraham  <abrhm@inf.u-szeged.hu>
> 
>         [Qt] Unreviewed gardening. Rebase failing tests.
>diff --git a/LayoutTests/fast/css/image-orientation/image-orientation-expected.txt b/LayoutTests/fast/css/image-orientation/image-orientation-expected.txt
>index 9a5138488df84cb8767653bf896cc086ab8841ef..c47d11f694beb3e6237ef9327cb37cb55ccf2b7d 100644
>--- a/LayoutTests/fast/css/image-orientation/image-orientation-expected.txt
>+++ b/LayoutTests/fast/css/image-orientation/image-orientation-expected.txt
>@@ -3,39 +3,39 @@ Apply image-resolution 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 c627122861851fc63856477b402b1c3a917a39ec..276df298cd2397fe34f950e9826f8fce1b83eb47 100644
>--- a/LayoutTests/fast/css/image-orientation/image-orientation.html
>+++ b/LayoutTests/fast/css/image-orientation/image-orientation.html
>@@ -20,7 +20,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