Title: [220832] releases/WebKitGTK/webkit-2.18
Revision
220832
Author
[email protected]
Date
2017-08-16 23:58:42 -0700 (Wed, 16 Aug 2017)

Log Message

Merge r220734 - Remove Proximity Events and related code
https://bugs.webkit.org/show_bug.cgi?id=175545

Reviewed by Daniel Bates.

No platform enables Proximity Events, so remove code inside ENABLE(PROXIMITY_EVENTS)
and other related code.

.:

* Source/cmake/OptionsMac.cmake:
* Source/cmake/OptionsWin.cmake:
* Source/cmake/WebKitFeatures.cmake:
* Source/cmake/tools/vsprops/FeatureDefines.props:
* Source/cmake/tools/vsprops/FeatureDefinesCairo.props:

Source/_javascript_Core:

* Configurations/FeatureDefines.xcconfig:

Source/WebCore:

* CMakeLists.txt:
* Configurations/FeatureDefines.xcconfig:
* DerivedSources.cpp:
* Modules/proximity/DeviceProximityClient.h: Removed.
* Modules/proximity/DeviceProximityController.cpp: Removed.
* Modules/proximity/DeviceProximityController.h: Removed.
* Modules/proximity/DeviceProximityEvent.cpp: Removed.
* Modules/proximity/DeviceProximityEvent.h: Removed.
* Modules/proximity/DeviceProximityEvent.idl: Removed.
* dom/EventNames.h:
* dom/EventNames.in:
* history/PageCache.cpp:
(WebCore::canCachePage):
* page/DOMWindow.cpp:
(WebCore::DOMWindow::addEventListener):
(WebCore::DOMWindow::removeEventListener):
(WebCore::DOMWindow::removeAllEventListeners):
* page/DOMWindow.idl:
* page/DiagnosticLoggingKeys.cpp:
(WebCore::DiagnosticLoggingKeys::deviceProximityKey): Deleted.
* page/DiagnosticLoggingKeys.h:
* testing/Internals.cpp:
(WebCore::Internals::setDeviceProximity): Deleted.
* testing/Internals.h:
* testing/Internals.idl:

Source/WebCore/PAL:

* Configurations/FeatureDefines.xcconfig:

Source/WebInspectorUI:

* UserInterface/Models/ScriptTimelineRecord.js:
(WI.ScriptTimelineRecord.EventType.displayName):

Source/WebKit:

* CMakeLists.txt:
* Configurations/FeatureDefines.xcconfig:
* WebProcess/WebCoreSupport/WebDeviceProximityClient.cpp: Removed.
* WebProcess/WebCoreSupport/WebDeviceProximityClient.h: Removed.
* WebProcess/WebPage/WebPage.cpp:
(WebKit::m_cpuLimit):

Source/WebKitLegacy/mac:

* Configurations/FeatureDefines.xcconfig:

Source/WTF:

* wtf/FeatureDefines.h:

Tools:

* TestWebKitAPI/Configurations/FeatureDefines.xcconfig:

LayoutTests:

* fast/events/constructors/device-proximity-event-constructor-expected.txt: Removed.
* fast/events/constructors/device-proximity-event-constructor.html: Removed.
* platform/gtk/TestExpectations:
* platform/ios/TestExpectations:
* platform/mac/TestExpectations:
* platform/win/TestExpectations:
* proximity/add-listener-from-callback-expected.txt: Removed.
* proximity/add-listener-from-callback.html: Removed.
* proximity/basic-operation-expected.txt: Removed.
* proximity/basic-operation.html: Removed.
* proximity/check-event-deviceproximity-expected.txt: Removed.
* proximity/check-event-deviceproximity.html: Removed.
* proximity/create-event-deviceproximity-expected.txt: Removed.
* proximity/create-event-deviceproximity.html: Removed.
* proximity/create-event-expected.txt: Removed.
* proximity/create-event.html: Removed.
* proximity/event-after-navigation-expected.txt: Removed.
* proximity/event-after-navigation.html: Removed.
* proximity/multiple-frames-expected.txt: Removed.
* proximity/multiple-frames.html: Removed.
* proximity/no-page-cache-expected.txt: Removed.
* proximity/no-page-cache.html: Removed.
* proximity/optional-event-properties-expected.txt: Removed.
* proximity/optional-event-properties.html: Removed.
* proximity/resources/cached-page-1.html: Removed.
* proximity/resources/cached-page-2.html: Removed.
* proximity/resources/event-after-navigation-new.html: Removed.
* proximity/updates-expected.txt: Removed.
* proximity/updates.html: Removed.
* proximity/window-property-expected.txt: Removed.
* proximity/window-property.html: Removed.

Modified Paths

Removed Paths

Diff

Modified: releases/WebKitGTK/webkit-2.18/ChangeLog (220831 => 220832)


--- releases/WebKitGTK/webkit-2.18/ChangeLog	2017-08-17 06:58:02 UTC (rev 220831)
+++ releases/WebKitGTK/webkit-2.18/ChangeLog	2017-08-17 06:58:42 UTC (rev 220832)
@@ -1,5 +1,21 @@
 2017-08-14  Simon Fraser  <[email protected]>
 
+        Remove Proximity Events and related code
+        https://bugs.webkit.org/show_bug.cgi?id=175545
+
+        Reviewed by Daniel Bates.
+
+        No platform enables Proximity Events, so remove code inside ENABLE(PROXIMITY_EVENTS)
+        and other related code.
+
+        * Source/cmake/OptionsMac.cmake:
+        * Source/cmake/OptionsWin.cmake:
+        * Source/cmake/WebKitFeatures.cmake:
+        * Source/cmake/tools/vsprops/FeatureDefines.props:
+        * Source/cmake/tools/vsprops/FeatureDefinesCairo.props:
+
+2017-08-14  Simon Fraser  <[email protected]>
+
         Remove ENABLE_VIEW_MODE_CSS_MEDIA and related code
         https://bugs.webkit.org/show_bug.cgi?id=175557
 

Modified: releases/WebKitGTK/webkit-2.18/LayoutTests/ChangeLog (220831 => 220832)


--- releases/WebKitGTK/webkit-2.18/LayoutTests/ChangeLog	2017-08-17 06:58:02 UTC (rev 220831)
+++ releases/WebKitGTK/webkit-2.18/LayoutTests/ChangeLog	2017-08-17 06:58:42 UTC (rev 220832)
@@ -1,5 +1,47 @@
 2017-08-14  Simon Fraser  <[email protected]>
 
+        Remove Proximity Events and related code
+        https://bugs.webkit.org/show_bug.cgi?id=175545
+
+        Reviewed by Daniel Bates.
+
+        No platform enables Proximity Events, so remove code inside ENABLE(PROXIMITY_EVENTS)
+        and other related code.
+
+        * fast/events/constructors/device-proximity-event-constructor-expected.txt: Removed.
+        * fast/events/constructors/device-proximity-event-constructor.html: Removed.
+        * platform/gtk/TestExpectations:
+        * platform/ios/TestExpectations:
+        * platform/mac/TestExpectations:
+        * platform/win/TestExpectations:
+        * proximity/add-listener-from-callback-expected.txt: Removed.
+        * proximity/add-listener-from-callback.html: Removed.
+        * proximity/basic-operation-expected.txt: Removed.
+        * proximity/basic-operation.html: Removed.
+        * proximity/check-event-deviceproximity-expected.txt: Removed.
+        * proximity/check-event-deviceproximity.html: Removed.
+        * proximity/create-event-deviceproximity-expected.txt: Removed.
+        * proximity/create-event-deviceproximity.html: Removed.
+        * proximity/create-event-expected.txt: Removed.
+        * proximity/create-event.html: Removed.
+        * proximity/event-after-navigation-expected.txt: Removed.
+        * proximity/event-after-navigation.html: Removed.
+        * proximity/multiple-frames-expected.txt: Removed.
+        * proximity/multiple-frames.html: Removed.
+        * proximity/no-page-cache-expected.txt: Removed.
+        * proximity/no-page-cache.html: Removed.
+        * proximity/optional-event-properties-expected.txt: Removed.
+        * proximity/optional-event-properties.html: Removed.
+        * proximity/resources/cached-page-1.html: Removed.
+        * proximity/resources/cached-page-2.html: Removed.
+        * proximity/resources/event-after-navigation-new.html: Removed.
+        * proximity/updates-expected.txt: Removed.
+        * proximity/updates.html: Removed.
+        * proximity/window-property-expected.txt: Removed.
+        * proximity/window-property.html: Removed.
+
+2017-08-14  Simon Fraser  <[email protected]>
+
         Remove ENABLE_VIEW_MODE_CSS_MEDIA and related code
         https://bugs.webkit.org/show_bug.cgi?id=175557
 

Deleted: releases/WebKitGTK/webkit-2.18/LayoutTests/fast/events/constructors/device-proximity-event-constructor-expected.txt (220831 => 220832)


--- releases/WebKitGTK/webkit-2.18/LayoutTests/fast/events/constructors/device-proximity-event-constructor-expected.txt	2017-08-17 06:58:02 UTC (rev 220831)
+++ releases/WebKitGTK/webkit-2.18/LayoutTests/fast/events/constructors/device-proximity-event-constructor-expected.txt	2017-08-17 06:58:42 UTC (rev 220832)
@@ -1,83 +0,0 @@
-This tests the constructor for the DeviceProximityEvent DOM class.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS new DeviceProximityEvent('eventType').bubbles is true
-PASS new DeviceProximityEvent('eventType').cancelable is false
-PASS new DeviceProximityEvent('eventType').value is Infinity
-PASS new DeviceProximityEvent('eventType').min is -Infinity
-PASS new DeviceProximityEvent('eventType').max is Infinity
-PASS new DeviceProximityEvent('eventType', { bubbles: false }).bubbles is false
-PASS new DeviceProximityEvent('eventType', { bubbles: true }).bubbles is true
-PASS new DeviceProximityEvent('eventType', { cancelable: false }).cancelable is false
-PASS new DeviceProximityEvent('eventType', { cancelable: true }).cancelable is true
-PASS new DeviceProximityEvent('eventType', { value: 0 }).value is 0
-PASS new DeviceProximityEvent('eventType', { value: 1 }).value is 1
-PASS new DeviceProximityEvent('eventType', { value: 1.79769313486231570E+308 }).value is 1.79769313486231570E+308
-PASS new DeviceProximityEvent('eventType', { value: -1.79769313486231570E+308 }).value is -1.79769313486231570E+308
-PASS new DeviceProximityEvent('eventType', { value: 1.8E+308 }).value is Infinity
-PASS new DeviceProximityEvent('eventType', { value: -1.8E+308 }).value is -Infinity
-PASS new DeviceProximityEvent('eventType', { value: 123.45 }).value is 123.45
-PASS new DeviceProximityEvent('eventType', { value: NaN }).value is NaN
-PASS new DeviceProximityEvent('eventType', { value: undefined }).value is NaN
-PASS new DeviceProximityEvent('eventType', { value: null }).value is 0
-PASS new DeviceProximityEvent('eventType', { value: '' }).value is 0
-PASS new DeviceProximityEvent('eventType', { value: '12345' }).value is 12345
-PASS new DeviceProximityEvent('eventType', { value: '12345a' }).value is NaN
-PASS new DeviceProximityEvent('eventType', { value: 'abc' }).value is NaN
-PASS new DeviceProximityEvent('eventType', { value: [] }).value is 0
-PASS new DeviceProximityEvent('eventType', { value: [12345] }).value is 12345
-PASS new DeviceProximityEvent('eventType', { value: [12345, 67890] }).value is NaN
-PASS new DeviceProximityEvent('eventType', { value: {} }).value is NaN
-PASS new DeviceProximityEvent('eventType', { value: {moemoe: 12345} }).value is NaN
-PASS new DeviceProximityEvent('eventType', { value: {valueOf: function () { return 12345; }} }).value is 12345
-PASS new DeviceProximityEvent('eventType', { min: 0 }).min is 0
-PASS new DeviceProximityEvent('eventType', { min: 1 }).min is 1
-PASS new DeviceProximityEvent('eventType', { min: 1.79769313486231570E+308 }).min is 1.79769313486231570E+308
-PASS new DeviceProximityEvent('eventType', { min: -1.79769313486231570E+308 }).min is -1.79769313486231570E+308
-PASS new DeviceProximityEvent('eventType', { min: 1.8E+308 }).min is Infinity
-PASS new DeviceProximityEvent('eventType', { min: -1.8E+308 }).min is -Infinity
-PASS new DeviceProximityEvent('eventType', { min: 123.45 }).min is 123.45
-PASS new DeviceProximityEvent('eventType', { min: NaN }).min is NaN
-PASS new DeviceProximityEvent('eventType', { min: undefined }).min is NaN
-PASS new DeviceProximityEvent('eventType', { min: null }).min is 0
-PASS new DeviceProximityEvent('eventType', { min: '' }).min is 0
-PASS new DeviceProximityEvent('eventType', { min: '12345' }).min is 12345
-PASS new DeviceProximityEvent('eventType', { min: '12345a' }).min is NaN
-PASS new DeviceProximityEvent('eventType', { min: 'abc' }).min is NaN
-PASS new DeviceProximityEvent('eventType', { min: [] }).min is 0
-PASS new DeviceProximityEvent('eventType', { min: [12345] }).min is 12345
-PASS new DeviceProximityEvent('eventType', { min: [12345, 67890] }).min is NaN
-PASS new DeviceProximityEvent('eventType', { min: {} }).min is NaN
-PASS new DeviceProximityEvent('eventType', { min: {moemoe: 12345} }).min is NaN
-PASS new DeviceProximityEvent('eventType', { min: {valueOf: function () { return 12345; }} }).min is 12345
-PASS new DeviceProximityEvent('eventType', { max: 0 }).max is 0
-PASS new DeviceProximityEvent('eventType', { max: 1 }).max is 1
-PASS new DeviceProximityEvent('eventType', { max: 1.79769313486231570E+308 }).max is 1.79769313486231570E+308
-PASS new DeviceProximityEvent('eventType', { max: -1.79769313486231570E+308 }).max is -1.79769313486231570E+308
-PASS new DeviceProximityEvent('eventType', { max: 1.8E+308 }).max is Infinity
-PASS new DeviceProximityEvent('eventType', { max: -1.8E+308 }).max is -Infinity
-PASS new DeviceProximityEvent('eventType', { max: 123.45 }).max is 123.45
-PASS new DeviceProximityEvent('eventType', { max: NaN }).max is NaN
-PASS new DeviceProximityEvent('eventType', { max: undefined }).max is NaN
-PASS new DeviceProximityEvent('eventType', { max: null }).max is 0
-PASS new DeviceProximityEvent('eventType', { max: '' }).max is 0
-PASS new DeviceProximityEvent('eventType', { max: '12345' }).max is 12345
-PASS new DeviceProximityEvent('eventType', { max: '12345a' }).max is NaN
-PASS new DeviceProximityEvent('eventType', { max: 'abc' }).max is NaN
-PASS new DeviceProximityEvent('eventType', { max: [] }).max is 0
-PASS new DeviceProximityEvent('eventType', { max: [12345] }).max is 12345
-PASS new DeviceProximityEvent('eventType', { max: [12345, 67890] }).max is NaN
-PASS new DeviceProximityEvent('eventType', { max: {} }).max is NaN
-PASS new DeviceProximityEvent('eventType', { max: {moemoe: 12345} }).max is NaN
-PASS new DeviceProximityEvent('eventType', { max: {valueOf: function () { return 12345; }} }).max is 12345
-PASS new DeviceProximityEvent('eventType', { bubbles: true, cancelable: true, value: 1000, min: 0, max: 10000 }).bubbles is true
-PASS new DeviceProximityEvent('eventType', { bubbles: true, cancelable: true, value: 1000, min: 0, max: 10000 }).cancelable is true
-PASS new DeviceProximityEvent('eventType', { bubbles: true, cancelable: true, value: 1000, min: 0, max: 10000 }).value is 1000
-PASS new DeviceProximityEvent('eventType', { bubbles: true, cancelable: true, value: 1000, min: 0, max: 10000 }).min is 0
-PASS new DeviceProximityEvent('eventType', { bubbles: true, cancelable: true, value: 1000, min: 0, max: 10000 }).max is 10000
-PASS successfullyParsed is true
-
-TEST COMPLETE
-

