Changeset 141378 in webkit

Timestamp:

Jan 30, 2013 10:00:52 PM (11 years ago)

Author:

Patrick Gansterer

Message:

Port DragImageWin.cpp to WinCE
​https://bugs.webkit.org/show_bug.cgi?id=108329

Reviewed by Brent Fulgham.

Add #if !OS(WINCE) around a few lines of the code, so it can be used by the WinCE port too.

• PlatformWinCE.cmake:
• platform/win/DragImageWin.cpp:

(WebCore::dragLabelFont):

• platform/wince/DragImageWinCE.cpp: Removed.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• PlatformWinCE.cmake (modified) (2 diffs)
• platform/win/DragImageWin.cpp (modified) (2 diffs)
• platform/wince/DragImageWinCE.cpp (deleted)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-01-30  Patrick Gansterer  <paroga@webkit.org>
+
+        Port DragImageWin.cpp to WinCE
+        https://bugs.webkit.org/show_bug.cgi?id=108329
+
+        Reviewed by Brent Fulgham.
+
+        Add #if !OS(WINCE) around a few lines of the code, so it can be used by the WinCE port too.
+
+        * PlatformWinCE.cmake:
+        * platform/win/DragImageWin.cpp:
+        (WebCore::dragLabelFont):
+        * platform/wince/DragImageWinCE.cpp: Removed.
+
 2013-01-30  Hayato Ito  <hayato@chromium.org>
 

trunk/Source/WebCore/PlatformWinCE.cmake

@@ -39 +39 @@
     platform/win/CursorWin.cpp
     platform/win/DragDataWin.cpp
+    platform/win/DragImageWin.cpp
     platform/win/EditorWin.cpp
     platform/win/EventLoopWin.cpp
@@ -63 +64 @@
     platform/win/WheelEventWin.cpp
 
-    platform/wince/DragImageWince.cpp
     platform/wince/FileSystemWince.cpp
     platform/wince/KURLWince.cpp

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

@@ -109 +109 @@
 static Font dragLabelFont(int size, bool bold, FontRenderingMode renderingMode)
 {
+    Font result;
+#if !OS(WINCE)
     NONCLIENTMETRICS metrics;
     metrics.cbSize = sizeof(metrics);
@@ -122 +124 @@
     description.setComputedSize((float)size);
     description.setRenderingMode(renderingMode);
-    Font result = Font(description, 0, 0); 
+    result = Font(description, 0, 0);
     result.update(0);
+#endif
     return result;
 }