Title: [210969] branches/safari-603-branch
Revision
210969
Author
matthew_han...@apple.com
Date
2017-01-20 10:09:26 -0800 (Fri, 20 Jan 2017)

Log Message

Merge r210949. rdar://problem/30108531

Modified Paths

Diff

Modified: branches/safari-603-branch/Source/_javascript_Core/ChangeLog (210968 => 210969)


--- branches/safari-603-branch/Source/_javascript_Core/ChangeLog	2017-01-20 18:09:17 UTC (rev 210968)
+++ branches/safari-603-branch/Source/_javascript_Core/ChangeLog	2017-01-20 18:09:26 UTC (rev 210969)
@@ -1,5 +1,19 @@
 2017-01-20  Matthew Hanson  <matthew_han...@apple.com>
 
+        Merge r210949. rdar://problem/30108531
+
+    2017-01-19  Chris Dumez  <cdu...@apple.com>
+
+            iterable<> should be enabled on WK1
+            https://bugs.webkit.org/show_bug.cgi?id=167221
+            <rdar://problem/30108531>
+
+            Reviewed by Youenn Fablet.
+
+            * runtime/CommonIdentifiers.h:
+
+2017-01-20  Matthew Hanson  <matthew_han...@apple.com>
+
         Merge r210947. rdar://problem/30108809
 
     2017-01-19  Filip Pizlo  <fpi...@apple.com>

Modified: branches/safari-603-branch/Source/_javascript_Core/runtime/CommonIdentifiers.h (210968 => 210969)


--- branches/safari-603-branch/Source/_javascript_Core/runtime/CommonIdentifiers.h	2017-01-20 18:09:17 UTC (rev 210968)
+++ branches/safari-603-branch/Source/_javascript_Core/runtime/CommonIdentifiers.h	2017-01-20 18:09:26 UTC (rev 210969)
@@ -40,7 +40,6 @@
     macro(Date) \
     macro(DateTimeFormat) \
     macro(DocumentTimeline) \
-    macro(DOMIterator) \
     macro(Error) \
     macro(EvalError) \
     macro(Function) \

Modified: branches/safari-603-branch/Source/WebCore/ChangeLog (210968 => 210969)


--- branches/safari-603-branch/Source/WebCore/ChangeLog	2017-01-20 18:09:17 UTC (rev 210968)
+++ branches/safari-603-branch/Source/WebCore/ChangeLog	2017-01-20 18:09:26 UTC (rev 210969)
@@ -1,5 +1,27 @@
 2017-01-20  Matthew Hanson  <matthew_han...@apple.com>
 
+        Merge r210949. rdar://problem/30108531
+
+    2017-01-19  Chris Dumez  <cdu...@apple.com>
+
+            iterable<> should be enabled on WK1
+            https://bugs.webkit.org/show_bug.cgi?id=167221
+            <rdar://problem/30108531>
+
+            Reviewed by Youenn Fablet.
+
+            * Modules/fetch/FetchHeaders.idl:
+            * bindings/scripts/test/JS/JSTestNode.cpp:
+            (WebCore::JSTestNodePrototype::finishCreation):
+            * bindings/scripts/test/JS/JSTestObj.cpp:
+            (WebCore::JSTestObjPrototype::finishCreation):
+            * bindings/scripts/test/TestNode.idl:
+            * bindings/scripts/test/TestObj.idl:
+            * css/FontFaceSet.idl:
+            * dom/NodeList.idl:
+
+2017-01-20  Matthew Hanson  <matthew_han...@apple.com>
+
         Merge r210945. rdar://problem/28745101
 
     2017-01-19  Jer Noble  <jer.no...@apple.com>

Modified: branches/safari-603-branch/Source/WebCore/Modules/fetch/FetchHeaders.idl (210968 => 210969)


