Changeset 244106 in webkit

Timestamp:

Apr 10, 2019, 1:00:41 AM (7 years ago)

Author:

commit-queue@webkit.org

Message:

[WinCairo][MiniBrowser] Pull down menu "Disable JavaScript" doesn't work.
​https://bugs.webkit.org/show_bug.cgi?id=196727

Patch by Takashi Komori <​Takashi.Komori@sony.com> on 2019-04-10
Reviewed by Fujii Hironori.

• MiniBrowser/win/WebKitBrowserWindow.cpp:

(WebKitBrowserWindow::create):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• MiniBrowser/win/WebKitBrowserWindow.cpp (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2019-04-10  Takashi Komori  <Takashi.Komori@sony.com>
+
+        [WinCairo][MiniBrowser] Pull down menu "Disable JavaScript" doesn't work.
+        https://bugs.webkit.org/show_bug.cgi?id=196727
+
+        Reviewed by Fujii Hironori.
+
+        * MiniBrowser/win/WebKitBrowserWindow.cpp:
+        (WebKitBrowserWindow::create):
+
 2019-04-09  Aakash Jain  <aakash_jain@apple.com>
 

trunk/Tools/MiniBrowser/win/WebKitBrowserWindow.cpp

@@ -107 +107 @@
 Ref<BrowserWindow> WebKitBrowserWindow::create(HWND mainWnd, HWND urlBarWnd, bool, bool)
 {
-    auto conf = WKPageConfigurationCreate();
-
-    auto prefs = WKPreferencesCreate();
-    WKPreferencesSetDeveloperExtrasEnabled(prefs, true);
-    WKPageConfigurationSetPreferences(conf, prefs);
-
-    auto context = WKContextCreateWithConfiguration(nullptr);
-    WKPageConfigurationSetContext(conf, context);
-
-    return adoptRef(*new WebKitBrowserWindow(conf, mainWnd, urlBarWnd));
+    auto conf = adoptWK(WKPageConfigurationCreate());
+
+    auto prefs = adoptWK(WKPreferencesCreate());
+
+    auto pageGroup = adoptWK(WKPageGroupCreateWithIdentifier(createWKString("WinMiniBrowser").get()));
+    WKPageConfigurationSetPageGroup(conf.get(), pageGroup.get());
+    WKPageGroupSetPreferences(pageGroup.get(), prefs.get());
+
+    WKPreferencesSetDeveloperExtrasEnabled(prefs.get(), true);
+    WKPageConfigurationSetPreferences(conf.get(), prefs.get());
+
+    auto context =adoptWK(WKContextCreateWithConfiguration(nullptr));
+    WKPageConfigurationSetContext(conf.get(), context.get());
+
+    return adoptRef(*new WebKitBrowserWindow(conf.get(), mainWnd, urlBarWnd));
 }