Attachment 209324 Details for Bug 91566 – Patch for ews

[patch] Patch for ews

bug-91566-20130822141753.patch (text/plain), 35.15 KB, created by Gyuyoung Kim on 2013-08-21 22:17:55 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Gyuyoung Kim

Created: 2013-08-21 22:17:55 PDT

Size: 35.15 KB

patch

obsolete

>Subversion Revision: 154381
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 01cbc5d653f72fba064bf29c536ed8322f31deca..904c99c3282c6db8a3a75e4fa4c650eb95167aaa 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,62 @@
>+2013-08-21  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):
>+        * 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/GeneratorGeneratedImage.h:
>+        * platform/graphics/Image.cpp:
>+        (WebCore::Image::draw):
>+        * platform/graphics/Image.h:
>+        * platform/graphics/cairo/BitmapImageCairo.cpp:
>+        (WebCore::BitmapImage::draw):
>+        * platform/graphics/qt/StillImageQt.h:
>+        * platform/mac/DragImageMac.mm:
>+        (WebCore::createDragImageFromImage):
>+        * rendering/RenderEmbeddedObject.cpp:
>+        (WebCore::RenderEmbeddedObject::paintSnapshotImage):
>+        * rendering/RenderImage.cpp:
>+        (WebCore::RenderImage::styleDidChange):
>+        (WebCore::RenderImage::paintReplaced):
>+        * 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-08-20  Jer Noble  <jer.noble@apple.com>
> 
>         <https://webkit.org/b/120101> [Mac] Suspended HTMLMediaElements can still hold power assertion after playback stops.
>diff --git a/Source/WebCore/loader/cache/CachedImage.cpp b/Source/WebCore/loader/cache/CachedImage.cpp
>index a6f9adf62476a1f56365d4a3e764bb2b37cc446a..3e801f03c8c48a895a8bf9ab7085b59e7c91b8a8 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();
>+    ImageOrientationDescription orientationDescirption;
>+#if ENABLE(CSS_IMAGE_ORIENTATION)
>+    if (renderer)
>+        orientationDescirption.setRespectImageOrientation(renderer->shouldRespectImageOrientation());
>+
>+    if (renderer && renderer->style())
>+        orientationDescirption.setImageOrientationEnum(renderer->style()->imageOrientation());
>+#endif
>+    if (m_image->isBitmapImage()
>+        && (orientationDescirption.respectImageOrientation() == RespectImageOrientation || orientationDescirption.imageOrientation() != DefaultImageOrientation))
>+        imageSize = static_cast<BitmapImage*>(m_image.get())->sizeRespectingOrientation(orientationDescirption);
>+
> #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 3ee3e135e860a01d27988c316f3a18496df3a1f1..bceab493b9b1e3f8ed8a797690bc91b140e3c336 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);
>+    ImageOrientationDescription orientationDescription;
>+#if ENABLE(CSS_IMAGE_ORIENTATION)
>+    if (element->renderer() && element->renderer()->style())
>+        orientationDescription.setImageOrientationEnum(element->renderer()->style()->imageOrientation());
>+#endif
>     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 9019a4007f0d9e1eb34143802278075ef82ea39d..8ca282faa7e3a523e4c3324dcdb51f27903a13d5 100644
>--- a/Source/WebCore/page/Frame.cpp
>+++ b/Source/WebCore/page/Frame.cpp
>@@ -1092,7 +1092,15 @@ 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;
>+#if ENABLE(CSS_IMAGE_ORIENTATION)
>+    if (renderer->style()) { 
>+        orientationDescription.setImageOrientationEnum(renderer->style()->imageOrientation());
>+        orientationDescription.setRespectImageOrientation(renderer->shouldRespectImageOrientation());
>+    }
>+#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 16d5a31c1071298ca7e9db90c1231dde51136abf..7807ae1cb0d810a969e2b97745ac4fa5b327b94d 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(ImageOrientationDescription description) const
> {
>-    if (!m_sizeAvailable || m_haveSize)
>+    if (!m_sizeAvailable || (m_haveSize
>+        && description.imageOrientation() == static_cast<ImageOrientationEnum>(m_imageOrientation)
>+        && description.respectImageOrientation() == static_cast<RespectImageOrientationEnum>(m_shouldRespectImageOrientation)))
>         return;
> 
>     m_size = m_source.size();
>-    m_sizeRespectingOrientation = m_source.size(ImageOrientationDescription(RespectImageOrientation));
>+    m_sizeRespectingOrientation = m_source.size(ImageOrientationDescription(description.respectImageOrientation(), description.imageOrientation()));
>+    m_imageOrientation = static_cast<unsigned>(description.imageOrientation());
>+    m_shouldRespectImageOrientation = static_cast<unsigned>(description.respectImageOrientation());
>     m_haveSize = true;
>     didDecodeProperties();
> }
>@@ -196,9 +200,9 @@ IntSize BitmapImage::size() const
>     return m_size;
> }
> 
>-IntSize BitmapImage::sizeRespectingOrientation() const
>+IntSize BitmapImage::sizeRespectingOrientation(ImageOrientationDescription description) const
> {
>-    updateSize();
>+    updateSize(description);
>     return m_sizeRespectingOrientation;
> }
> 
>diff --git a/Source/WebCore/platform/graphics/BitmapImage.h b/Source/WebCore/platform/graphics/BitmapImage.h
>index 7413484f5bd1c42d3c1c62f0b1b75e73bf185bc1..fadb8786cbcca9dbbdf779f86c7d2960426ba807 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(ImageOrientationDescription = ImageOrientationDescription()) const;
>     IntSize currentFrameSize() const;
>     virtual bool getHotSpot(IntPoint&) const;
> 
>@@ -173,7 +173,7 @@ public:
>     bool canAnimate();
> 
> private:
>-    void updateSize() const;
>+    void updateSize(ImageOrientationDescription = ImageOrientationDescription()) const;
> 
> protected:
>     enum RepetitionCountStatus {
>@@ -264,7 +264,9 @@ 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_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 1f41aa6faed3b010d1a804d1f06484a5ccd162ff..8b2edf2ee8ccd9a12cf3bcce0bdadd7210e1f1a1 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, ImageOrientationDescription)
> {
>     GraphicsContextStateSaver stateSaver(*context);
>     context->setCompositeOperation(compositeOp);
>diff --git a/Source/WebCore/platform/graphics/CrossfadeGeneratedImage.h b/Source/WebCore/platform/graphics/CrossfadeGeneratedImage.h
>index f1da2ca14d3bd9dd8abd83cd3dba27dd0ddc1073..dcceff47ad16981c6dbc3654094e9821f4ad6438 100644
>--- a/Source/WebCore/platform/graphics/CrossfadeGeneratedImage.h
>+++ b/Source/WebCore/platform/graphics/CrossfadeGeneratedImage.h
>@@ -51,7 +51,7 @@ public:
>     virtual IntSize size() const { return m_crossfadeSize; }
> 
> protected:
>-    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 = ImageOrientationDescription());
>     virtual void drawPattern(GraphicsContext*, const FloatRect& srcRect, const AffineTransform& patternTransform, const FloatPoint& phase, ColorSpace styleColorSpace, CompositeOperator, const FloatRect& dstRect, BlendMode);
> 
>     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..07a5a6f389f0ddd048daf1e79cfab66ea2600c42 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, ImageOrientationDescription = ImageOrientationDescription()) = 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..07123223d6381a8826587d1cd3603bf938c4ad8e 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, ImageOrientationDescription)
> {
>     GraphicsContextStateSaver stateSaver(*destContext);
>     destContext->setCompositeOperation(compositeOp, blendMode);
>diff --git a/Source/WebCore/platform/graphics/GeneratorGeneratedImage.h b/Source/WebCore/platform/graphics/GeneratorGeneratedImage.h
>index 0b55be655a6181ec23fec5609d656da2218b265d..910fb38b68c0f864fed125006354847b41a59217 100644
>--- a/Source/WebCore/platform/graphics/GeneratorGeneratedImage.h
>+++ b/Source/WebCore/platform/graphics/GeneratorGeneratedImage.h
>@@ -45,7 +45,7 @@ public:
>     virtual ~GeneratorGeneratedImage() { }
> 
> protected:
>-    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 = ImageOrientationDescription());
>     virtual void drawPattern(GraphicsContext*, const FloatRect& srcRect, const AffineTransform& patternTransform,
>         const FloatPoint& phase, ColorSpace styleColorSpace, CompositeOperator, const FloatRect& destRect, BlendMode);
> 
>diff --git a/Source/WebCore/platform/graphics/Image.cpp b/Source/WebCore/platform/graphics/Image.cpp
>index 2be0eba3ade77efdaddcb40e0950f3d26c948b6c..6ab5b4db42147451ec93ab96227c7dfb6aed5aed 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)
>diff --git a/Source/WebCore/platform/graphics/Image.h b/Source/WebCore/platform/graphics/Image.h
>index e706b5c999c7a5746b928f4c75e8511171209adf..323438f922ecb3322d17d2e112fb96aa4914dff4 100644
>--- a/Source/WebCore/platform/graphics/Image.h
>+++ b/Source/WebCore/platform/graphics/Image.h
>@@ -196,8 +196,7 @@ 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);
>+    virtual void draw(GraphicsContext*, const FloatRect& dstRect, const FloatRect& srcRect, ColorSpace styleColorSpace, CompositeOperator, BlendMode, ImageOrientationDescription = ImageOrientationDescription()) = 0;
>     void drawTiled(GraphicsContext*, const FloatRect& dstRect, const FloatPoint& srcPoint, const FloatSize& tileSize, ColorSpace styleColorSpace,
>         CompositeOperator , BlendMode);
>     void drawTiled(GraphicsContext*, const FloatRect& dstRect, const FloatRect& srcRect, const FloatSize& tileScaleFactor, TileRule hRule, TileRule vRule, ColorSpace styleColorSpace, CompositeOperator);
>diff --git a/Source/WebCore/platform/graphics/cairo/BitmapImageCairo.cpp b/Source/WebCore/platform/graphics/cairo/BitmapImageCairo.cpp
>index 8708d12e0e99ba074b0759567defdcc70a35353f..0a8533a4214a36c03bea719d7c04bf336a66fba0 100644
>--- a/Source/WebCore/platform/graphics/cairo/BitmapImageCairo.cpp
>+++ b/Source/WebCore/platform/graphics/cairo/BitmapImageCairo.cpp
>@@ -101,18 +101,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/qt/StillImageQt.h b/Source/WebCore/platform/graphics/qt/StillImageQt.h
>index 1e9e2197d663b62d35172a5f69780799f97d4c83..72065a43145d9f56abd46913760f891881e710dc 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, ImageOrientationDescription = ImageOrientationDescription());
> 
>     private:
>         StillImage(const QPixmap&);
>diff --git a/Source/WebCore/platform/mac/DragImageMac.mm b/Source/WebCore/platform/mac/DragImageMac.mm
>index 1493ae63896440c736606e077db6b17246ced7b4..e0e4e9845dbdb1cbcf1f7c7b0768df739d88e316 100644
>--- a/Source/WebCore/platform/mac/DragImageMac.mm
>+++ b/Source/WebCore/platform/mac/DragImageMac.mm
>@@ -82,14 +82,14 @@ RetainPtr<NSImage> createDragImageFromImage(Image* image, ImageOrientationDescri
>     IntSize size = image->size();
> 
>     if (image->isBitmapImage()) {
>-        ImageOrientation orientation;
>+        ImageOrientation frameOrientation(description.ImageOrientation());
>         BitmapImage* bitmapImage = static_cast<BitmapImage *>(image);
>-        IntSize sizeRespectingOrientation = bitmapImage->sizeRespectingOrientation();
>+        IntSize sizeRespectingOrientation = bitmapImage->sizeRespectingOrientation(description);
> 
>-        if (description.respectImageOrientation() == RespectImageOrientation)
>-            orientation = bitmapImage->orientationForCurrentFrame();
>+        if (description.imageOrientation() == DefaultImageOrientation && description.shouldRespectImageOrientation() == RespectImageOrientation)
>+            frameOrientation = bitmapImage->currentFrameOrientation();
> 
>-        if (orientation != DefaultImageOrientation) {
>+        if (description.imageOrientation() != 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, ImageOrientationDescri
>             // 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/rendering/RenderEmbeddedObject.cpp b/Source/WebCore/rendering/RenderEmbeddedObject.cpp
>index 80d7b84f9631f527c89685078c1751e7d4110360..43765321be4f22d8780daf1135535e529c1da201 100644
>--- a/Source/WebCore/rendering/RenderEmbeddedObject.cpp
>+++ b/Source/WebCore/rendering/RenderEmbeddedObject.cpp
>@@ -199,7 +199,12 @@ 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;
>+#if ENABLE(CSS_IMAGE_ORIENTATION)
>+    orientationDescription.setImageOrientationEnum(style()->imageOrientation());
>+    orientationDescription.setRespectImageOrientation(shouldRespectImageOrientation());
>+#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 2f054dcfccf0eb1f4ae9567017d886478b2a9ff9..8ad924c2516ed6cf0ea67528afde1cfb5a08205b 100644
>--- a/Source/WebCore/rendering/RenderImage.cpp
>+++ b/Source/WebCore/rendering/RenderImage.cpp
>@@ -146,6 +146,12 @@ 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 be6c767236d3f6d8a7138620343a45e6c92bbae8..04de517827d11f8abd60f3c6baf9356cbb05a7d1 100644
>--- a/Source/WebCore/rendering/RenderSnapshottedPlugIn.cpp
>+++ b/Source/WebCore/rendering/RenderSnapshottedPlugIn.cpp
>@@ -143,6 +143,7 @@ void RenderSnapshottedPlugIn::paintSnapshot(PaintInfo& paintInfo, const LayoutPo
>     ImageOrientationDescription orientationDescription;
> #if ENABLE(CSS_IMAGE_ORIENTATION)
>     orientationDescription.setImageOrientationEnum(style()->imageOrientation());
>+    orientationDescription.setRespectImageOrientation(shouldRespectImageOrientation());
> #endif
>     context->drawImage(image, style()->colorSpace(), alignedRect, CompositeSourceOver, orientationDescription, useLowQualityScaling);
> }
>diff --git a/Source/WebCore/rendering/style/RenderStyle.cpp b/Source/WebCore/rendering/style/RenderStyle.cpp
>index c0b148cd07d884364a4b767d1007badaba4fd9d5..7144430d157ea98d0b1f82306480f380e71f94f2 100644
>--- a/Source/WebCore/rendering/style/RenderStyle.cpp
>+++ b/Source/WebCore/rendering/style/RenderStyle.cpp
>@@ -498,6 +498,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 4b30c7aa2c221711113c51f3781dd82a0e41eb52..4a7a5c19cec5332eb3fe911ca2c57bd236bbae42 100644
>--- a/Source/WebCore/svg/graphics/SVGImage.cpp
>+++ b/Source/WebCore/svg/graphics/SVGImage.cpp
>@@ -214,7 +214,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 5a0ba451b5e7bbc0420e72e5f7834b5c773e94af..df0891358c1bb80dd576003d4cbd970bd76449cd 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);
>+    virtual void draw(GraphicsContext*, const FloatRect& fromRect, const FloatRect& toRect, ColorSpace styleColorSpace, CompositeOperator, BlendMode, ImageOrientationDescription = ImageOrientationDescription());
>     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..070cb7cebf942833087e479652ae3c346d9d61a7 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 a2f15e4d65d6a076ef909c90286436ae0b55808c..56dc74bdd586db84acfed9806e0bba7bf9e5db3d 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 = 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 02393081a60bde44077c3b76765ab0ede3b0d81e..02a53b54d9e0e4be95b9a321536144ef34fbec29 100644
>--- a/LayoutTests/ChangeLog
>+++ b/LayoutTests/ChangeLog
>@@ -1,3 +1,12 @@
>+2013-08-21  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-08-20  Gavin Barraclough  <barraclough@apple.com>
> 
>         https://bugs.webkit.org/show_bug.cgi?id=120086
>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 c627122861851fc63856477b402b1c3a917a39ec..fcdc0973f1d085b22974b7f32d03db40f25c9e1a 100644
>--- a/LayoutTests/fast/css/image-orientation/image-orientation.html
>+++ b/LayoutTests/fast/css/image-orientation/image-orientation.html
>@@ -6,7 +6,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'],
>@@ -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