diff options
| author | Steve Block <steveblock@google.com> | 2010-02-02 14:57:50 +0000 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-02-04 15:06:55 +0000 |
| commit | d0825bca7fe65beaee391d30da42e937db621564 (patch) | |
| tree | 7461c49eb5844ffd1f35d1ba2c8b7584c1620823 /WebCore/platform/wince | |
| parent | 3db770bd97c5a59b6c7574ca80a39e5a51c1defd (diff) | |
| download | external_webkit-d0825bca7fe65beaee391d30da42e937db621564.zip external_webkit-d0825bca7fe65beaee391d30da42e937db621564.tar.gz external_webkit-d0825bca7fe65beaee391d30da42e937db621564.tar.bz2 | |
Merge webkit.org at r54127 : Initial merge by git
Change-Id: Ib661abb595522f50ea406f72d3a0ce17f7193c82
Diffstat (limited to 'WebCore/platform/wince')
| -rw-r--r-- | WebCore/platform/wince/MIMETypeRegistryWince.cpp | 1 | ||||
| -rw-r--r-- | WebCore/platform/wince/SearchPopupMenuWince.cpp | 1 | ||||
| -rw-r--r-- | WebCore/platform/wince/SharedTimerWince.cpp | 2 |
3 files changed, 3 insertions, 1 deletions
diff --git a/WebCore/platform/wince/MIMETypeRegistryWince.cpp b/WebCore/platform/wince/MIMETypeRegistryWince.cpp index 2ecde48..b6ead9b 100644 --- a/WebCore/platform/wince/MIMETypeRegistryWince.cpp +++ b/WebCore/platform/wince/MIMETypeRegistryWince.cpp @@ -27,6 +27,7 @@ #include "config.h" #include "MIMETypeRegistry.h" +#include <wtf/HashMap.h> #include <windows.h> #include <winreg.h> diff --git a/WebCore/platform/wince/SearchPopupMenuWince.cpp b/WebCore/platform/wince/SearchPopupMenuWince.cpp index ca11292..756b7cf 100644 --- a/WebCore/platform/wince/SearchPopupMenuWince.cpp +++ b/WebCore/platform/wince/SearchPopupMenuWince.cpp @@ -21,6 +21,7 @@ #include "SearchPopupMenu.h" #include "AtomicString.h" +#include "NotImplemented.h" namespace WebCore { diff --git a/WebCore/platform/wince/SharedTimerWince.cpp b/WebCore/platform/wince/SharedTimerWince.cpp index ca2f104..a620a10 100644 --- a/WebCore/platform/wince/SharedTimerWince.cpp +++ b/WebCore/platform/wince/SharedTimerWince.cpp @@ -85,7 +85,7 @@ static void initializeOffScreenTimerWindow() RegisterClass(&wcex); timerWindowHandle = CreateWindow(kTimerWindowClassName, 0, 0, - CW_USEDEFAULT, 0, CW_USEDEFAULT, 0, HWND_MESSAGE, 0, Page::instanceHandle(), 0); + CW_USEDEFAULT, 0, CW_USEDEFAULT, 0, 0, 0, Page::instanceHandle(), 0); } void setSharedTimerFiredFunction(void (*f)()) |