Deleted: releases/WebKitGTK/webkit-2.18/LayoutTests/fast/events/constructors/device-proximity-event-constructor.html (220831 => 220832)


--- releases/WebKitGTK/webkit-2.18/LayoutTests/fast/events/constructors/device-proximity-event-constructor.html	2017-08-17 06:58:02 UTC (rev 220831)
+++ releases/WebKitGTK/webkit-2.18/LayoutTests/fast/events/constructors/device-proximity-event-constructor.html	2017-08-17 06:58:42 UTC (rev 220832)
@@ -1,118 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<script src=""
-</head>
-<body>
-<p id="description"></p>
-<div id="console"></div>
-<script>
-
-description("This tests the constructor for the DeviceProximityEvent DOM class.");
-
-// No initializer is passed.
-shouldBe("new DeviceProximityEvent('eventType').bubbles", "true");
-shouldBe("new DeviceProximityEvent('eventType').cancelable", "false");
-shouldBe("new DeviceProximityEvent('eventType').value", "Infinity");
-shouldBe("new DeviceProximityEvent('eventType').min", "-Infinity");
-shouldBe("new DeviceProximityEvent('eventType').max", "Infinity");
-
-// bubbles is passed.
-shouldBe("new DeviceProximityEvent('eventType', { bubbles: false }).bubbles", "false");
-shouldBe("new DeviceProximityEvent('eventType', { bubbles: true }).bubbles", "true");
-
-// cancelable is passed.
-shouldBe("new DeviceProximityEvent('eventType', { cancelable: false }).cancelable", "false");
-shouldBe("new DeviceProximityEvent('eventType', { cancelable: true }).cancelable", "true");
-
-// value is passed.
-// Numbers within the double range.
-shouldBe("new DeviceProximityEvent('eventType', { value: 0 }).value", "0");
-shouldBe("new DeviceProximityEvent('eventType', { value: 1 }).value", "1");
-shouldBe("new DeviceProximityEvent('eventType', { value: 1.79769313486231570E+308 }).value", "1.79769313486231570E+308");
-shouldBe("new DeviceProximityEvent('eventType', { value: -1.79769313486231570E+308 }).value", "-1.79769313486231570E+308");
-
-// Numbers out of the double range.
-shouldBe("new DeviceProximityEvent('eventType', { value: 1.8E+308 }).value", "Infinity");
-shouldBe("new DeviceProximityEvent('eventType', { value: -1.8E+308 }).value", "-Infinity");
-shouldBe("new DeviceProximityEvent('eventType', { value: 123.45 }).value", "123.45");
-shouldBe("new DeviceProximityEvent('eventType', { value: NaN }).value", "NaN");
-
-// Non-numeric values.
-shouldBe("new DeviceProximityEvent('eventType', { value: undefined }).value", "NaN");
-shouldBe("new DeviceProximityEvent('eventType', { value: null }).value", "0");
-shouldBe("new DeviceProximityEvent('eventType', { value: '' }).value", "0");
-shouldBe("new DeviceProximityEvent('eventType', { value: '12345' }).value", "12345");
-shouldBe("new DeviceProximityEvent('eventType', { value: '12345a' }).value", "NaN");
-shouldBe("new DeviceProximityEvent('eventType', { value: 'abc' }).value", "NaN");
-shouldBe("new DeviceProximityEvent('eventType', { value: [] }).value", "0");
-shouldBe("new DeviceProximityEvent('eventType', { value: [12345] }).value", "12345");
-shouldBe("new DeviceProximityEvent('eventType', { value: [12345, 67890] }).value", "NaN");
-shouldBe("new DeviceProximityEvent('eventType', { value: {} }).value", "NaN");
-shouldBe("new DeviceProximityEvent('eventType', { value: {moemoe: 12345} }).value", "NaN");
-shouldBe("new DeviceProximityEvent('eventType', { value: {valueOf: function () { return 12345; }} }).value", "12345");
-
-// min is passed.
-// Numbers within the double range.
-shouldBe("new DeviceProximityEvent('eventType', { min: 0 }).min", "0");
-shouldBe("new DeviceProximityEvent('eventType', { min: 1 }).min", "1");
-shouldBe("new DeviceProximityEvent('eventType', { min: 1.79769313486231570E+308 }).min", "1.79769313486231570E+308");
-shouldBe("new DeviceProximityEvent('eventType', { min: -1.79769313486231570E+308 }).min", "-1.79769313486231570E+308");
-
-// Numbers out of the double range.
-shouldBe("new DeviceProximityEvent('eventType', { min: 1.8E+308 }).min", "Infinity");
-shouldBe("new DeviceProximityEvent('eventType', { min: -1.8E+308 }).min", "-Infinity");
-shouldBe("new DeviceProximityEvent('eventType', { min: 123.45 }).min", "123.45");
-shouldBe("new DeviceProximityEvent('eventType', { min: NaN }).min", "NaN");
-
-// Non-numeric mins.
-shouldBe("new DeviceProximityEvent('eventType', { min: undefined }).min", "NaN");
-shouldBe("new DeviceProximityEvent('eventType', { min: null }).min", "0");
-shouldBe("new DeviceProximityEvent('eventType', { min: '' }).min", "0");
-shouldBe("new DeviceProximityEvent('eventType', { min: '12345' }).min", "12345");
-shouldBe("new DeviceProximityEvent('eventType', { min: '12345a' }).min", "NaN");
-shouldBe("new DeviceProximityEvent('eventType', { min: 'abc' }).min", "NaN");
-shouldBe("new DeviceProximityEvent('eventType', { min: [] }).min", "0");
-shouldBe("new DeviceProximityEvent('eventType', { min: [12345] }).min", "12345");
-shouldBe("new DeviceProximityEvent('eventType', { min: [12345, 67890] }).min", "NaN");
-shouldBe("new DeviceProximityEvent('eventType', { min: {} }).min", "NaN");
-shouldBe("new DeviceProximityEvent('eventType', { min: {moemoe: 12345} }).min", "NaN");
-shouldBe("new DeviceProximityEvent('eventType', { min: {valueOf: function () { return 12345; }} }).min", "12345");
-
-// max is passed.
-// Numbers within the double range.
-shouldBe("new DeviceProximityEvent('eventType', { max: 0 }).max", "0");
-shouldBe("new DeviceProximityEvent('eventType', { max: 1 }).max", "1");
-shouldBe("new DeviceProximityEvent('eventType', { max: 1.79769313486231570E+308 }).max", "1.79769313486231570E+308");
-shouldBe("new DeviceProximityEvent('eventType', { max: -1.79769313486231570E+308 }).max", "-1.79769313486231570E+308");
-
-// Numbers out of the double range.
-shouldBe("new DeviceProximityEvent('eventType', { max: 1.8E+308 }).max", "Infinity");
-shouldBe("new DeviceProximityEvent('eventType', { max: -1.8E+308 }).max", "-Infinity");
-shouldBe("new DeviceProximityEvent('eventType', { max: 123.45 }).max", "123.45");
-shouldBe("new DeviceProximityEvent('eventType', { max: NaN }).max", "NaN");
-
-// Non-numeric maxs.
-shouldBe("new DeviceProximityEvent('eventType', { max: undefined }).max", "NaN");
-shouldBe("new DeviceProximityEvent('eventType', { max: null }).max", "0");
-shouldBe("new DeviceProximityEvent('eventType', { max: '' }).max", "0");
-shouldBe("new DeviceProximityEvent('eventType', { max: '12345' }).max", "12345");
-shouldBe("new DeviceProximityEvent('eventType', { max: '12345a' }).max", "NaN");
-shouldBe("new DeviceProximityEvent('eventType', { max: 'abc' }).max", "NaN");
-shouldBe("new DeviceProximityEvent('eventType', { max: [] }).max", "0");
-shouldBe("new DeviceProximityEvent('eventType', { max: [12345] }).max", "12345");
-shouldBe("new DeviceProximityEvent('eventType', { max: [12345, 67890] }).max", "NaN");
-shouldBe("new DeviceProximityEvent('eventType', { max: {} }).max", "NaN");
-shouldBe("new DeviceProximityEvent('eventType', { max: {moemoe: 12345} }).max", "NaN");
-shouldBe("new DeviceProximityEvent('eventType', { max: {valueOf: function () { return 12345; }} }).max", "12345");
-
-// All initializers are passed.
-shouldBe("new DeviceProximityEvent('eventType', { bubbles: true, cancelable: true, value: 1000, min: 0, max: 10000 }).bubbles", "true");
-shouldBe("new DeviceProximityEvent('eventType', { bubbles: true, cancelable: true, value: 1000, min: 0, max: 10000 }).cancelable", "true");
-shouldBe("new DeviceProximityEvent('eventType', { bubbles: true, cancelable: true, value: 1000, min: 0, max: 10000 }).value", "1000");
-shouldBe("new DeviceProximityEvent('eventType', { bubbles: true, cancelable: true, value: 1000, min: 0, max: 10000 }).min", "0");
-shouldBe("new DeviceProximityEvent('eventType', { bubbles: true, cancelable: true, value: 1000, min: 0, max: 10000 }).max", "10000");
-</script>
-<script src=""
-</body>
-</html>

Modified: releases/WebKitGTK/webkit-2.18/LayoutTests/platform/gtk/TestExpectations (220831 => 220832)


--- releases/WebKitGTK/webkit-2.18/LayoutTests/platform/gtk/TestExpectations	2017-08-17 06:58:02 UTC (rev 220831)
+++ releases/WebKitGTK/webkit-2.18/LayoutTests/platform/gtk/TestExpectations	2017-08-17 06:58:42 UTC (rev 220832)
@@ -705,12 +705,6 @@
 # Canvas captureStream support is not implemented
 webkit.org/b/169811 fast/mediacapturefromelement [ Skip ]
 
-# Proximity Events is not supported.
-webkit.org/b/99060 proximity [ Failure ]
-webkit.org/b/99060 proximity/event-after-navigation.html [ Timeout ]
-webkit.org/b/99060 proximity/no-page-cache.html [ Timeout ]
-webkit.org/b/99060 fast/events/constructors/device-proximity-event-constructor.html [ Failure ]
-
 # Requires Resolution Media Query support
 webkit.org/b/100137 fast/media/mq-resolution.html [ Failure ]
 webkit.org/b/100137 fast/media/mq-resolution-dpi-dpcm-warning.html [ Failure ]

