Changeset 147912 in webkit

Timestamp:

Apr 8, 2013 6:35:18 AM (11 years ago)

Author:

Carlos Garcia Campos

Message:

DragImage should not depend on Frame and CachedImage
​https://bugs.webkit.org/show_bug.cgi?id=21357

Reviewed by Sam Weinig.

Remove Frame and CachedImage dependencies from DragImage.

• dom/Clipboard.h:

(WebCore): Add forward delcaration for CacheImage since it's not
included anymore in DragImage.h.

• page/DragController.cpp:

(WebCore::DragController::startDrag): Use
Frame::dragImageForSelection() and call
dissolveDragImageToFraction() for the returned DragImage. Pass the
font rendering mode to createDragImageForLink, instead of a Frame
that is only used to get the font rendering mode.
(WebCore::DragController::doImageDrag): Get the suggested filename
for the cached image and pass it to
createDragImageIconForCachedImageFilename().

• platform/DragImage.cpp:

(WebCore::createDragImageForLink): Receive a FontRenderingMode
instead of a Frame.

• platform/DragImage.h:

(WebCore): Remove createDragImageForSelection, change
createDragImageForLink to receive a FontRenderingMode instead of a
frame, and rename createDragImageIconForCachedImage as
createDragImageIconForCachedImageFilename since it nows received
the suggested filename of the cached image.

• platform/blackberry/DragImageBlackBerry.cpp:

(WebCore::createDragImageIconForCachedImageFilename): Adapt to API
changes.

• platform/efl/DragImageEfl.cpp:

(WebCore::createDragImageIconForCachedImageFilename): Ditto.

• platform/gtk/DragImageGtk.cpp:

(WebCore::createDragImageIconForCachedImageFilename): Ditto.

• platform/mac/DragImageMac.mm:

(WebCore::dissolveDragImageToFraction): Return early if the passed
image is NULL.
(WebCore::createDragImageIconForCachedImageFilename): Adapt to API
changes.
(WebCore::createDragImageForLink): Ditto.

• platform/qt/DragImageQt.cpp:

(WebCore::createDragImageIconForCachedImageFilename): Ditto.

• platform/win/DragImageWin.cpp:

(WebCore::createDragImageIconForCachedImageFilename): Ditto.
(WebCore::createDragImageForLink): Ditto.

• platform/wx/DragImageWx.cpp:

(WebCore::createDragImageIconForCachedImageFilename): Ditto.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/Clipboard.h (modified) (1 diff)
• page/DragController.cpp (modified) (3 diffs)
• platform/DragImage.cpp (modified) (2 diffs)
• platform/DragImage.h (modified) (3 diffs)
• platform/blackberry/DragImageBlackBerry.cpp (modified) (2 diffs)
• platform/efl/DragImageEfl.cpp (modified) (2 diffs)
• platform/gtk/DragImageGtk.cpp (modified) (2 diffs)
• platform/mac/DragImageMac.mm (modified) (5 diffs)
• platform/qt/DragImageQt.cpp (modified) (2 diffs)
• platform/win/DragImageWin.cpp (modified) (4 diffs)
• platform/wx/DragImageWx.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-04-08  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        DragImage should not depend on Frame and CachedImage
+        https://bugs.webkit.org/show_bug.cgi?id=21357
+
+        Reviewed by Sam Weinig.
+
+        Remove Frame and CachedImage dependencies from DragImage.
+
+        * dom/Clipboard.h:
+        (WebCore): Add forward delcaration for CacheImage since it's not
+        included anymore in DragImage.h.
+        * page/DragController.cpp:
+        (WebCore::DragController::startDrag): Use
+        Frame::dragImageForSelection() and call
+        dissolveDragImageToFraction() for the returned DragImage. Pass the
+        font rendering mode to createDragImageForLink, instead of a Frame
+        that is only used to get the font rendering mode.
+        (WebCore::DragController::doImageDrag): Get the suggested filename
+        for the cached image and pass it to
+        createDragImageIconForCachedImageFilename().
+        * platform/DragImage.cpp:
+        (WebCore::createDragImageForLink): Receive a FontRenderingMode
+        instead of a Frame.
+        * platform/DragImage.h:
+        (WebCore): Remove createDragImageForSelection, change
+        createDragImageForLink to receive a FontRenderingMode instead of a
+        frame, and rename createDragImageIconForCachedImage as
+        createDragImageIconForCachedImageFilename since it nows received
+        the suggested filename of the cached image.
+        * platform/blackberry/DragImageBlackBerry.cpp:
+        (WebCore::createDragImageIconForCachedImageFilename): Adapt to API
+        changes.
+        * platform/efl/DragImageEfl.cpp:
+        (WebCore::createDragImageIconForCachedImageFilename): Ditto.
+        * platform/gtk/DragImageGtk.cpp:
+        (WebCore::createDragImageIconForCachedImageFilename): Ditto.
+        * platform/mac/DragImageMac.mm:
+        (WebCore::dissolveDragImageToFraction): Return early if the passed
+        image is NULL.
+        (WebCore::createDragImageIconForCachedImageFilename): Adapt to API
+        changes.
+        (WebCore::createDragImageForLink): Ditto.
+        * platform/qt/DragImageQt.cpp:
+        (WebCore::createDragImageIconForCachedImageFilename): Ditto.
+        * platform/win/DragImageWin.cpp:
+        (WebCore::createDragImageIconForCachedImageFilename): Ditto.
+        (WebCore::createDragImageForLink): Ditto.
+        * platform/wx/DragImageWx.cpp:
+        (WebCore::createDragImageIconForCachedImageFilename): Ditto.
+
 2013-04-08  Raphael Kubo da Costa  <raphael.kubo.da.costa@intel.com>
 