--- branches/safari-603-branch/Source/WebCore/Modules/fetch/FetchHeaders.idl	2017-01-20 18:09:17 UTC (rev 210968)
+++ branches/safari-603-branch/Source/WebCore/Modules/fetch/FetchHeaders.idl	2017-01-20 18:09:26 UTC (rev 210969)
@@ -42,7 +42,7 @@
     [MayThrowException] boolean has(DOMString name);
     [MayThrowException] void set(DOMString name, DOMString value);
 
-    [EnabledAtRuntime=DOMIterator] iterable<DOMString, DOMString>;
+    iterable<DOMString, DOMString>;
 
     [ImplementedAs=append, MayThrowException, PrivateIdentifier] void appendFromJS(DOMString name, DOMString value);
     [ImplementedAs=fill, PrivateIdentifier] void fillFromJS(FetchHeaders? headers);

Modified: branches/safari-603-branch/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp (210968 => 210969)


--- branches/safari-603-branch/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp	2017-01-20 18:09:17 UTC (rev 210968)
+++ branches/safari-603-branch/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp	2017-01-20 18:09:26 UTC (rev 210969)
@@ -1897,8 +1897,7 @@
 #endif
     putDirect(vm, static_cast<JSVMClientData*>(vm.clientData)->builtinNames().privateMethodPrivateName(), JSFunction::create(vm, globalObject(), 0, String(), jsTestObjPrototypeFunctionPrivateMethod), ReadOnly | DontEnum);
     putDirect(vm, static_cast<JSVMClientData*>(vm.clientData)->builtinNames().publicAndPrivateMethodPrivateName(), JSFunction::create(vm, globalObject(), 0, String(), jsTestObjPrototypeFunctionPublicAndPrivateMethod), ReadOnly | DontEnum);
-    if (RuntimeEnabledFeatures::sharedFeatures().domIteratorEnabled())
-        addValueIterableMethods(*globalObject(), *this);
+    addValueIterableMethods(*globalObject(), *this);
     JSObject& unscopables = *constructEmptyObject(globalObject()->globalExec(), globalObject()->nullPrototypeObjectStructure());
     unscopables.putDirect(vm, Identifier::fromString(&vm, "voidMethod"), jsBoolean(true));
     unscopables.putDirect(vm, Identifier::fromString(&vm, "shortAttr"), jsBoolean(true));

Modified: branches/safari-603-branch/Source/WebCore/bindings/scripts/test/TestObj.idl (210968 => 210969)


--- branches/safari-603-branch/Source/WebCore/bindings/scripts/test/TestObj.idl	2017-01-20 18:09:17 UTC (rev 210968)
+++ branches/safari-603-branch/Source/WebCore/bindings/scripts/test/TestObj.idl	2017-01-20 18:09:26 UTC (rev 210969)
@@ -114,7 +114,7 @@
     // TypedArray attribute
     attribute Float32Array typedArrayAttr;
 
-    [EnabledAtRuntime=DOMIterator] iterable<DOMString>;
+    iterable<DOMString>;
 
     // Methods
     [Unscopable] void voidMethod();

Modified: branches/safari-603-branch/Source/WebCore/css/FontFaceSet.idl (210968 => 210969)


--- branches/safari-603-branch/Source/WebCore/css/FontFaceSet.idl	2017-01-20 18:09:17 UTC (rev 210968)
+++ branches/safari-603-branch/Source/WebCore/css/FontFaceSet.idl	2017-01-20 18:09:26 UTC (rev 210969)
@@ -35,7 +35,7 @@
     boolean has(FontFace font);
 
     // FIXME: We should add support for the setlike declaration.
-    [EnabledAtRuntime=DOMIterator] iterable<FontFace>;
+    iterable<FontFace>;
 
     readonly attribute long size;
 

Modified: branches/safari-603-branch/Source/WebCore/dom/NodeList.idl (210968 => 210969)


