[WebKit on watchOS] Upstream watchOS source additions to OpenSource (Part 3)
authorwenson_hsieh@apple.com <wenson_hsieh@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 17 Jun 2018 18:37:09 +0000 (18:37 +0000)
committerwenson_hsieh@apple.com <wenson_hsieh@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 17 Jun 2018 18:37:09 +0000 (18:37 +0000)
commit8a9147d5cec7b7db4de005aa439af3975fd64c05
tree73d1b2e195d45e6b59dce9431ad1bb400cd562b0
parent3e314c8036a388741ed15d87b205c3eb7e5bd731
[WebKit on watchOS] Upstream watchOS source additions to OpenSource (Part 3)
https://bugs.webkit.org/show_bug.cgi?id=186442
<rdar://problem/40879364>

Reviewed by Darin Adler.

Source/WebCore:

Rename references to "Extra zoom mode". No change in behavior.

* page/DisabledAdaptations.cpp:
(WebCore::watchAdaptationName):
(WebCore::extraZoomModeAdaptationName): Deleted.
* page/DisabledAdaptations.h:
* page/ViewportConfiguration.cpp:
(WebCore::needsUpdateAfterChangingDisabledAdaptations):
(WebCore::ViewportConfiguration::shouldOverrideDeviceWidthAndShrinkToFit const):
* page/WindowFeatures.cpp:
(WebCore::parseDisabledAdaptations):
* testing/Internals.cpp:
(WebCore::Internals::extraZoomModeAdaptationName const): Deleted.
* testing/Internals.h:
* testing/Internals.idl:

Source/WebKit:

Rename a category referencing "Extra zoom mode".

* UIProcess/ios/WKContentViewInteraction.mm:

LayoutTests:

Rename extrazoom layout test directories to watchos.

