Title: [141378] trunk/Source/WebCore
- Revision
- 141378
- Author
- [email protected]
- Date
- 2013-01-30 22:00:52 -0800 (Wed, 30 Jan 2013)
Log 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.
Modified Paths
Removed Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (141377 => 141378)
--- trunk/Source/WebCore/ChangeLog 2013-01-31 05:27:42 UTC (rev 141377)
+++ trunk/Source/WebCore/ChangeLog 2013-01-31 06:00:52 UTC (rev 141378)
@@ -1,3 +1,17 @@
+2013-01-30 Patrick Gansterer <[email protected]>
+
+ 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 <[email protected]>
Split CSSOMWrapper data and functions out from StyleResolver into its own class.
Modified: trunk/Source/WebCore/PlatformWinCE.cmake (141377 => 141378)
--- trunk/Source/WebCore/PlatformWinCE.cmake 2013-01-31 05:27:42 UTC (rev 141377)
+++ trunk/Source/WebCore/PlatformWinCE.cmake 2013-01-31 06:00:52 UTC (rev 141378)
@@ -38,6 +38,7 @@
platform/win/ContextMenuWin.cpp
platform/win/CursorWin.cpp
platform/win/DragDataWin.cpp
+ platform/win/DragImageWin.cpp
platform/win/EditorWin.cpp
platform/win/EventLoopWin.cpp
platform/win/KeyEventWin.cpp
@@ -62,7 +63,6 @@
platform/win/WidgetWin.cpp
platform/win/WheelEventWin.cpp
- platform/wince/DragImageWince.cpp
platform/wince/FileSystemWince.cpp
platform/wince/KURLWince.cpp
Modified: trunk/Source/WebCore/platform/win/DragImageWin.cpp (141377 => 141378)
--- trunk/Source/WebCore/platform/win/DragImageWin.cpp 2013-01-31 05:27:42 UTC (rev 141377)
+++ trunk/Source/WebCore/platform/win/DragImageWin.cpp 2013-01-31 06:00:52 UTC (rev 141378)
@@ -108,6 +108,8 @@
static Font dragLabelFont(int size, bool bold, FontRenderingMode renderingMode)
{
+ Font result;
+#if !OS(WINCE)
NONCLIENTMETRICS metrics;
metrics.cbSize = sizeof(metrics);
SystemParametersInfo(SPI_GETNONCLIENTMETRICS, metrics.cbSize, &metrics, 0);
@@ -121,8 +123,9 @@
description.setSpecifiedSize((float)size);
description.setComputedSize((float)size);
description.setRenderingMode(renderingMode);
- Font result = Font(description, 0, 0);
+ result = Font(description, 0, 0);
result.update(0);
+#endif
return result;
}
Deleted: trunk/Source/WebCore/platform/wince/DragImageWinCE.cpp (141377 => 141378)
--- trunk/Source/WebCore/platform/wince/DragImageWinCE.cpp 2013-01-31 05:27:42 UTC (rev 141377)
+++ trunk/Source/WebCore/platform/wince/DragImageWinCE.cpp 2013-01-31 06:00:52 UTC (rev 141378)
@@ -1,63 +0,0 @@
-/*
- * Copyright (C) 2007-2008 Torch Mobile, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with this library; see the file COPYING.LIB. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- *
- */
-
-#include "config.h"
-#include "DragImage.h"
-
-#include "CachedImage.h"
-#include "GraphicsContext.h"
-#include "Image.h"
-
-#include <windows.h>
-
-namespace WebCore {
-
-IntSize dragImageSize(DragImageRef)
-{
- return IntSize(0, 0);
-}
-
-void deleteDragImage(DragImageRef image)
-{
- if (image)
- ::DeleteObject(image);
-}
-
-DragImageRef scaleDragImage(DragImageRef, FloatSize)
-{
- return 0;
-}
-
-DragImageRef dissolveDragImageToFraction(DragImageRef image, float)
-{
- return image;
-}
-
-DragImageRef createDragImageFromImage(Image*, RespectImageOrientationEnum)
-{
- return 0;
-}
-
-DragImageRef createDragImageIconForCachedImage(CachedImage*)
-{
- return 0;
-}
-
-} // namespace WebCore
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