trunk/Source/WebCore/dom/Clipboard.h

@@ -34 +34 @@
 namespace WebCore {
 
+    class CachedImage;
     class DataTransferItemList;
     class DragData;

trunk/Source/WebCore/page/DragController.cpp

@@ -800 +800 @@
         m_client->willPerformDragSourceAction(DragSourceActionSelection, dragOrigin, clipboard);
         if (!dragImage) {
-            dragImage = createDragImageForSelection(src);
+            dragImage = dissolveDragImageToFraction(src->dragImageForSelection(), DragImageAlpha);
             dragLoc = dragLocForSelectionDrag(src);
             m_dragOffset = IntPoint(dragOrigin.x() - dragLoc.x(), dragOrigin.y() - dragLoc.y());
@@ -844 +844 @@
         m_client->willPerformDragSourceAction(DragSourceActionLink, dragOrigin, clipboard);
         if (!dragImage) {
-            dragImage = createDragImageForLink(linkURL, hitTestResult.textContent(), src);
+            dragImage = createDragImageForLink(linkURL, hitTestResult.textContent(), src->settings() ? src->settings()->fontRenderingMode() : NormalRenderingMode);
             IntSize size = dragImageSize(dragImage);
             m_dragOffset = IntPoint(-size.width() / 2, -LinkDragBorderInset);
@@ -894 +894 @@
         origin.setY((int)(dy + 0.5));
     } else {
-        dragImage = createDragImageIconForCachedImage(getCachedImage(element));
-        if (dragImage)
-            origin = IntPoint(DragIconRightInset - dragImageSize(dragImage).width(), DragIconBottomInset);
+        if (CachedImage* cachedImage = getCachedImage(element)) {
+            dragImage = createDragImageIconForCachedImageFilename(cachedImage->response().suggestedFilename());
+            if (dragImage)
+                origin = IntPoint(DragIconRightInset - dragImageSize(dragImage).width(), DragIconBottomInset);
+        }
     }
 

trunk/Source/WebCore/platform/DragImage.cpp

@@ -30 +30 @@
 #include "DragController.h"
 
-#include "Frame.h"
+#include "FontRenderingMode.h"
 
 namespace WebCore {
@@ -65 +65 @@
     return scaleDragImage(image, FloatSize(scalex, scaley));
 }
-    
-DragImageRef createDragImageForSelection(Frame* frame)
-{
-    DragImageRef image = frame->dragImageForSelection();
-    if (image)
-        image = dissolveDragImageToFraction(image, DragController::DragImageAlpha);
-    return image;
-}
 
 #if !PLATFORM(MAC) && (!PLATFORM(WIN) || OS(WINCE))
-DragImageRef createDragImageForLink(KURL&, const String&, Frame*)
+DragImageRef createDragImageForLink(KURL&, const String&, FontRenderingMode)
 {
     return 0;

trunk/Source/WebCore/platform/DragImage.h

@@ -27 +27 @@
 #define DragImage_h
 
+#include "FontRenderingMode.h"
 #include "ImageOrientation.h"
 #include "IntSize.h"
@@ -51 +52 @@
 
 namespace WebCore {
-    
-    class CachedImage;
-    class Frame;
+
     class Image;
     class KURL;
@@ -82 +81 @@
     
     DragImageRef createDragImageFromImage(Image*, RespectImageOrientationEnum = DoNotRespectImageOrientation);
-    DragImageRef createDragImageForSelection(Frame*);    
-    DragImageRef createDragImageIconForCachedImage(CachedImage*);
-    DragImageRef createDragImageForLink(KURL&, const String& label, Frame*);
+    DragImageRef createDragImageIconForCachedImageFilename(const String&);
+    DragImageRef createDragImageForLink(KURL&, const String& label, FontRenderingMode);
     void deleteDragImage(DragImageRef);
 }

trunk/Source/WebCore/platform/blackberry/DragImageBlackBerry.cpp

@@ -20 +20 @@
 #include "DragImage.h"
 
-#include "CachedImage.h"
 #include "FloatSize.h"
 #include "Image.h"
@@ -33 +32 @@
 }
 
-void* createDragImageIconForCachedImage(CachedImage*)
+void* createDragImageIconForCachedImageFilename(const String&)
 {
     notImplemented();

trunk/Source/WebCore/platform/efl/DragImageEfl.cpp

@@ -22 +22 @@
 #include "DragImage.h"
 
-#include "CachedImage.h"
 #include "Image.h"
 #include "NotImplemented.h"
@@ -57 +56 @@
 }
 
-DragImageRef createDragImageIconForCachedImage(CachedImage*)
+DragImageRef createDragImageIconForCachedImageFilename(const String&)
 {
     notImplemented();

trunk/Source/WebCore/platform/gtk/DragImageGtk.cpp

@@ -20 +20 @@
 #include "DragImage.h"
 
-#include "CachedImage.h"
 #include "Image.h"
 #include "RefPtrCairo.h"
@@ -83 +82 @@
 }
 
-DragImageRef createDragImageIconForCachedImage(CachedImage*)
+DragImageRef createDragImageIconForCachedImageFilename(const String&)
 {
     return 0;

trunk/Source/WebCore/platform/mac/DragImageMac.mm

@@ -29 +29 @@
 #if ENABLE(DRAG_SUPPORT)
 #import "BitmapImage.h"
-#import "CachedImage.h"
 #import "Font.h"
 #import "FontCache.h"
@@ -38 +37 @@
 #import "KURL.h"
 #import "ResourceResponse.h"
-#import "Settings.h"
 #import "StringTruncator.h"
 #import "TextRun.h"
@@ -68 +66 @@
 RetainPtr<NSImage> dissolveDragImageToFraction(RetainPtr<NSImage> image, float delta)
 {
+    if (!image)
+        return nil;
+
     RetainPtr<NSImage> dissolvedImage(AdoptNS, [[NSImage alloc] initWithSize:[image.get() size]]);
     
@@ -124 +125 @@
 }
     
-RetainPtr<NSImage> createDragImageIconForCachedImage(CachedImage* image)
-{
-    const String& filename = image->response().suggestedFilename();
+RetainPtr<NSImage> createDragImageIconForCachedImageFilename(const String& filename)
+{
     NSString *extension = nil;
     size_t dotIndex = filename.reverseFind('.');
@@ -268 +268 @@
 }
 
-DragImageRef createDragImageForLink(KURL& url, const String& title, Frame* frame)
-{
-    if (!frame)
-        return nil;
+DragImageRef createDragImageForLink(KURL& url, const String& title, FontRenderingMode)
+{
     NSString *label = nsStringNilIfEmpty(title);
     NSURL *cocoaURL = url;

trunk/Source/WebCore/platform/qt/DragImageQt.cpp

@@ -27 +27 @@
 #include "DragImage.h"
 
-#include "CachedImage.h"
 #include "Image.h"
 
@@ -70 +69 @@
 }
 
-DragImageRef createDragImageIconForCachedImage(CachedImage*)
+DragImageRef createDragImageIconForCachedImageFilename(const String&)
 {
     return 0;

trunk/Source/WebCore/platform/win/DragImageWin.cpp

@@ -27 +27 @@
 #include "DragImage.h"
 
-#include "CachedImage.h"
 #include "Font.h"
 #include "FontCache.h"
 #include "FontDescription.h"
 #include "FontSelector.h"
-#include "Frame.h"
 #include "GraphicsContext.h"
 #include "HWndDC.h"
 #include "Image.h"
-#include "Settings.h"
 #include "StringTruncator.h"
 #include "TextRun.h"
@@ -70 +67 @@
 }
         
-DragImageRef createDragImageIconForCachedImage(CachedImage* image)
-{
-    if (!image)
-        return 0;
-
-    String filename = image->response().suggestedFilename();
-    
+DragImageRef createDragImageIconForCachedImageFilename(const String& filename)
+{
     SHFILEINFO shfi = {0};
     if (FAILED(SHGetFileInfo(static_cast<LPCWSTR>(filename.charactersWithNullTermination()), FILE_ATTRIBUTE_NORMAL,
@@ -130 +122 @@
 }
 
-DragImageRef createDragImageForLink(KURL& url, const String& inLabel, Frame* frame)
+DragImageRef createDragImageForLink(KURL& url, const String& inLabel, FontRenderingMode fontRenderingMode)
 {
     // This is more or less an exact match for the Mac OS X code.
@@ -138 +130 @@
     FontCachePurgePreventer fontCachePurgePreventer;
 
-    if (frame->settings() && frame->settings()->fontRenderingMode() == AlternateRenderingMode) {
+    if (fontRenderingMode == AlternateRenderingMode) {
         static const Font alternateRenderingModeLabelFont = dragLabelFont(DragLinkLabelFontsize, true, AlternateRenderingMode);
         static const Font alternateRenderingModeURLFont = dragLabelFont(DragLinkUrlFontSize, false, AlternateRenderingMode);

trunk/Source/WebCore/platform/wx/DragImageWx.cpp

@@ -26 +26 @@
 #include "config.h"
 #include "DragImage.h"
-#include "CachedImage.h"
+
 #include "FloatSize.h"
 #include "Image.h"
@@ -56 +56 @@
 }
     
-DragImageRef createDragImageIconForCachedImage(CachedImage*)
+DragImageRef createDragImageIconForCachedImageFilename(const String&)
 {
     return 0;