Diff
Modified: trunk/LayoutTests/ChangeLog (197791 => 197792)
--- trunk/LayoutTests/ChangeLog 2016-03-08 20:26:17 UTC (rev 197791)
+++ trunk/LayoutTests/ChangeLog 2016-03-08 20:35:23 UTC (rev 197792)
@@ -1,3 +1,17 @@
+2016-03-08 Commit Queue <[email protected]>
+
+ Unreviewed, rolling out r197766.
+ https://bugs.webkit.org/show_bug.cgi?id=155183
+
+ Has platform-specific code in non-platform files (Requested by
+ smfr on #webkit).
+
+ Reverted changeset:
+
+ "AX: Force allow user zoom"
+ https://bugs.webkit.org/show_bug.cgi?id=155056
+ http://trac.webkit.org/changeset/197766
+
2016-03-08 Ryan Haddad <[email protected]>
Skip svg/animations/animate-marker-orient-from-angle-to-autostartreverse.html on ios-simulator
Deleted: trunk/LayoutTests/accessibility/ios-simulator/force-user-scalable-expected.txt (197791 => 197792)
--- trunk/LayoutTests/accessibility/ios-simulator/force-user-scalable-expected.txt 2016-03-08 20:26:17 UTC (rev 197791)
+++ trunk/LayoutTests/accessibility/ios-simulator/force-user-scalable-expected.txt 2016-03-08 20:35:23 UTC (rev 197792)
@@ -1,10 +0,0 @@
-This tests that when we set force always user scalable, the maximum scale will be changed too.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS window.internals.viewportConfigurationMaximumScale() is 10
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
Deleted: trunk/LayoutTests/accessibility/ios-simulator/force-user-scalable.html (197791 => 197792)
--- trunk/LayoutTests/accessibility/ios-simulator/force-user-scalable.html 2016-03-08 20:26:17 UTC (rev 197791)
+++ trunk/LayoutTests/accessibility/ios-simulator/force-user-scalable.html 2016-03-08 20:35:23 UTC (rev 197792)
@@ -1,30 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
-<html>
-<head>
-<script src=""
-<script>
-var successfullyParsed = false;
-</script>
-<meta name="viewport" content="width=device-width, user-scalable=no, maximum-scale=3, minimum-scale=1">
-</head>
-<body id="body">
-
-<p id="description"></p>
-<div id="console"></div>
-
-<script>
-
- description("This tests that when we set force always user scalable, the maximum scale will be changed too.");
-
- if (window.accessibilityController) {
- window.internals.setViewportForceAlwaysUserScalable(true);
- shouldBe("window.internals.viewportConfigurationMaximumScale()", "10");
- }
-
- successfullyParsed = true;
-</script>
-
-<script src=""
-</body>
-</html>
-
Modified: trunk/Source/WebCore/ChangeLog (197791 => 197792)
--- trunk/Source/WebCore/ChangeLog 2016-03-08 20:26:17 UTC (rev 197791)
+++ trunk/Source/WebCore/ChangeLog 2016-03-08 20:35:23 UTC (rev 197792)
@@ -1,3 +1,17 @@
+2016-03-08 Commit Queue <[email protected]>
+
+ Unreviewed, rolling out r197766.
+ https://bugs.webkit.org/show_bug.cgi?id=155183
+
+ Has platform-specific code in non-platform files (Requested by
+ smfr on #webkit).
+
+ Reverted changeset:
+
+ "AX: Force allow user zoom"
+ https://bugs.webkit.org/show_bug.cgi?id=155056
+ http://trac.webkit.org/changeset/197766
+
2016-03-08 Beth Dakin <[email protected]>
Add an event for when touch force changes
Modified: trunk/Source/WebCore/page/ViewportConfiguration.h (197791 => 197792)
--- trunk/Source/WebCore/page/ViewportConfiguration.h 2016-03-08 20:26:17 UTC (rev 197791)
+++ trunk/Source/WebCore/page/ViewportConfiguration.h 2016-03-08 20:35:23 UTC (rev 197792)
@@ -33,8 +33,6 @@
namespace WebCore {
-static const double forceAlwaysUserScalableMaximumScale = 10.0;
-
class TextStream;
class ViewportConfiguration {
@@ -90,7 +88,7 @@
WEBCORE_EXPORT double initialScale() const;
WEBCORE_EXPORT double initialScaleIgnoringContentSize() const;
WEBCORE_EXPORT double minimumScale() const;
- double maximumScale() const { return m_forceAlwaysUserScalable ? forceAlwaysUserScalableMaximumScale : m_configuration.maximumScale; }
+ double maximumScale() const { return m_configuration.maximumScale; }
WEBCORE_EXPORT bool allowsUserScaling() const;
bool allowsShrinkToFit() const;
Modified: trunk/Source/WebCore/testing/Internals.cpp (197791 => 197792)
--- trunk/Source/WebCore/testing/Internals.cpp 2016-03-08 20:26:17 UTC (rev 197791)
+++ trunk/Source/WebCore/testing/Internals.cpp 2016-03-08 20:35:23 UTC (rev 197792)
@@ -3518,22 +3518,4 @@
return WebCore::composedTreeAsText(downcast<ContainerNode>(*node));
}
-void Internals::setViewportForceAlwaysUserScalable(bool forceAlwaysUserScalableEnabled)
-{
-#if PLATFORM(IOS) || PLATFORM(MAC)
- m_viewportConfiguration.setForceAlwaysUserScalable(forceAlwaysUserScalableEnabled);
-#else
- UNUSED_PARAM(forceAlwaysUserScalableEnabled);
-#endif
}
-
-double Internals::viewportConfigurationMaximumScale()
-{
-#if PLATFORM(IOS) || PLATFORM(MAC)
- return m_viewportConfiguration.maximumScale();
-#else
- return 0;
-#endif
-}
-
-}
Modified: trunk/Source/WebCore/testing/Internals.h (197791 => 197792)
--- trunk/Source/WebCore/testing/Internals.h 2016-03-08 20:26:17 UTC (rev 197791)
+++ trunk/Source/WebCore/testing/Internals.h 2016-03-08 20:35:23 UTC (rev 197792)
@@ -39,10 +39,6 @@
#include <wtf/RefCounted.h>
#include <wtf/text/WTFString.h>
-#if PLATFORM(IOS) || PLATFORM(MAC)
-#include "ViewportConfiguration.h"
-#endif
-
namespace WebCore {
class AudioContext;
@@ -480,9 +476,6 @@
String composedTreeAsText(Node*);
- void setViewportForceAlwaysUserScalable(bool);
- double viewportConfigurationMaximumScale();
-
private:
explicit Internals(Document*);
Document* contextDocument() const;
@@ -491,9 +484,6 @@
RenderedDocumentMarker* markerAt(Node*, const String& markerType, unsigned index, ExceptionCode&);
std::unique_ptr<InspectorStubFrontend> m_inspectorFrontend;
-#if PLATFORM(IOS) || PLATFORM(MAC)
- ViewportConfiguration m_viewportConfiguration;
-#endif
};
} // namespace WebCore
Modified: trunk/Source/WebCore/testing/Internals.idl (197791 => 197792)
--- trunk/Source/WebCore/testing/Internals.idl 2016-03-08 20:26:17 UTC (rev 197791)
+++ trunk/Source/WebCore/testing/Internals.idl 2016-03-08 20:35:23 UTC (rev 197792)
@@ -443,7 +443,4 @@
[RaisesException] void setCanShowModalDialogOverride(boolean allow);
DOMString composedTreeAsText(Node parent);
-
- void setViewportForceAlwaysUserScalable(boolean enable);
- double viewportConfigurationMaximumScale();
};
Modified: trunk/Source/WebKit2/ChangeLog (197791 => 197792)
--- trunk/Source/WebKit2/ChangeLog 2016-03-08 20:26:17 UTC (rev 197791)
+++ trunk/Source/WebKit2/ChangeLog 2016-03-08 20:35:23 UTC (rev 197792)
@@ -1,3 +1,17 @@
+2016-03-08 Commit Queue <[email protected]>
+
+ Unreviewed, rolling out r197766.
+ https://bugs.webkit.org/show_bug.cgi?id=155183
+
+ Has platform-specific code in non-platform files (Requested by
+ smfr on #webkit).
+
+ Reverted changeset:
+
+ "AX: Force allow user zoom"
+ https://bugs.webkit.org/show_bug.cgi?id=155056
+ http://trac.webkit.org/changeset/197766
+
2016-03-04 Ada Chan <[email protected]>
Fix lifetime issues regarding WebVideoFullscreenInterfaceMac
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (197791 => 197792)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2016-03-08 20:26:17 UTC (rev 197791)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2016-03-08 20:35:23 UTC (rev 197792)
@@ -210,17 +210,8 @@
#include <CoreGraphics/CoreGraphics.h>
#include <WebCore/CoreTextSPI.h>
#include <WebCore/Icon.h>
-
-#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000
-#include <WebCore/SoftLinking.h>
-SOFT_LINK_LIBRARY(libAccessibility)
-SOFT_LINK(libAccessibility, _AXSForceAllowWebScaling, Boolean, (), ())
-SOFT_LINK_CONSTANT(libAccessibility, kAXSAllowForceWebScalingEnabledNotification, CFStringRef)
-#define kAXSAllowForceWebScalingEnabledNotification getkAXSAllowForceWebScalingEnabledNotification()
#endif
-#endif
-
#ifndef NDEBUG
#include <wtf/RefCountedLeakCounter.h>
#endif
@@ -270,15 +261,6 @@
DEFINE_DEBUG_ONLY_GLOBAL(WTF::RefCountedLeakCounter, webPageCounter, ("WebPage"));
-#if PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000
-static void forceAlwaysUserScalableChangedCallback(CFNotificationCenterRef, void* observer, CFStringRef, const void*, CFDictionaryRef)
-{
- ASSERT(observer);
- static_cast<WebPage*>(observer)->updateForceAlwaysUserScalable();
-}
-#endif
-
-
Ref<WebPage> WebPage::create(uint64_t pageID, const WebPageCreationParameters& parameters)
{
Ref<WebPage> page = adoptRef(*new WebPage(pageID, parameters));
@@ -564,10 +546,7 @@
#if PLATFORM(IOS)
m_page->settings().setContentDispositionAttachmentSandboxEnabled(true);
-#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000
- CFNotificationCenterAddObserver(CFNotificationCenterGetLocalCenter(), this, forceAlwaysUserScalableChangedCallback, kAXSAllowForceWebScalingEnabledNotification, 0, CFNotificationSuspensionBehaviorDeliverImmediately);
#endif
-#endif
}
void WebPage::reinitializeWebPage(const WebPageCreationParameters& parameters)
@@ -599,10 +578,6 @@
WebPage::~WebPage()
{
-#if PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000
- CFNotificationCenterRemoveObserver(CFNotificationCenterGetLocalCenter(), this, nullptr, nullptr);
-#endif
-
if (m_backForwardList)
m_backForwardList->detach();
@@ -2823,17 +2798,6 @@
updatePreferences(store);
}
-#if PLATFORM(IOS)
-void WebPage::updateForceAlwaysUserScalable()
-{
- bool forceAlwaysUserScalableEnabled = m_forceAlwaysUserScalable;
-#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000
- forceAlwaysUserScalableEnabled |= _AXSForceAllowWebScaling();
-#endif
- m_viewportConfiguration.setForceAlwaysUserScalable(forceAlwaysUserScalableEnabled);
-}
-#endif
-
void WebPage::updatePreferences(const WebPreferencesStore& store)
{
Settings& settings = m_page->settings();
@@ -3107,8 +3071,7 @@
#if PLATFORM(IOS)
m_ignoreViewportScalingConstraints = store.getBoolValueForKey(WebPreferencesKey::ignoreViewportScalingConstraintsKey());
m_viewportConfiguration.setCanIgnoreScalingConstraints(m_ignoreViewportScalingConstraints);
- m_forceAlwaysUserScalable = store.getBoolValueForKey(WebPreferencesKey::forceAlwaysUserScalableKey());
- updateForceAlwaysUserScalable();
+ m_viewportConfiguration.setForceAlwaysUserScalable(store.getBoolValueForKey(WebPreferencesKey::forceAlwaysUserScalableKey()));
#endif
}
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h (197791 => 197792)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2016-03-08 20:26:17 UTC (rev 197791)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2016-03-08 20:35:23 UTC (rev 197792)
@@ -931,10 +931,6 @@
bool isControlledByAutomation() const;
void setControlledByAutomation(bool);
-
-#if PLATFORM(IOS)
- void updateForceAlwaysUserScalable();
-#endif
void insertNewlineInQuotedContent();
@@ -1443,10 +1439,6 @@
bool m_inputMethodEnabled { false };
#endif
-#if PLATFORM(IOS)
- bool m_forceAlwaysUserScalable { false };
-#endif
-
#if ENABLE(VIDEO) && USE(GSTREAMER)
RefPtr<WebCore::MediaPlayerRequestInstallMissingPluginsCallback> m_installMediaPluginsCallback;
#endif
