Changeset 57649 in webkit


Ignore:
Timestamp:
Apr 15, 2010 8:59:28 AM (14 years ago)
Author:
eric@webkit.org
Message:

2010-04-15 Roland Steiner <rolandsteiner@chromium.org>

Reviewed by Dimitri Glazkov.

Bug 37636 - [DRT/Chromium] Implement DRT/Chromium for Windows
https://bugs.webkit.org/show_bug.cgi?id=37636

Second patch: add Windows-specific implementation parts
of TestShell.

  • DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp:
  • DumpRenderTree/chromium/TestShell.h: (TestShell::finishedEvent):
  • DumpRenderTree/chromium/TestShellWin.cpp: (watchDogThread): (TestShell::waitTestFinished):
Location:
trunk/WebKitTools
Files:
1 added
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/WebKitTools/ChangeLog

    r57648 r57649  
     12010-04-15  Roland Steiner  <rolandsteiner@chromium.org>
     2 
     3        Reviewed by Dimitri Glazkov.
     4
     5        Bug 37636 - [DRT/Chromium] Implement DRT/Chromium for Windows
     6        https://bugs.webkit.org/show_bug.cgi?id=37636
     7 
     8        Second patch: add Windows-specific implementation parts
     9        of TestShell.
     10
     11        * DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp:
     12        * DumpRenderTree/chromium/TestShell.h:
     13        (TestShell::finishedEvent):
     14        * DumpRenderTree/chromium/TestShellWin.cpp:
     15        (watchDogThread):
     16        (TestShell::waitTestFinished):
     17
    1182010-04-15  Roland Steiner  <rolandsteiner@chromium.org>
    219
  • trunk/WebKitTools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp

    r57648 r57649  
    9393                '../chromium/TestShell.cpp',
    9494                '../chromium/TestShell.h',
    95                 '../chromium/TestShellMac.mm',
    9695                '../chromium/TextInputController.cpp',
    9796                '../chromium/TextInputController.h',
    9897                '../chromium/WebViewHost.cpp',
    9998                '../chromium/WebViewHost.h',
     99            ],
     100            'conditions': [
     101                ['OS=="win"', {
     102                    'sources': [
     103                        '../chromium/TestShellWin.cpp',
     104                    ],
     105                }],
     106                ['OS=="mac"', {
     107                    'sources': [
     108                        '../chromium/TestShellMac.mm',
     109                    ],
     110                }],
    100111            ],
    101112            'mac_bundle_resources': [
  • trunk/WebKitTools/DumpRenderTree/chromium/TestShell.h

    r56963 r57649  
    101101    void testTimedOut();
    102102
     103#if defined(OS_WIN)
     104    // Access to the finished event.  Used by the static WatchDog thread.
     105    HANDLE finishedEvent() { return m_finishedEvent; }
     106#endif
     107
    103108    // Get the timeout for running a test in milliseconds.
    104109    static int layoutTestTimeout();
     
    137142    typedef Vector<WebViewHost*> WindowList;
    138143    WindowList m_windowList;
     144
     145#if defined(OS_WIN)
     146    // Used by the watchdog to know when it's finished.
     147    HANDLE m_finishedEvent;
     148#endif
    139149};
Note: See TracChangeset for help on using the changeset viewer.