Changeset 57648 in webkit


Ignore:
Timestamp:
Apr 15, 2010 8:50:12 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

First patch: fix compiler errors.

  • DumpRenderTree/chromium/EventSender.cpp: (EventSender::reset): (EventSender::dispatchMessage):
  • DumpRenderTree/chromium/LayoutTestController.cpp: (LayoutTestController::pathToLocalResource):
  • DumpRenderTree/chromium/TestWebWorker.h:
  • DumpRenderTree/chromium/TextInputController.cpp:
  • DumpRenderTree/chromium/WebViewHost.h:
  • DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp:
Location:
trunk/WebKitTools
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/WebKitTools/ChangeLog

    r57629 r57648  
     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        First patch: fix compiler errors.
     9
     10        * DumpRenderTree/chromium/EventSender.cpp:
     11        (EventSender::reset):
     12        (EventSender::dispatchMessage):
     13        * DumpRenderTree/chromium/LayoutTestController.cpp:
     14        (LayoutTestController::pathToLocalResource):
     15        * DumpRenderTree/chromium/TestWebWorker.h:
     16        * DumpRenderTree/chromium/TextInputController.cpp:
     17        * DumpRenderTree/chromium/WebViewHost.h:
     18        * DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp:
     19
    1202010-04-14  Luiz Agostini  <luiz.agostini@openbossa.org>
    221

  • trunk/WebKitTools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp

    r57461 r57648  
    5656            'dependencies': [
    5757                '<(webkit_api_dir)/WebKit.gyp:webkit',
     58                '<(webkit_top)/JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.gyp:wtf_config',
    5859                '<(chromium_src_dir)/third_party/npapi/npapi.gyp:npapi',
    5960                '<(chromium_src_dir)/skia/skia.gyp:skia',

  • trunk/WebKitTools/DumpRenderTree/chromium/EventSender.cpp

    r57395 r57648  
    301301    dragMode.set(true);
    302302#if OS(WINDOWS)
    303     wmKeyDown.Set(WM_KEYDOWN);
    304     wmKeyUp.Set(WM_KEYUP);
    305     wmChar.Set(WM_CHAR);
    306     wmDeadChar.Set(WM_DEADCHAR);
    307     wmSysKeyDown.Set(WM_SYSKEYDOWN);
    308     wmSysKeyUp.Set(WM_SYSKEYUP);
    309     wmSysChar.Set(WM_SYSCHAR);
    310     wmSysDeadChar.Set(WM_SYSDEADCHAR);
     303    wmKeyDown.set(WM_KEYDOWN);
     304    wmKeyUp.set(WM_KEYUP);
     305    wmChar.set(WM_CHAR);
     306    wmDeadChar.set(WM_DEADCHAR);
     307    wmSysKeyDown.set(WM_SYSKEYDOWN);
     308    wmSysKeyUp.set(WM_SYSKEYUP);
     309    wmSysChar.set(WM_SYSCHAR);
     310    wmSysDeadChar.set(WM_SYSDEADCHAR);
    311311#endif
    312312    lastMousePos = WebPoint(0, 0);
    … …  
    633633    if (arguments.size() == 3) {
    634634        // Grab the message id to see if we need to dispatch it.
    635         int msg = arguments[0].ToInt32();
     635        int msg = arguments[0].toInt32();
    636636
    637637        // WebKit's version of this function stuffs a MSG struct and uses
    … …  
    643643        webview()->layout();
    644644
    645         unsigned long lparam = static_cast<unsigned long>(arguments[2].ToDouble());
    646         webview()->handleInputEvent(WebInputEventFactory::keyboardEvent(0, msg, arguments[1].ToInt32(), lparam));
     645        unsigned long lparam = static_cast<unsigned long>(arguments[2].toDouble());
     646        webview()->handleInputEvent(WebInputEventFactory::keyboardEvent(0, msg, arguments[1].toInt32(), lparam));
    647647    } else
    648648        ASSERT_NOT_REACHED();

  • trunk/WebKitTools/DumpRenderTree/chromium/LayoutTestController.cpp

    r57535 r57648  
    4949#include "public/WebView.h"
    5050#include "webkit/support/webkit_support.h"
     51
     52#if OS(WINDOWS)
     53#include <wtf/OwnArrayPtr.h>
     54#endif
    5155
    5256using namespace WebKit;
    … …  
    648652            ASSERT(tempLength < bufferSize);
    649653        }
    650         result->set(WebString(tempPath.get(), tempLength).utf8() + url.substr(tempPrefixLength));
     654        std::string resultPath(WebString(tempPath.get(), tempLength).utf8());
     655        resultPath.append(url.substr(tempPrefixLength));
     656        result->set(resultPath);
    651657        return;
    652658    }

  • trunk/WebKitTools/DumpRenderTree/chromium/TestWebWorker.h

    r56434 r57648  
    4545class TestWebWorker : public WebKit::WebWorker,
    4646                      public WebKit::WebWorkerClient,
    47                       public RefCounted<TestWebWorker> {
     47                      public WTF::RefCounted<TestWebWorker> {
    4848public:
    4949    TestWebWorker()
    … …  
    8383private:
    8484    ~TestWebWorker() {}
    85     friend class RefCounted<TestWebWorker>;
     85    friend class WTF::RefCounted<TestWebWorker>;
    8686};
    8787

  • trunk/WebKitTools/DumpRenderTree/chromium/TextInputController.cpp

    r57188 r57648  
    3737#include "public/WebString.h"
    3838#include "public/WebView.h"
     39#include <wtf/StringExtras.h>
    3940#include <string>
    4041

  • trunk/WebKitTools/DumpRenderTree/chromium/WebViewHost.h

    r56963 r57648  
    4444class WebFrame;
    4545class WebURL;
    46 class WebURLError;
     46struct WebURLError;
    4747struct WebRect;
    4848}
Note: See TracChangeset for help on using the changeset viewer.