Changeset 230754 in webkit

Timestamp:

Apr 18, 2018 12:33:40 AM (6 years ago)

Author:

Fujii Hironori

Message:

[Win][WebKit] Implement InjectedBundleWin.cpp
​https://bugs.webkit.org/show_bug.cgi?id=184525

Reviewed by Konstantin Tokarev.

• WebProcess/InjectedBundle/win/InjectedBundleWin.cpp:

(WebKit::InjectedBundle::initialize):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/InjectedBundle/win/InjectedBundleWin.cpp (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2018-04-18  Fujii Hironori  <Hironori.Fujii@sony.com>
+
+        [Win][WebKit] Implement InjectedBundleWin.cpp
+        https://bugs.webkit.org/show_bug.cgi?id=184525
+
+        Reviewed by Konstantin Tokarev.
+
+        * WebProcess/InjectedBundle/win/InjectedBundleWin.cpp:
+        (WebKit::InjectedBundle::initialize):
+
 2018-04-17  Wenson Hsieh  <wenson_hsieh@apple.com>
 

trunk/Source/WebKit/WebProcess/InjectedBundle/win/InjectedBundleWin.cpp

@@ -29 +29 @@
 #include "WKBundleAPICast.h"
 #include "WKBundleInitialize.h"
-#include <WebCore/FileSystem.h>
-#include <wtf/text/CString.h>
-
-using namespace WebCore;
+#include <wtf/text/win/WCharStringExtras.h>
 
 namespace WebKit {
 
-typedef void (*BundleInitializeFunction)(WKBundleRef, WKTypeRef);
-
 bool InjectedBundle::initialize(const WebProcessCreationParameters&, API::Object* initializationUserData)
 {
-    return false;
+    HMODULE lib = ::LoadLibrary(stringToNullTerminatedWChar(m_path).data());
+    if (!lib)
+        return false;
+
+    WKBundleInitializeFunctionPtr proc = reinterpret_cast<WKBundleInitializeFunctionPtr>(::GetProcAddress(lib, "WKBundleInitialize"));
+    if (!proc)
+        return false;
+
+    proc(toAPI(this), toAPI(initializationUserData));
+    return true;
 }