* TestExpectations:
* fast/css/watchos/viewport-units-shrink-to-fit-expected.txt: Renamed from LayoutTests/fast/css/extrazoom/viewport-units-shrink-to-fit-expected.txt.
* fast/css/watchos/viewport-units-shrink-to-fit.html: Renamed from LayoutTests/fast/css/extrazoom/viewport-units-shrink-to-fit.html.
* fast/dom/Window/watchos/window-get-real-screen-dimensions-expected.txt: Renamed from LayoutTests/fast/dom/Window/extrazoom/window-get-real-screen-dimensions-expected.txt.
* fast/dom/Window/watchos/window-get-real-screen-dimensions.html: Renamed from LayoutTests/fast/dom/Window/extrazoom/window-get-real-screen-dimensions.html.
* fast/events/watchos/change-focus-during-change-event-expected.txt: Renamed from LayoutTests/fast/events/extrazoom/change-focus-during-change-event-expected.txt.
* fast/events/watchos/change-focus-during-change-event.html: Renamed from LayoutTests/fast/events/extrazoom/change-focus-during-change-event.html.
* fast/events/watchos/double-tap-to-zoom-on-full-width-text-expected.txt: Renamed from LayoutTests/fast/events/extrazoom/double-tap-to-zoom-on-full-width-text-expected.txt.
* fast/events/watchos/double-tap-to-zoom-on-full-width-text.html: Renamed from LayoutTests/fast/events/extrazoom/double-tap-to-zoom-on-full-width-text.html.
* fast/events/watchos/double-tap-to-zoom-with-large-text-expected.txt: Renamed from LayoutTests/fast/events/extrazoom/double-tap-to-zoom-with-large-text-expected.txt.
* fast/events/watchos/double-tap-to-zoom-with-large-text.html: Renamed from LayoutTests/fast/events/extrazoom/double-tap-to-zoom-with-large-text.html.
* fast/forms/watchos/delete-content-in-text-field-expected.txt: Renamed from LayoutTests/fast/forms/extrazoom/delete-content-in-text-field-expected.txt.
* fast/forms/watchos/delete-content-in-text-field.html: Renamed from LayoutTests/fast/forms/extrazoom/delete-content-in-text-field.html.
* fast/forms/watchos/edit-text-field-calls-injected-bundle-expected.txt: Renamed from LayoutTests/fast/forms/extrazoom/edit-text-field-calls-injected-bundle-expected.txt.
* fast/forms/watchos/edit-text-field-calls-injected-bundle.html: Renamed from LayoutTests/fast/forms/extrazoom/edit-text-field-calls-injected-bundle.html.
* fast/forms/watchos/form-control-label-text-expected.txt: Renamed from LayoutTests/fast/forms/extrazoom/form-control-label-text-expected.txt.
* fast/forms/watchos/form-control-label-text.html: Renamed from LayoutTests/fast/forms/extrazoom/form-control-label-text.html.
* fast/forms/watchos/time-picker-value-change-expected.txt: Renamed from LayoutTests/fast/forms/extrazoom/time-picker-value-change-expected.txt.
* fast/forms/watchos/time-picker-value-change.html: Renamed from LayoutTests/fast/forms/extrazoom/time-picker-value-change.html.
* fast/viewport/watchos/viewport-adaptations-after-navigation-expected.txt: Renamed from LayoutTests/fast/viewport/extrazoom/viewport-adaptations-after-navigation-expected.txt.
* fast/viewport/watchos/viewport-adaptations-after-navigation.html: Renamed from LayoutTests/fast/viewport/extrazoom/viewport-adaptations-after-navigation.html.
* fast/viewport/watchos/viewport-disable-extra-zoom-adaptations-expected.txt: Renamed from LayoutTests/fast/viewport/extrazoom/viewport-disable-extra-zoom-adaptations-expected.txt.
* fast/viewport/watchos/viewport-disable-extra-zoom-adaptations.html: Renamed from LayoutTests/fast/viewport/extrazoom/viewport-disable-extra-zoom-adaptations.html.
* fast/visual-viewport/watchos/layout-viewport-after-scrolling-and-resizing-expected.txt: Renamed from LayoutTests/fast/visual-viewport/extrazoom/layout-viewport-after-scrolling-and-resizing-expected.txt.
* fast/visual-viewport/watchos/layout-viewport-after-scrolling-and-resizing.html: Renamed from LayoutTests/fast/visual-viewport/extrazoom/layout-viewport-after-scrolling-and-resizing.html.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@232916 268f45cc-cd09-0410-ab3c-d52691b4dbfc
36 files changed:
LayoutTests/ChangeLog
LayoutTests/TestExpectations
LayoutTests/fast/css/watchos/viewport-units-shrink-to-fit-expected.txt [moved from LayoutTests/fast/css/extrazoom/viewport-units-shrink-to-fit-expected.txt with 100% similarity]
LayoutTests/fast/css/watchos/viewport-units-shrink-to-fit.html [moved from LayoutTests/fast/css/extrazoom/viewport-units-shrink-to-fit.html with 100% similarity]
LayoutTests/fast/dom/Window/watchos/window-get-real-screen-dimensions-expected.txt [moved from LayoutTests/fast/dom/Window/extrazoom/window-get-real-screen-dimensions-expected.txt with 100% similarity]
LayoutTests/fast/dom/Window/watchos/window-get-real-screen-dimensions.html [moved from LayoutTests/fast/dom/Window/extrazoom/window-get-real-screen-dimensions.html with 100% similarity]
LayoutTests/fast/events/watchos/change-focus-during-change-event-expected.txt [moved from LayoutTests/fast/events/extrazoom/change-focus-during-change-event-expected.txt with 100% similarity]
LayoutTests/fast/events/watchos/change-focus-during-change-event.html [moved from LayoutTests/fast/events/extrazoom/change-focus-during-change-event.html with 100% similarity]
LayoutTests/fast/events/watchos/double-tap-to-zoom-on-full-width-text-expected.txt [moved from LayoutTests/fast/events/extrazoom/double-tap-to-zoom-on-full-width-text-expected.txt with 100% similarity]
LayoutTests/fast/events/watchos/double-tap-to-zoom-on-full-width-text.html [moved from LayoutTests/fast/events/extrazoom/double-tap-to-zoom-on-full-width-text.html with 100% similarity]
LayoutTests/fast/events/watchos/double-tap-to-zoom-with-large-text-expected.txt [moved from LayoutTests/fast/events/extrazoom/double-tap-to-zoom-with-large-text-expected.txt with 100% similarity]
LayoutTests/fast/events/watchos/double-tap-to-zoom-with-large-text.html [moved from LayoutTests/fast/events/extrazoom/double-tap-to-zoom-with-large-text.html with 100% similarity]
LayoutTests/fast/forms/watchos/delete-content-in-text-field-expected.txt [moved from LayoutTests/fast/forms/extrazoom/delete-content-in-text-field-expected.txt with 100% similarity]
LayoutTests/fast/forms/watchos/delete-content-in-text-field.html [moved from LayoutTests/fast/forms/extrazoom/delete-content-in-text-field.html with 100% similarity]
LayoutTests/fast/forms/watchos/edit-text-field-calls-injected-bundle-expected.txt [moved from LayoutTests/fast/forms/extrazoom/edit-text-field-calls-injected-bundle-expected.txt with 100% similarity]
LayoutTests/fast/forms/watchos/edit-text-field-calls-injected-bundle.html [moved from LayoutTests/fast/forms/extrazoom/edit-text-field-calls-injected-bundle.html with 100% similarity]
LayoutTests/fast/forms/watchos/form-control-label-text-expected.txt [moved from LayoutTests/fast/forms/extrazoom/form-control-label-text-expected.txt with 100% similarity]
LayoutTests/fast/forms/watchos/form-control-label-text.html [moved from LayoutTests/fast/forms/extrazoom/form-control-label-text.html with 100% similarity]
LayoutTests/fast/forms/watchos/time-picker-value-change-expected.txt [moved from LayoutTests/fast/forms/extrazoom/time-picker-value-change-expected.txt with 100% similarity]
LayoutTests/fast/forms/watchos/time-picker-value-change.html [moved from LayoutTests/fast/forms/extrazoom/time-picker-value-change.html with 100% similarity]
LayoutTests/fast/viewport/watchos/viewport-adaptations-after-navigation-expected.txt [moved from LayoutTests/fast/viewport/extrazoom/viewport-adaptations-after-navigation-expected.txt with 100% similarity]
LayoutTests/fast/viewport/watchos/viewport-adaptations-after-navigation.html [moved from LayoutTests/fast/viewport/extrazoom/viewport-adaptations-after-navigation.html with 94% similarity]
LayoutTests/fast/viewport/watchos/viewport-disable-extra-zoom-adaptations-expected.txt [moved from LayoutTests/fast/viewport/extrazoom/viewport-disable-extra-zoom-adaptations-expected.txt with 100% similarity]
LayoutTests/fast/viewport/watchos/viewport-disable-extra-zoom-adaptations.html [moved from LayoutTests/fast/viewport/extrazoom/viewport-disable-extra-zoom-adaptations.html with 92% similarity]
LayoutTests/fast/visual-viewport/watchos/layout-viewport-after-scrolling-and-resizing-expected.txt [moved from LayoutTests/fast/visual-viewport/extrazoom/layout-viewport-after-scrolling-and-resizing-expected.txt with 100% similarity]
LayoutTests/fast/visual-viewport/watchos/layout-viewport-after-scrolling-and-resizing.html [moved from LayoutTests/fast/visual-viewport/extrazoom/layout-viewport-after-scrolling-and-resizing.html with 100% similarity]
Source/WebCore/ChangeLog
Source/WebCore/page/DisabledAdaptations.cpp
Source/WebCore/page/DisabledAdaptations.h
Source/WebCore/page/ViewportConfiguration.cpp
Source/WebCore/page/WindowFeatures.cpp
Source/WebCore/testing/Internals.cpp
Source/WebCore/testing/Internals.h
Source/WebCore/testing/Internals.idl
Source/WebKit/ChangeLog
Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm