[wpe] Rename PageSettings to WKSettings to better match native code

Igalia · Sep 5, 2024 · f7e55bf · f7e55bf
1 parent 49264e1
commit f7e55bf
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 14 deletions.
diff --git a/tools/mediaplayer/src/main/java/org/wpewebkit/tools/mediaplayer/MainActivity.java b/tools/mediaplayer/src/main/java/org/wpewebkit/tools/mediaplayer/MainActivity.java
@@ -57,7 +57,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         try {
             String content = getHtmlContent();
             WPEView view = findViewById(R.id.wpe_view);
-            view.getWKWebView().getPageSettings().setAllowFileUrls(true);
+            view.getWKWebView().getWKSettings().setAllowFileUrls(true);
             view.loadHtml(content, "file:///");
         } catch (IOException ex) {
             String message = "Cannot initialize web application";

diff --git a/wpe/src/main/cpp/Browser/EntryPoint.cpp b/wpe/src/main/cpp/Browser/EntryPoint.cpp
@@ -18,10 +18,10 @@
  */
 
 #include "Browser.h"
-#include "PageSettings.h"
 #include "WKCallback.h"
 #include "WKCookieManager.h"
 #include "WKNetworkSession.h"
+#include "WKSettings.h"
 #include "WKWebContext.h"
 #include "WKWebView.h"
 #include "WKWebsiteDataManager.h"
@@ -38,7 +38,7 @@ extern "C" JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM* javaVM, void* /*reserved*/)
         WKWebContext::configureJNIMappings();
         WKWebsiteDataManager::configureJNIMappings();
         WKWebView::configureJNIMappings();
-        PageSettings::configureJNIMappings();
+        WKSettings::configureJNIMappings();
 
         return JNI::VERSION;
     } catch (...) {

diff --git a/wpe/src/main/cpp/Browser/PageSettings.cpp → wpe/src/main/cpp/Browser/WKSettings.cpp b/wpe/src/main/cpp/Browser/PageSettings.cpp → wpe/src/main/cpp/Browser/WKSettings.cpp
@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "PageSettings.h"
+#include "WKSettings.h"
 
 #include "WKWebView.h"
 
@@ -52,9 +52,9 @@ void setNativeAllowFileUrls(JNIEnv* /*env*/, jobject /*obj*/, jlong wkWebViewPtr
 }
 } // namespace
 
-void PageSettings::configureJNIMappings()
+void WKSettings::configureJNIMappings()
 {
-    JNI::Class("org/wpewebkit/wpe/PageSettings")
+    JNI::Class("org/wpewebkit/wpe/WKSettings")
         .registerNativeMethods(JNI::NativeMethod<void(jlong, jstring)>("setNativeUserAgent", setNativeUserAgent),
             JNI::NativeMethod<void(jlong, jboolean)>(
                 "setNativeMediaPlaybackRequiresUserGesture", setNativeMediaPlaybackRequiresUserGesture),

diff --git a/wpe/src/main/cpp/Browser/PageSettings.h → wpe/src/main/cpp/Browser/WKSettings.h b/wpe/src/main/cpp/Browser/PageSettings.h → wpe/src/main/cpp/Browser/WKSettings.h
@@ -20,9 +20,9 @@
 
 #pragma once
 
-class PageSettings final {
+class WKSettings final {
 public:
-    PageSettings() = delete;
+    WKSettings() = delete;
 
     static void configureJNIMappings();
 };
diff --git a/wpe/src/main/cpp/CMakeLists.txt b/wpe/src/main/cpp/CMakeLists.txt
@@ -111,7 +111,7 @@ add_library(
     Browser/LooperThread.cpp
     Browser/MessagePump.cpp
     Browser/WKWebView.cpp
-    Browser/PageSettings.cpp
+    Browser/WKSettings.cpp
     Browser/RendererSurfaceControl.cpp
     Browser/SurfaceControl.cpp
     Browser/WKCallback.cpp

diff --git a/.../java/org/wpewebkit/wpe/PageSettings.java → ...in/java/org/wpewebkit/wpe/WKSettings.java b/.../java/org/wpewebkit/wpe/PageSettings.java → ...in/java/org/wpewebkit/wpe/WKSettings.java
@@ -27,7 +27,7 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-public final class PageSettings {
+public final class WKSettings {
     private static final int DEFAULT_MAJOR_VERSION = 12;
     private static final int DEFAULT_MINOR_VERSION = 0;
     private static final int DEFAULT_BUGFIX_VERSION = 0;
@@ -60,7 +60,7 @@ private static String getOsVersion() {
     private native void setNativeMediaPlaybackRequiresUserGesture(long nativePtr, boolean requires);
     private native void setNativeAllowFileUrls(long nativePtr, boolean allow);
 
-    public PageSettings(@NonNull WKWebView wkWebView) {
+    public WKSettings(@NonNull WKWebView wkWebView) {
         this.wkWebView = wkWebView;
         setUserAgent(null);
         setMediaPlaybackRequiresUserGesture(true);

diff --git a/wpe/src/main/java/org/wpewebkit/wpe/WKWebView.java b/wpe/src/main/java/org/wpewebkit/wpe/WKWebView.java
@@ -111,9 +111,9 @@ public final class WKWebView {
     private final WPEView wpeView;
     private final PageSurfaceView surfaceView;
     protected final ScaleGestureDetector scaleDetector;
-    private final PageSettings pageSettings;
+    private final WKSettings wkSettings;
 
-    public @NonNull PageSettings getPageSettings() { return pageSettings; }
+    public @NonNull WKSettings getWKSettings() { return wkSettings; }
 
     private boolean isClosed = false;
     private boolean canGoBack = true;
@@ -156,7 +156,7 @@ public WKWebView(@NonNull WPEView wpeView, @NonNull WKWebContext context, boolea
         wpeView.onPageSurfaceViewCreated(surfaceView);
         wpeView.onPageSurfaceViewReady(surfaceView);
 
-        pageSettings = new PageSettings(this);
+        wkSettings = new WKSettings(this);
     }
 
     public void close() {