Attachment 153729 Details for Bug 91566 – Draft patch

[patch] Draft patch

bug-91566-20120723135751.patch (text/plain), 23.64 KB, created by David Barr on 2012-07-22 20:58:00 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: David Barr

Created: 2012-07-22 20:58:00 PDT

Size: 23.64 KB

patch

obsolete

>Subversion Revision: 123157
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 78213fc7c406143494555c1d5edeee0b5efef0e5..6dfaebed0cbb34f7c788dcdf15f1ba6bcd6e3f36 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,57 @@
>+2012-07-22  David Barr  <davidbarr@chromium.org>
>+
>+        Integrate css3-images image-orientation with existing EXIF support
>+        https://bugs.webkit.org/show_bug.cgi?id=91566
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        The css3-images module is at candidate recommendation.
>+        http://www.w3.org/TR/2012/CR-css3-images-20120417/#the-image-orientation
>+
>+        No new tests; draft patch to outline scope of changes.
>+
>+        * WebCore.exp.in:
>+        * loader/cache/CachedImage.cpp:
>+        (WebCore::CachedImage::imageSizeForRenderer):
>+        * page/DragController.cpp:
>+        (WebCore::DragController::doImageDrag):
>+        * page/Frame.cpp:
>+        (WebCore::Frame::nodeImage):
>+        * platform/DragImage.h:
>+        (WebCore):
>+        * platform/blackberry/DragImageBlackBerry.cpp:
>+        (WebCore::createDragImageFromImage):
>+        * platform/chromium/DragImageChromiumSkia.cpp:
>+        (WebCore::createDragImageFromImage):
>+        * platform/efl/DragImageEfl.cpp:
>+        (WebCore::createDragImageFromImage):
>+        * platform/graphics/BitmapImage.cpp:
>+        (WebCore::BitmapImage::updateSize):
>+        (WebCore::BitmapImage::sizeRespectingOrientation):
>+        * platform/graphics/BitmapImage.h:
>+        (BitmapImage):
>+        * platform/graphics/ImageSource.cpp:
>+        (WebCore::ImageSource::size):
>+        (WebCore::ImageSource::frameSizeAtIndex):
>+        * platform/graphics/ImageSource.h:
>+        * platform/graphics/cg/ImageSourceCG.cpp:
>+        (WebCore::ImageSource::frameSizeAtIndex):
>+        (WebCore::ImageSource::size):
>+        * 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):
>+        * platform/wince/DragImageWinCE.cpp:
>+        (WebCore::createDragImageFromImage):
>+        * platform/wx/DragImageWx.cpp:
>+        (WebCore::createDragImageFromImage):
>+
> 2012-07-19  Chris Fleizach  <cfleizach@apple.com>
> 
>         WebKit should pass <title> element value as the default description for web views
>diff --git a/Source/WebCore/WebCore.exp.in b/Source/WebCore/WebCore.exp.in
>index 9efb2c77ac3eed7253efeb830c78661f9653df54..bbed3640f97dc8bac3df82290c69d01316828374 100644
>--- a/Source/WebCore/WebCore.exp.in
>+++ b/Source/WebCore/WebCore.exp.in
>@@ -597,6 +597,7 @@ __ZN7WebCore24FrameDestructionObserver14frameDestroyedEv
> __ZN7WebCore24FrameDestructionObserver14willDetachPageEv
> __ZN7WebCore24FrameDestructionObserverC2EPNS_5FrameE
> __ZN7WebCore24FrameDestructionObserverD2Ev
>+__ZN7WebCore24createDragImageFromImageEPNS_5ImageENS_20ImageOrientationEnumENS_27RespectImageOrientationEnumE
> __ZN7WebCore24createFragmentFromMarkupEPNS_8DocumentERKN3WTF6StringES5_NS_27FragmentScriptingPermissionE
> __ZN7WebCore24decodeURLEscapeSequencesERKN3WTF6StringE
> __ZN7WebCore24deleteCookiesForHostnameERKN3WTF6StringE
>diff --git a/Source/WebCore/loader/cache/CachedImage.cpp b/Source/WebCore/loader/cache/CachedImage.cpp
>index fb31f1baf57da0f1239cabfa7b86e7d071297d72..e5da4cb9b7ef9630697cbd2527ad81fb752354d5 100644
>--- a/Source/WebCore/loader/cache/CachedImage.cpp
>+++ b/Source/WebCore/loader/cache/CachedImage.cpp
>@@ -247,9 +247,19 @@ IntSize CachedImage::imageSizeForRenderer(const RenderObject* renderer, float mu
>         return IntSize();
> 
>     IntSize imageSize;
>+    ImageOrientationEnum styleOrientation = OriginTopLeft;
>+    RespectImageOrientationEnum shouldRespectImageOrientation = DoNotRespectImageOrientation;
> 
>-    if (m_image->isBitmapImage() && (renderer && renderer->shouldRespectImageOrientation() == RespectImageOrientation))
>-        imageSize = static_cast<BitmapImage*>(m_image.get())->sizeRespectingOrientation();
>+    if (renderer)
>+        shouldRespectImageOrientation = renderer->shouldRespectImageOrientation();
>+
>+#if ENABLE(CSS_IMAGE_ORIENTATION)
>+    if (renderer && renderer->style())
>+        styleOrientation = renderer->style()->imageOrientation();
>+#endif
>+
>+    if (m_image->isBitmapImage() && (shouldRespectImageOrientation == RespectImageOrientation || styleOrientation != OriginTopLeft))
>+        imageSize = static_cast<BitmapImage*>(m_image.get())->sizeRespectingOrientation(styleOrientation, shouldRespectImageOrientation);
>     else
>         imageSize = m_image->size();
> 
>diff --git a/Source/WebCore/page/DragController.cpp b/Source/WebCore/page/DragController.cpp
>index dbfb3d7833fb5fa06bc356e548aa644de16da545..c437f8529fdf9cc5419965c380b3325342111b37 100644
>--- a/Source/WebCore/page/DragController.cpp
>+++ b/Source/WebCore/page/DragController.cpp
>@@ -849,8 +849,13 @@ void DragController::doImageDrag(Element* element, const IntPoint& dragOrigin, c
>     IntPoint origin;
> 
>     Image* image = getImage(element);
>+#if ENABLE(CSS_IMAGE_ORIENTATION)
>+    ImageOrientationEnum orientation = element->renderer() && element->renderer()->style() ? element->renderer()->style()->imageOrientation() : OriginTopLeft;
>+#else
>+    ImageOrientationEnum orientation = OriginTopLeft;
>+#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 5146e735f003fcb5860fa80343617ee9ab0ef7ba..37abfd29461f1a3d53e689979a9a44462639da47 100644
>--- a/Source/WebCore/page/Frame.cpp
>+++ b/Source/WebCore/page/Frame.cpp
>@@ -1117,7 +1117,12 @@ DragImageRef Frame::nodeImage(Node* node)
>     m_view->paintContents(buffer->context(), paintingRect);
> 
>     RefPtr<Image> image = buffer->copyImage();
>-    return createDragImageFromImage(image.get(), renderer->shouldRespectImageOrientation());
>+#if ENABLE(CSS_IMAGE_ORIENTATION)
>+    ImageOrientationEnum orientation = renderer->style() ? renderer->style()->imageOrientation() : OriginTopLeft;
>+#else
>+    ImageOrientationEnum orientation = OriginTopLeft;
>+#endif
>+    return createDragImageFromImage(image.get(), orientation, renderer->shouldRespectImageOrientation());
> }
> 
> DragImageRef Frame::dragImageForSelection()
>diff --git a/Source/WebCore/platform/DragImage.h b/Source/WebCore/platform/DragImage.h
>index e78a9d3a86b230d1f8468312ec63912220b27df8..1d7ec7bafc263497aed49d9f05f10fb02d4eacfa 100644
>--- a/Source/WebCore/platform/DragImage.h
>+++ b/Source/WebCore/platform/DragImage.h
>@@ -82,7 +82,7 @@ namespace WebCore {
>     DragImageRef scaleDragImage(DragImageRef, FloatSize scale);
>     DragImageRef dissolveDragImageToFraction(DragImageRef image, float delta);
>     
>-    DragImageRef createDragImageFromImage(Image*, RespectImageOrientationEnum = DoNotRespectImageOrientation);
>+    DragImageRef createDragImageFromImage(Image*, ImageOrientationEnum = OriginTopLeft, RespectImageOrientationEnum = DoNotRespectImageOrientation);
>     DragImageRef createDragImageForSelection(Frame*);    
>     DragImageRef createDragImageIconForCachedImage(CachedImage*);
>     DragImageRef createDragImageForLink(KURL&, const String& label, Frame*);
>diff --git a/Source/WebCore/platform/blackberry/DragImageBlackBerry.cpp b/Source/WebCore/platform/blackberry/DragImageBlackBerry.cpp
>index 404e8f2b4bbfd55a8eab696e122cc9500e6fcd66..a34f1c081487db2254599a342f040f96231bd515 100644
>--- a/Source/WebCore/platform/blackberry/DragImageBlackBerry.cpp
>+++ b/Source/WebCore/platform/blackberry/DragImageBlackBerry.cpp
>@@ -26,7 +26,7 @@
> 
> namespace WebCore {
> 
>-void* createDragImageFromImage(Image*, RespectImageOrientationEnum)
>+void* createDragImageFromImage(Image*, ImageOrientationEnum, RespectImageOrientationEnum)
> {
>     notImplemented();
>     return 0;
>diff --git a/Source/WebCore/platform/chromium/DragImageChromiumSkia.cpp b/Source/WebCore/platform/chromium/DragImageChromiumSkia.cpp
>index dd8ace385c248308fb6b301a42efa89e7364f325..c35bae1c90527bf7dca5e742dae8ce450d83c5ff 100644
>--- a/Source/WebCore/platform/chromium/DragImageChromiumSkia.cpp
>+++ b/Source/WebCore/platform/chromium/DragImageChromiumSkia.cpp
>@@ -95,7 +95,7 @@ DragImageRef dissolveDragImageToFraction(DragImageRef image, float fraction)
>     return image;
> }
> 
>-DragImageRef createDragImageFromImage(Image* image, RespectImageOrientationEnum)
>+DragImageRef createDragImageFromImage(Image* image, ImageOrientationEnum, RespectImageOrientationEnum)
> {
>     if (!image)
>         return 0;
>diff --git a/Source/WebCore/platform/efl/DragImageEfl.cpp b/Source/WebCore/platform/efl/DragImageEfl.cpp
>index 4c19da74a02ef919cf1ec2fcb076de5d9fb5efce..357ca0ea98b6395f25d2989331c7a182ae1b29de 100644
>--- a/Source/WebCore/platform/efl/DragImageEfl.cpp
>+++ b/Source/WebCore/platform/efl/DragImageEfl.cpp
>@@ -50,7 +50,7 @@ DragImageRef dissolveDragImageToFraction(DragImageRef image, float)
>     return image;
> }
> 
>-DragImageRef createDragImageFromImage(Image*, RespectImageOrientationEnum)
>+DragImageRef createDragImageFromImage(Image*, ImageOrientationEnum, RespectImageOrientationEnum)
> {
>     notImplemented();
>     return 0;
>diff --git a/Source/WebCore/platform/graphics/BitmapImage.cpp b/Source/WebCore/platform/graphics/BitmapImage.cpp
>index 45460f8d34d31d777159e74cc56118423f29549c..2dcff661bb1cff13d93b285d8905ed922dc56591 100644
>--- a/Source/WebCore/platform/graphics/BitmapImage.cpp
>+++ b/Source/WebCore/platform/graphics/BitmapImage.cpp
>@@ -178,13 +178,17 @@ void BitmapImage::didDecodeProperties() const
>         imageObserver()->decodedSizeChanged(this, deltaBytes);
> }
> 
>-void BitmapImage::updateSize() const
>+void BitmapImage::updateSize(ImageOrientationEnum styleOrientation, RespectImageOrientationEnum shouldRespectImageOrientation) const
> {
>-    if (!m_sizeAvailable || m_haveSize)
>+    if (!m_sizeAvailable || (m_haveSize
>+        && styleOrientation == static_cast<ImageOrientationEnum>(m_styleOrientation)
>+        && shouldRespectImageOrientation == static_cast<RespectImageOrientationEnum>(m_shouldRespectImageOrientation)))
>         return;
> 
>     m_size = m_source.size();
>-    m_sizeRespectingOrientation = m_source.size(RespectImageOrientation);
>+    m_sizeRespectingOrientation = m_source.size(styleOrientation, shouldRespectImageOrientation);
>+    m_styleOrientation = static_cast<unsigned>(styleOrientation);
>+    m_shouldRespectImageOrientation = static_cast<unsigned>(shouldRespectImageOrientation);
>     m_haveSize = true;
>     didDecodeProperties();
> }
>@@ -195,9 +199,9 @@ IntSize BitmapImage::size() const
>     return m_size;
> }
> 
>-IntSize BitmapImage::sizeRespectingOrientation() const
>+IntSize BitmapImage::sizeRespectingOrientation(ImageOrientationEnum styleOrientation, RespectImageOrientationEnum shouldRespectImageOrientation) const
> {
>-    updateSize();
>+    updateSize(styleOrientation, shouldRespectImageOrientation);
>     return m_sizeRespectingOrientation;
> }
> 
>diff --git a/Source/WebCore/platform/graphics/BitmapImage.h b/Source/WebCore/platform/graphics/BitmapImage.h
>index f5bfeb145de0f6f19fb392a1828ff9c82ef7cf37..a542347f24ae0a250161f8ffae9dfb7f8856f58d 100644
>--- a/Source/WebCore/platform/graphics/BitmapImage.h
>+++ b/Source/WebCore/platform/graphics/BitmapImage.h
>@@ -119,7 +119,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;
> 
>@@ -180,7 +180,7 @@ public:
> #endif
> 
> private:
>-    void updateSize() const;
>+    void updateSize(ImageOrientationEnum = OriginTopLeft, RespectImageOrientationEnum = DoNotRespectImageOrientation) const;
> 
> protected:
>     enum RepetitionCountStatus {
>@@ -272,6 +272,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_styleOrientation : 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/ImageSource.cpp b/Source/WebCore/platform/graphics/ImageSource.cpp
>index 75ed5a1a26f6403203b383a79e13e10b80afb8a1..c6f454ceb9297068bd6999c6eb3c60d2c3bfa9ec 100644
>--- a/Source/WebCore/platform/graphics/ImageSource.cpp
>+++ b/Source/WebCore/platform/graphics/ImageSource.cpp
>@@ -99,7 +99,7 @@ bool ImageSource::isSizeAvailable()
>     return m_decoder && m_decoder->isSizeAvailable();
> }
> 
>-IntSize ImageSource::size(RespectImageOrientationEnum shouldRespectOrientation) const
>+IntSize ImageSource::size(ImageOrientationEnum, RespectImageOrientationEnum shouldRespectOrientation) const
> {
>     // The JPEG and TIFF decoders need to be taught how to read EXIF, XMP, or IPTC data.
>     if (shouldRespectOrientation == RespectImageOrientation)
>@@ -108,7 +108,7 @@ IntSize ImageSource::size(RespectImageOrientationEnum shouldRespectOrientation)
>     return m_decoder ? m_decoder->size() : IntSize();
> }
> 
>-IntSize ImageSource::frameSizeAtIndex(size_t index, RespectImageOrientationEnum shouldRespectOrientation) const
>+IntSize ImageSource::frameSizeAtIndex(size_t index, ImageOrientationEnum, RespectImageOrientationEnum shouldRespectOrientation) const
> {
>     // The JPEG and TIFF decoders need to be taught how to read EXIF, XMP, or IPTC data.
>     if (shouldRespectOrientation == RespectImageOrientation)
>diff --git a/Source/WebCore/platform/graphics/ImageSource.h b/Source/WebCore/platform/graphics/ImageSource.h
>index 913a3e7dcd8d265f717c476e90a45a860f56264f..22cfd8b7d9ed8888769acaff406acad593296284 100644
>--- a/Source/WebCore/platform/graphics/ImageSource.h
>+++ b/Source/WebCore/platform/graphics/ImageSource.h
>@@ -167,8 +167,8 @@ public:
>     String filenameExtension() const;
> 
>     bool isSizeAvailable();
>-    IntSize size(RespectImageOrientationEnum = DoNotRespectImageOrientation) const;
>-    IntSize frameSizeAtIndex(size_t, RespectImageOrientationEnum = DoNotRespectImageOrientation) const;
>+    IntSize size(ImageOrientationEnum = OriginTopLeft, RespectImageOrientationEnum = DoNotRespectImageOrientation) const;
>+    IntSize frameSizeAtIndex(size_t, ImageOrientationEnum = OriginTopLeft, RespectImageOrientationEnum = DoNotRespectImageOrientation) const;
> 
>     bool getHotSpot(IntPoint&) const;
> 
>diff --git a/Source/WebCore/platform/graphics/cg/ImageSourceCG.cpp b/Source/WebCore/platform/graphics/cg/ImageSourceCG.cpp
>index 7cf02968edc6d6a80f5f119f7e2c5abd303d4c7e..e5ceca27c0beacbe2273cc9132b16add533f79c0 100644
>--- a/Source/WebCore/platform/graphics/cg/ImageSourceCG.cpp
>+++ b/Source/WebCore/platform/graphics/cg/ImageSourceCG.cpp
>@@ -196,7 +196,7 @@ bool ImageSource::isSizeAvailable()
>     return result;
> }
> 
>-IntSize ImageSource::frameSizeAtIndex(size_t index, RespectImageOrientationEnum shouldRespectOrientation) const
>+IntSize ImageSource::frameSizeAtIndex(size_t index, ImageOrientationEnum styleOrientation, RespectImageOrientationEnum shouldRespectOrientation) const
> {
>     RetainPtr<CFDictionaryRef> properties(AdoptCF, CGImageSourceCopyPropertiesAtIndex(m_decoder, index, imageSourceOptions(SkipMetadata)));
> 
>@@ -211,7 +211,11 @@ IntSize ImageSource::frameSizeAtIndex(size_t index, RespectImageOrientationEnum
>     if (num)
>         CFNumberGetValue(num, kCFNumberIntType, &h);
> 
>-    if ((shouldRespectOrientation == RespectImageOrientation) && orientationAtIndex(index).usesWidthAsHeight())
>+    ImageOrientation frameOrientation(styleOrientation);
>+    if (styleOrientation != OriginTopLeft && shouldRespectOrientation == RespectImageOrientation)
>+        frameOrientation = orientationAtIndex(index);
>+
>+    if (frameOrientation.usesWidthAsHeight())
>         return IntSize(h, w);
> 
>     return IntSize(w, h);
>@@ -232,9 +236,9 @@ ImageOrientation ImageSource::orientationAtIndex(size_t index) const
>     return ImageOrientation::fromEXIFValue(exifValue);
> }
> 
>-IntSize ImageSource::size(RespectImageOrientationEnum shouldRespectOrientation) const
>+IntSize ImageSource::size(ImageOrientationEnum styleOrientation, RespectImageOrientationEnum shouldRespectOrientation) const
> {
>-    return frameSizeAtIndex(0, shouldRespectOrientation);
>+    return frameSizeAtIndex(0, styleOrientation, shouldRespectOrientation);
> }
> 
> bool ImageSource::getHotSpot(IntPoint& hotSpot) const
>diff --git a/Source/WebCore/platform/gtk/DragImageGtk.cpp b/Source/WebCore/platform/gtk/DragImageGtk.cpp
>index 0198dec28dc5994892cc988f2039f411c9897388..1e54916e2e97fb2eee06bb2dbe7f3ff9cbb2d6a9 100644
>--- a/Source/WebCore/platform/gtk/DragImageGtk.cpp
>+++ b/Source/WebCore/platform/gtk/DragImageGtk.cpp
>@@ -73,7 +73,7 @@ DragImageRef dissolveDragImageToFraction(DragImageRef image, float fraction)
>     return image;
> }
> 
>-DragImageRef createDragImageFromImage(Image* image, RespectImageOrientationEnum)
>+DragImageRef createDragImageFromImage(Image* image, ImageOrientationEnum, RespectImageOrientationEnum)
> {
>     NativeImageCairo* nativeImage = image->nativeImageForCurrentFrame();
>     return nativeImage ? cairo_surface_reference(nativeImage->surface()) : 0;
>diff --git a/Source/WebCore/platform/mac/DragImageMac.mm b/Source/WebCore/platform/mac/DragImageMac.mm
>index 3379f39cabd27e8ed4016227f9a3289b54efa246..bd0a11d36527a9ab1f91ba76338a4630bf066e9b 100644
>--- a/Source/WebCore/platform/mac/DragImageMac.mm
>+++ b/Source/WebCore/platform/mac/DragImageMac.mm
>@@ -85,16 +85,16 @@ RetainPtr<NSImage> dissolveDragImageToFraction(RetainPtr<NSImage> image, float d
>     return image;
> }
>         
>-RetainPtr<NSImage> createDragImageFromImage(Image* image, RespectImageOrientationEnum shouldRespectImageOrientation)
>+RetainPtr<NSImage> createDragImageFromImage(Image* image, ImageOrientationEnum styleOrientation, RespectImageOrientationEnum shouldRespectImageOrientation)
> {
>     IntSize size = image->size();
> 
>     if (image->isBitmapImage()) {
>-        ImageOrientation orientation = DefaultImageOrientation;
>+        ImageOrientation orientation(styleOrientation);
>         BitmapImage* bitmapImage = static_cast<BitmapImage *>(image);
>-        IntSize sizeRespectingOrientation = bitmapImage->sizeRespectingOrientation();
>+        IntSize sizeRespectingOrientation = bitmapImage->sizeRespectingOrientation(styleOrientation, shouldRespectImageOrientation);
> 
>-        if (shouldRespectImageOrientation == RespectImageOrientation)
>+        if (shouldRespectImageOrientation == RespectImageOrientation && styleOrientation == OriginTopLeft)
>             orientation = bitmapImage->currentFrameOrientation();
> 
>         if (orientation != DefaultImageOrientation) {
>diff --git a/Source/WebCore/platform/qt/DragImageQt.cpp b/Source/WebCore/platform/qt/DragImageQt.cpp
>index e93ac70894c739cedc9c1de5913f16f6230e0e08..803f757ac74a99b47ae5debad9f0683c2467de2c 100644
>--- a/Source/WebCore/platform/qt/DragImageQt.cpp
>+++ b/Source/WebCore/platform/qt/DragImageQt.cpp
>@@ -63,7 +63,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 cb49f95b5a45e21135aabd97df2831446e6382d7..d0cf508d06e326a534ced08841ed1593b2f9b0e6 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 a2aa975c6a989b5c840aa5936b58c7bb5fbd9cde..dd727a1fdc27a7c4eed3facf3ba980aa72dda2a3 100644
>--- a/Source/WebCore/platform/win/DragImageCairoWin.cpp
>+++ b/Source/WebCore/platform/win/DragImageCairoWin.cpp
>@@ -151,7 +151,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/platform/wince/DragImageWinCE.cpp b/Source/WebCore/platform/wince/DragImageWinCE.cpp
>index 14df4805f89a40f05c4385c333dd1e02104eb83d..d3044a805d18e67545b95b0840547cea49998ae2 100644
>--- a/Source/WebCore/platform/wince/DragImageWinCE.cpp
>+++ b/Source/WebCore/platform/wince/DragImageWinCE.cpp
>@@ -50,7 +50,7 @@ DragImageRef dissolveDragImageToFraction(DragImageRef image, float)
>     return image;
> }
> 
>-DragImageRef createDragImageFromImage(Image*, RespectImageOrientationEnum)
>+DragImageRef createDragImageFromImage(Image*, ImageOrientationEnum, RespectImageOrientationEnum)
> {
>     return 0;
> }
>diff --git a/Source/WebCore/platform/wx/DragImageWx.cpp b/Source/WebCore/platform/wx/DragImageWx.cpp
>index 38833304de98d3af7d3fc558267daa155c2add80..a299e98304f28aa25b61373771bb334b74e7af4c 100644
>--- a/Source/WebCore/platform/wx/DragImageWx.cpp
>+++ b/Source/WebCore/platform/wx/DragImageWx.cpp
>@@ -50,7 +50,7 @@ DragImageRef dissolveDragImageToFraction(DragImageRef image, float)
>     return image;
> }
>         
>-DragImageRef createDragImageFromImage(Image*, RespectImageOrientationEnum)
>+DragImageRef createDragImageFromImage(Image*, ImageOrientationEnum, RespectImageOrientationEnum)
> {
>     return 0;
> }
>diff --git a/Source/autotools/symbols.filter b/Source/autotools/symbols.filter
>index 5def47471d5f678100c078a4c107110b75f2e11e..e222782464f980b1efc22e27ab42c4f2896c0335 100644
>--- a/Source/autotools/symbols.filter
>+++ b/Source/autotools/symbols.filter
>@@ -78,6 +78,7 @@ _ZN7WebCore20NodeRenderingContextD1Ev;
> _ZN7WebCore21getCachedDOMStructureEPNS_17JSDOMGlobalObjectEPKN3JSC9ClassInfoE;
> _ZN7WebCore22externalRepresentationEPNS_7ElementEj;
> _ZN7WebCore22userPreferredLanguagesEv;
>+_ZN7WebCore24createDragImageFromImageEPNS_5ImageENS_20ImageOrientationEnumENS_27RespectImageOrientationEnumE;
> _ZN7WebCore24ComposedShadowTreeWalker10firstChildEv;
> _ZN7WebCore24ComposedShadowTreeWalker11nextSiblingEv;
> _ZN7WebCore24ComposedShadowTreeWalker4nextEv;
>diff --git a/ChangeLog b/ChangeLog
>index d48da4adc61d00bb350f0bc03855c655edcef6a5..6de783d2e7f4e9339ef2dcb86eed648c526c2d84 100644
>--- a/ChangeLog
>+++ b/ChangeLog
>@@ -1,3 +1,15 @@
>+2012-07-22  David Barr  <davidbarr@chromium.org>
>+
>+        Integrate css3-images image-orientation with existing EXIF support
>+        https://bugs.webkit.org/show_bug.cgi?id=91566
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        The css3-images module is at candidate recommendation.
>+        http://www.w3.org/TR/2012/CR-css3-images-20120417/#the-image-orientation
>+
>+        * Source/autotools/symbols.filter:
>+
> 2012-07-19  Christophe Dumez  <christophe.dumez@intel.com>
> 
>         [EFL] Bump libsoup dependency to v2.39.4.1 to fix cookie issues

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