Title: [107592] trunk/Source/WebCore
- Revision
- 107592
- Author
- [email protected]
- Date
- 2012-02-13 11:54:31 -0800 (Mon, 13 Feb 2012)
Log Message
[WIN] Define HWND_MESSAGE if not done already
https://bugs.webkit.org/show_bug.cgi?id=78341
Reviewed by Adam Roben.
HWND_MESSAGE is not defined on WinCE.
Set it to 0 when not defined to avoid #ifdefs.
* platform/win/PasteboardWin.cpp:
(WebCore::Pasteboard::Pasteboard):
* platform/win/WindowsExtras.h:
(WebCore):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (107591 => 107592)
--- trunk/Source/WebCore/ChangeLog 2012-02-13 19:39:31 UTC (rev 107591)
+++ trunk/Source/WebCore/ChangeLog 2012-02-13 19:54:31 UTC (rev 107592)
@@ -1,3 +1,18 @@
+2012-02-13 Patrick Gansterer <[email protected]>
+
+ [WIN] Define HWND_MESSAGE if not done already
+ https://bugs.webkit.org/show_bug.cgi?id=78341
+
+ Reviewed by Adam Roben.
+
+ HWND_MESSAGE is not defined on WinCE.
+ Set it to 0 when not defined to avoid #ifdefs.
+
+ * platform/win/PasteboardWin.cpp:
+ (WebCore::Pasteboard::Pasteboard):
+ * platform/win/WindowsExtras.h:
+ (WebCore):
+
2012-02-13 Chris Fleizach <[email protected]>
AX: <mark> element should be exposed through attributes
Modified: trunk/Source/WebCore/platform/win/PasteboardWin.cpp (107591 => 107592)
--- trunk/Source/WebCore/platform/win/PasteboardWin.cpp 2012-02-13 19:39:31 UTC (rev 107591)
+++ trunk/Source/WebCore/platform/win/PasteboardWin.cpp 2012-02-13 19:54:31 UTC (rev 107592)
@@ -42,6 +42,7 @@
#include "RenderImage.h"
#include "TextEncoding.h"
#include "WebCoreInstanceHandle.h"
+#include "WindowsExtras.h"
#include "markup.h"
#include <wtf/text/CString.h>
@@ -88,11 +89,6 @@
Pasteboard::Pasteboard()
{
- HWND hWndParent = 0;
-#if !OS(WINCE)
- hWndParent = HWND_MESSAGE;
-#endif
-
WNDCLASS wc;
memset(&wc, 0, sizeof(WNDCLASS));
wc.lpfnWndProc = PasteboardOwnerWndProc;
@@ -101,7 +97,7 @@
RegisterClass(&wc);
m_owner = ::CreateWindow(L"PasteboardOwnerWindowClass", L"PasteboardOwnerWindow", 0, 0, 0, 0, 0,
- hWndParent, 0, 0, 0);
+ HWND_MESSAGE, 0, 0, 0);
HTMLClipboardFormat = ::RegisterClipboardFormat(L"HTML Format");
BookmarkClipboardFormat = ::RegisterClipboardFormat(L"UniformResourceLocatorW");
Modified: trunk/Source/WebCore/platform/win/WindowsExtras.h (107591 => 107592)
--- trunk/Source/WebCore/platform/win/WindowsExtras.h 2012-02-13 19:39:31 UTC (rev 107591)
+++ trunk/Source/WebCore/platform/win/WindowsExtras.h 2012-02-13 19:54:31 UTC (rev 107592)
@@ -29,6 +29,10 @@
namespace WebCore {
+#ifndef HWND_MESSAGE
+const HWND HWND_MESSAGE = 0;
+#endif
+
inline void* getWindowPointer(HWND hWnd, int index)
{
#if OS(WINCE)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
