Changeset 105028 in webkit


Ignore:
Timestamp:
Jan 14, 2012 7:14:07 PM (12 years ago)
Author:
levin@chromium.org
Message:

HWndDC should be in platform/win instead of wtf.
​https://bugs.webkit.org/show_bug.cgi?id=76314

Reviewed by Sam Weinig.

Source/JavaScriptCore:

Source/WebCore:

No new functionality, so no new tests.

  • WebCore.gypi:
  • WebCore.vcproj/WebCore.vcproj:
  • platform/win/HWndDC.h: Renamed from Source/JavaScriptCore/wtf/win/HWndDCWin.h.

I also made the class non-copyable.
(WebCore::HWndDC::HWndDC):
(WebCore::HWndDC::~HWndDC):
(WebCore::HWndDC::operator HDC):

Source/WebKit/chromium:

  • src/win/WebScreenInfoFactory.cpp:

(WebKit::WebScreenInfoFactory::screenInfo):

Location:
trunk/Source
Files:
8 edited
1 moved

Legend:

Unmodified
Added
Removed

  • trunk/Source/JavaScriptCore/ChangeLog

    r104995 r105028  
     12012-01-14  David Levin  <levin@chromium.org>
     2
     3        HWndDC should be in platform/win instead of wtf.
     4        https://bugs.webkit.org/show_bug.cgi?id=76314
     5
     6        Reviewed by Sam Weinig.
     7
     8        * JavaScriptCore.gyp/JavaScriptCore.gyp:
     9        * JavaScriptCore.gypi:
     10
    1112012-01-13  David Levin  <levin@chromium.org>
    212

  • trunk/Source/JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.gyp

    r104946 r105028  
    174174            ['exclude', 'OSAllocatorPosix\\.cpp$'],
    175175            ['include', 'OSAllocatorWin\\.cpp$'],
    176             ['include', 'win/HWndDCWin\\.h$'],
    177176          ],
    178177          'include_dirs!': [

  • trunk/Source/JavaScriptCore/JavaScriptCore.gypi

    r104946 r105028  
    649649            'wtf/unicode/wince/UnicodeWinCE.h',
    650650            'wtf/win/MainThreadWin.cpp',
    651             'wtf/win/HWndDCWin.h',
    652651            'wtf/win/OwnPtrWin.cpp',
    653652            'wtf/wince/FastMallocWinCE.h',

  • trunk/Source/WebCore/ChangeLog

    r105027 r105028  
     12012-01-14  David Levin  <levin@chromium.org>
     2
     3        HWndDC should be in platform/win instead of wtf.
     4        https://bugs.webkit.org/show_bug.cgi?id=76314
     5
     6        Reviewed by Sam Weinig.
     7
     8        No new functionality, so no new tests.
     9
     10        * WebCore.gypi:
     11        * WebCore.vcproj/WebCore.vcproj:
     12        * platform/win/HWndDC.h: Renamed from Source/JavaScriptCore/wtf/win/HWndDCWin.h.
     13        I also made the class non-copyable.
     14        (WebCore::HWndDC::HWndDC):
     15        (WebCore::HWndDC::~HWndDC):
     16        (WebCore::HWndDC::operator HDC):
     17
    1182012-01-14  Adam Treat  <atreat@rim.com>
    219

  • trunk/Source/WebCore/WebCore.gypi

    r104961 r105028  
    45104510            'platform/win/GDIObjectCounter.cpp',
    45114511            'platform/win/GDIObjectCounter.h',
     4512            'platform/win/HWndDC.h',
    45124513            'platform/win/KeyEventWin.cpp',
    45134514            'platform/win/LanguageWin.cpp',

  • trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj

    r105013 r105028  
    2698226982                                </File>
    2698326983                                <File
     26984                                        RelativePath="..\platform\win\HWndDC.h"
     26985                                        >
     26986                                </File>
     26987                                <File
    2698426988                                        RelativePath="..\platform\win\ImportedFunctionsEnumerator.cpp"
    2698526989                                        >

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

    r105027 r105028  
    2424 */
    2525
    26 #ifndef WTF_HWndDCWin_h
    27 #define WTF_HWndDCWin_h
     26#ifndef HWndDC_h
     27#define HWndDC_h
    2828
    2929#include <windows.h>
     30#include <wtf/NonCopyable.h>
    3031
    31 namespace WTF {
     32namespace WebCore {
    3233
    3334class HWndDC {
     35    WTF_MAKE_NONCOPYABLE(HWndDC);
    3436public:
    3537    explicit HWndDC(HWND hwnd)
    … …  
    6163};
    6264
    63 }
     65} // namespace WebCore
    6466
    65 using WTF::HWndDC;
    66 
    67 #endif // WTF_HWndDCWin_h
     67#endif // HWndDC_h

  • trunk/Source/WebKit/chromium/ChangeLog

    r105020 r105028  
     12012-01-14  David Levin  <levin@chromium.org>
     2
     3        HWndDC should be in platform/win instead of wtf.
     4        https://bugs.webkit.org/show_bug.cgi?id=76314
     5
     6        Reviewed by Sam Weinig.
     7
     8        * src/win/WebScreenInfoFactory.cpp:
     9        (WebKit::WebScreenInfoFactory::screenInfo):
     10
    1112012-01-14  Dmitry Lomov  <dslomov@google.com>
    212

  • trunk/Source/WebKit/chromium/src/win/WebScreenInfoFactory.cpp

    r104946 r105028  
    3232#include "WebScreenInfoFactory.h"
    3333
     34#include "HWndDC.h"
    3435#include "WebScreenInfo.h"
    35 
    36 #include <wtf/win/HWndDCWin.h>
    3736
    3837#include <windows.h>
    … …  
    6362    EnumDisplaySettings(monitorInfo.szDevice, ENUM_CURRENT_SETTINGS, &devMode);
    6463
    65     HWndDC hdc(0);
     64    WebCore::HWndDC hdc(0);
    6665    ASSERT(hdc);
    6766
Note: See TracChangeset for help on using the changeset viewer.