Changeset 230744 in webkit

Timestamp:

Apr 17, 2018, 6:01:09 PM (8 years ago)

Author:

Fujii Hironori

Message:

[WinCairo][TestWebKitAPI] Implement PlatformWebView for TestWebKit
​https://bugs.webkit.org/show_bug.cgi?id=184524

Reviewed by Alex Christensen.

Resurrect PlatformWebView for Windows port which was removed in Bug 104607.

• TestWebKitAPI/PlatformWebView.h:
• TestWebKitAPI/PlatformWin.cmake:
• TestWebKitAPI/win/InjectedBundleControllerWin.cpp: Added.

(TestWebKitAPI::InjectedBundleController::platformInitialize):

• TestWebKitAPI/win/PlatformUtilitiesWin.cpp: Added.

(TestWebKitAPI::Util::moduleDirectory):
(TestWebKitAPI::Util::createInjectedBundlePath):
(TestWebKitAPI::Util::createURLForResource):
(TestWebKitAPI::Util::URLForNonExistentResource):
(TestWebKitAPI::Util::isKeyDown):

• TestWebKitAPI/win/PlatformWebViewWin.cpp: Added.

(TestWebKitAPI::PlatformWebView::registerWindowClass):
(TestWebKitAPI::PlatformWebView::PlatformWebView):
(TestWebKitAPI::PlatformWebView::initialize):
(TestWebKitAPI::PlatformWebView::~PlatformWebView):
(TestWebKitAPI::PlatformWebView::page const):
(TestWebKitAPI::PlatformWebView::resizeTo):
(TestWebKitAPI::PlatformWebView::simulateSpacebarKeyPress):
(TestWebKitAPI::PlatformWebView::simulateAltKeyPress):
(TestWebKitAPI::PlatformWebView::simulateRightClick):
(TestWebKitAPI::PlatformWebView::simulateMouseMove):
(TestWebKitAPI::PlatformWebView::wndProc):

• TestWebKitAPI/win/UtilitiesWin.cpp: Added.

(TestWebKitAPI::Util::run):
(TestWebKitAPI::Util::spinRunLoop):
(TestWebKitAPI::Util::sleep):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• TestWebKitAPI/PlatformWebView.h (modified) (2 diffs)
• TestWebKitAPI/PlatformWin.cmake (modified) (1 diff)
• TestWebKitAPI/win/InjectedBundleControllerWin.cpp (added)
• TestWebKitAPI/win/PlatformUtilitiesWin.cpp (added)
• TestWebKitAPI/win/PlatformWebViewWin.cpp (added)
• TestWebKitAPI/win/UtilitiesWin.cpp (added)

trunk/Tools/ChangeLog

@@ +1 @@
+2018-04-17  Fujii Hironori  <Hironori.Fujii@sony.com>
+
+        [WinCairo][TestWebKitAPI] Implement PlatformWebView for TestWebKit
+        https://bugs.webkit.org/show_bug.cgi?id=184524
+
+        Reviewed by Alex Christensen.
+
+        Resurrect PlatformWebView for Windows port which was removed in Bug 104607.
+
+        * TestWebKitAPI/PlatformWebView.h:
+        * TestWebKitAPI/PlatformWin.cmake:
+        * TestWebKitAPI/win/InjectedBundleControllerWin.cpp: Added.
+        (TestWebKitAPI::InjectedBundleController::platformInitialize):
+        * TestWebKitAPI/win/PlatformUtilitiesWin.cpp: Added.
+        (TestWebKitAPI::Util::moduleDirectory):
+        (TestWebKitAPI::Util::createInjectedBundlePath):
+        (TestWebKitAPI::Util::createURLForResource):
+        (TestWebKitAPI::Util::URLForNonExistentResource):
+        (TestWebKitAPI::Util::isKeyDown):
+        * TestWebKitAPI/win/PlatformWebViewWin.cpp: Added.
+        (TestWebKitAPI::PlatformWebView::registerWindowClass):
+        (TestWebKitAPI::PlatformWebView::PlatformWebView):
+        (TestWebKitAPI::PlatformWebView::initialize):
+        (TestWebKitAPI::PlatformWebView::~PlatformWebView):
+        (TestWebKitAPI::PlatformWebView::page const):
+        (TestWebKitAPI::PlatformWebView::resizeTo):
+        (TestWebKitAPI::PlatformWebView::simulateSpacebarKeyPress):
+        (TestWebKitAPI::PlatformWebView::simulateAltKeyPress):
+        (TestWebKitAPI::PlatformWebView::simulateRightClick):
+        (TestWebKitAPI::PlatformWebView::simulateMouseMove):
+        (TestWebKitAPI::PlatformWebView::wndProc):
+        * TestWebKitAPI/win/UtilitiesWin.cpp: Added.
+        (TestWebKitAPI::Util::run):
+        (TestWebKitAPI::Util::spinRunLoop):
+        (TestWebKitAPI::Util::sleep):
+
 2018-04-17  Jonathan Bedard  <jbedard@apple.com>
 

