Attachment 208323 Details for Bug 119418 – Patch for ews

[patch] Patch for ews

bug-119418-20130808193612.patch (text/plain), 45.87 KB, created by Gyuyoung Kim on 2013-08-08 03:36:15 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Gyuyoung Kim

Created: 2013-08-08 03:36:15 PDT

Size: 45.87 KB

patch

obsolete

>Subversion Revision: 153814
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index b0e5d795f1039c10474ef443863d888c7803ac67..8b6558312bf070df12840c6e97454a2d330cdb06 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,86 @@
>+2013-08-07  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
>+
>+        [CSS] Introduce new structure to pass image orientation values.
>+        https://bugs.webkit.org/show_bug.cgi?id=119418
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Add a ImageOrientationDescription struct in order to reduce count of argument for
>+        image orientation.
>+
>+        No new tests, no behavior change.
>+
>+        * html/HTMLCanvasElement.cpp:
>+        (WebCore::HTMLCanvasElement::paint):
>+        * page/DragController.cpp:
>+        (WebCore::DragController::doImageDrag):
>+        * page/Frame.cpp:
>+        (WebCore::Frame::nodeImage):
>+        (WebCore::Frame::dragImageForSelection):
>+        * platform/DragImage.h:
>+        * platform/blackberry/DragImageBlackBerry.cpp:
>+        (WebCore::createDragImageFromImage):
>+        * platform/efl/DragImageEfl.cpp:
>+        (WebCore::createDragImageFromImage):
>+        * platform/graphics/BitmapImage.cpp:
>+        (WebCore::BitmapImage::updateSize):
>+        * platform/graphics/BitmapImage.h:
>+        * platform/graphics/GraphicsContext.cpp:
>+        (WebCore::GraphicsContext::drawImage):
>+        * platform/graphics/GraphicsContext.h:
>+        * platform/graphics/Image.cpp:
>+        (WebCore::Image::draw):
>+        * platform/graphics/Image.h:
>+        * platform/graphics/ImageOrientation.h:
>+        (WebCore::ImageOrientationDescription::ImageOrientationDescription):
>+        (WebCore::ImageOrientationDescription::respectImageOrientation):
>+        (WebCore::ImageOrientationDescription::imageOrientation):
>+        * platform/graphics/ImageSource.cpp:
>+        (WebCore::ImageSource::size):
>+        (WebCore::ImageSource::frameSizeAtIndex):
>+        * platform/graphics/ImageSource.h:
>+        * platform/graphics/blackberry/ImageBlackBerry.cpp:
>+        (WebCore::BitmapImage::draw):
>+        * platform/graphics/cairo/BitmapImageCairo.cpp:
>+        (WebCore::BitmapImage::draw):
>+        * platform/graphics/cairo/ImageBufferCairo.cpp:
>+        (WebCore::ImageBuffer::draw):
>+        * platform/graphics/cg/BitmapImageCG.cpp:
>+        (WebCore::BitmapImage::draw):
>+        * platform/graphics/cg/ImageSourceCG.cpp:
>+        (WebCore::ImageSource::frameSizeAtIndex):
>+        (WebCore::ImageSource::size):
>+        (WebCore::ImageSource::frameBytesAtIndex):
>+        * platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp:
>+        (WebCore::MediaPlayerPrivateGStreamerBase::paint):
>+        * platform/graphics/qt/ImageBufferQt.cpp:
>+        (WebCore::ImageBuffer::draw):
>+        * platform/graphics/wince/ImageBufferWinCE.cpp:
>+        (WebCore::ImageBuffer::draw):
>+        * platform/gtk/ClipboardGtk.cpp:
>+        (WebCore::Clipboard::createDragImage):
>+        * platform/gtk/DragImageGtk.cpp:
>+        (WebCore::createDragImageFromImage):
>+        * platform/mac/DragImageMac.mm:
>+        (WebCore::createDragImageFromImage):
>+        * platform/qt/ClipboardQt.cpp:
>+        (WebCore::Clipboard::createDragImage):
>+        * platform/qt/DragImageQt.cpp:
>+        (WebCore::createDragImageFromImage):
>+        * platform/win/ClipboardWin.cpp:
>+        (WebCore::Clipboard::createDragImage):
>+        * platform/win/DragImageCGWin.cpp:
>+        (WebCore::createDragImageFromImage):
>+        * platform/win/DragImageCairoWin.cpp:
>+        (WebCore::createDragImageFromImage):
>+        * rendering/RenderEmbeddedObject.cpp:
>+        (WebCore::RenderEmbeddedObject::paintSnapshotImage):
>+        * rendering/RenderImage.cpp:
>+        (WebCore::RenderImage::paintReplaced):
>+        (WebCore::RenderImage::paintIntoRect):
>+        * rendering/RenderSnapshottedPlugIn.cpp:
>+        (WebCore::RenderSnapshottedPlugIn::paintSnapshot):
>+
> 2013-08-07  Andrei Bucur  <abucur@adobe.com>
> 
>         [CSS Regions] Propagate overflow from the flow thread to the first and last region
>diff --git a/Source/WebCore/WebCore.exp.in b/Source/WebCore/WebCore.exp.in
>index b1ff21697d65fa7d7d76151d22493e8d4bedeb4e..95c98f0f77c3640759fd9a77a8eae6cbc77415a1 100644
>--- a/Source/WebCore/WebCore.exp.in
>+++ b/Source/WebCore/WebCore.exp.in
>@@ -463,7 +463,7 @@ __ZN7WebCore15GraphicsContext8fillPathERKNS_4PathE
> __ZN7WebCore15GraphicsContext8fillRectERKNS_9FloatRectE
> __ZN7WebCore15GraphicsContext8fillRectERKNS_9FloatRectERKNS_5ColorENS_10ColorSpaceE
> __ZN7WebCore15GraphicsContext9clearRectERKNS_9FloatRectE
>-__ZN7WebCore15GraphicsContext9drawImageEPNS_5ImageENS_10ColorSpaceERKNS_8IntPointENS_17CompositeOperatorENS_27RespectImageOrientationEnumE
>+__ZN7WebCore15GraphicsContext9drawImageEPNS_5ImageENS_10ColorSpaceERKNS_8IntPointENS_17CompositeOperatorENS_27ImageOrientationDescriptionE
> __ZN7WebCore15GraphicsContext9setShadowERKNS_9FloatSizeEfRKNS_5ColorENS_10ColorSpaceE
> __ZN7WebCore15GraphicsContext9translateEff
> __ZN7WebCore15GraphicsContextD1Ev
>diff --git a/Source/WebCore/html/HTMLCanvasElement.cpp b/Source/WebCore/html/HTMLCanvasElement.cpp
>index 7299e14d143ea8cc4ac978b12ccaa94e1f1b1ab0..795a3baebe82d784da923b7f641adbccc57bea94 100644
>--- a/Source/WebCore/html/HTMLCanvasElement.cpp
>+++ b/Source/WebCore/html/HTMLCanvasElement.cpp
>@@ -405,7 +405,7 @@ void HTMLCanvasElement::paint(GraphicsContext* context, const LayoutRect& r, boo
>         ImageBuffer* imageBuffer = buffer();
>         if (imageBuffer) {
>             if (m_presentedImage)
>-                context->drawImage(m_presentedImage.get(), ColorSpaceDeviceRGB, pixelSnappedIntRect(r), CompositeSourceOver, DoNotRespectImageOrientation, useLowQualityScale);
>+                context->drawImage(m_presentedImage.get(), ColorSpaceDeviceRGB, pixelSnappedIntRect(r), CompositeSourceOver, ImageOrientationDescription(), useLowQualityScale);
>             else
>                 context->drawImageBuffer(imageBuffer, ColorSpaceDeviceRGB, pixelSnappedIntRect(r), CompositeSourceOver, BlendModeNormal, useLowQualityScale);
>         }
>diff --git a/Source/WebCore/page/DragController.cpp b/Source/WebCore/page/DragController.cpp
>index 2537040d8c5709cdcc59dcc202614a8bc24e51af..1e3dfff45d85fcebd3b6d9bec5bb7ee38454803d 100644
>--- a/Source/WebCore/page/DragController.cpp
>+++ b/Source/WebCore/page/DragController.cpp
>@@ -879,7 +879,7 @@ void DragController::doImageDrag(Element* element, const IntPoint& dragOrigin, c
> 
>     Image* image = getImage(element);
>     if (image && image->size().height() * image->size().width() <= MaxOriginalImageArea
>-        && (dragImage = createDragImageFromImage(image, element->renderer() ? element->renderer()->shouldRespectImageOrientation() : DoNotRespectImageOrientation))) {
>+        && (dragImage = createDragImageFromImage(image, element->renderer() ? ImageOrientationDescription(element->renderer()->shouldRespectImageOrientation()) : ImageOrientationDescription()))) {
>         IntSize originalSize = rect.size();
>         origin = rect.location();
> 
>diff --git a/Source/WebCore/page/Frame.cpp b/Source/WebCore/page/Frame.cpp
>index f9e1090ee1327f8667f4034f1cd27eba1e809286..ab51b2bd47dcdd458e6eb1fd137b58192d49c84a 100644
>--- a/Source/WebCore/page/Frame.cpp
>+++ b/Source/WebCore/page/Frame.cpp
>@@ -1097,7 +1097,7 @@ DragImageRef Frame::nodeImage(Node* node)
>     m_view->paintContents(buffer->context(), paintingRect);
> 
>     RefPtr<Image> image = buffer->copyImage();
>-    return createDragImageFromImage(image.get(), renderer->shouldRespectImageOrientation());
>+    return createDragImageFromImage(image.get(), ImageOrientationDescription(renderer->shouldRespectImageOrientation()));
> }
> 
> DragImageRef Frame::dragImageForSelection()
>@@ -1126,7 +1126,7 @@ DragImageRef Frame::dragImageForSelection()
>     m_view->paintContents(buffer->context(), paintingRect);
> 
>     RefPtr<Image> image = buffer->copyImage();
>-    return createDragImageFromImage(image.get());
>+    return createDragImageFromImage(image.get(), ImageOrientationDescription());
> }
> 
> #endif
>diff --git a/Source/WebCore/platform/DragImage.h b/Source/WebCore/platform/DragImage.h
>index df9422a49dc87644c4fef523ef647fbf9d47ac82..4265c8bd96908eafc9090eeaa872805f0dbb51d0 100644
>--- a/Source/WebCore/platform/DragImage.h
>+++ b/Source/WebCore/platform/DragImage.h
>@@ -74,7 +74,7 @@ namespace WebCore {
>     DragImageRef scaleDragImage(DragImageRef, FloatSize scale);
>     DragImageRef dissolveDragImageToFraction(DragImageRef image, float delta);
>     
>-    DragImageRef createDragImageFromImage(Image*, RespectImageOrientationEnum = DoNotRespectImageOrientation);
>+    DragImageRef createDragImageFromImage(Image*, ImageOrientationDescription);
>     DragImageRef createDragImageIconForCachedImageFilename(const String&);
>     DragImageRef createDragImageForLink(KURL&, const String& label, FontRenderingMode);
>     void deleteDragImage(DragImageRef);
>diff --git a/Source/WebCore/platform/blackberry/DragImageBlackBerry.cpp b/Source/WebCore/platform/blackberry/DragImageBlackBerry.cpp
>index 6f60c07eb75048ec27d841bb80c1d6e00cae9d60..c028c4bf6dc75922d8b18876a2db403034680a4e 100644
>--- a/Source/WebCore/platform/blackberry/DragImageBlackBerry.cpp
>+++ b/Source/WebCore/platform/blackberry/DragImageBlackBerry.cpp
>@@ -25,7 +25,7 @@
> 
> namespace WebCore {
> 
>-void* createDragImageFromImage(Image*, RespectImageOrientationEnum)
>+void* createDragImageFromImage(Image*, ImageOrientationDescription)
> {
>     notImplemented();
>     return 0;
>diff --git a/Source/WebCore/platform/efl/DragImageEfl.cpp b/Source/WebCore/platform/efl/DragImageEfl.cpp
>index f92997021224e214c6af551e9cecf9dca609c8e7..b1a6b12a621d0623ad0cea58e34331d5f1743e6c 100644
>--- a/Source/WebCore/platform/efl/DragImageEfl.cpp
>+++ b/Source/WebCore/platform/efl/DragImageEfl.cpp
>@@ -49,7 +49,7 @@ DragImageRef dissolveDragImageToFraction(DragImageRef image, float)
>     return image;
> }
> 
>-DragImageRef createDragImageFromImage(Image*, RespectImageOrientationEnum)
>+DragImageRef createDragImageFromImage(Image*, ImageOrientationDescription)
> {
>     notImplemented();
>     return 0;
>diff --git a/Source/WebCore/platform/graphics/BitmapImage.cpp b/Source/WebCore/platform/graphics/BitmapImage.cpp
>index 2e5b7705fe5c60671c6a1ec6012abf27e48964d6..16d5a31c1071298ca7e9db90c1231dde51136abf 100644
>--- a/Source/WebCore/platform/graphics/BitmapImage.cpp
>+++ b/Source/WebCore/platform/graphics/BitmapImage.cpp
>@@ -185,7 +185,7 @@ void BitmapImage::updateSize() const
>         return;
> 
>     m_size = m_source.size();
>-    m_sizeRespectingOrientation = m_source.size(RespectImageOrientation);
>+    m_sizeRespectingOrientation = m_source.size(ImageOrientationDescription(RespectImageOrientation));
>     m_haveSize = true;
>     didDecodeProperties();
> }
>diff --git a/Source/WebCore/platform/graphics/BitmapImage.h b/Source/WebCore/platform/graphics/BitmapImage.h
>index 9633acec995449a79da525a44ad5a9239ebb1ad8..7413484f5bd1c42d3c1c62f0b1b75e73bf185bc1 100644
>--- a/Source/WebCore/platform/graphics/BitmapImage.h
>+++ b/Source/WebCore/platform/graphics/BitmapImage.h
>@@ -190,7 +190,7 @@ protected:
> #endif
>     virtual void draw(GraphicsContext*, const FloatRect& dstRect, const FloatRect& srcRect, ColorSpace styleColorSpace, CompositeOperator, BlendMode);
> #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, ImageOrientationDescription) OVERRIDE;
> #endif
> 
> #if USE(WINGDI)
>diff --git a/Source/WebCore/platform/graphics/GraphicsContext.cpp b/Source/WebCore/platform/graphics/GraphicsContext.cpp
>index 26e2dbb4aee401f04aa27c295524e9c6e5307d67..29e97a8517f932a83974f5df2816419dd99cdf07 100644
>--- a/Source/WebCore/platform/graphics/GraphicsContext.cpp
>+++ b/Source/WebCore/platform/graphics/GraphicsContext.cpp
>@@ -469,28 +469,28 @@ void GraphicsContext::drawHighlightForText(const Font& font, const TextRun& run,
>     fillRect(font.selectionRectForText(run, point, h, from, to), backgroundColor, colorSpace);
> }
> 
>-void GraphicsContext::drawImage(Image* image, ColorSpace styleColorSpace, const IntPoint& p, CompositeOperator op, RespectImageOrientationEnum shouldRespectImageOrientation)
>+void GraphicsContext::drawImage(Image* image, ColorSpace styleColorSpace, const IntPoint& p, CompositeOperator op, ImageOrientationDescription description)
> {
>     if (!image)
>         return;
>-    drawImage(image, styleColorSpace, FloatRect(IntRect(p, image->size())), FloatRect(FloatPoint(), FloatSize(image->size())), op, shouldRespectImageOrientation);
>+    drawImage(image, styleColorSpace, FloatRect(IntRect(p, image->size())), FloatRect(FloatPoint(), FloatSize(image->size())), op, description);
> }
> 
>-void GraphicsContext::drawImage(Image* image, ColorSpace styleColorSpace, const IntRect& r, CompositeOperator op, RespectImageOrientationEnum shouldRespectImageOrientation, bool useLowQualityScale)
>+void GraphicsContext::drawImage(Image* image, ColorSpace styleColorSpace, const IntRect& r, CompositeOperator op, ImageOrientationDescription description, bool useLowQualityScale)
> {
>     if (!image)
>         return;
>-    drawImage(image, styleColorSpace, FloatRect(r), FloatRect(FloatPoint(), FloatSize(image->size())), op, shouldRespectImageOrientation, useLowQualityScale);
>+    drawImage(image, styleColorSpace, FloatRect(r), FloatRect(FloatPoint(), FloatSize(image->size())), op, description, useLowQualityScale);
> }
> 
>-void GraphicsContext::drawImage(Image* image, ColorSpace styleColorSpace, const IntPoint& dest, const IntRect& srcRect, CompositeOperator op, RespectImageOrientationEnum shouldRespectImageOrientation)
>+void GraphicsContext::drawImage(Image* image, ColorSpace styleColorSpace, const IntPoint& dest, const IntRect& srcRect, CompositeOperator op, ImageOrientationDescription description)
> {
>-    drawImage(image, styleColorSpace, FloatRect(IntRect(dest, srcRect.size())), FloatRect(srcRect), op, shouldRespectImageOrientation);
>+    drawImage(image, styleColorSpace, FloatRect(IntRect(dest, srcRect.size())), FloatRect(srcRect), op, description);
> }
> 
>-void GraphicsContext::drawImage(Image* image, ColorSpace styleColorSpace, const FloatRect& dest, const FloatRect& src, CompositeOperator op, RespectImageOrientationEnum shouldRespectImageOrientation, bool useLowQualityScale)
>+void GraphicsContext::drawImage(Image* image, ColorSpace styleColorSpace, const FloatRect& dest, const FloatRect& src, CompositeOperator op, ImageOrientationDescription description, bool useLowQualityScale)
> {
>-    drawImage(image, styleColorSpace, dest, src, op, BlendModeNormal, shouldRespectImageOrientation, useLowQualityScale);
>+    drawImage(image, styleColorSpace, dest, src, op, BlendModeNormal, description, useLowQualityScale);
> }
> 
> void GraphicsContext::drawImage(Image* image, ColorSpace styleColorSpace, const FloatRect& dest)
>@@ -500,7 +500,7 @@ void GraphicsContext::drawImage(Image* image, ColorSpace styleColorSpace, const
>     drawImage(image, styleColorSpace, dest, FloatRect(IntRect(IntPoint(), image->size())));
> }
> 
>-void GraphicsContext::drawImage(Image* image, ColorSpace styleColorSpace, const FloatRect& dest, const FloatRect& src, CompositeOperator op, BlendMode blendMode, RespectImageOrientationEnum shouldRespectImageOrientation, bool useLowQualityScale)
>+void GraphicsContext::drawImage(Image* image, ColorSpace styleColorSpace, const FloatRect& dest, const FloatRect& src, CompositeOperator op, BlendMode blendMode, ImageOrientationDescription description, bool useLowQualityScale)
> {    if (paintingDisabled() || !image)
>         return;
> 
>@@ -512,7 +512,7 @@ void GraphicsContext::drawImage(Image* image, ColorSpace styleColorSpace, const
>         setImageInterpolationQuality(InterpolationNone);
>     }
> 
>-    image->draw(this, dest, src, styleColorSpace, op, blendMode, shouldRespectImageOrientation);
>+    image->draw(this, dest, src, styleColorSpace, op, blendMode, description);
> 
>     if (useLowQualityScale)
>         setImageInterpolationQuality(previousInterpolationQuality);
>diff --git a/Source/WebCore/platform/graphics/GraphicsContext.h b/Source/WebCore/platform/graphics/GraphicsContext.h
>index 9c5f4da19477ff457cfeeee49bffe740c08419fc..8ec2c5930e17219b8ea4d6ebe14848dded5aa9f2 100644
>--- a/Source/WebCore/platform/graphics/GraphicsContext.h
>+++ b/Source/WebCore/platform/graphics/GraphicsContext.h
>@@ -287,12 +287,12 @@ namespace WebCore {
> 
>         void strokeRect(const FloatRect&, float lineWidth);
> 
>-        void drawImage(Image*, ColorSpace styleColorSpace, const IntPoint&, CompositeOperator = CompositeSourceOver, RespectImageOrientationEnum = DoNotRespectImageOrientation);
>-        void drawImage(Image*, ColorSpace styleColorSpace, const IntRect&, CompositeOperator = CompositeSourceOver, RespectImageOrientationEnum = DoNotRespectImageOrientation, bool useLowQualityScale = false);
>-        void drawImage(Image*, ColorSpace styleColorSpace, const IntPoint& destPoint, const IntRect& srcRect, CompositeOperator = CompositeSourceOver, RespectImageOrientationEnum = DoNotRespectImageOrientation);
>+        void drawImage(Image*, ColorSpace styleColorSpace, const IntPoint&, CompositeOperator = CompositeSourceOver, ImageOrientationDescription = ImageOrientationDescription());
>+        void drawImage(Image*, ColorSpace styleColorSpace, const IntRect&, CompositeOperator = CompositeSourceOver, ImageOrientationDescription = ImageOrientationDescription(), bool useLowQualityScale = false);
>+        void drawImage(Image*, ColorSpace styleColorSpace, const IntPoint& destPoint, const IntRect& srcRect, CompositeOperator = CompositeSourceOver, ImageOrientationDescription = ImageOrientationDescription());
>         void drawImage(Image*, ColorSpace styleColorSpace, const FloatRect& destRect);
>-        void drawImage(Image*, ColorSpace styleColorSpace, const FloatRect& destRect, const FloatRect& srcRect, CompositeOperator = CompositeSourceOver, RespectImageOrientationEnum = DoNotRespectImageOrientation, bool useLowQualityScale = false);
>-        void drawImage(Image*, ColorSpace styleColorSpace, const FloatRect& destRect, const FloatRect& srcRect, CompositeOperator, BlendMode, RespectImageOrientationEnum = DoNotRespectImageOrientation, bool useLowQualityScale = false);
>+        void drawImage(Image*, ColorSpace styleColorSpace, const FloatRect& destRect, const FloatRect& srcRect, CompositeOperator = CompositeSourceOver, ImageOrientationDescription = ImageOrientationDescription(), bool useLowQualityScale = false);
>+        void drawImage(Image*, ColorSpace styleColorSpace, const FloatRect& destRect, const FloatRect& srcRect, CompositeOperator, BlendMode, ImageOrientationDescription = ImageOrientationDescription(), bool useLowQualityScale = false);
>         
>         void drawTiledImage(Image*, ColorSpace styleColorSpace, const IntRect& destRect, const IntPoint& srcPoint, const IntSize& tileSize,
>             CompositeOperator = CompositeSourceOver, bool useLowQualityScale = false, BlendMode = BlendModeNormal);
>diff --git a/Source/WebCore/platform/graphics/Image.cpp b/Source/WebCore/platform/graphics/Image.cpp
>index b83bc4c509c3d94cc38792ac33a5b75d1176a3ec..e94072a34f3d9d14dcc0f3e840955a860834af3a 100644
>--- a/Source/WebCore/platform/graphics/Image.cpp
>+++ b/Source/WebCore/platform/graphics/Image.cpp
>@@ -90,7 +90,7 @@ 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, RespectImageOrientationEnum)
>+void Image::draw(GraphicsContext* ctx, const FloatRect& dstRect, const FloatRect& srcRect, ColorSpace styleColorSpace, CompositeOperator op, BlendMode blendMode, ImageOrientationDescription)
> {
>     draw(ctx, dstRect, srcRect, styleColorSpace, op, blendMode);
> }
>diff --git a/Source/WebCore/platform/graphics/Image.h b/Source/WebCore/platform/graphics/Image.h
>index b446be7fadcdafa6273293906e315662e04e41d5..e706b5c999c7a5746b928f4c75e8511171209adf 100644
>--- a/Source/WebCore/platform/graphics/Image.h
>+++ b/Source/WebCore/platform/graphics/Image.h
>@@ -197,7 +197,7 @@ protected:
>     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, RespectImageOrientationEnum);
>+    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);
>     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/ImageOrientation.h b/Source/WebCore/platform/graphics/ImageOrientation.h
>index b184dc2f70a7b62fcd1417d8ce6b954e5b617712..04344e27939642323617ba7be9f652ca35e50a9a 100644
>--- a/Source/WebCore/platform/graphics/ImageOrientation.h
>+++ b/Source/WebCore/platform/graphics/ImageOrientation.h
>@@ -52,6 +52,33 @@ enum RespectImageOrientationEnum {
>     RespectImageOrientation = 1
> };
> 
>+struct ImageOrientationDescription {
>+    ImageOrientationDescription(RespectImageOrientationEnum shouldRespectImageOrientation,
>+        ImageOrientationEnum orientation)
>+        : m_respectOrientation(shouldRespectImageOrientation)
>+        , m_orientation(orientation)
>+    {
>+    }
>+
>+    ImageOrientationDescription()
>+        : m_respectOrientation(DoNotRespectImageOrientation)
>+        , m_orientation(DefaultImageOrientation)
>+    {
>+    }
>+
>+    ImageOrientationDescription(RespectImageOrientationEnum shouldRespectImageOrientation)
>+        : m_respectOrientation(shouldRespectImageOrientation)
>+        , m_orientation(DefaultImageOrientation)
>+    {
>+    }
>+
>+    RespectImageOrientationEnum respectImageOrientation() { return m_respectOrientation; }
>+    ImageOrientationEnum imageOrientation() { return m_orientation; }
>+
>+    RespectImageOrientationEnum m_respectOrientation;
>+    ImageOrientationEnum m_orientation;
>+};
>+
> class ImageOrientation {
> public:
>     ImageOrientation(ImageOrientationEnum orientation = DefaultImageOrientation)
>diff --git a/Source/WebCore/platform/graphics/ImageSource.cpp b/Source/WebCore/platform/graphics/ImageSource.cpp
>index f7b4909736a32ea131752ddb5c28fbb8770941c9..f86520091e85ad3bae48d96f7fc94b864906abe7 100644
>--- a/Source/WebCore/platform/graphics/ImageSource.cpp
>+++ b/Source/WebCore/platform/graphics/ImageSource.cpp
>@@ -99,18 +99,18 @@ bool ImageSource::isSizeAvailable()
>     return m_decoder && m_decoder->isSizeAvailable();
> }
> 
>-IntSize ImageSource::size(RespectImageOrientationEnum shouldRespectOrientation) const
>+IntSize ImageSource::size(ImageOrientationDescription description) const
> {
>-    return frameSizeAtIndex(0, shouldRespectOrientation);
>+    return frameSizeAtIndex(0, description);
> }
> 
>-IntSize ImageSource::frameSizeAtIndex(size_t index, RespectImageOrientationEnum shouldRespectOrientation) const
>+IntSize ImageSource::frameSizeAtIndex(size_t index, ImageOrientationDescription description) const
> {
>     if (!m_decoder)
>         return IntSize();
> 
>     IntSize size = m_decoder->frameSizeAtIndex(index);
>-    if ((shouldRespectOrientation == RespectImageOrientation) && m_decoder->orientation().usesWidthAsHeight())
>+    if ((description.respectImageOrientation() == RespectImageOrientation) && m_decoder->orientation().usesWidthAsHeight())
>         return IntSize(size.height(), size.width());
> 
>     return size;
>diff --git a/Source/WebCore/platform/graphics/ImageSource.h b/Source/WebCore/platform/graphics/ImageSource.h
>index 31a2e19f9c520e0c94bacd784a9f27f354ed90a8..a496f6eb2ad76385fb25903c381e45f5ab0eea4d 100644
>--- a/Source/WebCore/platform/graphics/ImageSource.h
>+++ b/Source/WebCore/platform/graphics/ImageSource.h
>@@ -132,8 +132,8 @@ public:
>     String filenameExtension() const;
> 
>     bool isSizeAvailable();
>-    IntSize size(RespectImageOrientationEnum = DoNotRespectImageOrientation) const;
>-    IntSize frameSizeAtIndex(size_t, RespectImageOrientationEnum = DoNotRespectImageOrientation) const;
>+    IntSize size(ImageOrientationDescription = ImageOrientationDescription()) const;
>+    IntSize frameSizeAtIndex(size_t, ImageOrientationDescription = ImageOrientationDescription()) const;
> 
>     bool getHotSpot(IntPoint&) const;
> 
>diff --git a/Source/WebCore/platform/graphics/blackberry/ImageBlackBerry.cpp b/Source/WebCore/platform/graphics/blackberry/ImageBlackBerry.cpp
>index 0f457866b23c0d5eaf8251ac3fdf0ae555bdf90a..d0968780194c8e267a4096322e52b8816dae4fc0 100644
>--- a/Source/WebCore/platform/graphics/blackberry/ImageBlackBerry.cpp
>+++ b/Source/WebCore/platform/graphics/blackberry/ImageBlackBerry.cpp
>@@ -121,10 +121,9 @@ 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, DoNotRespectImageOrientation);
>-}
>+    draw(context, dstRect, srcRect, styleColorSpace, op, blendMode, ImageOrientationDescription());
> 
>-void BitmapImage::draw(GraphicsContext* context, const FloatRect& dstRect, const FloatRect& srcRect, ColorSpace, CompositeOperator op, BlendMode, RespectImageOrientationEnum shouldRespectImageOrientation)
>+void BitmapImage::draw(GraphicsContext* context, const FloatRect& dstRect, const FloatRect& srcRect, ColorSpace, CompositeOperator op, BlendMode, ImageOrientationDescription description)
> {
>     startAnimation();
> 
>@@ -143,9 +142,9 @@ void BitmapImage::draw(GraphicsContext* context, const FloatRect& dstRect, const
> #endif
> 
>     // use similar orientation code as ImageSkia
>-    ImageOrientation orientation = DefaultImageOrientation;
>-    if (shouldRespectImageOrientation == RespectImageOrientation)
>-        orientation = frameOrientationAtIndex(m_currentFrame);
>+    ImageOrientation orientation;
>+    if (description.respectImageOrientation() == RespectImageOrientation)
>+        orientation = frameOrientationAtIndex(m_currentFrame);  
> 
>     GraphicsContextStateSaver saveContext(*context, false);
>     if (orientation != DefaultImageOrientation) {
>diff --git a/Source/WebCore/platform/graphics/cairo/BitmapImageCairo.cpp b/Source/WebCore/platform/graphics/cairo/BitmapImageCairo.cpp
>index 56077318b56fcb2c02f400988a7a24e4aeaa8429..8708d12e0e99ba074b0759567defdcc70a35353f 100644
>--- a/Source/WebCore/platform/graphics/cairo/BitmapImageCairo.cpp
>+++ b/Source/WebCore/platform/graphics/cairo/BitmapImageCairo.cpp
>@@ -66,11 +66,11 @@ BitmapImage::BitmapImage(PassRefPtr<cairo_surface_t> nativeImage, ImageObserver*
> 
> void BitmapImage::draw(GraphicsContext* context, const FloatRect& dst, const FloatRect& src, ColorSpace styleColorSpace, CompositeOperator op, BlendMode blendMode)
> {
>-    draw(context, dst, src, styleColorSpace, op, blendMode, DoNotRespectImageOrientation);
>+    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, RespectImageOrientationEnum shouldRespectImageOrientation)
>+    BlendMode blendMode, ImageOrientationDescription description)
> {
>     if (!dst.width() || !dst.height() || !src.width() || !src.height())
>         return;
>@@ -101,8 +101,8 @@ void BitmapImage::draw(GraphicsContext* context, const FloatRect& dst, const Flo
>     FloatRect adjustedSrcRect(src);
> #endif
> 
>-    ImageOrientation orientation = DefaultImageOrientation;
>-    if (shouldRespectImageOrientation == RespectImageOrientation)
>+    ImageOrientation orientation;
>+    if (description.respectImageOrientation() == RespectImageOrientation)
>         orientation = frameOrientationAtIndex(m_currentFrame);
> 
>     FloatRect dstRect = dst;
>diff --git a/Source/WebCore/platform/graphics/cairo/ImageBufferCairo.cpp b/Source/WebCore/platform/graphics/cairo/ImageBufferCairo.cpp
>index 3cfc2f4d1abaaf03a3807afa3f6333b1fd6a2965..4fd3c54d75e34fc080c7c237262ad8c78e973d9e 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, ImageOrientationDescription(), useLowQualityScale);
> }
> 
> void ImageBuffer::drawPattern(GraphicsContext* context, const FloatRect& srcRect, const AffineTransform& patternTransform,
>diff --git a/Source/WebCore/platform/graphics/cg/BitmapImageCG.cpp b/Source/WebCore/platform/graphics/cg/BitmapImageCG.cpp
>index cd037a98a43417ab6fcbbcec84e8e94fee7074d9..9cdc6fa38a851f91768419170fd298af4582cd07 100644
>--- a/Source/WebCore/platform/graphics/cg/BitmapImageCG.cpp
>+++ b/Source/WebCore/platform/graphics/cg/BitmapImageCG.cpp
>@@ -163,10 +163,10 @@ RetainPtr<CFArrayRef> BitmapImage::getCGImageArray()
> 
> void BitmapImage::draw(GraphicsContext* ctx, const FloatRect& dstRect, const FloatRect& srcRect, ColorSpace styleColorSpace, CompositeOperator op, BlendMode blendMode)
> {
>-    draw(ctx, dstRect, srcRect, styleColorSpace, op, blendMode, DoNotRespectImageOrientation);
>+    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, RespectImageOrientationEnum shouldRespectImageOrientation)
>+void BitmapImage::draw(GraphicsContext* ctxt, const FloatRect& destRect, const FloatRect& srcRect, ColorSpace styleColorSpace, CompositeOperator compositeOp, BlendMode blendMode, ImageOrientationDescription description)
> {
>     startAnimation();
> 
>@@ -180,9 +180,9 @@ void BitmapImage::draw(GraphicsContext* ctxt, const FloatRect& destRect, const F
>     }
> 
>     FloatSize selfSize = currentFrameSize();
>-    ImageOrientation orientation = DefaultImageOrientation;
>+    ImageOrientation orientation;
> 
>-    if (shouldRespectImageOrientation == RespectImageOrientation)
>+    if (description.respectImageOrientation() == RespectImageOrientation)
>         orientation = frameOrientationAtIndex(m_currentFrame);
> 
>     ctxt->drawNativeImage(image, selfSize, styleColorSpace, destRect, srcRect, compositeOp, blendMode, orientation);
>diff --git a/Source/WebCore/platform/graphics/cg/ImageSourceCG.cpp b/Source/WebCore/platform/graphics/cg/ImageSourceCG.cpp
>index aaa2fdfcdc7c176c5044a0e528bcf5181927feff..aa955885a579604c6d249604b2fa437be419615e 100644
>--- a/Source/WebCore/platform/graphics/cg/ImageSourceCG.cpp
>+++ b/Source/WebCore/platform/graphics/cg/ImageSourceCG.cpp
>@@ -195,7 +195,7 @@ static ImageOrientation orientationFromProperties(CFDictionaryRef imagePropertie
>     return ImageOrientation::fromEXIFValue(exifValue);
> }
> 
>-IntSize ImageSource::frameSizeAtIndex(size_t index, RespectImageOrientationEnum shouldRespectOrientation) const
>+IntSize ImageSource::frameSizeAtIndex(size_t index, ImageOrientationDescription description) const
> {
>     RetainPtr<CFDictionaryRef> properties = adoptCF(CGImageSourceCopyPropertiesAtIndex(m_decoder, index, imageSourceOptions(SkipMetadata)));
> 
>@@ -210,7 +210,7 @@ IntSize ImageSource::frameSizeAtIndex(size_t index, RespectImageOrientationEnum
>     if (num)
>         CFNumberGetValue(num, kCFNumberIntType, &h);
> 
>-    if ((shouldRespectOrientation == RespectImageOrientation) && orientationFromProperties(properties.get()).usesWidthAsHeight())
>+    if ((description.respectImageOrientation() == RespectImageOrientation) && orientationFromProperties(properties.get()).usesWidthAsHeight())
>         return IntSize(h, w);
> 
>     return IntSize(w, h);
>@@ -225,9 +225,9 @@ ImageOrientation ImageSource::orientationAtIndex(size_t index) const
>     return orientationFromProperties(properties.get());
> }
> 
>-IntSize ImageSource::size(RespectImageOrientationEnum shouldRespectOrientation) const
>+IntSize ImageSource::size(ImageOrientationDescription description) const
> {
>-    return frameSizeAtIndex(0, shouldRespectOrientation);
>+    return frameSizeAtIndex(0, description);
> }
> 
> bool ImageSource::getHotSpot(IntPoint& hotSpot) const
>@@ -384,7 +384,7 @@ bool ImageSource::frameHasAlphaAtIndex(size_t index)
> 
> unsigned ImageSource::frameBytesAtIndex(size_t index) const
> {
>-    IntSize frameSize = frameSizeAtIndex(index, RespectImageOrientation);
>+    IntSize frameSize = frameSizeAtIndex(index, ImageOrientationDescription(RespectImageOrientation));
>     return frameSize.width() * frameSize.height() * 4;
> }
> 
>diff --git a/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp b/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp
>index 542dcfed49a91b0462668a9599de54a594d87264..d9d4ba6e30990718f48490bf33f08cb8bb9fe247 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, ImageOrientationDescription(), false);
>     g_mutex_unlock(m_bufferMutex);
> }
> 
>diff --git a/Source/WebCore/platform/graphics/qt/ImageBufferQt.cpp b/Source/WebCore/platform/graphics/qt/ImageBufferQt.cpp
>index 1bcdee945d514d433ce8c93edb7cf51bc7c78497..1808082f5f4beb09d8c0d926a566896d64022586 100644
>--- a/Source/WebCore/platform/graphics/qt/ImageBufferQt.cpp
>+++ b/Source/WebCore/platform/graphics/qt/ImageBufferQt.cpp
>@@ -136,9 +136,9 @@ void ImageBuffer::draw(GraphicsContext* destContext, ColorSpace styleColorSpace,
>     if (destContext == context()) {
>         // We're drawing into our own buffer.  In order for this to work, we need to copy the source buffer first.
>         RefPtr<Image> copy = copyImage(CopyBackingStore);
>-        destContext->drawImage(copy.get(), ColorSpaceDeviceRGB, destRect, srcRect, op, DoNotRespectImageOrientation, useLowQualityScale);
>+        destContext->drawImage(copy.get(), ColorSpaceDeviceRGB, destRect, srcRect, op, ImageOrientationDescription(), useLowQualityScale);
>     } else
>-        destContext->drawImage(m_data.m_image.get(), styleColorSpace, destRect, srcRect, op, DoNotRespectImageOrientation, useLowQualityScale);
>+        destContext->drawImage(m_data.m_image.get(), styleColorSpace, destRect, srcRect, op, ImageOrientationDescription(), useLowQualityScale);
> }
> 
> void ImageBuffer::drawPattern(GraphicsContext* destContext, const FloatRect& srcRect, const AffineTransform& patternTransform,
>diff --git a/Source/WebCore/platform/graphics/wince/ImageBufferWinCE.cpp b/Source/WebCore/platform/graphics/wince/ImageBufferWinCE.cpp
>index a139bc97bc3b1a55acc93ad0006ac7aa2b50c950..ccab3ebbd471c3fad2fbe2902484d58f284898ff 100644
>--- a/Source/WebCore/platform/graphics/wince/ImageBufferWinCE.cpp
>+++ b/Source/WebCore/platform/graphics/wince/ImageBufferWinCE.cpp
>@@ -114,7 +114,7 @@ void ImageBuffer::draw(GraphicsContext* context, ColorSpace styleColorSpace, con
>                        CompositeOperator op, BlendMode blendMode, bool useLowQualityScale)
> {
>     RefPtr<Image> imageCopy = copyImage(CopyBackingStore);
>-    context->drawImage(imageCopy.get(), styleColorSpace, destRect, srcRect, op, blendMode, DoNotRespectImageOrientation, useLowQualityScale);
>+    context->drawImage(imageCopy.get(), styleColorSpace, destRect, srcRect, op, blendMode, ImageOrientationDescription(), useLowQualityScale);
> }
> 
> void ImageBuffer::drawPattern(GraphicsContext* context, const FloatRect& srcRect, const AffineTransform& patternTransform,
>diff --git a/Source/WebCore/platform/gtk/ClipboardGtk.cpp b/Source/WebCore/platform/gtk/ClipboardGtk.cpp
>index d388b5b6c170f7cd35ec407ef1aaeaf4c4f6b279..dfd214c450626627ab241326fcad2c601433c630 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(), ImageOrientationDescription());
> 
>     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..df213898cfd730971ee2c9a5550fa2bd1d9a5d17 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, ImageOrientationDescription)
> {
>     return image->nativeImageForCurrentFrame().leakRef();
> }
>diff --git a/Source/WebCore/platform/mac/DragImageMac.mm b/Source/WebCore/platform/mac/DragImageMac.mm
>index b3966a5445c49ae030ad6f5c30f9895aab9c8ebf..1493ae63896440c736606e077db6b17246ced7b4 100644
>--- a/Source/WebCore/platform/mac/DragImageMac.mm
>+++ b/Source/WebCore/platform/mac/DragImageMac.mm
>@@ -77,16 +77,16 @@ RetainPtr<NSImage> dissolveDragImageToFraction(RetainPtr<NSImage> image, float d
>     return dissolvedImage;
> }
>         
>-RetainPtr<NSImage> createDragImageFromImage(Image* image, RespectImageOrientationEnum shouldRespectImageOrientation)
>+RetainPtr<NSImage> createDragImageFromImage(Image* image, ImageOrientationDescription description)
> {
>     IntSize size = image->size();
> 
>     if (image->isBitmapImage()) {
>-        ImageOrientation orientation = DefaultImageOrientation;
>+        ImageOrientation orientation;
>         BitmapImage* bitmapImage = static_cast<BitmapImage *>(image);
>         IntSize sizeRespectingOrientation = bitmapImage->sizeRespectingOrientation();
> 
>-        if (shouldRespectImageOrientation == RespectImageOrientation)
>+        if (description.respectImageOrientation() == RespectImageOrientation)
>             orientation = bitmapImage->orientationForCurrentFrame();
> 
>         if (orientation != DefaultImageOrientation) {
>diff --git a/Source/WebCore/platform/qt/ClipboardQt.cpp b/Source/WebCore/platform/qt/ClipboardQt.cpp
>index f2e641352357750d35dc1e83a9d868209dfdc447..97ecdf2107ca7bd1b9ab38d12d5e6b186a56f931 100644
>--- a/Source/WebCore/platform/qt/ClipboardQt.cpp
>+++ b/Source/WebCore/platform/qt/ClipboardQt.cpp
>@@ -45,7 +45,7 @@ DragImageRef Clipboard::createDragImage(IntPoint& location) const
>     location = m_dragLoc;
> 
>     if (m_dragImage)
>-        return createDragImageFromImage(m_dragImage->image());
>+        return createDragImageFromImage(m_dragImage->image(), ImageOrientationDescription());
> 
>     if (m_dragImageElement) {
>         Document* document = m_dragImageElement->document();
>diff --git a/Source/WebCore/platform/qt/DragImageQt.cpp b/Source/WebCore/platform/qt/DragImageQt.cpp
>index d388f39dc2538687caf307fddcc6c51693a40998..8897cff6dd5c0ae8ddc77b49b0c514237db7acab 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, ImageOrientationDescription)
> {
>     if (!image || !image->nativeImageForCurrentFrame())
>         return 0;
>diff --git a/Source/WebCore/platform/win/ClipboardWin.cpp b/Source/WebCore/platform/win/ClipboardWin.cpp
>index edfe2374e3700d49dad04b27c4fe81f615075227..0a8ab076ab75737b7fa09f466b54ec658dd6ed23 100644
>--- a/Source/WebCore/platform/win/ClipboardWin.cpp
>+++ b/Source/WebCore/platform/win/ClipboardWin.cpp
>@@ -45,7 +45,7 @@ DragImageRef Clipboard::createDragImage(IntPoint& dragLocation) const
>     HBITMAP result = 0;
>     if (m_dragImage) {
> #if USE(CAIRO) || USE(CG)
>-        result = createDragImageFromImage(m_dragImage->image());        
>+        result = createDragImageFromImage(m_dragImage->image(), ImageOrientationDescription());        
>         dragLocation = m_dragLoc;
> #else
>         notImplemented();
>diff --git a/Source/WebCore/platform/win/DragImageCGWin.cpp b/Source/WebCore/platform/win/DragImageCGWin.cpp
>index 93025b7f950c97027727d3202721d714ad0ff9a6..86266f900a1c900f1e814c0b156ef5aebb885414 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, ImageOrientationDescription)
> {
>     HBITMAP hbmp = 0;
>     HWndDC dc(0);
>diff --git a/Source/WebCore/platform/win/DragImageCairoWin.cpp b/Source/WebCore/platform/win/DragImageCairoWin.cpp
>index 681ccfe7cc126133afed2f3caf827315deb46628..8037486b5435ba315a274eaff43635ca9e0f557a 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, ImageOrientationDescription)
> {
>     HBITMAP hbmp = 0;
>     HDC dc = GetDC(0);
>diff --git a/Source/WebCore/rendering/RenderEmbeddedObject.cpp b/Source/WebCore/rendering/RenderEmbeddedObject.cpp
>index 02a1ff7386539a2d00a08916f175b9e2b499ba63..06c033dc30ec623e898c2301df9a006e1064828d 100644
>--- a/Source/WebCore/rendering/RenderEmbeddedObject.cpp
>+++ b/Source/WebCore/rendering/RenderEmbeddedObject.cpp
>@@ -199,7 +199,7 @@ 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);
>+    context->drawImage(image, style()->colorSpace(), alignedRect, CompositeSourceOver, ImageOrientationDescription(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..5fa2c7fd495e973a74c357ae51c5beebb74b7667 100644
>--- a/Source/WebCore/rendering/RenderImage.cpp
>+++ b/Source/WebCore/rendering/RenderImage.cpp
>@@ -353,7 +353,7 @@ 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());
>+                context->drawImage(image.get(), style()->colorSpace(), pixelSnappedIntRect(LayoutRect(paintOffset + imageOffset, imageSize)), CompositeSourceOver, ImageOrientationDescription(shouldRespectImageOrientation()));
>                 errorPictureDrawn = true;
>             }
> 
>@@ -475,7 +475,7 @@ 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);
>+    context->drawImage(m_imageResource->image(alignedRect.width(), alignedRect.height()).get(), style()->colorSpace(), alignedRect, compositeOperator, ImageOrientationDescription(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..57891fe401af594eb77b7bf5a1458bd20b2e1568 100644
>--- a/Source/WebCore/rendering/RenderSnapshottedPlugIn.cpp
>+++ b/Source/WebCore/rendering/RenderSnapshottedPlugIn.cpp
>@@ -139,7 +139,7 @@ void RenderSnapshottedPlugIn::paintSnapshot(PaintInfo& paintInfo, const LayoutPo
>         return;
> 
>     bool useLowQualityScaling = shouldPaintAtLowQuality(context, image, image, alignedRect.size());
>-    context->drawImage(image, style()->colorSpace(), alignedRect, CompositeSourceOver, shouldRespectImageOrientation(), useLowQualityScaling);
>+    context->drawImage(image, style()->colorSpace(), alignedRect, CompositeSourceOver, ImageOrientationDescription(shouldRespectImageOrientation()), useLowQualityScaling);
> }
> 
> CursorDirective RenderSnapshottedPlugIn::getCursor(const LayoutPoint& point, Cursor& overrideCursor) const

Actions: View | Formatted Diff | Diff

Attachments on bug 119418: 208093 | 208315 | 208323 | 208506 | 208699