Modified: releases/WebKitGTK/webkit-2.18/LayoutTests/platform/ios/TestExpectations (220831 => 220832)


--- releases/WebKitGTK/webkit-2.18/LayoutTests/platform/ios/TestExpectations	2017-08-17 06:58:02 UTC (rev 220831)
+++ releases/WebKitGTK/webkit-2.18/LayoutTests/platform/ios/TestExpectations	2017-08-17 06:58:42 UTC (rev 220832)
@@ -40,7 +40,6 @@
 
 # Encrypted Media Extensions are not enabled
 media/encrypted-media/
-fast/events/constructors/device-proximity-event-constructor.html
 
 # FIXME: <rdar://problem/6512037> LayoutTests: Enable printing tests once printing is supported on iOS
 printing
@@ -88,7 +87,6 @@
 fast/speechsynthesis
 gamepad
 mhtml
-proximity
 
 # ENABLE(MEDIA_CAPTURE) is not enabled
 fast/forms/file/file-input-capture.html

Modified: releases/WebKitGTK/webkit-2.18/LayoutTests/platform/mac/TestExpectations (220831 => 220832)


--- releases/WebKitGTK/webkit-2.18/LayoutTests/platform/mac/TestExpectations	2017-08-17 06:58:02 UTC (rev 220831)
+++ releases/WebKitGTK/webkit-2.18/LayoutTests/platform/mac/TestExpectations	2017-08-17 06:58:42 UTC (rev 220832)
@@ -270,10 +270,6 @@
 # <rdar://problem/11059777>
 webkit.org/b/81289 canvas/philip/tests/2d.line.cap.round.html [ Failure ]
 
-# Proximity Events are not supported.
-proximity
-fast/events/constructors/device-proximity-event-constructor.html
-
 webkit.org/b/81410 scrollbars/scrollbar-middleclick-nopaste.html
 
 # Has failed since its introduction in r105826.

Modified: releases/WebKitGTK/webkit-2.18/LayoutTests/platform/win/TestExpectations (220831 => 220832)


--- releases/WebKitGTK/webkit-2.18/LayoutTests/platform/win/TestExpectations	2017-08-17 06:58:02 UTC (rev 220831)
+++ releases/WebKitGTK/webkit-2.18/LayoutTests/platform/win/TestExpectations	2017-08-17 06:58:42 UTC (rev 220832)
@@ -531,10 +531,6 @@
 pointer-lock/ [ Skip ]
 http/tests/pointer-lock/ [ Skip ]
 
-# Proximity Events is not supported.
-proximity/ [ Skip ]
-fast/events/constructors/device-proximity-event-constructor.html
-
 # TODO Fail until SUBPIXEL_LAYOUT is enabled
 webkit.org/b/85532 fast/sub-pixel [ Skip ]
 

Deleted: releases/WebKitGTK/webkit-2.18/LayoutTests/proximity/add-listener-from-callback-expected.txt (220831 => 220832)


--- releases/WebKitGTK/webkit-2.18/LayoutTests/proximity/add-listener-from-callback-expected.txt	2017-08-17 06:58:02 UTC (rev 220831)
+++ releases/WebKitGTK/webkit-2.18/LayoutTests/proximity/add-listener-from-callback-expected.txt	2017-08-17 06:58:42 UTC (rev 220832)
@@ -1,18 +0,0 @@
-Tests that adding a new event listener from a callback works as expected.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS deviceProximityEvent.value is firedEvent.value
-PASS deviceProximityEvent.min is firedEvent.min
-PASS deviceProximityEvent.max is firedEvent.max
-PASS deviceProximityEvent.value is firedEvent.value
-PASS deviceProximityEvent.min is firedEvent.min
-PASS deviceProximityEvent.max is firedEvent.max
-PASS deviceProximityEvent.value is firedEvent.value
-PASS deviceProximityEvent.min is firedEvent.min
-PASS deviceProximityEvent.max is firedEvent.max
-PASS successfullyParsed is true
-
-TEST COMPLETE
-

Deleted: releases/WebKitGTK/webkit-2.18/LayoutTests/proximity/add-listener-from-callback.html (220831 => 220832)


--- releases/WebKitGTK/webkit-2.18/LayoutTests/proximity/add-listener-from-callback.html	2017-08-17 06:58:02 UTC (rev 220831)
+++ releases/WebKitGTK/webkit-2.18/LayoutTests/proximity/add-listener-from-callback.html	2017-08-17 06:58:42 UTC (rev 220832)
@@ -1,50 +0,0 @@
-<html>
-<head>
-<script src=""
-</head>
-<body>
-<script>
-description('Tests that adding a new event listener from a callback works as expected.');
-
-var firedEvent = {value: 2.2, min: 1.1, max: 3.3};
-
-var deviceProximityEvent;
-function checkProximity(event) {
-    deviceProximityEvent = event;
-    shouldBe('deviceProximityEvent.value', 'firedEvent.value');
-    shouldBe('deviceProximityEvent.min', 'firedEvent.min');
-    shouldBe('deviceProximityEvent.max', 'firedEvent.max');
-}
-
-var firstListenerEvents = 0;
-function firstListener(event) {
-    checkProximity(event);
-    if (++firstListenerEvents == 1) {
-        window.addEventListener('webkitdeviceproximity', secondListener);
-        internals.setDeviceProximity('webkitdeviceproximity', firedEvent.value, firedEvent.min, firedEvent.max);
-    }
-    else if (firstListenerEvents > 2)
-        testFailed('Too many events for first listener.');
-    maybeFinishTest();
-}
-
-var secondListenerEvents = 0;
-function secondListener(event) {
-    checkProximity(event);
-    if (++secondListenerEvents > 1)
-        testFailed('Too many events for second listener.');
-    maybeFinishTest();
-}
-
-function maybeFinishTest() {
-    if (firstListenerEvents == 2 && secondListenerEvents == 1)
-        finishJSTest();
-}
-
-window.addEventListener('webkitdeviceproximity', firstListener);
-internals.setDeviceProximity('webkitdeviceproximity', firedEvent.value, firedEvent.min, firedEvent.max);
-window.jsTestIsAsync = true;
-</script>
-<script src=""
-</body>
-</html>

Deleted: releases/WebKitGTK/webkit-2.18/LayoutTests/proximity/basic-operation-expected.txt (220831 => 220832)


--- releases/WebKitGTK/webkit-2.18/LayoutTests/proximity/basic-operation-expected.txt	2017-08-17 06:58:02 UTC (rev 220831)
+++ releases/WebKitGTK/webkit-2.18/LayoutTests/proximity/basic-operation-expected.txt	2017-08-17 06:58:42 UTC (rev 220832)
@@ -1,12 +0,0 @@
-Tests the basic operation of DeviceProximity using the proximity.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS deviceProximityEvent.value is firedEvent.value
-PASS deviceProximityEvent.min is firedEvent.min
-PASS deviceProximityEvent.max is firedEvent.max
-PASS successfullyParsed is true
-
-TEST COMPLETE
-

Deleted: releases/WebKitGTK/webkit-2.18/LayoutTests/proximity/basic-operation.html (220831 => 220832)


--- releases/WebKitGTK/webkit-2.18/LayoutTests/proximity/basic-operation.html	2017-08-17 06:58:02 UTC (rev 220831)
+++ releases/WebKitGTK/webkit-2.18/LayoutTests/proximity/basic-operation.html	2017-08-17 06:58:42 UTC (rev 220832)
@@ -1,25 +0,0 @@
-<html>
-<head>
-<script src=""
-</head>
-<body>
-<script>
-description('Tests the basic operation of DeviceProximity using the proximity.');
-
-var firedEvent = {value: 2.2, min: 1.1, max: 3.3};
-
-var deviceProximityEvent;
-window.addEventListener('webkitdeviceproximity', function(e) {
-    deviceProximityEvent = e;
-    shouldBe('deviceProximityEvent.value', 'firedEvent.value');
-    shouldBe('deviceProximityEvent.min', 'firedEvent.min');
-    shouldBe('deviceProximityEvent.max', 'firedEvent.max');
-    finishJSTest();
-});
-
-internals.setDeviceProximity('webkitdeviceproximity', firedEvent.value, firedEvent.min, firedEvent.max);
-window.jsTestIsAsync = true;
-</script>
-<script src=""
-</body>
-</html>

Deleted: releases/WebKitGTK/webkit-2.18/LayoutTests/proximity/check-event-deviceproximity-expected.txt (220831 => 220832)


--- releases/WebKitGTK/webkit-2.18/LayoutTests/proximity/check-event-deviceproximity-expected.txt	2017-08-17 06:58:02 UTC (rev 220831)
+++ releases/WebKitGTK/webkit-2.18/LayoutTests/proximity/check-event-deviceproximity-expected.txt	2017-08-17 06:58:42 UTC (rev 220832)
@@ -1,13 +0,0 @@
-This test is for checking availablity of proximity event.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS 'onwebkitdeviceproximity' in window is true
-PASS document.createEvent('DeviceProximityEvent') instanceof window.DeviceProximityEvent is true
-PASS document.createEvent('DeviceProximityEvent') instanceof window.Event is true
-PASS document.createEvent('DeviceProximityEvent').constructor === window.DeviceProximityEvent is true
-PASS successfullyParsed is true
-
-TEST COMPLETE
-

Deleted: releases/WebKitGTK/webkit-2.18/LayoutTests/proximity/check-event-deviceproximity.html (220831 => 220832)


--- releases/WebKitGTK/webkit-2.18/LayoutTests/proximity/check-event-deviceproximity.html	2017-08-17 06:58:02 UTC (rev 220831)
+++ releases/WebKitGTK/webkit-2.18/LayoutTests/proximity/check-event-deviceproximity.html	2017-08-17 06:58:42 UTC (rev 220832)
@@ -1,20 +0,0 @@
-<html>
-<head>
-<script src=""
-</head>
-<body>
-<p id="description"></p>
-<div id="console"></div>
-<div id="result"></div>
-<script>
-description("This test is for checking availablity of proximity event.");
-
-shouldBeTrue("'onwebkitdeviceproximity' in window");
-
-shouldBeTrue("document.createEvent('DeviceProximityEvent') instanceof window.DeviceProximityEvent");
-shouldBeTrue("document.createEvent('DeviceProximityEvent') instanceof window.Event");
-shouldBeTrue("document.createEvent('DeviceProximityEvent').constructor === window.DeviceProximityEvent");
-</script>
-<script src=""
-</body>
-</html>

Deleted: releases/WebKitGTK/webkit-2.18/LayoutTests/proximity/create-event-deviceproximity-expected.txt (220831 => 220832)


--- releases/WebKitGTK/webkit-2.18/LayoutTests/proximity/create-event-deviceproximity-expected.txt	2017-08-17 06:58:02 UTC (rev 220831)
+++ releases/WebKitGTK/webkit-2.18/LayoutTests/proximity/create-event-deviceproximity-expected.txt	2017-08-17 06:58:42 UTC (rev 220832)
@@ -1,10 +0,0 @@
-Tests that document.createEvent() works with deviceproximity
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS deviceproximity event is called properly.
-PASS successfullyParsed is true
-
-TEST COMPLETE
-

Deleted: releases/WebKitGTK/webkit-2.18/LayoutTests/proximity/create-event-deviceproximity.html (220831 => 220832)


--- releases/WebKitGTK/webkit-2.18/LayoutTests/proximity/create-event-deviceproximity.html	2017-08-17 06:58:02 UTC (rev 220831)
+++ releases/WebKitGTK/webkit-2.18/LayoutTests/proximity/create-event-deviceproximity.html	2017-08-17 06:58:42 UTC (rev 220832)
@@ -1,29 +0,0 @@
-<html>
-<head>
-<script src=""
-</head>
-<body>
-<p id="description"></p>
-<div id="result"></div>
-<div id="console"></div>
-<script>
-description('Tests that document.createEvent() works with deviceproximity');
-
-function handleDeviceProximity()
-{
-    testPassed("deviceproximity event is called properly.");
-}
-
-window.addEventListener('webkitdeviceproximity', handleDeviceProximity, false);
-
-try {
-    var event = document.createEvent("DeviceProximityEvent");
-    event.initEvent("webkitdeviceproximity", false, false);
-    window.dispatchEvent(event);
-} catch(e) {
-    testFailed("deviceproximity event doesn't appear to be enabled or implemented.");
-}
-</script>
-<script src=""
-</body>
-</html>

Deleted: releases/WebKitGTK/webkit-2.18/LayoutTests/proximity/create-event-expected.txt (220831 => 220832)