trunk/Tools/TestWebKitAPI/PlatformWebView.h

@@ -53 +53 @@
 typedef WKViewRef PlatformWKView;
 typedef HeadlessViewBackend *PlatformWindow;
+#elif PLATFORM(WIN)
+typedef WKViewRef PlatformWKView;
+typedef HWND PlatformWindow;
 #endif
 
@@ -83 +86 @@
 #if PLATFORM(MAC)
     void initialize(WKPageConfigurationRef, Class wkViewSubclass);
-#elif PLATFORM(GTK) || PLATFORM(WPE)
+#elif PLATFORM(GTK) || PLATFORM(WPE) || PLATFORM(WIN)
     void initialize(WKPageConfigurationRef);
+#endif
+#if PLATFORM(WIN)
+    static void registerWindowClass();
+    static LRESULT CALLBACK wndProc(HWND, UINT message, WPARAM, LPARAM);
 #endif
 

trunk/Tools/TestWebKitAPI/PlatformWin.cmake

@@ -163 +163 @@
 endif ()
 
+if (ENABLE_WEBKIT)
+    set(bundle_harness_SOURCES
+        ${TESTWEBKITAPI_DIR}/win/UtilitiesWin.cpp
+        ${TESTWEBKITAPI_DIR}/win/InjectedBundleControllerWin.cpp
+        ${TESTWEBKITAPI_DIR}/win/PlatformUtilitiesWin.cpp
+    )
+
+    set(webkit_api_harness_SOURCES
+        ${TESTWEBKITAPI_DIR}/win/PlatformUtilitiesWin.cpp
+        ${TESTWEBKITAPI_DIR}/win/PlatformWebViewWin.cpp
+        ${TESTWEBKITAPI_DIR}/win/UtilitiesWin.cpp
+    )
+
+    add_library(TestWebKitLib SHARED
+        ${TESTWEBKITAPI_DIR}/win/main.cpp
+        ${test_webkit_api_SOURCES}
+    )
+
+    target_link_libraries(TestWebKitLib ${test_webkit_api_LIBRARIES})
+
+    add_executable(TestWebKit
+        ${TOOLS_DIR}/win/DLLLauncher/DLLLauncherMain.cpp
+    )
+    target_link_libraries(TestWebKit shlwapi)
+
+    add_test(TestWebKit ${TESTWEBKITAPI_RUNTIME_OUTPUT_DIRECTORY}/WebKit/TestWebKit)
+    set_tests_properties(TestWebKit PROPERTIES TIMEOUT 60)
+    set_target_properties(TestWebKit PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${TESTWEBKITAPI_RUNTIME_OUTPUT_DIRECTORY}/WebKit)
+
+    add_dependencies(TestWebKit TestWebKitAPIBase)
+endif ()
+
 set(test_main_SOURCES
     ${TOOLS_DIR}/win/DLLLauncher/DLLLauncherMain.cpp