Attachment 341603 Details for Bug 186109 – Patch

[patch] Patch

bug-186109-20180530144135.patch (text/plain), 6.52 KB, created by Megan Gardner on 2018-05-30 14:41:36 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Megan Gardner

Created: 2018-05-30 14:41:36 PDT

Size: 6.52 KB

patch

obsolete

>Subversion Revision: 231854
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 051b6bc788a0e126cf71a04de8d7841aafbd5ba9..dc2ac41321506aab1ad7c1c7e4c944062c210484 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,21 @@
>+2018-05-30  Megan Gardner  <megan_gardner@apple.com>
>+
>+        Add setting to allow override screen size to be disabled.
>+        https://bugs.webkit.org/show_bug.cgi?id=186109
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Not Testable, and for debug only.
>+
>+        Pipe settings and use them to ignore override screen size if setting is set. 
>+
>+        * page/DeprecatedGlobalSettings.cpp:
>+        * page/DeprecatedGlobalSettings.h:
>+        (WebCore::DeprecatedGlobalSettings::setDisableScreenSizeOverride):
>+        (WebCore::DeprecatedGlobalSettings::disableScreenSizeOverride):
>+        * page/Settings.yaml:
>+        * platform/ios/PlatformScreenIOS.mm:
>+
> 2018-05-14  Yusuke Suzuki  <utatane.tea@gmail.com>
> 
>         [Win] Use C++17 in MSVC
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 51940422374a2719afe00b023c72a9af669ead17..b26a67a75bfc23ac8052211102c9d84471c86528 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,16 @@
>+2018-05-30  Megan Gardner  <megan_gardner@apple.com>
>+
>+        Add setting to allow override screen size to be disabled.
>+        https://bugs.webkit.org/show_bug.cgi?id=186109
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Pipe the needed settings through to WebCore.
>+
>+        * Shared/WebPreferences.yaml:
>+        * UIProcess/WebPageProxy.cpp:
>+        (WebKit::m_configurationPreferenceValues):
>+
> 2018-05-16  Fujii Hironori  <Hironori.Fujii@sony.com>
> 
>         [Win] Implement WebPage::handleEditingKeyboardEvent
>diff --git a/Source/WebCore/page/DeprecatedGlobalSettings.cpp b/Source/WebCore/page/DeprecatedGlobalSettings.cpp
>index fa92e2e35611cb44abe44a3a91f953f3e25d4efb..bed9f6c732739dec8242470b68459222dc70fae7 100644
>--- a/Source/WebCore/page/DeprecatedGlobalSettings.cpp
>+++ b/Source/WebCore/page/DeprecatedGlobalSettings.cpp
>@@ -72,6 +72,7 @@ bool DeprecatedGlobalSettings::gAllowsAnySSLCertificate = false;
> bool DeprecatedGlobalSettings::gNetworkDataUsageTrackingEnabled = false;
> bool DeprecatedGlobalSettings::gAVKitEnabled = false;
> bool DeprecatedGlobalSettings::gShouldOptOutOfNetworkStateObservation = false;
>+bool DeprecatedGlobalSettings::gDisableScreenSizeOverride = true;
> #endif
> bool DeprecatedGlobalSettings::gManageAudioSession = false;
> 
>diff --git a/Source/WebCore/page/DeprecatedGlobalSettings.h b/Source/WebCore/page/DeprecatedGlobalSettings.h
>index ec558abd0a8354253b081b609968868261df24d9..c8a9ed3ddc2d9ff2ce940fd4c1f978aa1ae6e4ec 100644
>--- a/Source/WebCore/page/DeprecatedGlobalSettings.h
>+++ b/Source/WebCore/page/DeprecatedGlobalSettings.h
>@@ -88,6 +88,8 @@ public:
>     WEBCORE_EXPORT static void setNetworkInterfaceName(const String&);
>     static const String& networkInterfaceName();
> 
>+    static void setDisableScreenSizeOverride(bool flag) { gDisableScreenSizeOverride = flag; }
>+    static bool disableScreenSizeOverride() { return gDisableScreenSizeOverride; }
> #if HAVE(AVKIT)
>     static void setAVKitEnabled(bool flag) { gAVKitEnabled = flag; }
> #endif
>@@ -135,6 +137,7 @@ private:
>     static bool gNetworkDataUsageTrackingEnabled;
>     WEBCORE_EXPORT static bool gAVKitEnabled;
>     WEBCORE_EXPORT static bool gShouldOptOutOfNetworkStateObservation;
>+    WEBCORE_EXPORT static bool gDisableScreenSizeOverride;
> #endif
>     WEBCORE_EXPORT static bool gManageAudioSession;
>     
>diff --git a/Source/WebCore/page/Settings.yaml b/Source/WebCore/page/Settings.yaml
>index 01bc6c8edc5a25751537fb905cf525938338399d..ff770d1ace7bde7caa446df097aa854296f3da3d 100644
>--- a/Source/WebCore/page/Settings.yaml
>+++ b/Source/WebCore/page/Settings.yaml
>@@ -150,6 +150,8 @@ resourceUsageOverlayVisible:
>   initial: false
>   onChange: resourceUsageOverlayVisibleChanged
>   condition: RESOURCE_USAGE
>+disableScreenSizeOverride:
>+  initial: false
> 
> # This is a quirk we are pro-actively applying to old applications. It changes keyboard event dispatching,
> # making keyIdentifier available on keypress events, making charCode available on keydown/keyup events,
>diff --git a/Source/WebCore/platform/ios/PlatformScreenIOS.mm b/Source/WebCore/platform/ios/PlatformScreenIOS.mm
>index 8e900826228917edfe7a355e8270ff31f4677689..05b6ce3715c8566929392fefd500b18f98225012 100644
>--- a/Source/WebCore/platform/ios/PlatformScreenIOS.mm
>+++ b/Source/WebCore/platform/ios/PlatformScreenIOS.mm
>@@ -28,6 +28,7 @@
> 
> #if PLATFORM(IOS)
> 
>+#import "DeprecatedGlobalSettings.h"
> #import "Device.h"
> #import "FloatRect.h"
> #import "FloatSize.h"
>diff --git a/Source/WebKit/Shared/WebPreferences.yaml b/Source/WebKit/Shared/WebPreferences.yaml
>index 8b9b0b90f9ad2180e78a2b43882fff593977fba4..695860e6a81e697c164f5ad1c7df7a4573624bc4 100644
>--- a/Source/WebKit/Shared/WebPreferences.yaml
>+++ b/Source/WebKit/Shared/WebPreferences.yaml
>@@ -1000,6 +1000,11 @@ TiledScrollingIndicatorVisible:
>   category: debug
>   webcoreName: showTiledScrollingIndicator
> 
>+DisableScreenSizeOverride:
>+    type: bool
>+    defaultValue: false
>+    category: debug
>+
> SimpleLineLayoutDebugBordersEnabled:
>   type: bool
>   defaultValue: false
>diff --git a/Source/WebKit/UIProcess/WebPageProxy.cpp b/Source/WebKit/UIProcess/WebPageProxy.cpp
>index cde1000c4edb846700f0915fe8a28013eb7fca63..04f1105f7269e89b8e3d22269fb42eba0c97ed1c 100644
>--- a/Source/WebKit/UIProcess/WebPageProxy.cpp
>+++ b/Source/WebKit/UIProcess/WebPageProxy.cpp
>@@ -110,6 +110,7 @@
> #include "WebPopupItem.h"
> #include "WebPopupMenuProxy.h"
> #include "WebPreferences.h"
>+#include "WebPreferencesKeys.h"
> #include "WebProcessMessages.h"
> #include "WebProcessPool.h"
> #include "WebProcessProxy.h"
>@@ -119,6 +120,7 @@
> #include "WebsiteDataStore.h"
> #include <WebCore/AttachmentTypes.h>
> #include <WebCore/BitmapImage.h>
>+#include <WebCore/DeprecatedGlobalSettings.h>
> #include <WebCore/DiagnosticLoggingClient.h>
> #include <WebCore/DiagnosticLoggingKeys.h>
> #include <WebCore/DragController.h>
>@@ -447,6 +449,8 @@ WebPageProxy::WebPageProxy(PageClient& pageClient, WebProcessProxy& process, uin
> #endif
> 
>     m_process->addMessageReceiver(Messages::WebPageProxy::messageReceiverName(), m_pageID, *this);
>+    
>+    DeprecatedGlobalSettings::setDisableScreenSizeOverride(preferencesStore().getBoolValueForKey(WebPreferencesKey::disableScreenSizeOverrideKey()));
> 
> #if PLATFORM(COCOA)
>     m_activityStateChangeDispatcher = std::make_unique<RunLoopObserver>(static_cast<CFIndex>(RunLoopObserver::WellKnownRunLoopOrders::ActivityStateChange), [this] {

Actions: View | Formatted Diff | Diff

Attachments on bug 186109: 341603 | 341609 | 341616