--- releases/WebKitGTK/webkit-2.18/LayoutTests/proximity/create-event-expected.txt	2017-08-17 06:58:02 UTC (rev 220831)
+++ releases/WebKitGTK/webkit-2.18/LayoutTests/proximity/create-event-expected.txt	2017-08-17 06:58:42 UTC (rev 220832)
@@ -1,22 +0,0 @@
-Tests that document.createEvent() works with DeviceProximityEvent.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS typeof event == 'object' is true
-PASS 'type' in event is true
-PASS 'bubbles' in event is true
-PASS 'cancelable' in event is true
-PASS 'value' in event is true
-PASS 'min' in event is true
-PASS 'max' in event is true
-PASS typeof event.type == 'string' is true
-PASS typeof event.bubbles == 'boolean' is true
-PASS typeof event.cancelable == 'boolean' is true
-PASS typeof event.value == 'number' is true
-PASS typeof event.min == 'number' is true
-PASS typeof event.max == 'number' is true
-PASS successfullyParsed is true
-
-TEST COMPLETE
-

Deleted: releases/WebKitGTK/webkit-2.18/LayoutTests/proximity/create-event.html (220831 => 220832)


--- releases/WebKitGTK/webkit-2.18/LayoutTests/proximity/create-event.html	2017-08-17 06:58:02 UTC (rev 220831)
+++ releases/WebKitGTK/webkit-2.18/LayoutTests/proximity/create-event.html	2017-08-17 06:58:42 UTC (rev 220832)
@@ -1,29 +0,0 @@
-<html>
-<head>
-<script src=""
-</head>
-<body>
-<script>
-description('Tests that document.createEvent() works with DeviceProximityEvent.');
-
-var event = document.createEvent('DeviceProximityEvent');
-
-shouldBeTrue("typeof event == 'object'");
-
-shouldBeTrue("'type' in event");
-shouldBeTrue("'bubbles' in event");
-shouldBeTrue("'cancelable' in event");
-shouldBeTrue("'value' in event");
-shouldBeTrue("'min' in event");
-shouldBeTrue("'max' in event");
-
-shouldBeTrue("typeof event.type == 'string'");
-shouldBeTrue("typeof event.bubbles == 'boolean'");
-shouldBeTrue("typeof event.cancelable == 'boolean'");
-shouldBeTrue("typeof event.value == 'number'");
-shouldBeTrue("typeof event.min == 'number'");
-shouldBeTrue("typeof event.max == 'number'");
-</script>
-<script src=""
-</body>
-</html>

Deleted: releases/WebKitGTK/webkit-2.18/LayoutTests/proximity/event-after-navigation-expected.txt (220831 => 220832)


--- releases/WebKitGTK/webkit-2.18/LayoutTests/proximity/event-after-navigation-expected.txt	2017-08-17 06:58:02 UTC (rev 220831)
+++ releases/WebKitGTK/webkit-2.18/LayoutTests/proximity/event-after-navigation-expected.txt	2017-08-17 06:58:42 UTC (rev 220832)
@@ -1,3 +0,0 @@
-Tests for a crash where an event is fired after the page has been navigated away when the original page is in the page cache.
-
-SUCCESS

Deleted: releases/WebKitGTK/webkit-2.18/LayoutTests/proximity/event-after-navigation.html (220831 => 220832)


--- releases/WebKitGTK/webkit-2.18/LayoutTests/proximity/event-after-navigation.html	2017-08-17 06:58:02 UTC (rev 220831)
+++ releases/WebKitGTK/webkit-2.18/LayoutTests/proximity/event-after-navigation.html	2017-08-17 06:58:42 UTC (rev 220832)
@@ -1,23 +0,0 @@
-<html>
-<head>
-<script src=""
-</head>
-<body>
-<script>
-description('Tests for a crash where an event is fired after the page has been navigated away when the original page is in the page cache.');
-
-if (window.testRunner)
-    testRunner.overridePreference('WebKitUsesPageCachePreferenceKey', 1);
-else
-    debug('This test can not be run without the TestRunner');
-
-document.body._onload_ = function() {
-    window.addEventListener('webkitdeviceproximity', function() { } );
-    window.location = "resources/event-after-navigation-new.html";
-}
-
-window.jsTestIsAsync = true;
-</script>
-<script src=""
-</body>
-</html>

Deleted: releases/WebKitGTK/webkit-2.18/LayoutTests/proximity/multiple-frames-expected.txt (220831 => 220832)


--- releases/WebKitGTK/webkit-2.18/LayoutTests/proximity/multiple-frames-expected.txt	2017-08-17 06:58:02 UTC (rev 220831)
+++ releases/WebKitGTK/webkit-2.18/LayoutTests/proximity/multiple-frames-expected.txt	2017-08-17 06:58:42 UTC (rev 220832)
@@ -1,15 +0,0 @@
-Tests using DeviceProximity from multiple frames.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS DeviceProximityEvent.value is firedEvent.value
-PASS DeviceProximityEvent.min is firedEvent.min
-PASS DeviceProximityEvent.max is firedEvent.max
-PASS DeviceProximityEvent.value is firedEvent.value
-PASS DeviceProximityEvent.min is firedEvent.min
-PASS DeviceProximityEvent.max is firedEvent.max
-PASS successfullyParsed is true
-
-TEST COMPLETE
-

Deleted: releases/WebKitGTK/webkit-2.18/LayoutTests/proximity/multiple-frames.html (220831 => 220832)


--- releases/WebKitGTK/webkit-2.18/LayoutTests/proximity/multiple-frames.html	2017-08-17 06:58:02 UTC (rev 220831)
+++ releases/WebKitGTK/webkit-2.18/LayoutTests/proximity/multiple-frames.html	2017-08-17 06:58:42 UTC (rev 220832)
@@ -1,48 +0,0 @@
-<html>
-<head>
-<script src=""
-</head>
-<body>
-<script>
-description('Tests using DeviceProximity from multiple frames.');
-
-var DeviceProximityEvent;
-function checkProximity(event) {
-    DeviceProximityEvent = event;
-    shouldBe('DeviceProximityEvent.value', 'firedEvent.value');
-    shouldBe('DeviceProximityEvent.min', 'firedEvent.min');
-    shouldBe('DeviceProximityEvent.max', 'firedEvent.max');
-}
-
-var hasMainFrameEventFired = false;
-function mainFrameListener(event) {
-    checkProximity(event);
-    hasMainFrameEventFired = true;
-    maybeFinishTest();
-}
-
-var hasChildFrameEventFired = false;
-function childFrameListener(event) {
-    checkProximity(event);
-    hasChildFrameEventFired = true;
-    maybeFinishTest();
-}
-
-function maybeFinishTest() {
-    if (hasMainFrameEventFired && hasChildFrameEventFired)
-        finishJSTest();
-}
-
-var childFrame = document.createElement('iframe');
-document.body.appendChild(childFrame);
-childFrame.contentWindow.addEventListener('webkitdeviceproximity', childFrameListener);
-
-window.addEventListener('webkitdeviceproximity', mainFrameListener);
-var firedEvent = {value: 2.2, min: 1.1, max: 3.3};
-internals.setDeviceProximity('webkitdeviceproximity', firedEvent.value, firedEvent.min, firedEvent.max);
-
-window.jsTestIsAsync = true;
-</script>
-<script src=""
-</body>
-</html>

Deleted: releases/WebKitGTK/webkit-2.18/LayoutTests/proximity/no-page-cache-expected.txt (220831 => 220832)


--- releases/WebKitGTK/webkit-2.18/LayoutTests/proximity/no-page-cache-expected.txt	2017-08-17 06:58:02 UTC (rev 220831)
+++ releases/WebKitGTK/webkit-2.18/LayoutTests/proximity/no-page-cache-expected.txt	2017-08-17 06:58:42 UTC (rev 220832)
@@ -1,14 +0,0 @@
-Tests that pages that use DeviceProximity are not put in the page cache.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-Main page opening resources/cached-page-1.html
-resources/cached-page-1.html onload fired, count = 1
-resources/cached-page-1.html about to navigate to resources/cached-page-2.html
-resources/cached-page-2.html about to go back to resources/cached-page-1.html
-resources/cached-page-1.html onload fired, count = 2
-PASS successfullyParsed is true
-
-TEST COMPLETE
-

Deleted: releases/WebKitGTK/webkit-2.18/LayoutTests/proximity/no-page-cache.html (220831 => 220832)


--- releases/WebKitGTK/webkit-2.18/LayoutTests/proximity/no-page-cache.html	2017-08-17 06:58:02 UTC (rev 220831)
+++ releases/WebKitGTK/webkit-2.18/LayoutTests/proximity/no-page-cache.html	2017-08-17 06:58:42 UTC (rev 220832)
@@ -1,33 +0,0 @@
-<html>
-<head>
-<script src=""
-</head>
-<body>
-<script>
-description('Tests that pages that use DeviceProximity are not put in the page cache.');
-
-if (window.testRunner) {
-    testRunner.waitUntilDone();
-    testRunner.setCanOpenWindows();
-    testRunner.overridePreference('WebKitUsesPageCachePreferenceKey', 1);
-} else
-    debug('This test can not be run without the TestRunner');
-
-var pageOneOnloadCount = 0;
-function reportPageOneOnload() {
-    ++pageOneOnloadCount;
-    debug('resources/cached-page-1.html onload fired, count = ' + pageOneOnloadCount);
-    if (pageOneOnloadCount == 2) {
-        finishJSTest();
-    }
-    return pageOneOnloadCount;
-}
-
-debug("Main page opening resources/cached-page-1.html");
-window.open("resources/cached-page-1.html");
-
-window.jsTestIsAsync = true;
-</script>
-<script src=""
-</body>
-</html>

Deleted: releases/WebKitGTK/webkit-2.18/LayoutTests/proximity/optional-event-properties-expected.txt (220831 => 220832)


--- releases/WebKitGTK/webkit-2.18/LayoutTests/proximity/optional-event-properties-expected.txt	2017-08-17 06:58:02 UTC (rev 220831)
+++ releases/WebKitGTK/webkit-2.18/LayoutTests/proximity/optional-event-properties-expected.txt	2017-08-17 06:58:42 UTC (rev 220832)
@@ -1,13 +0,0 @@
-Tests the optional properties of DeviceProximityEvent. Each property should be null if not set, or set to null or undefined.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-event = document.createEvent('DeviceProximityEvent')
-PASS event.value == Number.POSITIVE_INFINITY is true
-PASS event.min == Number.NEGATIVE_INFINITY is true
-PASS event.max == Number.POSITIVE_INFINITY is true
-PASS successfullyParsed is true
-
-TEST COMPLETE
-

Deleted: releases/WebKitGTK/webkit-2.18/LayoutTests/proximity/optional-event-properties.html (220831 => 220832)


--- releases/WebKitGTK/webkit-2.18/LayoutTests/proximity/optional-event-properties.html	2017-08-17 06:58:02 UTC (rev 220831)
+++ releases/WebKitGTK/webkit-2.18/LayoutTests/proximity/optional-event-properties.html	2017-08-17 06:58:42 UTC (rev 220832)
@@ -1,17 +0,0 @@
-<html>
-<head>
-<script src=""
-</head>
-<body>
-<script>
-description('Tests the optional properties of DeviceProximityEvent. Each property should be null if not set, or set to null or undefined.');
-
-var event;
-evalAndLog("event = document.createEvent('DeviceProximityEvent')");
-shouldBeTrue("event.value == Number.POSITIVE_INFINITY");
-shouldBeTrue("event.min == Number.NEGATIVE_INFINITY");
-shouldBeTrue("event.max == Number.POSITIVE_INFINITY");
-</script>
-<script src=""
-</body>
-</html>

Deleted: releases/WebKitGTK/webkit-2.18/LayoutTests/proximity/resources/cached-page-1.html (220831 => 220832)


--- releases/WebKitGTK/webkit-2.18/LayoutTests/proximity/resources/cached-page-1.html	2017-08-17 06:58:02 UTC (rev 220831)
+++ releases/WebKitGTK/webkit-2.18/LayoutTests/proximity/resources/cached-page-1.html	2017-08-17 06:58:42 UTC (rev 220832)
@@ -1,11 +0,0 @@
-<script>
-function loadNext() {
-    window.addEventListener('webkitdeviceproximity', function() {});
-    if (window.opener.reportPageOneOnload() == 1) {
-        window.opener.debug('resources/cached-page-1.html about to navigate to resources/cached-page-2.html')
-        // Location changes need to happen outside the onload handler to generate history entries.
-        setTimeout(function() { location.href = ''; }, 0);
-    }
-}
-</script>
-<body _onload_="loadNext()"></body>
\ No newline at end of file

Deleted: releases/WebKitGTK/webkit-2.18/LayoutTests/proximity/resources/cached-page-2.html (220831 => 220832)


--- releases/WebKitGTK/webkit-2.18/LayoutTests/proximity/resources/cached-page-2.html	2017-08-17 06:58:02 UTC (rev 220831)
+++ releases/WebKitGTK/webkit-2.18/LayoutTests/proximity/resources/cached-page-2.html	2017-08-17 06:58:42 UTC (rev 220832)
@@ -1,8 +0,0 @@
-<script>
-function init() {
-    window.opener.pageTwoLoaded = true;
-    window.opener.debug('resources/cached-page-2.html about to go back to resources/cached-page-1.html');
-    history.back();
-}
-</script>
-<body _onload_="init()"></body>
\ No newline at end of file

Deleted: releases/WebKitGTK/webkit-2.18/LayoutTests/proximity/resources/event-after-navigation-new.html (220831 => 220832)


