Changeset 153483 in webkit


Ignore:
Timestamp:
Jul 30, 2013 11:54:18 AM (11 years ago)
Author:
Patrick Gansterer
Message:

Move WindowsExtras.h from WebCore to WTF
​https://bugs.webkit.org/show_bug.cgi?id=118125

Reviewed by Anders Carlsson.

Move it to WTF to be able to use the functions in WTF too.

Source/WebCore:

  • platform/PlatformKeyboardEvent.h:
  • platform/PlatformMouseEvent.h:
  • platform/PlatformWheelEvent.h:
  • platform/graphics/win/MediaPlayerPrivateFullscreenWindow.h:
  • platform/win/MIMETypeRegistryWin.cpp:
  • platform/win/PasteboardWin.cpp:
  • platform/win/PopupMenuWin.cpp:
  • platform/win/RunLoopWin.cpp:
  • platform/win/SharedTimerWin.cpp:
  • platform/win/WindowMessageListener.h:
  • plugins/win/PluginDatabaseWin.cpp:

Source/WTF:

  • wtf/WindowsExtras.h: Renamed from Source/WebCore/platform/win/WindowsExtras.h.

(WTF::getRegistryValue):
(WTF::getWindowPointer):
(WTF::setWindowPointer):

  • wtf/win/MainThreadWin.cpp:

(WTF::initializeMainThreadPlatform):

Location:
trunk/Source
Files:
14 edited
1 moved

Legend:

