Unreviewed, rolling out r247444.
Caused two scrolling tests to fail on iOS Simulator
Reverted changeset:
"Typing into a cell in a Google Sheet lags behind by one
character"
https://bugs.webkit.org/show_bug.cgi?id=199587
https://trac.webkit.org/changeset/247444
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@247472 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 730e1a7..1a181c7 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,16 @@
+2019-07-15 Ryan Haddad <ryanhaddad@apple.com>
+
+ Unreviewed, rolling out r247444.
+
+ Caused two scrolling tests to fail on iOS Simulator
+
+ Reverted changeset:
+
+ "Typing into a cell in a Google Sheet lags behind by one
+ character"
+ https://bugs.webkit.org/show_bug.cgi?id=199587
+ https://trac.webkit.org/changeset/247444
+
2019-07-15 Keith Miller <keith_miller@apple.com>
A Possible Issue of Object.create method
diff --git a/LayoutTests/fast/events/ios/dom-update-on-keydown-quirk-expected.txt b/LayoutTests/fast/events/ios/dom-update-on-keydown-quirk-expected.txt
deleted file mode 100644
index fad26c2..0000000
--- a/LayoutTests/fast/events/ios/dom-update-on-keydown-quirk-expected.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-This tests that the value of the field is updated by the time any timer scheduled on keydown, keypress, or keyup fires. To run this test manually, focus the text field and press [.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-
-For keydown:
-PASS document.getElementById("input").value is "["
-
-For keypress:
-PASS document.getElementById("input").value is "["
-
-For input:
-PASS document.getElementById("input").value is "["
-
-For keyup:
-PASS document.getElementById("input").value is "["
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
diff --git a/LayoutTests/fast/events/ios/dom-update-on-keydown-quirk.html b/LayoutTests/fast/events/ios/dom-update-on-keydown-quirk.html
deleted file mode 100644
index 38e22f7..0000000
--- a/LayoutTests/fast/events/ios/dom-update-on-keydown-quirk.html
+++ /dev/null
@@ -1,53 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<script src="../../../resources/js-test.js"></script>
-<script src="../../../resources/ui-helper.js"></script>
-</head>
-<body>
-<input id="input">
-<script>
-const expectedValue = "["; // [ chosen to avoid having to handle or disable iOS auto capitalization.
-
-let input = document.getElementById("input");
-
-function done()
-{
- document.body.removeChild(input);
- finishJSTest();
-}
-
-async function runTest()
-{
- if (window.internals.settings)
- internals.settings.setNeedsDeferKeyDownAndKeyPressTimersUntilNextEditingCommandQuirk(true);
-
- if (window.testRunner)
- await UIHelper.callFunctionAndWaitForEvent(() => UIHelper.activateElement(input), input, "focus");
-
- function checkResult(event) {
- // Note that scheduling a timer from an Input event handler is for aesthetics only: to make the
- // logged Input event be ordered like the spec'ed DOM dispatch event order. By the time the Input
- // event fires the DOM is guaranteed to have been updated. So, no timer is needed.
- window.setTimeout(() => {
- debug(`<br>For ${event.type}:`);
- shouldBeEqualToString('document.getElementById("input").value', expectedValue);
- if (event.type === "keyup")
- done();
- }, 0);
- }
-
- for (let eventName of ["keydown", "keypress", "keyup", "input"])
- input.addEventListener(eventName, checkResult, { once: true });
-
- if (window.testRunner)
- UIHelper.keyDown(expectedValue);
-}
-
-window.jsTestIsAsync = true;
-description("This tests that the value of the field is updated by the time any timer scheduled on keydown, keypress, or keyup fires. To run this test manually, focus the text field and press <kbd>[</kbd>.");
-
-runTest();
-</script>
-</body>
-</html>
\ No newline at end of file
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 209d447..61dc5fd 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2019-07-15 Ryan Haddad <ryanhaddad@apple.com>
+
+ Unreviewed, rolling out r247444.
+
+ Caused two scrolling tests to fail on iOS Simulator
+
+ Reverted changeset:
+
+ "Typing into a cell in a Google Sheet lags behind by one
+ character"
+ https://bugs.webkit.org/show_bug.cgi?id=199587
+ https://trac.webkit.org/changeset/247444
+
2019-07-15 Zalan Bujtas <zalan@apple.com>
outlook.live.com has odd viewport with edge gap
diff --git a/Source/WebCore/SourcesCocoa.txt b/Source/WebCore/SourcesCocoa.txt
index e83348a..db8aa2e 100644
--- a/Source/WebCore/SourcesCocoa.txt
+++ b/Source/WebCore/SourcesCocoa.txt
@@ -131,7 +131,6 @@
page/cocoa/SettingsBaseCocoa.mm
page/ios/ContentChangeObserver.cpp
-page/ios/DOMTimerHoldingTank.cpp
page/ios/EventHandlerIOS.mm
page/ios/FrameIOS.mm
page/ios/WebEventRegion.mm
diff --git a/Source/WebCore/WebCore.xcodeproj/project.pbxproj b/Source/WebCore/WebCore.xcodeproj/project.pbxproj
index 586ef4a..70ef35a 100644
--- a/Source/WebCore/WebCore.xcodeproj/project.pbxproj
+++ b/Source/WebCore/WebCore.xcodeproj/project.pbxproj
@@ -4147,7 +4147,6 @@
CE057FA61220731100A476D5 /* DocumentMarkerController.h in Headers */ = {isa = PBXBuildFile; fileRef = CE057FA41220731100A476D5 /* DocumentMarkerController.h */; settings = {ATTRIBUTES = (Private, ); }; };
CE08C3D2152B599A0021B8C2 /* AlternativeTextController.h in Headers */ = {isa = PBXBuildFile; fileRef = CE08C3D0152B599A0021B8C2 /* AlternativeTextController.h */; settings = {ATTRIBUTES = (); }; };
CE1866451F72E5B400A0CAB6 /* MarkedText.h in Headers */ = {isa = PBXBuildFile; fileRef = CE1866431F72E5B400A0CAB6 /* MarkedText.h */; settings = {ATTRIBUTES = (Private, ); }; };
- CE1A501F22D5350900CBC927 /* DOMTimerHoldingTank.h in Headers */ = {isa = PBXBuildFile; fileRef = CE1A501D22D5350900CBC927 /* DOMTimerHoldingTank.h */; settings = {ATTRIBUTES = (Private, ); }; };
CE2849871CA360DF00B4A57F /* ContentSecurityPolicyDirectiveNames.h in Headers */ = {isa = PBXBuildFile; fileRef = CE2849861CA360DF00B4A57F /* ContentSecurityPolicyDirectiveNames.h */; };
CE5169E721F1B84700EA4F78 /* ColorIOS.h in Headers */ = {isa = PBXBuildFile; fileRef = CE5169E521F1B84700EA4F78 /* ColorIOS.h */; settings = {ATTRIBUTES = (Private, ); }; };
CE5FA255209E48C50051D700 /* ContentSecurityPolicyClient.h in Headers */ = {isa = PBXBuildFile; fileRef = CE5FA253209E48C50051D700 /* ContentSecurityPolicyClient.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -13810,8 +13809,6 @@
CE08C3D0152B599A0021B8C2 /* AlternativeTextController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AlternativeTextController.h; sourceTree = "<group>"; };
CE1866421F72E5B400A0CAB6 /* MarkedText.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = MarkedText.cpp; sourceTree = "<group>"; };
CE1866431F72E5B400A0CAB6 /* MarkedText.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MarkedText.h; sourceTree = "<group>"; };
- CE1A501D22D5350900CBC927 /* DOMTimerHoldingTank.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DOMTimerHoldingTank.h; sourceTree = "<group>"; };
- CE1A501E22D5350900CBC927 /* DOMTimerHoldingTank.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = DOMTimerHoldingTank.cpp; sourceTree = "<group>"; };
CE2849861CA360DF00B4A57F /* ContentSecurityPolicyDirectiveNames.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ContentSecurityPolicyDirectiveNames.h; path = csp/ContentSecurityPolicyDirectiveNames.h; sourceTree = "<group>"; };
CE2849881CA3614600B4A57F /* ContentSecurityPolicyDirectiveNames.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ContentSecurityPolicyDirectiveNames.cpp; path = csp/ContentSecurityPolicyDirectiveNames.cpp; sourceTree = "<group>"; };
CE5169E521F1B84700EA4F78 /* ColorIOS.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ColorIOS.h; sourceTree = "<group>"; };
@@ -16531,8 +16528,6 @@
children = (
6FE9F09222211035004C5082 /* ContentChangeObserver.cpp */,
6FB5E212221F2447003989CF /* ContentChangeObserver.h */,
- CE1A501E22D5350900CBC927 /* DOMTimerHoldingTank.cpp */,
- CE1A501D22D5350900CBC927 /* DOMTimerHoldingTank.h */,
FE6938B51045D67E008EABB6 /* EventHandlerIOS.mm */,
FED13D3B0CEA936A00D89466 /* FrameIOS.mm */,
225A16B30D5C11E900090295 /* WebEventRegion.h */,
@@ -28977,7 +28972,6 @@
C544274B11A57E7A0063A749 /* DOMStringList.h in Headers */,
BC64640A11D7F304006455B0 /* DOMStringMap.h in Headers */,
188604B40F2E654A000B6443 /* DOMTimer.h in Headers */,
- CE1A501F22D5350900CBC927 /* DOMTimerHoldingTank.h in Headers */,
05FD69E012845D4300B2BEB3 /* DOMTimeStamp.h in Headers */,
76FC2B0C12370DA0006A991A /* DOMTokenList.h in Headers */,
2E37DFDB12DBAFB800A6B233 /* DOMURL.h in Headers */,
diff --git a/Source/WebCore/dom/Document.cpp b/Source/WebCore/dom/Document.cpp
index 1035fb3..83bafc9 100644
--- a/Source/WebCore/dom/Document.cpp
+++ b/Source/WebCore/dom/Document.cpp
@@ -262,7 +262,6 @@
#if PLATFORM(IOS_FAMILY)
#include "ContentChangeObserver.h"
#include "CSSFontSelector.h"
-#include "DOMTimerHoldingTank.h"
#include "DeviceMotionClientIOS.h"
#include "DeviceMotionController.h"
#include "DeviceOrientationClientIOS.h"
@@ -8187,22 +8186,12 @@
#endif
#if PLATFORM(IOS_FAMILY)
-
ContentChangeObserver& Document::contentChangeObserver()
{
if (!m_contentChangeObserver)
m_contentChangeObserver = std::make_unique<ContentChangeObserver>(*this);
return *m_contentChangeObserver;
}
-
-DOMTimerHoldingTank& Document::domTimerHoldingTank()
-{
- if (m_domTimerHoldingTank)
- return *m_domTimerHoldingTank;
- m_domTimerHoldingTank = std::make_unique<DOMTimerHoldingTank>();
- return *m_domTimerHoldingTank;
-}
-
#endif
bool Document::hasEvaluatedUserAgentScripts() const
diff --git a/Source/WebCore/dom/Document.h b/Source/WebCore/dom/Document.h
index 34913c5..a022efd 100644
--- a/Source/WebCore/dom/Document.h
+++ b/Source/WebCore/dom/Document.h
@@ -106,7 +106,6 @@
class ContentChangeObserver;
class DOMImplementation;
class DOMSelection;
-class DOMTimerHoldingTank;
class DOMWindow;
class DOMWrapperWorld;
class Database;
@@ -884,9 +883,6 @@
void processWebAppOrientations();
WEBCORE_EXPORT ContentChangeObserver& contentChangeObserver();
-
- DOMTimerHoldingTank* domTimerHoldingTankIfExists() { return m_domTimerHoldingTank.get(); }
- DOMTimerHoldingTank& domTimerHoldingTank();
#endif
void processViewport(const String& features, ViewportArguments::Type origin);
@@ -2048,7 +2044,6 @@
Ref<UndoManager> m_undoManager;
#if PLATFORM(IOS_FAMILY)
std::unique_ptr<ContentChangeObserver> m_contentChangeObserver;
- std::unique_ptr<DOMTimerHoldingTank> m_domTimerHoldingTank;
#endif
HashMap<Element*, ElementIdentifier> m_identifiedElementsMap;
diff --git a/Source/WebCore/page/DOMTimer.cpp b/Source/WebCore/page/DOMTimer.cpp
index 7f57537..6a22dbe 100644
--- a/Source/WebCore/page/DOMTimer.cpp
+++ b/Source/WebCore/page/DOMTimer.cpp
@@ -43,7 +43,6 @@
#if PLATFORM(IOS_FAMILY)
#include "ContentChangeObserver.h"
-#include "DOMTimerHoldingTank.h"
#endif
namespace WebCore {
@@ -197,12 +196,8 @@
if (NestedTimersMap* nestedTimers = NestedTimersMap::instanceForContext(context))
nestedTimers->add(timer->m_timeoutId, *timer);
#if PLATFORM(IOS_FAMILY)
- if (is<Document>(context)) {
- auto& document = downcast<Document>(context);
- document.contentChangeObserver().didInstallDOMTimer(*timer, timeout, singleShot);
- if (DeferDOMTimersForScope::isDeferring())
- document.domTimerHoldingTank().add(*timer);
- }
+ if (is<Document>(context))
+ downcast<Document>(context).contentChangeObserver().didInstallDOMTimer(*timer, timeout, singleShot);
#endif
return timer->m_timeoutId;
}
@@ -218,11 +213,8 @@
#if PLATFORM(IOS_FAMILY)
if (is<Document>(context)) {
auto& document = downcast<Document>(context);
- if (auto* timer = document.findTimeout(timeoutId)) {
+ if (auto* timer = document.findTimeout(timeoutId))
document.contentChangeObserver().didRemoveDOMTimer(*timer);
- if (auto* holdingTank = document.domTimerHoldingTankIfExists())
- holdingTank->remove(*timer);
- }
}
#endif
@@ -292,17 +284,6 @@
ASSERT(scriptExecutionContext());
ScriptExecutionContext& context = *scriptExecutionContext();
-#if PLATFORM(IOS_FAMILY)
- if (is<Document>(context)) {
- auto& document = downcast<Document>(context);
- if (auto* holdingTank = document.domTimerHoldingTankIfExists(); holdingTank && holdingTank->contains(*this)) {
- if (!repeatInterval())
- startOneShot(0_s);
- return;
- }
- }
-#endif
-
DOMTimerFireState fireState(context, std::min(m_nestingLevel + 1, maxTimerNestingLevel));
if (m_userGestureTokenToForward && m_userGestureTokenToForward->hasExpired(maxIntervalForUserGestureForwarding))
diff --git a/Source/WebCore/page/EventHandler.cpp b/Source/WebCore/page/EventHandler.cpp
index b97a8d5..ef05ff1 100644
--- a/Source/WebCore/page/EventHandler.cpp
+++ b/Source/WebCore/page/EventHandler.cpp
@@ -131,10 +131,6 @@
#include "RuntimeEnabledFeatures.h"
#endif
-#if PLATFORM(IOS_FAMILY)
-#include "DOMTimerHoldingTank.h"
-#endif
-
namespace WebCore {
using namespace HTMLNames;
@@ -3345,10 +3341,6 @@
if (accessibilityPreventsEventPropagation(keydown))
keydown->stopPropagation();
-#if PLATFORM(IOS_FAMILY)
- DeferDOMTimersForScope deferralScope { m_frame.document()->quirks().needsDeferKeyDownAndKeyPressTimersUntilNextEditingCommand() };
-#endif
-
element->dispatchEvent(keydown);
if (handledByInputMethod)
return true;
diff --git a/Source/WebCore/page/Quirks.cpp b/Source/WebCore/page/Quirks.cpp
index 1c7ef8b..b4f0ffd 100644
--- a/Source/WebCore/page/Quirks.cpp
+++ b/Source/WebCore/page/Quirks.cpp
@@ -317,22 +317,6 @@
return false;
}
-bool Quirks::needsDeferKeyDownAndKeyPressTimersUntilNextEditingCommand() const
-{
-#if PLATFORM(IOS_FAMILY)
- if (m_document->settings().needsDeferKeyDownAndKeyPressTimersUntilNextEditingCommandQuirk())
- return true;
-
- if (!needsQuirks())
- return false;
-
- auto& url = m_document->topDocument().url();
- return equalLettersIgnoringASCIICase(url.host(), "docs.google.com") && url.path().startsWithIgnoringASCIICase("/spreadsheets/");
-#else
- return false;
-#endif
-}
-
// FIXME(<rdar://problem/50394969>): Remove after desmos.com adopts inputmode="none".
bool Quirks::needsInputModeNoneImplicitly(const HTMLElement& element) const
{
diff --git a/Source/WebCore/page/Quirks.h b/Source/WebCore/page/Quirks.h
index 28d2e54..30d1066 100644
--- a/Source/WebCore/page/Quirks.h
+++ b/Source/WebCore/page/Quirks.h
@@ -54,7 +54,6 @@
#endif
bool shouldDisablePointerEventsQuirk() const;
bool needsInputModeNoneImplicitly(const HTMLElement&) const;
- bool needsDeferKeyDownAndKeyPressTimersUntilNextEditingCommand() const;
WEBCORE_EXPORT bool shouldDispatchSyntheticMouseEventsWhenModifyingSelection() const;
WEBCORE_EXPORT bool shouldSuppressAutocorrectionAndAutocaptializationInHiddenEditableAreas() const;
diff --git a/Source/WebCore/page/Settings.yaml b/Source/WebCore/page/Settings.yaml
index 45625e1..9f07553 100644
--- a/Source/WebCore/page/Settings.yaml
+++ b/Source/WebCore/page/Settings.yaml
@@ -162,15 +162,6 @@
needsKeyboardEventDisambiguationQuirks:
initial: false
-# This is an iOS-specific quirk. Unlike Mac, keyboard operations are asynchronous and hence a DOM update as
-# a result of text insertion or deletion does not occur within the same event loop iteration as a dispatched
-# DOM keydown event. Some sites, notably Google Sheets, schedule timers on keypress and expect on a DOM update
-# to have occurred on expiration. When enabled, this quirk puts all such scheduled timers in a holding tank
-# until the keyboard performs the insertion or deletion. This gives Google Sheets the illusion that the DOM
-# update happened within the same event loop iteration that the keypress event was dispatched in.
-needsDeferKeyDownAndKeyPressTimersUntilNextEditingCommandQuirk:
- initial: false
-
treatsAnyTextCSSLinkAsStylesheet:
initial: false
shrinksStandaloneImagesToFit:
diff --git a/Source/WebCore/page/ios/DOMTimerHoldingTank.cpp b/Source/WebCore/page/ios/DOMTimerHoldingTank.cpp
deleted file mode 100644
index 3883c3b..0000000
--- a/Source/WebCore/page/ios/DOMTimerHoldingTank.cpp
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Copyright (C) 2019 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "DOMTimerHoldingTank.h"
-
-#if PLATFORM(IOS_FAMILY)
-
-#include <wtf/HashSet.h>
-
-namespace WebCore {
-
-#if PLATFORM(IOS_SIMULATOR)
-constexpr Seconds maximumHoldTimeLimit { 50_ms };
-#else
-constexpr Seconds maximumHoldTimeLimit { 32_ms };
-#endif
-
-bool DeferDOMTimersForScope::s_isDeferring { false };
-
-DOMTimerHoldingTank::DOMTimerHoldingTank()
- : m_exceededMaximumHoldTimer { *this, &DOMTimerHoldingTank::removeAll }
-{
-}
-
-DOMTimerHoldingTank::~DOMTimerHoldingTank() = default;
-
-void DOMTimerHoldingTank::add(const DOMTimer& timer)
-{
- m_timers.add(&timer);
- if (!m_exceededMaximumHoldTimer.isActive())
- m_exceededMaximumHoldTimer.startOneShot(maximumHoldTimeLimit);
-}
-
-void DOMTimerHoldingTank::remove(const DOMTimer& timer)
-{
- stopExceededMaximumHoldTimer();
- m_timers.remove(&timer);
-}
-
-bool DOMTimerHoldingTank::contains(const DOMTimer& timer)
-{
- return m_timers.contains(&timer);
-}
-
-void DOMTimerHoldingTank::removeAll()
-{
- stopExceededMaximumHoldTimer();
- m_timers.clear();
-}
-
-inline void DOMTimerHoldingTank::stopExceededMaximumHoldTimer()
-{
- if (m_exceededMaximumHoldTimer.isActive())
- m_exceededMaximumHoldTimer.stop();
-}
-
-} // namespace WebCore
-
-#endif // PLATFORM(IOS_FAMILY)
diff --git a/Source/WebCore/page/ios/DOMTimerHoldingTank.h b/Source/WebCore/page/ios/DOMTimerHoldingTank.h
deleted file mode 100644
index 60277c7..0000000
--- a/Source/WebCore/page/ios/DOMTimerHoldingTank.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright (C) 2019 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#pragma once
-
-#if PLATFORM(IOS_FAMILY)
-
-#include "Timer.h"
-#include <wtf/Forward.h>
-
-namespace WebCore {
-
-class DOMTimer;
-
-class DOMTimerHoldingTank {
-public:
- DOMTimerHoldingTank();
- ~DOMTimerHoldingTank();
-
- void add(const DOMTimer&);
- void remove(const DOMTimer&);
- bool contains(const DOMTimer&);
- WEBCORE_EXPORT void removeAll();
-
-private:
- void stopExceededMaximumHoldTimer();
-
- HashSet<const DOMTimer*> m_timers;
- Timer m_exceededMaximumHoldTimer;
-};
-
-class DeferDOMTimersForScope {
-public:
- DeferDOMTimersForScope(bool enable)
- : m_previousIsDeferring { s_isDeferring }
- {
- if (enable)
- s_isDeferring = true;
- }
-
- ~DeferDOMTimersForScope() { s_isDeferring = m_previousIsDeferring; }
-
- static bool isDeferring() { return s_isDeferring; }
-
-private:
- bool m_previousIsDeferring;
- static bool s_isDeferring;
-};
-
-} // namespace WebCore
-
-#endif // PLATFORM(IOS_FAMILY)
diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
index 30055b0..f9cd55d 100644
--- a/Source/WebKit/ChangeLog
+++ b/Source/WebKit/ChangeLog
@@ -1,3 +1,16 @@
+2019-07-15 Ryan Haddad <ryanhaddad@apple.com>
+
+ Unreviewed, rolling out r247444.
+
+ Caused two scrolling tests to fail on iOS Simulator
+
+ Reverted changeset:
+
+ "Typing into a cell in a Google Sheet lags behind by one
+ character"
+ https://bugs.webkit.org/show_bug.cgi?id=199587
+ https://trac.webkit.org/changeset/247444
+
2019-07-15 Zalan Bujtas <zalan@apple.com>
outlook.live.com has odd viewport with edge gap
diff --git a/Source/WebKit/WebProcess/WebPage/WebPage.cpp b/Source/WebKit/WebProcess/WebPage/WebPage.cpp
index f1d822b..06c7316 100644
--- a/Source/WebKit/WebProcess/WebPage/WebPage.cpp
+++ b/Source/WebKit/WebProcess/WebPage/WebPage.cpp
@@ -1260,9 +1260,7 @@
void WebPage::executeEditingCommand(const String& commandName, const String& argument)
{
- platformWillPerformEditingCommand();
-
- auto& frame = m_page->focusController().focusedOrMainFrame();
+ Frame& frame = m_page->focusController().focusedOrMainFrame();
if (PluginView* pluginView = focusedPluginViewForFrame(frame)) {
pluginView->handleEditingCommand(commandName, argument);
@@ -5172,9 +5170,7 @@
void WebPage::insertTextAsync(const String& text, const EditingRange& replacementEditingRange, InsertTextOptions&& options)
{
- platformWillPerformEditingCommand();
-
- auto& frame = m_page->focusController().focusedOrMainFrame();
+ Frame& frame = m_page->focusController().focusedOrMainFrame();
Ref<Frame> protector(frame);
@@ -5248,9 +5244,7 @@
void WebPage::setCompositionAsync(const String& text, const Vector<CompositionUnderline>& underlines, const EditingRange& selection, const EditingRange& replacementEditingRange)
{
- platformWillPerformEditingCommand();
-
- auto& frame = m_page->focusController().focusedOrMainFrame();
+ Frame& frame = m_page->focusController().focusedOrMainFrame();
if (frame.selection().selection().isContentEditable()) {
RefPtr<Range> replacementRange;
@@ -5266,8 +5260,6 @@
void WebPage::confirmCompositionAsync()
{
- platformWillPerformEditingCommand();
-
Frame& frame = m_page->focusController().focusedOrMainFrame();
frame.editor().confirmComposition();
}
diff --git a/Source/WebKit/WebProcess/WebPage/WebPage.h b/Source/WebKit/WebProcess/WebPage/WebPage.h
index 8d9a05b..0cbb8c6 100644
--- a/Source/WebKit/WebProcess/WebPage/WebPage.h
+++ b/Source/WebKit/WebProcess/WebPage/WebPage.h
@@ -1225,7 +1225,6 @@
void platformReinitialize();
void platformDetach();
void platformEditorState(WebCore::Frame&, EditorState& result, IncludePostLayoutDataHint) const;
- void platformWillPerformEditingCommand();
void sendEditorStateUpdate();
#if PLATFORM(COCOA)
@@ -1957,9 +1956,5 @@
#endif
};
-#if !PLATFORM(IOS_FAMILY)
-inline void WebPage::platformWillPerformEditingCommand() { }
-#endif
-
} // namespace WebKit
diff --git a/Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm b/Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm
index 87910c6c..13c8531 100644
--- a/Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm
+++ b/Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm
@@ -63,7 +63,6 @@
#import <WebCore/AutofillElements.h>
#import <WebCore/Chrome.h>
#import <WebCore/ContentChangeObserver.h>
-#import <WebCore/DOMTimerHoldingTank.h>
#import <WebCore/DataDetection.h>
#import <WebCore/DiagnosticLoggingClient.h>
#import <WebCore/DiagnosticLoggingKeys.h>
@@ -276,15 +275,6 @@
}
}
-void WebPage::platformWillPerformEditingCommand()
-{
- auto& frame = m_page->focusController().focusedOrMainFrame();
- if (auto* document = frame.document()) {
- if (auto* holdingTank = document->domTimerHoldingTankIfExists())
- holdingTank->removeAll();
- }
-}
-
FloatSize WebPage::screenSize() const
{
return m_screenSize;