--- releases/WebKitGTK/webkit-2.18/LayoutTests/proximity/resources/event-after-navigation-new.html	2017-08-17 06:58:02 UTC (rev 220831)
+++ releases/WebKitGTK/webkit-2.18/LayoutTests/proximity/resources/event-after-navigation-new.html	2017-08-17 06:58:42 UTC (rev 220832)
@@ -1,15 +0,0 @@
-<html>
-<head>
-</head>
-<body>
-    Tests for a crash where an event is fired after the page has been navigated
-    away when the original page is in the page cache.<br><br>
-    SUCCESS
-    <script>
-        if (window.testRunner) {
-            internals.setDeviceProximity('webkitdeviceproximity', 2.2, 1.1, 3.3);
-            testRunner.notifyDone();
-        }
-    </script>
-</body>
-</html>
\ No newline at end of file

Deleted: releases/WebKitGTK/webkit-2.18/LayoutTests/proximity/updates-expected.txt (220831 => 220832)


--- releases/WebKitGTK/webkit-2.18/LayoutTests/proximity/updates-expected.txt	2017-08-17 06:58:02 UTC (rev 220831)
+++ releases/WebKitGTK/webkit-2.18/LayoutTests/proximity/updates-expected.txt	2017-08-17 06:58:42 UTC (rev 220832)
@@ -1,15 +0,0 @@
-Tests that updates to the proximity causes new events to fire.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS deviceProximityEvent.value is firedEvent.value
-PASS deviceProximityEvent.min is firedEvent.min
-PASS deviceProximityEvent.max is firedEvent.max
-PASS deviceProximityEvent.value is firedEvent.value
-PASS deviceProximityEvent.min is firedEvent.min
-PASS deviceProximityEvent.max is firedEvent.max
-PASS successfullyParsed is true
-
-TEST COMPLETE
-

Deleted: releases/WebKitGTK/webkit-2.18/LayoutTests/proximity/updates.html (220831 => 220832)


--- releases/WebKitGTK/webkit-2.18/LayoutTests/proximity/updates.html	2017-08-17 06:58:02 UTC (rev 220831)
+++ releases/WebKitGTK/webkit-2.18/LayoutTests/proximity/updates.html	2017-08-17 06:58:42 UTC (rev 220832)
@@ -1,41 +0,0 @@
-<html>
-<head>
-<script src=""
-</head>
-<body>
-<script>
-description('Tests that updates to the proximity causes new events to fire.');
-
-var firedEvent;
-function setProximity(value, min, max) {
-    firedEvent = {value: value, min: min, max: max};
-    internals.setDeviceProximity('webkitdeviceproximity', firedEvent.value, firedEvent.min, firedEvent.max);
-}
-
-var deviceProximityEvent;
-function checkProximity(event) {
-    deviceProximityEvent = event;
-    shouldBe('deviceProximityEvent.value', 'firedEvent.value');
-    shouldBe('deviceProximityEvent.min', 'firedEvent.min');
-    shouldBe('deviceProximityEvent.max', 'firedEvent.max');
-}
-
-function firstListener(event) {
-    checkProximity(event);
-    window.removeEventListener('webkitdeviceproximity', firstListener);
-    window.addEventListener('webkitdeviceproximity', updateListener);
-    setProximity(22.2, 11.1, 33.3);
-}
-
-function updateListener(event) {
-    checkProximity(event);
-    finishJSTest();
-}
-
-window.addEventListener('webkitdeviceproximity', firstListener);
-setProximity(2.2, 1.1, 3.3);
-window.jsTestIsAsync = true;
-</script>
-<script src=""
-</body>
-</html>

Deleted: releases/WebKitGTK/webkit-2.18/LayoutTests/proximity/window-property-expected.txt (220831 => 220832)


--- releases/WebKitGTK/webkit-2.18/LayoutTests/proximity/window-property-expected.txt	2017-08-17 06:58:02 UTC (rev 220831)
+++ releases/WebKitGTK/webkit-2.18/LayoutTests/proximity/window-property-expected.txt	2017-08-17 06:58:42 UTC (rev 220832)
@@ -1,18 +0,0 @@
-Tests that the window.DeviceProximityEvent and window.onwebkitdeviceproximity properties are present.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS typeof window.DeviceProximityEvent == 'object' is true
-PASS typeof window.DeviceProximityEvent == 'function' is false
-PASS window.propertyIsEnumerable('DeviceProximityEvent') is false
-PASS 'DeviceProximityEvent' in window is true
-PASS window.hasOwnProperty('DeviceProximityEvent') is true
-PASS typeof window._onwebkitdeviceproximity_ == 'object' is true
-PASS hasOnDeviceProximityProperty() is true
-PASS 'onwebkitdeviceproximity' in window is true
-PASS window.hasOwnProperty('onwebkitdeviceproximity') is true
-PASS successfullyParsed is true
-
-TEST COMPLETE
-

Deleted: releases/WebKitGTK/webkit-2.18/LayoutTests/proximity/window-property.html (220831 => 220832)


--- releases/WebKitGTK/webkit-2.18/LayoutTests/proximity/window-property.html	2017-08-17 06:58:02 UTC (rev 220831)
+++ releases/WebKitGTK/webkit-2.18/LayoutTests/proximity/window-property.html	2017-08-17 06:58:42 UTC (rev 220832)
@@ -1,31 +0,0 @@
-<html>
-<head>
-<script src=""
-</head>
-<body>
-<script>
-description('Tests that the window.DeviceProximityEvent and window.onwebkitdeviceproximity properties are present.');
-
-shouldBeTrue("typeof window.DeviceProximityEvent == 'object'");
-shouldBeFalse("typeof window.DeviceProximityEvent == 'function'");
-shouldBeFalse("window.propertyIsEnumerable('DeviceProximityEvent')");
-shouldBeTrue("'DeviceProximityEvent' in window");
-shouldBeTrue("window.hasOwnProperty('DeviceProximityEvent')");
-
-function hasOnDeviceProximityProperty()
-{
-    for (var property in window) {
-        if (property == 'onwebkitdeviceproximity')
-            return true;
-    }
-    return false;
-}
-
-shouldBeTrue("typeof window._onwebkitdeviceproximity_ == 'object'");
-shouldBeTrue("hasOnDeviceProximityProperty()");
-shouldBeTrue("'onwebkitdeviceproximity' in window");
-shouldBeTrue("window.hasOwnProperty('onwebkitdeviceproximity')");
-</script>
-<script src=""
-</body>
-</html>

Modified: releases/WebKitGTK/webkit-2.18/Source/_javascript_Core/ChangeLog (220831 => 220832)


--- releases/WebKitGTK/webkit-2.18/Source/_javascript_Core/ChangeLog	2017-08-17 06:58:02 UTC (rev 220831)
+++ releases/WebKitGTK/webkit-2.18/Source/_javascript_Core/ChangeLog	2017-08-17 06:58:42 UTC (rev 220832)
@@ -1,5 +1,17 @@
 2017-08-14  Simon Fraser  <[email protected]>
 
+        Remove Proximity Events and related code
+        https://bugs.webkit.org/show_bug.cgi?id=175545
+
+        Reviewed by Daniel Bates.
+
+        No platform enables Proximity Events, so remove code inside ENABLE(PROXIMITY_EVENTS)
+        and other related code.
+
+        * Configurations/FeatureDefines.xcconfig:
+
+2017-08-14  Simon Fraser  <[email protected]>
+
         Remove ENABLE(REQUEST_AUTOCOMPLETE) code, which was disabled everywhere
         https://bugs.webkit.org/show_bug.cgi?id=175504
 

Modified: releases/WebKitGTK/webkit-2.18/Source/WTF/ChangeLog (220831 => 220832)


--- releases/WebKitGTK/webkit-2.18/Source/WTF/ChangeLog	2017-08-17 06:58:02 UTC (rev 220831)
+++ releases/WebKitGTK/webkit-2.18/Source/WTF/ChangeLog	2017-08-17 06:58:42 UTC (rev 220832)
@@ -1,5 +1,17 @@
 2017-08-14  Simon Fraser  <[email protected]>
 
+        Remove Proximity Events and related code
+        https://bugs.webkit.org/show_bug.cgi?id=175545
+
+        Reviewed by Daniel Bates.
+
+        No platform enables Proximity Events, so remove code inside ENABLE(PROXIMITY_EVENTS)
+        and other related code.
+
+        * wtf/FeatureDefines.h:
+
+2017-08-14  Simon Fraser  <[email protected]>
+
         Remove ENABLE(REQUEST_AUTOCOMPLETE) code, which was disabled everywhere
         https://bugs.webkit.org/show_bug.cgi?id=175504
 

Modified: releases/WebKitGTK/webkit-2.18/Source/WTF/wtf/FeatureDefines.h (220831 => 220832)


--- releases/WebKitGTK/webkit-2.18/Source/WTF/wtf/FeatureDefines.h	2017-08-17 06:58:02 UTC (rev 220831)
+++ releases/WebKitGTK/webkit-2.18/Source/WTF/wtf/FeatureDefines.h	2017-08-17 06:58:42 UTC (rev 220832)
@@ -596,10 +596,6 @@
 #define ENABLE_POINTER_LOCK 1
 #endif
 
-#if !defined(ENABLE_PROXIMITY_EVENTS)
-#define ENABLE_PROXIMITY_EVENTS 0
-#endif
-
 #if !defined(ENABLE_QUOTA)
 #define ENABLE_QUOTA 0
 #endif

Modified: releases/WebKitGTK/webkit-2.18/Source/WebCore/CMakeLists.txt (220831 => 220832)


--- releases/WebKitGTK/webkit-2.18/Source/WebCore/CMakeLists.txt	2017-08-17 06:58:02 UTC (rev 220831)
+++ releases/WebKitGTK/webkit-2.18/Source/WebCore/CMakeLists.txt	2017-08-17 06:58:42 UTC (rev 220832)
@@ -34,7 +34,6 @@
     "${WEBCORE_DIR}/Modules/navigatorcontentutils"
     "${WEBCORE_DIR}/Modules/notifications"
     "${WEBCORE_DIR}/Modules/plugins"
-    "${WEBCORE_DIR}/Modules/proximity"
     "${WEBCORE_DIR}/Modules/quota"
     "${WEBCORE_DIR}/Modules/speech"
     "${WEBCORE_DIR}/Modules/streams"
@@ -158,7 +157,6 @@
     Modules/mediasession
     Modules/mediastream
     Modules/notifications
-    Modules/proximity
     Modules/quota
     Modules/speech
     Modules/streams
@@ -297,8 +295,6 @@
     Modules/notifications/NotificationPermission.idl
     Modules/notifications/NotificationPermissionCallback.idl
 
-    Modules/proximity/DeviceProximityEvent.idl
-
     Modules/speech/DOMWindowSpeechSynthesis.idl
     Modules/speech/SpeechSynthesis.idl
     Modules/speech/SpeechSynthesisEvent.idl
@@ -1040,9 +1036,6 @@
     Modules/notifications/Notification.cpp
     Modules/notifications/NotificationController.cpp
 
-    Modules/proximity/DeviceProximityController.cpp
-    Modules/proximity/DeviceProximityEvent.cpp
-
     Modules/speech/DOMWindowSpeechSynthesis.cpp
     Modules/speech/SpeechSynthesis.cpp
     Modules/speech/SpeechSynthesisEvent.cpp

Modified: releases/WebKitGTK/webkit-2.18/Source/WebCore/ChangeLog (220831 => 220832)


--- releases/WebKitGTK/webkit-2.18/Source/WebCore/ChangeLog	2017-08-17 06:58:02 UTC (rev 220831)
+++ releases/WebKitGTK/webkit-2.18/Source/WebCore/ChangeLog	2017-08-17 06:58:42 UTC (rev 220832)
@@ -1,5 +1,41 @@
 2017-08-14  Simon Fraser  <[email protected]>
 
+        Remove Proximity Events and related code
+        https://bugs.webkit.org/show_bug.cgi?id=175545
+
+        Reviewed by Daniel Bates.
+
+        No platform enables Proximity Events, so remove code inside ENABLE(PROXIMITY_EVENTS)
+        and other related code.
+
+        * CMakeLists.txt:
+        * Configurations/FeatureDefines.xcconfig:
+        * DerivedSources.cpp:
+        * Modules/proximity/DeviceProximityClient.h: Removed.
+        * Modules/proximity/DeviceProximityController.cpp: Removed.
+        * Modules/proximity/DeviceProximityController.h: Removed.
+        * Modules/proximity/DeviceProximityEvent.cpp: Removed.
+        * Modules/proximity/DeviceProximityEvent.h: Removed.
+        * Modules/proximity/DeviceProximityEvent.idl: Removed.
+        * dom/EventNames.h:
+        * dom/EventNames.in:
+        * history/PageCache.cpp:
+        (WebCore::canCachePage):
+        * page/DOMWindow.cpp:
+        (WebCore::DOMWindow::addEventListener):
+        (WebCore::DOMWindow::removeEventListener):
+        (WebCore::DOMWindow::removeAllEventListeners):
+        * page/DOMWindow.idl:
+        * page/DiagnosticLoggingKeys.cpp:
+        (WebCore::DiagnosticLoggingKeys::deviceProximityKey): Deleted.
+        * page/DiagnosticLoggingKeys.h:
+        * testing/Internals.cpp:
+        (WebCore::Internals::setDeviceProximity): Deleted.
+        * testing/Internals.h:
+        * testing/Internals.idl:
+
+2017-08-14  Simon Fraser  <[email protected]>
+
         Remove ENABLE(REQUEST_AUTOCOMPLETE) code, which was disabled everywhere
         https://bugs.webkit.org/show_bug.cgi?id=175504
 

