Title: [230754] trunk/Source/WebKit
- Revision
- 230754
- Author
- hironori.fu...@sony.com
- Date
- 2018-04-18 00:33:40 -0700 (Wed, 18 Apr 2018)
Log 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):
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (230753 => 230754)
--- trunk/Source/WebKit/ChangeLog 2018-04-18 06:51:33 UTC (rev 230753)
+++ trunk/Source/WebKit/ChangeLog 2018-04-18 07:33:40 UTC (rev 230754)
@@ -1,3 +1,13 @@
+2018-04-18 Fujii Hironori <hironori.fu...@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_hs...@apple.com>
[Extra zoom mode] Programmatically changing focus when an element already has focus is a confusing experience
Modified: trunk/Source/WebKit/WebProcess/InjectedBundle/win/InjectedBundleWin.cpp (230753 => 230754)
--- trunk/Source/WebKit/WebProcess/InjectedBundle/win/InjectedBundleWin.cpp 2018-04-18 06:51:33 UTC (rev 230753)
+++ trunk/Source/WebKit/WebProcess/InjectedBundle/win/InjectedBundleWin.cpp 2018-04-18 07:33:40 UTC (rev 230754)
@@ -28,18 +28,22 @@
#include "WKBundleAPICast.h"
#include "WKBundleInitialize.h"
-#include <WebCore/FileSystem.h>
-#include <wtf/text/CString.h>
+#include <wtf/text/win/WCharStringExtras.h>
-using namespace WebCore;
-
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;
}
void InjectedBundle::setBundleParameter(WTF::String const&, IPC::DataReference const&)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
