Changeset 19713 in webkit

Timestamp:

Feb 19, 2007 3:32:12 PM (17 years ago)

Author:

andersca

Message:

Reviewed by Oliver.

Make DragController::maxDragImageSize a function to get rid of the global initializer.

• page/DragController.cpp: (WebCore::DragController::doImageDrag):
• page/DragController.h:
• page/mac/DragControllerMac.mm: (WebCore::DragController::maxDragImageSize):
• page/qt/DragControllerQt.cpp: (WebCore::DragController::maxDragImageSize):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/DragController.cpp (modified) (1 diff)
• page/DragController.h (modified) (1 diff)
• page/mac/DragControllerMac.mm (modified) (2 diffs)
• page/qt/DragControllerQt.cpp (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-02-19  Anders Carlsson  <acarlsson@apple.com>
+
+        Reviewed by Oliver.
+
+        Make DragController::maxDragImageSize a function to get rid of the global initializer.
+        
+        * page/DragController.cpp:
+        (WebCore::DragController::doImageDrag):
+        * page/DragController.h:
+        * page/mac/DragControllerMac.mm:
+        (WebCore::DragController::maxDragImageSize):
+        * page/qt/DragControllerQt.cpp:
+        (WebCore::DragController::maxDragImageSize):
+
 2007-02-19  Darin Adler  <darin@apple.com>
 

trunk/WebCore/page/DragController.cpp

@@ -634 +634 @@
         IntSize newSize;
         if (dragImage) {
-            dragImage = fitDragImageToMaxSize(dragImage, MaxDragImageSize);
+            dragImage = fitDragImageToMaxSize(dragImage, maxDragImageSize());
             dragImage = dissolveDragImageToFraction(dragImage, DragImageAlpha);
             newSize = dragImageSize(dragImage);

trunk/WebCore/page/DragController.h

@@ -83 +83 @@
         
         bool startDrag(Frame* src, Clipboard*, DragOperation srcOp, const PlatformMouseEvent& dragEvent, const IntPoint& dragOrigin, bool isDHTMLDrag);
+        static const IntSize& maxDragImageSize();
         
         static const int LinkDragBorderInset;
-        static const IntSize MaxDragImageSize;
         static const int MaxOriginalImageArea;
         static const int DragIconRightInset;

trunk/WebCore/page/mac/DragControllerMac.mm

@@ -36 +36 @@
 const int DragController::LinkDragBorderInset = -2;
 
-const IntSize DragController::MaxDragImageSize(400, 400);
 const int DragController::MaxOriginalImageArea = 1500 * 1500;
 const int DragController::DragIconRightInset = 7;
@@ -61 +60 @@
 } 
 
+const IntSize& DragController::maxDragImageSize()
+{
+    static const IntSize maxDragImageSize(400, 400);
+    
+    return maxDragImageSize;
 }
+
+}

trunk/WebCore/page/qt/DragControllerQt.cpp

@@ -38 +38 @@
 // little correlation with Qt standards...
 const int DragController::LinkDragBorderInset = 2;
-const IntSize DragController::MaxDragImageSize(400, 400);
 const int DragController::MaxOriginalImageArea = 1500 * 1500;
 const int DragController::DragIconRightInset = 7;
@@ -60 +59 @@
 } 
 
+const IntSize& DragController::maxDragImageSize()
+{
+    static const IntSize maxDragImageSize(400, 400);
+    
+    return maxDragImageSize;
 }
+
+}