Modified: releases/WebKitGTK/webkit-2.18/Source/WebCore/DerivedSources.cpp (220831 => 220832)


--- releases/WebKitGTK/webkit-2.18/Source/WebCore/DerivedSources.cpp	2017-08-17 06:58:02 UTC (rev 220831)
+++ releases/WebKitGTK/webkit-2.18/Source/WebCore/DerivedSources.cpp	2017-08-17 06:58:42 UTC (rev 220832)
@@ -148,9 +148,6 @@
 #include "JSDeviceMotionEvent.h"
 #include "JSDeviceOrientationEvent.cpp"
 #endif
-#if ENABLE(PROXIMITY_EVENTS)
-#include "JSDeviceProximityEvent.cpp"
-#endif
 #include "JSDocument.cpp"
 #include "JSDocumentFragment.cpp"
 #include "JSDocumentType.cpp"

Deleted: releases/WebKitGTK/webkit-2.18/Source/WebCore/Modules/proximity/DeviceProximityClient.h (220831 => 220832)


--- releases/WebKitGTK/webkit-2.18/Source/WebCore/Modules/proximity/DeviceProximityClient.h	2017-08-17 06:58:02 UTC (rev 220831)
+++ releases/WebKitGTK/webkit-2.18/Source/WebCore/Modules/proximity/DeviceProximityClient.h	2017-08-17 06:58:42 UTC (rev 220832)
@@ -1,50 +0,0 @@
-/*
- * Copyright 2012 Samsung Electronics. 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 ENABLE(PROXIMITY_EVENTS)
-
-#include "DeviceClient.h"
-#include <limits>
-
-namespace WebCore {
-
-class Page;
-
-class DeviceProximityClient : public DeviceClient {
-public:
-    virtual ~DeviceProximityClient() { }
-    virtual bool hasLastData() = 0;
-    virtual double value() = 0;
-    virtual double min() = 0;
-    virtual double max() = 0;
-};
-
-void provideDeviceProximityTo(Page*, DeviceProximityClient*);
-
-} // namespace WebCore
-
-#endif // PROXIMITY_EVENTS

Deleted: releases/WebKitGTK/webkit-2.18/Source/WebCore/Modules/proximity/DeviceProximityController.cpp (220831 => 220832)


--- releases/WebKitGTK/webkit-2.18/Source/WebCore/Modules/proximity/DeviceProximityController.cpp	2017-08-17 06:58:02 UTC (rev 220831)
+++ releases/WebKitGTK/webkit-2.18/Source/WebCore/Modules/proximity/DeviceProximityController.cpp	2017-08-17 06:58:42 UTC (rev 220832)
@@ -1,89 +0,0 @@
-/*
- * Copyright 2012 Samsung Electronics. 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 "DeviceProximityController.h"
-
-#if ENABLE(PROXIMITY_EVENTS)
-
-#include "DeviceProximityClient.h"
-#include "DeviceProximityEvent.h"
-#include "Page.h"
-
-namespace WebCore {
-
-DeviceProximityController::DeviceProximityController(DeviceProximityClient* client)
-    : DeviceController(client)
-{
-    ASSERT(m_client);
-}
-
-void DeviceProximityController::didChangeDeviceProximity(const double value, const double min, const double max)
-{
-    ASSERT(value >= min && value <= max);
-
-    dispatchDeviceEvent(DeviceProximityEvent::create(eventNames().webkitdeviceproximityEvent, value, min, max));
-}
-
-DeviceProximityClient* DeviceProximityController::deviceProximityClient()
-{
-    return static_cast<DeviceProximityClient*>(m_client);
-}
-
-bool DeviceProximityController::hasLastData()
-{
-    return deviceProximityClient()->hasLastData();
-}
-
-RefPtr<Event> DeviceProximityController::getLastEvent()
-{
-    return DeviceProximityEvent::create(eventNames().webkitdeviceproximityEvent, deviceProximityClient()->value(), deviceProximityClient()->min(), deviceProximityClient()->max());
-}
-
-const char* DeviceProximityController::supplementName()
-{
-    return "DeviceProximityController";
-}
-
-DeviceProximityController* DeviceProximityController::from(Page* page)
-{
-    return static_cast<DeviceProximityController*>(Supplement<Page>::from(page, supplementName()));
-}
-
-bool DeviceProximityController::isActiveAt(Page* page)
-{
-    if (DeviceProximityController* controller = DeviceProximityController::from(page))
-        return controller->isActive();
-    return false;
-}
-
-void provideDeviceProximityTo(Page* page, DeviceProximityClient* client)
-{
-    DeviceProximityController::provideTo(page, DeviceProximityController::supplementName(), std::make_unique<DeviceProximityController>(client));
-}
-
-} // namespace WebCore
-
-#endif // PROXIMITY_EVENTS

Deleted: releases/WebKitGTK/webkit-2.18/Source/WebCore/Modules/proximity/DeviceProximityController.h (220831 => 220832)


--- releases/WebKitGTK/webkit-2.18/Source/WebCore/Modules/proximity/DeviceProximityController.h	2017-08-17 06:58:02 UTC (rev 220831)
+++ releases/WebKitGTK/webkit-2.18/Source/WebCore/Modules/proximity/DeviceProximityController.h	2017-08-17 06:58:42 UTC (rev 220832)
@@ -1,54 +0,0 @@
-/*
- * Copyright 2012 Samsung Electronics. 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 ENABLE(PROXIMITY_EVENTS)
-
-#include "DeviceController.h"
-
-namespace WebCore {
-
-class DeviceProximityClient;
-
-class DeviceProximityController : public DeviceController {
-public:
-    explicit DeviceProximityController(DeviceProximityClient*);
-    ~DeviceProximityController() { }
-
-    void didChangeDeviceProximity(const double value, const double min, const double max);
-    DeviceProximityClient* deviceProximityClient();
-
-    virtual bool hasLastData();
-    virtual RefPtr<Event> getLastEvent();
-
-    static const char* supplementName();
-    static DeviceProximityController* from(Page*);
-    static bool isActiveAt(Page*);
-};
-
-} // namespace WebCore
-
-#endif // PROXIMITY_EVENTS

Deleted: releases/WebKitGTK/webkit-2.18/Source/WebCore/Modules/proximity/DeviceProximityEvent.cpp (220831 => 220832)


--- releases/WebKitGTK/webkit-2.18/Source/WebCore/Modules/proximity/DeviceProximityEvent.cpp	2017-08-17 06:58:02 UTC (rev 220831)
+++ releases/WebKitGTK/webkit-2.18/Source/WebCore/Modules/proximity/DeviceProximityEvent.cpp	2017-08-17 06:58:42 UTC (rev 220832)
@@ -1,52 +0,0 @@
-/*
- *  Copyright (C) 2012 Samsung Electronics
- *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public
- *  License as published by the Free Software Foundation; either
- *  version 2 of the License, or (at your option) any later version.
- *
- *  This library is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *  Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public License
- *  along with this library; see the file COPYING.LIB.  If not, write to
- *  the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- *  Boston, MA 02110-1301, USA.
- */
-
-#include "config.h"
-#include "DeviceProximityEvent.h"
-
-#if ENABLE(PROXIMITY_EVENTS)
-
-namespace WebCore {
-
-DeviceProximityEvent::DeviceProximityEvent()
-    : m_value(std::numeric_limits<double>::infinity())
-    , m_min(-std::numeric_limits<double>::infinity())
-    , m_max(std::numeric_limits<double>::infinity())
-{
-}
-
-DeviceProximityEvent::DeviceProximityEvent(const AtomicString& eventType, const double value, const double min, const double max)
-    : Event(eventType, true, false) // Default event is bubbles, not cancelable.
-    , m_value(value)
-    , m_min(min)
-    , m_max(max)
-{
-}
-
-DeviceProximityEvent::DeviceProximityEvent(const AtomicString& eventType, const Init& initializer, IsTrusted isTrusted)
-    : Event(eventType, initializer, isTrusted)
-    , m_value(initializer.value ? *initializer.value : std::numeric_limits<double>::infinity())
-    , m_min(initializer.min ? *initializer.min : -std::numeric_limits<double>::infinity())
-    , m_max(initializer.max ? *initializer.max : std::numeric_limits<double>::infinity())
-{
-}
-
-} // namespace WebCore
-
-#endif // PROXIMITY_EVENTS

Deleted: releases/WebKitGTK/webkit-2.18/Source/WebCore/Modules/proximity/DeviceProximityEvent.h (220831 => 220832)


--- releases/WebKitGTK/webkit-2.18/Source/WebCore/Modules/proximity/DeviceProximityEvent.h	2017-08-17 06:58:02 UTC (rev 220831)
+++ releases/WebKitGTK/webkit-2.18/Source/WebCore/Modules/proximity/DeviceProximityEvent.h	2017-08-17 06:58:42 UTC (rev 220832)
@@ -1,71 +0,0 @@
-/*
- *  Copyright (C) 2012 Samsung Electronics
- *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public
- *  License as published by the Free Software Foundation; either
- *  version 2 of the License, or (at your option) any later version.
- *
- *  This library is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *  Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public License
- *  along with this library; see the file COPYING.LIB.  If not, write to
- *  the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- *  Boston, MA 02110-1301, USA.
- */
-
-#pragma once
-
-#if ENABLE(PROXIMITY_EVENTS)
-
-#include "Event.h"
-
-namespace WebCore {
-
-class DeviceProximityEvent : public Event {
-public:
-    ~DeviceProximityEvent() { }
-
-    static Ref<DeviceProximityEvent> create()
-    {
-        return adoptRef(*new DeviceProximityEvent());
-    }
-
-    static Ref<DeviceProximityEvent> create(const AtomicString& eventType, const double value, const double min, const double max)
-    {
-        return adoptRef(*new DeviceProximityEvent(eventType, value, min, max));
-    }
-
-    struct Init : EventInit {
-        std::optional<double> value;
-        std::optional<double> min;
-        std::optional<double> max;
-    };
-
-    static Ref<DeviceProximityEvent> create(const AtomicString& type, const Init& initializer, IsTrusted isTrusted = IsTrusted::No)
-    {
-        return adoptRef(*new DeviceProximityEvent(type, initializer, isTrusted));
-    }
-
-    double value() { return m_value; }
-    double min() { return m_min; }
-    double max() { return m_max; }
-
-    virtual EventInterface eventInterface() const { return DeviceProximityEventInterfaceType; }
-
-private:
-    DeviceProximityEvent();
-    DeviceProximityEvent(const AtomicString& eventType, const double value, const double min, const double max);
-    DeviceProximityEvent(const AtomicString& eventType, const Init&, IsTrusted);
-
-    double m_value;
-    double m_min;
-    double m_max;
-};
-
-} // namespace WebCore
-
-#endif // DeviceProximityEvent_h

Deleted: releases/WebKitGTK/webkit-2.18/Source/WebCore/Modules/proximity/DeviceProximityEvent.idl (220831 => 220832)


--- releases/WebKitGTK/webkit-2.18/Source/WebCore/Modules/proximity/DeviceProximityEvent.idl	2017-08-17 06:58:02 UTC (rev 220831)
+++ releases/WebKitGTK/webkit-2.18/Source/WebCore/Modules/proximity/DeviceProximityEvent.idl	2017-08-17 06:58:42 UTC (rev 220832)
@@ -1,33 +0,0 @@
-/*
- *  Copyright (C) 2012 Samsung Electronics
- *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public
- *  License as published by the Free Software Foundation; either
- *  version 2 of the License, or (at your option) any later version.
- *
- *  This library is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *  Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public License
- *  along with this library; see the file COPYING.LIB.  If not, write to
- *  the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- *  Boston, MA 02110-1301, USA.
- */
-
-[
-    Conditional=PROXIMITY_EVENTS,
-    Constructor(DOMString type, optional DeviceProximityEventInit eventInitDict),
-] interface DeviceProximityEvent : Event {
-    readonly attribute unrestricted double value;
-    readonly attribute unrestricted double min;
-    readonly attribute unrestricted double max;
-};
-
-dictionary DeviceProximityEventInit : EventInit {
-    double value;
-    double min;
-    double max;
-};

Modified: releases/WebKitGTK/webkit-2.18/Source/WebCore/PAL/ChangeLog (220831 => 220832)


--- releases/WebKitGTK/webkit-2.18/Source/WebCore/PAL/ChangeLog	2017-08-17 06:58:02 UTC (rev 220831)
+++ releases/WebKitGTK/webkit-2.18/Source/WebCore/PAL/ChangeLog	2017-08-17 06:58:42 UTC (rev 220832)
@@ -1,5 +1,17 @@
 2017-08-14  Simon Fraser  <[email protected]>
 