Unmodified
Added
Removed

  • trunk/Source/WTF/ChangeLog

    r153460 r153483  
     12013-07-30  Patrick Gansterer  <paroga@webkit.org>
     2
     3        Move WindowsExtras.h from WebCore to WTF
     4        https://bugs.webkit.org/show_bug.cgi?id=118125
     5
     6        Reviewed by Anders Carlsson.
     7
     8        Move it to WTF to be able to use the functions in WTF too.
     9
     10        * wtf/WindowsExtras.h: Renamed from Source/WebCore/platform/win/WindowsExtras.h.
     11        (WTF::getRegistryValue):
     12        (WTF::getWindowPointer):
     13        (WTF::setWindowPointer):
     14        * wtf/win/MainThreadWin.cpp:
     15        (WTF::initializeMainThreadPlatform):
     16
    1172013-07-29  Carlos Garcia Campos  <cgarcia@igalia.com>
    218

  • trunk/Source/WTF/wtf/WindowsExtras.h

    r153482 r153483  
    2626#define WindowsExtras_h
    2727
     28#if OS(WINDOWS)
     29
    2830#include <windows.h>
    2931#include <objbase.h>
    3032#include <shlwapi.h>
    3133
    32 namespace WebCore {
    33 
    3434#ifndef HWND_MESSAGE
    3535const HWND HWND_MESSAGE = 0;
    3636#endif
     37
     38namespace WTF {
    3739
    3840inline HRESULT getRegistryValue(HKEY hkey, LPCWSTR pszSubKey, LPCWSTR pszValue, LPDWORD pdwType, LPVOID pvData, LPDWORD pcbData)
    … …  
    6870}
    6971
    70 } // namespace WebCore
     72} // namespace WTF
     73
     74using WTF::getRegistryValue;
     75using WTF::getWindowPointer;
     76using WTF::setWindowPointer;
     77
     78#endif // OS(WINDOWS)
    7179
    7280#endif // WindowsExtras_h

  • trunk/Source/WTF/wtf/win/MainThreadWin.cpp

    r137054 r153483  
    3333#include "Assertions.h"
    3434#include "Threading.h"
    35 #include <windows.h>
     35#include "WindowsExtras.h"
    3636
    3737namespace WTF {
    … …  
    5555        return;
    5656
    57     HWND hWndParent = 0;
    5857    WNDCLASSW wcex;
    5958    memset(&wcex, 0, sizeof(WNDCLASSW));
    … …  
    6160    wcex.lpszClassName  = kThreadingWindowClassName;
    6261    RegisterClassW(&wcex);
    63 #if !OS(WINCE)
    64     hWndParent = HWND_MESSAGE;
    65 #endif
    6662
    6763    threadingWindowHandle = CreateWindowW(kThreadingWindowClassName, 0, 0,
    68        CW_USEDEFAULT, 0, CW_USEDEFAULT, 0, hWndParent, 0, 0, 0);
     64        CW_USEDEFAULT, 0, CW_USEDEFAULT, 0, HWND_MESSAGE, 0, 0, 0);
    6965    threadingFiredMessage = RegisterWindowMessageW(L"com.apple.WebKit.MainThreadFired");
    7066

  • trunk/Source/WebCore/ChangeLog

    r153480 r153483  
     12013-07-30  Patrick Gansterer  <paroga@webkit.org>
     2
     3        Move WindowsExtras.h from WebCore to WTF
     4        https://bugs.webkit.org/show_bug.cgi?id=118125
     5
     6        Reviewed by Anders Carlsson.
     7
     8        Move it to WTF to be able to use the functions in WTF too.
     9
     10        * platform/PlatformKeyboardEvent.h:
     11        * platform/PlatformMouseEvent.h:
     12        * platform/PlatformWheelEvent.h:
     13        * platform/graphics/win/MediaPlayerPrivateFullscreenWindow.h:
     14        * platform/win/MIMETypeRegistryWin.cpp:
     15        * platform/win/PasteboardWin.cpp:
     16        * platform/win/PopupMenuWin.cpp:
     17        * platform/win/RunLoopWin.cpp:
     18        * platform/win/SharedTimerWin.cpp:
     19        * platform/win/WindowMessageListener.h:
     20        * plugins/win/PluginDatabaseWin.cpp:
     21
    1222013-07-30  Christophe Dumez  <ch.dumez@sisa.samsung.com>
    223

  • trunk/Source/WebCore/platform/PlatformKeyboardEvent.h

    r149186 r153483  
    2929
    3030#include "PlatformEvent.h"
    31 #if OS(WINDOWS)
    32 #include "WindowsExtras.h"
    33 #endif
     31#include <wtf/WindowsExtras.h>
    3432#include <wtf/text/WTFString.h>
    3533

  • trunk/Source/WebCore/platform/PlatformMouseEvent.h

    r149186 r153483  
    2929#include "IntPoint.h"
    3030#include "PlatformEvent.h"
    31 #if OS(WINDOWS)
    32 #include "WindowsExtras.h"
    33 #endif
     31#include <wtf/WindowsExtras.h>
    3432
    3533#if PLATFORM(GTK)

  • trunk/Source/WebCore/platform/PlatformWheelEvent.h

    r149186 r153483  
    2929#include "IntPoint.h"
    3030#include "PlatformEvent.h"
    31 #if OS(WINDOWS)
    32 #include "WindowsExtras.h"
    33 #endif
     31#include <wtf/WindowsExtras.h>
    3432
    3533#if PLATFORM(GTK)

  • trunk/Source/WebCore/platform/graphics/win/MediaPlayerPrivateFullscreenWindow.h

    r125506 r153483  
    2727#define MediaPlayerPrivateFullscreenWindow_h
    2828
    29 #if OS(WINDOWS)
    30 #include "WindowsExtras.h"
    31 #endif
    3229#include <wtf/RefPtr.h>
     30#include <wtf/WindowsExtras.h>
    3331
    3432#if USE(ACCELERATED_COMPOSITING)

  • trunk/Source/WebCore/platform/win/MIMETypeRegistryWin.cpp

    r152142 r153483  
    2727#include "MIMETypeRegistry.h"
    2828
    29 #include "WindowsExtras.h"
    3029#include <wtf/Assertions.h>
    3130#include <wtf/HashMap.h>
    3231#include <wtf/MainThread.h>
     32#include <wtf/WindowsExtras.h>
    3333
    3434namespace WebCore {

  • trunk/Source/WebCore/platform/win/PasteboardWin.cpp

    r152927 r153483  
    4949#include "TextEncoding.h"
    5050#include "WebCoreInstanceHandle.h"
    51 #include "WindowsExtras.h"
    5251#include "markup.h"
     52#include <wtf/WindowsExtras.h>
    5353#include <wtf/text/CString.h>
    5454

  • trunk/Source/WebCore/platform/win/PopupMenuWin.cpp

    r138182 r153483  
    4646#include "TextRun.h"
    4747#include "WebCoreInstanceHandle.h"
    48 #include "WindowsExtras.h"
     48#include <wtf/WindowsExtras.h>
    4949
    5050#include <windows.h>

  • trunk/Source/WebCore/platform/win/RunLoopWin.cpp

    r149358 r153483  
    2727#include "RunLoop.h"
    2828
    29 #include "WindowsExtras.h"
    3029#include <wtf/CurrentTime.h>
     30#include <wtf/WindowsExtras.h>
    3131
    3232using namespace std;

  • trunk/Source/WebCore/platform/win/SharedTimerWin.cpp

    r149186 r153483  
    3333#include <wtf/Assertions.h>
    3434#include <wtf/CurrentTime.h>
    35 
    36 #include "WindowsExtras.h"
     35#include <wtf/WindowsExtras.h>
     36
    3737#include <mmsystem.h>
    3838

  • trunk/Source/WebCore/platform/win/WindowMessageListener.h

    r125506 r153483  
    3030#define WindowMessageListener_h
    3131
    32 #if OS(WINDOWS)
    33 #include "WindowsExtras.h"
    34 #endif
     32#include <windows.h>
    3533
    3634namespace WebCore {

  • trunk/Source/WebCore/plugins/win/PluginDatabaseWin.cpp

    r152142 r153483  
    3232#include "KURL.h"
    3333#include "PluginPackage.h"
    34 #include "WindowsExtras.h"
     34#include <wtf/WindowsExtras.h>
    3535
    3636#if OS(WINCE)
Note: See TracChangeset for help on using the changeset viewer.