--- branches/safari-603-branch/Source/WebCore/dom/NodeList.idl	2017-01-20 18:09:17 UTC (rev 210968)
+++ branches/safari-603-branch/Source/WebCore/dom/NodeList.idl	2017-01-20 18:09:26 UTC (rev 210969)
@@ -28,5 +28,5 @@
 ] interface NodeList {
     getter Node item(unsigned long index);
     readonly attribute unsigned long length;
-    [EnabledAtRuntime=DOMIterator] iterable<Node>;
+    iterable<Node>;
 };

Modified: branches/safari-603-branch/Source/WebKit/mac/ChangeLog (210968 => 210969)


--- branches/safari-603-branch/Source/WebKit/mac/ChangeLog	2017-01-20 18:09:17 UTC (rev 210968)
+++ branches/safari-603-branch/Source/WebKit/mac/ChangeLog	2017-01-20 18:09:26 UTC (rev 210969)
@@ -1,5 +1,26 @@
 2017-01-20  Matthew Hanson  <matthew_han...@apple.com>
 
+        Merge r210949. rdar://problem/30108531
+
+    2017-01-19  Chris Dumez  <cdu...@apple.com>
+
+            iterable<> should be enabled on WK1
+            https://bugs.webkit.org/show_bug.cgi?id=167221
+            <rdar://problem/30108531>
+
+            Reviewed by Youenn Fablet.
+
+            * WebView/WebPreferenceKeysPrivate.h:
+            * WebView/WebPreferences.mm:
+            (-[WebPreferences setCustomElementsEnabled:]):
+            (-[WebPreferences DOMIteratorEnabled]): Deleted.
+            (-[WebPreferences setDOMIteratorEnabled:]): Deleted.
+            * WebView/WebPreferencesPrivate.h:
+            * WebView/WebView.mm:
+            (-[WebView _preferencesChanged:]):
+
+2017-01-20  Matthew Hanson  <matthew_han...@apple.com>
+
         Merge r210939. rdar://problem/29885052
 
     2017-01-19  Chris Dumez  <cdu...@apple.com>

Modified: branches/safari-603-branch/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h (210968 => 210969)


--- branches/safari-603-branch/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h	2017-01-20 18:09:17 UTC (rev 210968)
+++ branches/safari-603-branch/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h	2017-01-20 18:09:26 UTC (rev 210969)
@@ -166,7 +166,6 @@
 #define WebKitMediaKeysStorageDirectoryKey @"WebKitMediaKeysStorageDirectory"
 #define WebKitShadowDOMEnabledPreferenceKey @"WebKitShadowDOMEnabled"
 #define WebKitCustomElementsEnabledPreferenceKey @"WebKitCustomElementsEnabled"
-#define WebKitDOMIteratorEnabledPreferenceKey @"WebKitDOMIteratorEnabled"
 #define WebKitFetchAPIEnabledPreferenceKey @"WebKitFetchAPIEnabled"
 #define WebKitDownloadAttributeEnabledPreferenceKey @"WebKitDownloadAttributeEnabled"
 #define WebKitES6ModulesEnabledPreferenceKey @"WebKitES6ModulesEnabled"

Modified: branches/safari-603-branch/Source/WebKit/mac/WebView/WebPreferences.mm (210968 => 210969)


--- branches/safari-603-branch/Source/WebKit/mac/WebView/WebPreferences.mm	2017-01-20 18:09:17 UTC (rev 210968)
+++ branches/safari-603-branch/Source/WebKit/mac/WebView/WebPreferences.mm	2017-01-20 18:09:26 UTC (rev 210969)
@@ -2829,16 +2829,6 @@
     [self _setBoolValue:flag forKey:WebKitCustomElementsEnabledPreferenceKey];
 }
 