+        Remove Proximity Events and related code
+        https://bugs.webkit.org/show_bug.cgi?id=175545
+
+        Reviewed by Daniel Bates.
+
+        No platform enables Proximity Events, so remove code inside ENABLE(PROXIMITY_EVENTS)
+        and other related code.
+
+        * Configurations/FeatureDefines.xcconfig:
+
+2017-08-14  Simon Fraser  <[email protected]>
+
         Remove ENABLE(REQUEST_AUTOCOMPLETE) code, which was disabled everywhere
         https://bugs.webkit.org/show_bug.cgi?id=175504
 

Modified: releases/WebKitGTK/webkit-2.18/Source/WebCore/dom/EventNames.h (220831 => 220832)


--- releases/WebKitGTK/webkit-2.18/Source/WebCore/dom/EventNames.h	2017-08-17 06:58:02 UTC (rev 220831)
+++ releases/WebKitGTK/webkit-2.18/Source/WebCore/dom/EventNames.h	2017-08-17 06:58:42 UTC (rev 220832)
@@ -264,7 +264,6 @@
     macro(webkitTransitionEnd) \
     macro(webkitbeginfullscreen) \
     macro(webkitcurrentplaybacktargetiswirelesschanged) \
-    macro(webkitdeviceproximity) \
     macro(webkitendfullscreen) \
     macro(webkitfullscreenchange) \
     macro(webkitfullscreenerror) \

Modified: releases/WebKitGTK/webkit-2.18/Source/WebCore/dom/EventNames.in (220831 => 220832)


--- releases/WebKitGTK/webkit-2.18/Source/WebCore/dom/EventNames.in	2017-08-17 06:58:02 UTC (rev 220831)
+++ releases/WebKitGTK/webkit-2.18/Source/WebCore/dom/EventNames.in	2017-08-17 06:58:42 UTC (rev 220832)
@@ -58,7 +58,6 @@
 TouchEvent conditional=TOUCH_EVENTS
 DeviceMotionEvent conditional=DEVICE_ORIENTATION
 DeviceOrientationEvent conditional=DEVICE_ORIENTATION
-DeviceProximityEvent conditional=PROXIMITY_EVENTS
 OrientationEvent interfaceName=Event, conditional=ORIENTATION_EVENTS
 WebKitMediaKeyMessageEvent conditional=LEGACY_ENCRYPTED_MEDIA
 WebKitMediaKeyNeededEvent conditional=LEGACY_ENCRYPTED_MEDIA

Modified: releases/WebKitGTK/webkit-2.18/Source/WebCore/history/PageCache.cpp (220831 => 220832)


--- releases/WebKitGTK/webkit-2.18/Source/WebCore/history/PageCache.cpp	2017-08-17 06:58:02 UTC (rev 220831)
+++ releases/WebKitGTK/webkit-2.18/Source/WebCore/history/PageCache.cpp	2017-08-17 06:58:42 UTC (rev 220832)
@@ -54,10 +54,6 @@
 #include <wtf/text/CString.h>
 #include <wtf/text/StringConcatenate.h>
 
-#if ENABLE(PROXIMITY_EVENTS)
-#include "DeviceProximityController.h"
-#endif
-
 namespace WebCore {
 
 #define PCLOG(...) LOG(PageCache, "%*s%s", indentLevel*4, "", makeString(__VA_ARGS__).utf8().data())
@@ -209,13 +205,7 @@
         isCacheable = false;
     }
 #endif
-#if ENABLE(PROXIMITY_EVENTS)
-    if (DeviceProximityController::isActiveAt(page)) {
-        PCLOG("   -Page is using DeviceProximity");
-        logPageCacheFailureDiagnosticMessage(diagnosticLoggingClient, deviceProximityKey);
-        isCacheable = false;
-    }
-#endif
+
     FrameLoadType loadType = page.mainFrame().loader().loadType();
     switch (loadType) {
     case FrameLoadType::Reload:

Modified: releases/WebKitGTK/webkit-2.18/Source/WebCore/page/DOMWindow.cpp (220831 => 220832)


--- releases/WebKitGTK/webkit-2.18/Source/WebCore/page/DOMWindow.cpp	2017-08-17 06:58:02 UTC (rev 220831)
+++ releases/WebKitGTK/webkit-2.18/Source/WebCore/page/DOMWindow.cpp	2017-08-17 06:58:42 UTC (rev 220832)
@@ -135,10 +135,6 @@
 #include "PointerLockController.h"
 #endif
 
-#if ENABLE(PROXIMITY_EVENTS)
-#include "DeviceProximityController.h"
-#endif
-
 #if PLATFORM(IOS)
 #include "WKContentObservation.h"
 #include "WKContentObservationInternal.h"
@@ -1832,12 +1828,6 @@
     else if (eventNames().isGamepadEventType(eventType))
         incrementGamepadEventListenerCount();
 #endif
-#if ENABLE(PROXIMITY_EVENTS)
-    else if (eventType == eventNames().webkitdeviceproximityEvent) {
-        if (DeviceProximityController* controller = DeviceProximityController::from(page()))
-            controller->addDeviceEventListener(this);
-    }
-#endif
 
     return true;
 }
@@ -1927,12 +1917,6 @@
     else if (eventNames().isGamepadEventType(eventType))
         decrementGamepadEventListenerCount();
 #endif
-#if ENABLE(PROXIMITY_EVENTS)
-    else if (eventType == eventNames().webkitdeviceproximityEvent) {
-        if (DeviceProximityController* controller = DeviceProximityController::from(page()))
-            controller->removeDeviceEventListener(this);
-    }
-#endif
 
     return true;
 }
@@ -2034,11 +2018,6 @@
         document->didRemoveEventTargetNode(*document);
 #endif
 
-#if ENABLE(PROXIMITY_EVENTS)
-    if (DeviceProximityController* controller = DeviceProximityController::from(page()))
-        controller->removeAllDeviceEventListeners(this);
-#endif
-
     if (m_performance)
         m_performance->removeAllEventListeners();
 

Modified: releases/WebKitGTK/webkit-2.18/Source/WebCore/page/DOMWindow.idl (220831 => 220832)


--- releases/WebKitGTK/webkit-2.18/Source/WebCore/page/DOMWindow.idl	2017-08-17 06:58:02 UTC (rev 220831)
+++ releases/WebKitGTK/webkit-2.18/Source/WebCore/page/DOMWindow.idl	2017-08-17 06:58:42 UTC (rev 220832)
@@ -191,7 +191,6 @@
     [NotEnumerable, Conditional=DEVICE_ORIENTATION] attribute EventHandler ondeviceorientation; // FIXME: Should be enumerable.
 
     // Non standard event handlers.
-    [NotEnumerable, Conditional=PROXIMITY_EVENTS] attribute EventHandler onwebkitdeviceproximity;
     [NotEnumerable, ImplementedAs=onwebkitAnimationEnd] attribute EventHandler onwebkitanimationend;
     [NotEnumerable, ImplementedAs=onwebkitAnimationIteration] attribute EventHandler onwebkitanimationiteration;
     [NotEnumerable, ImplementedAs=onwebkitAnimationStart] attribute EventHandler onwebkitanimationstart;

Modified: releases/WebKitGTK/webkit-2.18/Source/WebCore/page/DiagnosticLoggingKeys.cpp (220831 => 220832)


--- releases/WebKitGTK/webkit-2.18/Source/WebCore/page/DiagnosticLoggingKeys.cpp	2017-08-17 06:58:02 UTC (rev 220831)
+++ releases/WebKitGTK/webkit-2.18/Source/WebCore/page/DiagnosticLoggingKeys.cpp	2017-08-17 06:58:42 UTC (rev 220832)
@@ -453,11 +453,6 @@
     return ASCIILiteral("deviceOrientation");
 }
 
-String DiagnosticLoggingKeys::deviceProximityKey()
-{
-    return ASCIILiteral("deviceProximity");
-}
-
 String DiagnosticLoggingKeys::diskCacheKey()
 {
     return ASCIILiteral("diskCache");

Modified: releases/WebKitGTK/webkit-2.18/Source/WebCore/page/DiagnosticLoggingKeys.h (220831 => 220832)


--- releases/WebKitGTK/webkit-2.18/Source/WebCore/page/DiagnosticLoggingKeys.h	2017-08-17 06:58:02 UTC (rev 220831)
+++ releases/WebKitGTK/webkit-2.18/Source/WebCore/page/DiagnosticLoggingKeys.h	2017-08-17 06:58:42 UTC (rev 220832)
@@ -46,7 +46,6 @@
     static String deniedByClientKey();
     static String deviceMotionKey();
     static String deviceOrientationKey();
-    static String deviceProximityKey();
     static String diskCacheKey();
     static String diskCacheAfterValidationKey();
     static String documentLoaderStoppingKey();

Modified: releases/WebKitGTK/webkit-2.18/Source/WebCore/testing/Internals.cpp (220831 => 220832)


--- releases/WebKitGTK/webkit-2.18/Source/WebCore/testing/Internals.cpp	2017-08-17 06:58:02 UTC (rev 220831)
+++ releases/WebKitGTK/webkit-2.18/Source/WebCore/testing/Internals.cpp	2017-08-17 06:58:42 UTC (rev 220832)
@@ -162,10 +162,6 @@
 #include "ColorChooser.h"
 #endif
 
-#if ENABLE(PROXIMITY_EVENTS)
-#include "DeviceProximityController.h"
-#endif
-
 #if ENABLE(MOUSE_CURSOR_SCALE)
 #include <wtf/dtoa.h>
 #endif
@@ -1929,22 +1925,6 @@
     return result.toString();
 }
 
-ExceptionOr<void> Internals::setDeviceProximity(const String&, double value, double min, double max)
-{
-    Document* document = contextDocument();
-    if (!document || !document->page())
-        return Exception { InvalidAccessError };
-
-#if ENABLE(PROXIMITY_EVENTS)
-    DeviceProximityController::from(document->page())->didChangeDeviceProximity(value, min, max);
-#else
-    UNUSED_PARAM(value);
-    UNUSED_PARAM(min);
-    UNUSED_PARAM(max);
-#endif
-    return { };
-}
-
 void Internals::updateEditorUINowIfScheduled()
 {
     if (Document* document = contextDocument()) {

Modified: releases/WebKitGTK/webkit-2.18/Source/WebCore/testing/Internals.h (220831 => 220832)


--- releases/WebKitGTK/webkit-2.18/Source/WebCore/testing/Internals.h	2017-08-17 06:58:02 UTC (rev 220831)
+++ releases/WebKitGTK/webkit-2.18/Source/WebCore/testing/Internals.h	2017-08-17 06:58:42 UTC (rev 220832)
@@ -286,8 +286,6 @@
     ExceptionOr<bool> areSVGAnimationsPaused() const;
     ExceptionOr<double> svgAnimationsInterval(SVGSVGElement&) const;
 
-    ExceptionOr<void> setDeviceProximity(const String& eventType, double value, double min, double max);
-
     enum {
         // Values need to be kept in sync with Internals.idl.
         LAYER_TREE_INCLUDES_VISIBLE_RECTS = 1,

Modified: releases/WebKitGTK/webkit-2.18/Source/WebCore/testing/Internals.idl (220831 => 220832)


--- releases/WebKitGTK/webkit-2.18/Source/WebCore/testing/Internals.idl	2017-08-17 06:58:02 UTC (rev 220831)
+++ releases/WebKitGTK/webkit-2.18/Source/WebCore/testing/Internals.idl	2017-08-17 06:58:42 UTC (rev 220832)
@@ -299,8 +299,6 @@
     void beginSimulatedMemoryPressure();
     void endSimulatedMemoryPressure();
 
-    [Conditional=PROXIMITY_EVENTS, MayThrowException] void setDeviceProximity(DOMString eventType, unrestricted double value, unrestricted double min, unrestricted double max);
-
     unsigned long numberOfLiveNodes();
     unsigned long numberOfLiveDocuments();
     unsigned long referencingNodeCount(Document document);

Modified: releases/WebKitGTK/webkit-2.18/Source/WebInspectorUI/ChangeLog (220831 => 220832)


--- releases/WebKitGTK/webkit-2.18/Source/WebInspectorUI/ChangeLog	2017-08-17 06:58:02 UTC (rev 220831)
+++ releases/WebKitGTK/webkit-2.18/Source/WebInspectorUI/ChangeLog	2017-08-17 06:58:42 UTC (rev 220832)
@@ -1,3 +1,16 @@
+2017-08-14  Simon Fraser  <[email protected]>
+
+        Remove Proximity Events and related code
+        https://bugs.webkit.org/show_bug.cgi?id=175545
+
+        Reviewed by Daniel Bates.
+
+        No platform enables Proximity Events, so remove code inside ENABLE(PROXIMITY_EVENTS)
+        and other related code.
+
+        * UserInterface/Models/ScriptTimelineRecord.js:
+        (WI.ScriptTimelineRecord.EventType.displayName):
+
 2017-08-08  Devin Rousso  <[email protected]>
 
         Web Inspector: Canvas: support editing WebGL shaders

Modified: releases/WebKitGTK/webkit-2.18/Source/WebInspectorUI/UserInterface/Models/ScriptTimelineRecord.js (220831 => 220832)


--- releases/WebKitGTK/webkit-2.18/Source/WebInspectorUI/UserInterface/Models/ScriptTimelineRecord.js	2017-08-17 06:58:02 UTC (rev 220831)
+++ releases/WebKitGTK/webkit-2.18/Source/WebInspectorUI/UserInterface/Models/ScriptTimelineRecord.js	2017-08-17 06:58:42 UTC (rev 220832)
@@ -331,7 +331,6 @@
         nameMap.set("webkitaddsourcebuffer", "Add Source Buffer");
         nameMap.set("webkitbeginfullscreen", "Begin Full Screen");
         nameMap.set("webkitcurrentplaybacktargetiswirelesschanged", "Current Playback Target Is Wireless Changed");
-        nameMap.set("webkitdeviceproximity", "Device Proximity");
         nameMap.set("webkitendfullscreen", "End Full Screen");
         nameMap.set("webkitfullscreenchange", "Full Screen Change");
         nameMap.set("webkitfullscreenerror", "Full Screen Error");

Modified: releases/WebKitGTK/webkit-2.18/Source/WebKit/CMakeLists.txt (220831 => 220832)


--- releases/WebKitGTK/webkit-2.18/Source/WebKit/CMakeLists.txt	2017-08-17 06:58:02 UTC (rev 220831)
+++ releases/WebKitGTK/webkit-2.18/Source/WebKit/CMakeLists.txt	2017-08-17 06:58:42 UTC (rev 220832)
@@ -530,7 +530,6 @@
     WebProcess/WebCoreSupport/WebChromeClient.cpp
     WebProcess/WebCoreSupport/WebColorChooser.cpp
     WebProcess/WebCoreSupport/WebContextMenuClient.cpp
-    WebProcess/WebCoreSupport/WebDeviceProximityClient.cpp
     WebProcess/WebCoreSupport/WebDiagnosticLoggingClient.cpp
     WebProcess/WebCoreSupport/WebDragClient.cpp
     WebProcess/WebCoreSupport/WebEditorClient.cpp

Modified: releases/WebKitGTK/webkit-2.18/Source/WebKit/ChangeLog (220831 => 220832)


--- releases/WebKitGTK/webkit-2.18/Source/WebKit/ChangeLog	2017-08-17 06:58:02 UTC (rev 220831)
+++ releases/WebKitGTK/webkit-2.18/Source/WebKit/ChangeLog	2017-08-17 06:58:42 UTC (rev 220832)
@@ -1,5 +1,22 @@
 2017-08-14  Simon Fraser  <[email protected]>
 
+        Remove Proximity Events and related code
+        https://bugs.webkit.org/show_bug.cgi?id=175545
+
+        Reviewed by Daniel Bates.
+
+        No platform enables Proximity Events, so remove code inside ENABLE(PROXIMITY_EVENTS)
+        and other related code.
+
+        * CMakeLists.txt:
+        * Configurations/FeatureDefines.xcconfig:
+        * WebProcess/WebCoreSupport/WebDeviceProximityClient.cpp: Removed.
+        * WebProcess/WebCoreSupport/WebDeviceProximityClient.h: Removed.
+        * WebProcess/WebPage/WebPage.cpp:
+        (WebKit::m_cpuLimit):
+
+2017-08-14  Simon Fraser  <[email protected]>
+
         Remove ENABLE(REQUEST_AUTOCOMPLETE) code, which was disabled everywhere
         https://bugs.webkit.org/show_bug.cgi?id=175504
 

Deleted: releases/WebKitGTK/webkit-2.18/Source/WebKit/WebProcess/WebCoreSupport/WebDeviceProximityClient.cpp (220831 => 220832)


--- releases/WebKitGTK/webkit-2.18/Source/WebKit/WebProcess/WebCoreSupport/WebDeviceProximityClient.cpp	2017-08-17 06:58:02 UTC (rev 220831)
+++ releases/WebKitGTK/webkit-2.18/Source/WebKit/WebProcess/WebCoreSupport/WebDeviceProximityClient.cpp	2017-08-17 06:58:42 UTC (rev 220832)
@@ -1,61 +0,0 @@
-/*
- * Copyright 2012 Samsung Electronics. 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 "WebDeviceProximityClient.h"
-
-#if ENABLE(PROXIMITY_EVENTS)
-
-#include <WebCore/DeviceProximityController.h>
-
-namespace WebKit {
-
-WebDeviceProximityClient::WebDeviceProximityClient(WebPage* page)
-    : m_page(page)
-    , m_value(std::numeric_limits<double>::infinity())
-    , m_min(-std::numeric_limits<double>::infinity())
-    , m_max(std::numeric_limits<double>::infinity())
-{
-}
-
-void WebDeviceProximityClient::startUpdating()
-{
-    // FIXME : Start getting proximity data from device.
-}
-
-void WebDeviceProximityClient::stopUpdating()
-{
-    // FIXME : Stop getting proximity data from device.
-}
-
-bool WebDeviceProximityClient::hasLastData()
-{
-    return m_value == std::numeric_limits<double>::infinity() ? false : true;
-}
-
-} // namespace WebKit
-
-#endif // PROXIMITY_EVENTS
-

Deleted: releases/WebKitGTK/webkit-2.18/Source/WebKit/WebProcess/WebCoreSupport/WebDeviceProximityClient.h (220831 => 220832)


--- releases/WebKitGTK/webkit-2.18/Source/WebKit/WebProcess/WebCoreSupport/WebDeviceProximityClient.h	2017-08-17 06:58:02 UTC (rev 220831)
+++ releases/WebKitGTK/webkit-2.18/Source/WebKit/WebProcess/WebCoreSupport/WebDeviceProximityClient.h	2017-08-17 06:58:42 UTC (rev 220832)
@@ -1,63 +0,0 @@
-/*
- * Copyright 2012 Samsung Electronics. 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.
- */
-
-#ifndef WebDeviceProximityClient_h
-#define WebDeviceProximityClient_h
-
-#if ENABLE(PROXIMITY_EVENTS)
-
-#include <WebCore/DeviceProximityClient.h>
-
-namespace WebKit {
-
-class WebPage;
-
-class WebDeviceProximityClient : public WebCore::DeviceProximityClient {
-public:
-    explicit WebDeviceProximityClient(WebPage*);
-    virtual ~WebDeviceProximityClient() { }
-
-    void startUpdating();
-    void stopUpdating();
-
-    bool hasLastData() override;
-    double value() override { return m_value; }
-    double min() override { return m_min; }
-    double max() override { return m_max; }
-
-private:
-    WebPage* m_page;
-    
-    bool m_isUpdating;
-    double m_value;
-    double m_min;
-    double m_max;
-};
-
-} // namespace WebKit
-
-#endif // PROXIMITY_EVENTS
-#endif // WebDeviceProximityClient_h
-

Modified: releases/WebKitGTK/webkit-2.18/Source/WebKit/WebProcess/WebPage/WebPage.cpp (220831 => 220832)


--- releases/WebKitGTK/webkit-2.18/Source/WebKit/WebProcess/WebPage/WebPage.cpp	2017-08-17 06:58:02 UTC (rev 220831)
+++ releases/WebKitGTK/webkit-2.18/Source/WebKit/WebProcess/WebPage/WebPage.cpp	2017-08-17 06:58:42 UTC (rev 220832)
@@ -212,10 +212,6 @@
 #include <WebCore/PointerLockController.h>
 #endif
 
-#if ENABLE(PROXIMITY_EVENTS)
-#include "WebDeviceProximityClient.h"
-#endif
-
 #if PLATFORM(COCOA)
 #include "PDFPlugin.h"
 #include "PlaybackSessionManager.h"
@@ -434,9 +430,6 @@
 #if ENABLE(NOTIFICATIONS)
     WebCore::provideNotification(m_page.get(), new WebNotificationClient(this));
 #endif
-#if ENABLE(PROXIMITY_EVENTS)
-    WebCore::provideDeviceProximityTo(m_page.get(), new WebDeviceProximityClient(this));
-#endif
 #if ENABLE(MEDIA_STREAM)
     WebCore::provideUserMediaTo(m_page.get(), new WebUserMediaClient(*this));
 #endif

Modified: releases/WebKitGTK/webkit-2.18/Source/WebKitLegacy/mac/ChangeLog (220831 => 220832)


--- releases/WebKitGTK/webkit-2.18/Source/WebKitLegacy/mac/ChangeLog	2017-08-17 06:58:02 UTC (rev 220831)
+++ releases/WebKitGTK/webkit-2.18/Source/WebKitLegacy/mac/ChangeLog	2017-08-17 06:58:42 UTC (rev 220832)
@@ -1,5 +1,17 @@
 2017-08-14  Simon Fraser  <[email protected]>
 
+        Remove Proximity Events and related code
+        https://bugs.webkit.org/show_bug.cgi?id=175545
+
+        Reviewed by Daniel Bates.
+
+        No platform enables Proximity Events, so remove code inside ENABLE(PROXIMITY_EVENTS)
+        and other related code.
+
+        * Configurations/FeatureDefines.xcconfig:
+
+2017-08-14  Simon Fraser  <[email protected]>
+
         Remove ENABLE(REQUEST_AUTOCOMPLETE) code, which was disabled everywhere
         https://bugs.webkit.org/show_bug.cgi?id=175504
 

Modified: releases/WebKitGTK/webkit-2.18/Source/cmake/OptionsMac.cmake (220831 => 220832)


--- releases/WebKitGTK/webkit-2.18/Source/cmake/OptionsMac.cmake	2017-08-17 06:58:02 UTC (rev 220831)
+++ releases/WebKitGTK/webkit-2.18/Source/cmake/OptionsMac.cmake	2017-08-17 06:58:42 UTC (rev 220832)
@@ -65,7 +65,6 @@
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_NOTIFICATIONS PRIVATE ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_PDFKIT_PLUGIN PRIVATE ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_POINTER_LOCK PRIVATE OFF)
-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_PROXIMITY_EVENTS PRIVATE OFF)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_PUBLIC_SUFFIX_LIST PRIVATE ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_QUOTA PRIVATE OFF)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_REMOTE_INSPECTOR PRIVATE ON)

Modified: releases/WebKitGTK/webkit-2.18/Source/cmake/OptionsWin.cmake (220831 => 220832)


--- releases/WebKitGTK/webkit-2.18/Source/cmake/OptionsWin.cmake	2017-08-17 06:58:02 UTC (rev 220831)
+++ releases/WebKitGTK/webkit-2.18/Source/cmake/OptionsWin.cmake	2017-08-17 06:58:42 UTC (rev 220832)
@@ -55,7 +55,6 @@
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_METER_ELEMENT PUBLIC ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MOUSE_CURSOR_SCALE PUBLIC ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_NOTIFICATIONS PUBLIC OFF)
-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_PROXIMITY_EVENTS PUBLIC OFF)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_QUOTA PUBLIC OFF)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_NAVIGATOR_CONTENT_UTILS PUBLIC OFF)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_STREAMS_API PUBLIC ON)

Modified: releases/WebKitGTK/webkit-2.18/Source/cmake/WebKitFeatures.cmake (220831 => 220832)


--- releases/WebKitGTK/webkit-2.18/Source/cmake/WebKitFeatures.cmake	2017-08-17 06:58:02 UTC (rev 220831)
+++ releases/WebKitGTK/webkit-2.18/Source/cmake/WebKitFeatures.cmake	2017-08-17 06:58:42 UTC (rev 220832)
@@ -154,7 +154,6 @@
     WEBKIT_OPTION_DEFINE(ENABLE_ORIENTATION_EVENTS "Toggle Orientation Events support" PRIVATE OFF)
     WEBKIT_OPTION_DEFINE(ENABLE_PDFKIT_PLUGIN "Toggle PDFKit plugin support" PRIVATE OFF)
     WEBKIT_OPTION_DEFINE(ENABLE_POINTER_LOCK "Toggle pointer lock support" PRIVATE OFF)
-    WEBKIT_OPTION_DEFINE(ENABLE_PROXIMITY_EVENTS "Toggle Proximity Events support" PRIVATE OFF)
     WEBKIT_OPTION_DEFINE(ENABLE_PUBLIC_SUFFIX_LIST "Toggle public suffix list support" PRIVATE OFF)
     WEBKIT_OPTION_DEFINE(ENABLE_QUOTA "Toggle Quota support" PRIVATE OFF)
     WEBKIT_OPTION_DEFINE(ENABLE_STREAMS_API "Toggle Streams API support" PRIVATE ON)

Modified: releases/WebKitGTK/webkit-2.18/Tools/ChangeLog (220831 => 220832)


--- releases/WebKitGTK/webkit-2.18/Tools/ChangeLog	2017-08-17 06:58:02 UTC (rev 220831)
+++ releases/WebKitGTK/webkit-2.18/Tools/ChangeLog	2017-08-17 06:58:42 UTC (rev 220832)
@@ -1,5 +1,17 @@
 2017-08-14  Simon Fraser  <[email protected]>
 
+        Remove Proximity Events and related code
+        https://bugs.webkit.org/show_bug.cgi?id=175545
+
+        Reviewed by Daniel Bates.
+
+        No platform enables Proximity Events, so remove code inside ENABLE(PROXIMITY_EVENTS)
+        and other related code.
+
+        * TestWebKitAPI/Configurations/FeatureDefines.xcconfig:
+
+2017-08-14  Simon Fraser  <[email protected]>
+
         Remove ENABLE(REQUEST_AUTOCOMPLETE) code, which was disabled everywhere
         https://bugs.webkit.org/show_bug.cgi?id=175504
 
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to