-- (BOOL)DOMIteratorEnabled
-{
-    return [self _boolValueForKey:WebKitDOMIteratorEnabledPreferenceKey];
-}
-
-- (void)setDOMIteratorEnabled:(BOOL)flag
-{
-    [self _setBoolValue:flag forKey:WebKitDOMIteratorEnabledPreferenceKey];
-}
-
 - (BOOL)fetchAPIEnabled
 {
     return [self _boolValueForKey:WebKitFetchAPIEnabledPreferenceKey];

Modified: branches/safari-603-branch/Source/WebKit/mac/WebView/WebPreferencesPrivate.h (210968 => 210969)


--- branches/safari-603-branch/Source/WebKit/mac/WebView/WebPreferencesPrivate.h	2017-01-20 18:09:17 UTC (rev 210968)
+++ branches/safari-603-branch/Source/WebKit/mac/WebView/WebPreferencesPrivate.h	2017-01-20 18:09:26 UTC (rev 210969)
@@ -499,9 +499,6 @@
 - (void)setCustomElementsEnabled:(BOOL)flag;
 - (BOOL)customElementsEnabled;
 
-- (void)setDOMIteratorEnabled:(BOOL)flag;
-- (BOOL)DOMIteratorEnabled;
-
 - (void)setFetchAPIEnabled:(BOOL)flag;
 - (BOOL)fetchAPIEnabled;
 

Modified: branches/safari-603-branch/Source/WebKit/mac/WebView/WebView.mm (210968 => 210969)


--- branches/safari-603-branch/Source/WebKit/mac/WebView/WebView.mm	2017-01-20 18:09:17 UTC (rev 210968)
+++ branches/safari-603-branch/Source/WebKit/mac/WebView/WebView.mm	2017-01-20 18:09:26 UTC (rev 210969)
@@ -2875,8 +2875,6 @@
 
     RuntimeEnabledFeatures::sharedFeatures().setInteractiveFormValidationEnabled([self interactiveFormValidationEnabled]);
 
-    RuntimeEnabledFeatures::sharedFeatures().setDOMIteratorEnabled([preferences DOMIteratorEnabled]);
-
     RuntimeEnabledFeatures::sharedFeatures().setModernMediaControlsEnabled([preferences modernMediaControlsEnabled]);
 
     RuntimeEnabledFeatures::sharedFeatures().setCustomElementsEnabled([preferences customElementsEnabled]);

Modified: branches/safari-603-branch/Source/WebKit/win/ChangeLog (210968 => 210969)


--- branches/safari-603-branch/Source/WebKit/win/ChangeLog	2017-01-20 18:09:17 UTC (rev 210968)
+++ branches/safari-603-branch/Source/WebKit/win/ChangeLog	2017-01-20 18:09:26 UTC (rev 210969)
@@ -1,3 +1,24 @@
+2017-01-20  Matthew Hanson  <matthew_han...@apple.com>
+
+        Merge r210949. rdar://problem/30108531
+
+    2017-01-19  Chris Dumez  <cdu...@apple.com>
+
+            iterable<> should be enabled on WK1
+            https://bugs.webkit.org/show_bug.cgi?id=167221
+            <rdar://problem/30108531>
+
+            Reviewed by Youenn Fablet.
+
+            * Interfaces/IWebPreferencesPrivate.idl:
+            * WebPreferenceKeysPrivate.h:
+            * WebPreferences.cpp:
+            (WebPreferences::setDOMIteratorEnabled): Deleted.
+            (WebPreferences::domIteratorEnabled): Deleted.
+            * WebPreferences.h:
+            * WebView.cpp:
+            (WebView::notifyPreferencesChanged):
+
 2016-12-10  Filip Pizlo  <fpi...@apple.com>
 
         The DOM should have an advancing wavefront opaque root barrier

Modified: branches/safari-603-branch/Source/WebKit/win/Interfaces/IWebPreferencesPrivate.idl (210968 => 210969)


--- branches/safari-603-branch/Source/WebKit/win/Interfaces/IWebPreferencesPrivate.idl	2017-01-20 18:09:17 UTC (rev 210968)
+++ branches/safari-603-branch/Source/WebKit/win/Interfaces/IWebPreferencesPrivate.idl	2017-01-20 18:09:26 UTC (rev 210969)
@@ -175,8 +175,6 @@
 {
     HRESULT showTiledScrollingIndicator([out, retval] BOOL* enabled);
     HRESULT setShowTiledScrollingIndicator([in] BOOL enabled);
-    HRESULT domIteratorEnabled([out, retval] BOOL* enabled);
-    HRESULT setDOMIteratorEnabled([in] BOOL enabled);
     HRESULT fetchAPIEnabled([out, retval] BOOL* enabled);
     HRESULT setFetchAPIEnabled([in] BOOL enabled);
     HRESULT shadowDOMEnabled([out, retval] BOOL* enabled);

Modified: branches/safari-603-branch/Source/WebKit/win/WebPreferenceKeysPrivate.h (210968 => 210969)


--- branches/safari-603-branch/Source/WebKit/win/WebPreferenceKeysPrivate.h	2017-01-20 18:09:17 UTC (rev 210968)
+++ branches/safari-603-branch/Source/WebKit/win/WebPreferenceKeysPrivate.h	2017-01-20 18:09:26 UTC (rev 210969)
@@ -168,8 +168,6 @@
 
 #define WebKitShowTiledScrollingIndicatorPreferenceKey "WebKitShowTiledScrollingIndicator"
 
-#define WebKitDOMIteratorEnabledPreferenceKey "WebKitDOMIteratorEnabled"
-
 #define WebKitFetchAPIEnabledPreferenceKey "WebKitFetchAPIEnabled"
 
 #define WebKitShadowDOMEnabledPreferenceKey "WebKitShadowDOMEnabled"

Modified: branches/safari-603-branch/Source/WebKit/win/WebPreferences.cpp (210968 => 210969)


--- branches/safari-603-branch/Source/WebKit/win/WebPreferences.cpp	2017-01-20 18:09:17 UTC (rev 210968)
+++ branches/safari-603-branch/Source/WebKit/win/WebPreferences.cpp	2017-01-20 18:09:26 UTC (rev 210969)
@@ -1947,20 +1947,6 @@
     return S_OK;
 }
 
-HRESULT WebPreferences::setDOMIteratorEnabled(BOOL enabled)
-{
-    setBoolValue(WebKitDOMIteratorEnabledPreferenceKey, enabled);
-    return S_OK;
-}
-
-HRESULT WebPreferences::domIteratorEnabled(_Out_ BOOL* enabled)
-{
-    if (!enabled)
-        return E_POINTER;
-    *enabled = boolValueForKey(WebKitDOMIteratorEnabledPreferenceKey);
-    return S_OK;
-}
-
 HRESULT WebPreferences::shadowDOMEnabled(_Out_ BOOL* enabled)
 {
     if (!enabled)

Modified: branches/safari-603-branch/Source/WebKit/win/WebPreferences.h (210968 => 210969)


--- branches/safari-603-branch/Source/WebKit/win/WebPreferences.h	2017-01-20 18:09:17 UTC (rev 210968)
+++ branches/safari-603-branch/Source/WebKit/win/WebPreferences.h	2017-01-20 18:09:26 UTC (rev 210969)
@@ -234,8 +234,6 @@
     virtual HRESULT STDMETHODCALLTYPE setShowTiledScrollingIndicator(BOOL);
     virtual HRESULT STDMETHODCALLTYPE fetchAPIEnabled(_Out_ BOOL*);
     virtual HRESULT STDMETHODCALLTYPE setFetchAPIEnabled(BOOL);
-    virtual HRESULT STDMETHODCALLTYPE domIteratorEnabled(_Out_ BOOL*);
-    virtual HRESULT STDMETHODCALLTYPE setDOMIteratorEnabled(BOOL);
     virtual HRESULT STDMETHODCALLTYPE shadowDOMEnabled(_Out_ BOOL*);
     virtual HRESULT STDMETHODCALLTYPE setShadowDOMEnabled(BOOL);
     virtual HRESULT STDMETHODCALLTYPE customElementsEnabled(_Out_ BOOL*);

Modified: branches/safari-603-branch/Source/WebKit/win/WebView.cpp (210968 => 210969)


--- branches/safari-603-branch/Source/WebKit/win/WebView.cpp	2017-01-20 18:09:17 UTC (rev 210968)
+++ branches/safari-603-branch/Source/WebKit/win/WebView.cpp	2017-01-20 18:09:26 UTC (rev 210969)
@@ -5232,11 +5232,6 @@
     RuntimeEnabledFeatures::sharedFeatures().setWebkitIndexedDBEnabled(true);
 #endif
 
-    hr = prefsPrivate->domIteratorEnabled(&enabled);
-    if (FAILED(hr))
-        return hr;
-    RuntimeEnabledFeatures::sharedFeatures().setDOMIteratorEnabled(!!enabled);
-
 #if ENABLE(FETCH_API)
     hr = prefsPrivate->fetchAPIEnabled(&enabled);
     if (FAILED(hr))

Modified: branches/safari-603-branch/Source/WebKit2/ChangeLog (210968 => 210969)


--- branches/safari-603-branch/Source/WebKit2/ChangeLog	2017-01-20 18:09:17 UTC (rev 210968)
+++ branches/safari-603-branch/Source/WebKit2/ChangeLog	2017-01-20 18:09:26 UTC (rev 210969)
@@ -1,5 +1,23 @@
 2017-01-20  Matthew Hanson  <matthew_han...@apple.com>
 
+        Merge r210949. rdar://problem/30108531
+
+    2017-01-19  Chris Dumez  <cdu...@apple.com>
+
+            iterable<> should be enabled on WK1
+            https://bugs.webkit.org/show_bug.cgi?id=167221
+            <rdar://problem/30108531>
+
+            Reviewed by Youenn Fablet.
+
+            * Shared/WebPreferencesDefinitions.h:
+            * WebProcess/InjectedBundle/InjectedBundle.cpp:
+            (WebKit::InjectedBundle::overrideBoolPreferenceForTestRunner):
+            * WebProcess/WebPage/WebPage.cpp:
+            (WebKit::WebPage::updatePreferences):
+
+2017-01-20  Matthew Hanson  <matthew_han...@apple.com>
+
         Merge r210936. rdar://problem/30058349
 
     2017-01-19  Chris Dumez  <cdu...@apple.com>

Modified: branches/safari-603-branch/Source/WebKit2/Shared/WebPreferencesDefinitions.h (210968 => 210969)


--- branches/safari-603-branch/Source/WebKit2/Shared/WebPreferencesDefinitions.h	2017-01-20 18:09:17 UTC (rev 210968)
+++ branches/safari-603-branch/Source/WebKit2/Shared/WebPreferencesDefinitions.h	2017-01-20 18:09:26 UTC (rev 210969)
@@ -233,7 +233,6 @@
     macro(MockCaptureDevicesEnabled, mockCaptureDevicesEnabled, Bool, bool, false, "", "") \
     macro(MediaCaptureRequiresSecureConnection, mediaCaptureRequiresSecureConnection, Bool, bool, true, "", "") \
     macro(ShadowDOMEnabled, shadowDOMEnabled, Bool, bool, true, "Shadow DOM", "HTML Shadow DOM prototype") \
-    macro(DOMIteratorEnabled, domIteratorEnabled, Bool, bool, true, "", "") \
     macro(FetchAPIEnabled, fetchAPIEnabled, Bool, bool, true, "", "") \
     macro(DownloadAttributeEnabled, downloadAttributeEnabled, Bool, bool, true, "", "") \
     macro(SelectionPaintingWithoutSelectionGapsEnabled, selectionPaintingWithoutSelectionGapsEnabled, Bool, bool, DEFAULT_SELECTION_PAINTING_WITHOUT_SELECTION_GAPS_ENABLED, "", "") \

Modified: branches/safari-603-branch/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp (210968 => 210969)


--- branches/safari-603-branch/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp	2017-01-20 18:09:17 UTC (rev 210968)
+++ branches/safari-603-branch/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp	2017-01-20 18:09:26 UTC (rev 210969)
@@ -195,9 +195,6 @@
     if (preference == "WebKitShadowDOMEnabled")
         RuntimeEnabledFeatures::sharedFeatures().setShadowDOMEnabled(enabled);
 
-    if (preference == "WebKitDOMIteratorEnabled")
-        RuntimeEnabledFeatures::sharedFeatures().setDOMIteratorEnabled(enabled);
-
 #if ENABLE(CSS_GRID_LAYOUT)
     if (preference == "WebKitCSSGridLayoutEnabled")
         RuntimeEnabledFeatures::sharedFeatures().setCSSGridLayoutEnabled(enabled);

Modified: branches/safari-603-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (210968 => 210969)


--- branches/safari-603-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp	2017-01-20 18:09:17 UTC (rev 210968)
+++ branches/safari-603-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp	2017-01-20 18:09:26 UTC (rev 210969)
@@ -3234,8 +3234,6 @@
 
     RuntimeEnabledFeatures::sharedFeatures().setInteractiveFormValidationEnabled(store.getBoolValueForKey(WebPreferencesKey::interactiveFormValidationEnabledKey()));
 
-    RuntimeEnabledFeatures::sharedFeatures().setDOMIteratorEnabled(store.getBoolValueForKey(WebPreferencesKey::domIteratorEnabledKey()));
-
     // Experimental Features.
 
 #if ENABLE(CSS_GRID_LAYOUT)

Modified: branches/safari-603-branch/Tools/ChangeLog (210968 => 210969)


--- branches/safari-603-branch/Tools/ChangeLog	2017-01-20 18:09:17 UTC (rev 210968)
+++ branches/safari-603-branch/Tools/ChangeLog	2017-01-20 18:09:26 UTC (rev 210969)
@@ -1,3 +1,25 @@
+2017-01-20  Matthew Hanson  <matthew_han...@apple.com>
+
+        Merge r210949. rdar://problem/30108531
+
+    2017-01-19  Chris Dumez  <cdu...@apple.com>
+
+            iterable<> should be enabled on WK1
+            https://bugs.webkit.org/show_bug.cgi?id=167221
+            <rdar://problem/30108531>
+
+            Reviewed by Youenn Fablet.
+
+            * DumpRenderTree/mac/DumpRenderTree.mm:
+            (resetWebPreferencesToConsistentValues):
+            * DumpRenderTree/win/DumpRenderTree.cpp:
+            (resetWebPreferencesToConsistentValues):
+            * WebKitTestRunner/InjectedBundle/InjectedBundle.cpp:
+            (WTR::InjectedBundle::beginTesting):
+            * WebKitTestRunner/InjectedBundle/TestRunner.cpp:
+            (WTR::TestRunner::setDOMIteratorEnabled): Deleted.
+            * WebKitTestRunner/InjectedBundle/TestRunner.h:
+
 2017-01-12  Matthew Hanson  <matthew_han...@apple.com>
 
         Merge r210608. rdar://problem/15307582

Modified: branches/safari-603-branch/Tools/DumpRenderTree/mac/DumpRenderTree.mm (210968 => 210969)


--- branches/safari-603-branch/Tools/DumpRenderTree/mac/DumpRenderTree.mm	2017-01-20 18:09:17 UTC (rev 210968)
+++ branches/safari-603-branch/Tools/DumpRenderTree/mac/DumpRenderTree.mm	2017-01-20 18:09:26 UTC (rev 210969)
@@ -985,8 +985,6 @@
     [preferences setShadowDOMEnabled:YES];
     [preferences setCustomElementsEnabled:YES];
 
-    [preferences setDOMIteratorEnabled:YES];
-
     [preferences setWebGL2Enabled:YES];
 
     [preferences setFetchAPIEnabled:YES];

Modified: branches/safari-603-branch/Tools/DumpRenderTree/win/DumpRenderTree.cpp (210968 => 210969)


--- branches/safari-603-branch/Tools/DumpRenderTree/win/DumpRenderTree.cpp	2017-01-20 18:09:17 UTC (rev 210968)
+++ branches/safari-603-branch/Tools/DumpRenderTree/win/DumpRenderTree.cpp	2017-01-20 18:09:26 UTC (rev 210969)
@@ -855,7 +855,6 @@
     prefsPrivate3->setCustomElementsEnabled(TRUE);
     prefsPrivate3->setES6ModulesEnabled(TRUE);
 
-    prefsPrivate3->setDOMIteratorEnabled(TRUE);
     prefsPrivate3->setModernMediaControlsEnabled(FALSE);
 
     setAlwaysAcceptCookies(false);

Modified: branches/safari-603-branch/Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.cpp (210968 => 210969)


--- branches/safari-603-branch/Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.cpp	2017-01-20 18:09:17 UTC (rev 210968)
+++ branches/safari-603-branch/Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.cpp	2017-01-20 18:09:26 UTC (rev 210969)
@@ -322,8 +322,6 @@
     m_testRunner->setShadowDOMEnabled(true);
     m_testRunner->setCustomElementsEnabled(true);
 
-    m_testRunner->setDOMIteratorEnabled(true);
-
     m_testRunner->setWebGL2Enabled(true);
 
     m_testRunner->setFetchAPIEnabled(true);

Modified: branches/safari-603-branch/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp (210968 => 210969)


--- branches/safari-603-branch/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp	2017-01-20 18:09:17 UTC (rev 210968)
+++ branches/safari-603-branch/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp	2017-01-20 18:09:26 UTC (rev 210969)
@@ -375,13 +375,6 @@
     WKBundleOverrideBoolPreferenceForTestRunner(injectedBundle.bundle(), injectedBundle.pageGroup(), key.get(), enabled);
 }
 
-void TestRunner::setDOMIteratorEnabled(bool enabled)
-{
-    WKRetainPtr<WKStringRef> key(AdoptWK, WKStringCreateWithUTF8CString("WebKitDOMIteratorEnabled"));
-    auto& injectedBundle = InjectedBundle::singleton();
-    WKBundleOverrideBoolPreferenceForTestRunner(injectedBundle.bundle(), injectedBundle.pageGroup(), key.get(), enabled);
-}
-
 void TestRunner::setModernMediaControlsEnabled(bool enabled)
 {
     WKRetainPtr<WKStringRef> key(AdoptWK, WKStringCreateWithUTF8CString("WebKitModernMediaControlsEnabled"));

Modified: branches/safari-603-branch/Tools/WebKitTestRunner/InjectedBundle/TestRunner.h (210968 => 210969)


--- branches/safari-603-branch/Tools/WebKitTestRunner/InjectedBundle/TestRunner.h	2017-01-20 18:09:17 UTC (rev 210968)
+++ branches/safari-603-branch/Tools/WebKitTestRunner/InjectedBundle/TestRunner.h	2017-01-20 18:09:26 UTC (rev 210969)
@@ -103,7 +103,6 @@
     void setXSSAuditorEnabled(bool);
     void setShadowDOMEnabled(bool);
     void setCustomElementsEnabled(bool);
-    void setDOMIteratorEnabled(bool);
     void setModernMediaControlsEnabled(bool);
     void setWebGL2Enabled(bool);
     void setFetchAPIEnabled(bool);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to