Title: [230080] tags/Safari-606.1.11/Source

Diff

Modified: tags/Safari-606.1.11/Source/WebCore/ChangeLog (230079 => 230080)


--- tags/Safari-606.1.11/Source/WebCore/ChangeLog	2018-03-29 20:36:06 UTC (rev 230079)
+++ tags/Safari-606.1.11/Source/WebCore/ChangeLog	2018-03-29 21:13:03 UTC (rev 230080)
@@ -1,3 +1,7 @@
+2018-03-29  Jason Marcell  <jmarc...@apple.com>
+
+        Revert r229680. rdar://problem/39011568
+
 2018-03-28  Miguel Gomez  <mago...@igalia.com>
 
         [GTK][WPE] Remove UpdateAtlas

Modified: tags/Safari-606.1.11/Source/WebCore/dom/Document.idl (230079 => 230080)


--- tags/Safari-606.1.11/Source/WebCore/dom/Document.idl	2018-03-29 20:36:06 UTC (rev 230079)
+++ tags/Safari-606.1.11/Source/WebCore/dom/Document.idl	2018-03-29 21:13:03 UTC (rev 230080)
@@ -144,15 +144,15 @@
 
     // Extensions from FullScreen API (https://fullscreen.spec.whatwg.org/#api).
     // FIXME: Should probably be unprefixed.
-    [Conditional=FULLSCREEN_API, EnabledBySetting=FullScreen] readonly attribute boolean webkitFullscreenEnabled;
-    [Conditional=FULLSCREEN_API, EnabledBySetting=FullScreen, ImplementedAs=webkitFullscreenElementForBindings] readonly attribute Element? webkitFullscreenElement;
-    [Conditional=FULLSCREEN_API, EnabledBySetting=FullScreen] void webkitExitFullscreen();
-    [Conditional=FULLSCREEN_API, EnabledBySetting=FullScreen] readonly attribute boolean webkitIsFullScreen; // Mozilla version.
-    [Conditional=FULLSCREEN_API, EnabledBySetting=FullScreen] readonly attribute boolean webkitFullScreenKeyboardInputAllowed; // Mozilla version.
-    [Conditional=FULLSCREEN_API, EnabledBySetting=FullScreen, ImplementedAs=webkitCurrentFullScreenElementForBindings] readonly attribute Element webkitCurrentFullScreenElement; // Mozilla version.
-    [Conditional=FULLSCREEN_API, EnabledBySetting=FullScreen] void webkitCancelFullScreen(); // Mozilla version.
-    [NotEnumerable, Conditional=FULLSCREEN_API, EnabledBySetting=FullScreen] attribute EventHandler onwebkitfullscreenchange;
-    [NotEnumerable, Conditional=FULLSCREEN_API, EnabledBySetting=FullScreen] attribute EventHandler onwebkitfullscreenerror;
+    [Conditional=FULLSCREEN_API] readonly attribute boolean webkitFullscreenEnabled;
+    [Conditional=FULLSCREEN_API, ImplementedAs=webkitFullscreenElementForBindings] readonly attribute Element? webkitFullscreenElement;
+    [Conditional=FULLSCREEN_API] void webkitExitFullscreen();
+    [Conditional=FULLSCREEN_API] readonly attribute boolean webkitIsFullScreen; // Mozilla version.
+    [Conditional=FULLSCREEN_API] readonly attribute boolean webkitFullScreenKeyboardInputAllowed; // Mozilla version.
+    [Conditional=FULLSCREEN_API, ImplementedAs=webkitCurrentFullScreenElementForBindings] readonly attribute Element webkitCurrentFullScreenElement; // Mozilla version.
+    [Conditional=FULLSCREEN_API] void webkitCancelFullScreen(); // Mozilla version.
+    [NotEnumerable, Conditional=FULLSCREEN_API] attribute EventHandler onwebkitfullscreenchange;
+    [NotEnumerable, Conditional=FULLSCREEN_API] attribute EventHandler onwebkitfullscreenerror;
 
     // Extensions from Pointer Lock API (https://www.w3.org/TR/pointerlock/#extensions-to-the-document-interface).
     [NotEnumerable, Conditional=POINTER_LOCK] attribute EventHandler onpointerlockchange; // FIXME: Should be enumerable.

Modified: tags/Safari-606.1.11/Source/WebCore/dom/Element.idl (230079 => 230080)


--- tags/Safari-606.1.11/Source/WebCore/dom/Element.idl	2018-03-29 20:36:06 UTC (rev 230079)
+++ tags/Safari-606.1.11/Source/WebCore/dom/Element.idl	2018-03-29 21:13:03 UTC (rev 230080)
@@ -94,8 +94,8 @@
 
     // Extensions from Full Screen API (https://fullscreen.spec.whatwg.org/#api).
     // FIXME: Should we add unprefixed versions?
-    [Conditional=FULLSCREEN_API, EnabledBySetting=FullScreen, ImplementedAs=webkitRequestFullscreen] void webkitRequestFullScreen(); // Prefixed Mozilla version.
-    [Conditional=FULLSCREEN_API, EnabledBySetting=FullScreen] void webkitRequestFullscreen(); // Prefixed W3C version.
+    [Conditional=FULLSCREEN_API, ImplementedAs=webkitRequestFullscreen] void webkitRequestFullScreen(); // Prefixed Mozilla version.
+    [Conditional=FULLSCREEN_API] void webkitRequestFullscreen(); // Prefixed W3C version.
 
     // Extensions from Pointer Lock API (https://w3c.github.io/pointerlock/#extensions-to-the-element-interface).
     [Conditional=POINTER_LOCK] void requestPointerLock();
@@ -119,8 +119,8 @@
     [NotEnumerable, ImplementedAs=onwebkitTransitionEnd] attribute EventHandler onwebkittransitionend;
 
     // FIXME: These event handlers should only be on Document (https://fullscreen.spec.whatwg.org/#api).
-    [NotEnumerable, Conditional=FULLSCREEN_API, EnabledBySetting=FullScreen] attribute EventHandler onwebkitfullscreenchange;
-    [NotEnumerable, Conditional=FULLSCREEN_API, EnabledBySetting=FullScreen] attribute EventHandler onwebkitfullscreenerror;
+    [NotEnumerable, Conditional=FULLSCREEN_API] attribute EventHandler onwebkitfullscreenchange;
+    [NotEnumerable, Conditional=FULLSCREEN_API] attribute EventHandler onwebkitfullscreenerror;
 
     // FIXME: Cannot find those EventHandlers in the latest specification (https://w3c.github.io/uievents/#events-focus-types).
     [NotEnumerable] attribute EventHandler onfocusin;

Modified: tags/Safari-606.1.11/Source/WebKit/ChangeLog (230079 => 230080)


--- tags/Safari-606.1.11/Source/WebKit/ChangeLog	2018-03-29 20:36:06 UTC (rev 230079)
+++ tags/Safari-606.1.11/Source/WebKit/ChangeLog	2018-03-29 21:13:03 UTC (rev 230080)
@@ -1,3 +1,7 @@
+2018-03-29  Jason Marcell  <jmarc...@apple.com>
+
+        Revert r229680. rdar://problem/39011568
+
 2018-03-28  Wenson Hsieh  <wenson_hs...@apple.com>
 
         Revert an unnecessary workaround when zooming focused form controls

Modified: tags/Safari-606.1.11/Source/WebKit/Scripts/GeneratePreferences.rb (230079 => 230080)


--- tags/Safari-606.1.11/Source/WebKit/Scripts/GeneratePreferences.rb	2018-03-29 20:36:06 UTC (rev 230079)
+++ tags/Safari-606.1.11/Source/WebKit/Scripts/GeneratePreferences.rb	2018-03-29 21:13:03 UTC (rev 230080)
@@ -70,7 +70,6 @@
   attr_accessor :category
   attr_accessor :webcoreBinding
   attr_accessor :condition
-  attr_accessor :visibleCondition
 
   def initialize(name, opts)
     @name = name
@@ -83,7 +82,6 @@
     @webcoreBinding = opts["webcoreBinding"]
     @webcoreName = opts["webcoreName"]
     @condition = opts["condition"]
-    @visibleCondition = opts["visibleCondition"]
   end
 
   def nameLower

Modified: tags/Safari-606.1.11/Source/WebKit/Scripts/PreferencesTemplates/WebPreferencesExperimentalFeatures.cpp.erb (230079 => 230080)


--- tags/Safari-606.1.11/Source/WebKit/Scripts/PreferencesTemplates/WebPreferencesExperimentalFeatures.cpp.erb	2018-03-29 20:36:06 UTC (rev 230079)
+++ tags/Safari-606.1.11/Source/WebKit/Scripts/PreferencesTemplates/WebPreferencesExperimentalFeatures.cpp.erb	2018-03-29 21:13:03 UTC (rev 230080)
@@ -53,13 +53,7 @@
 <%- if @pref.condition -%>
 #if <%= @pref.condition %>
 <%- end -%>
-<%- if @pref.visibleCondition -%>
-#if <%= @pref.visibleCondition %>
-<%- end -%>
         API::ExperimentalFeature::create(<%= @pref.humanReadableName %>, "<%= @pref.name %>", <%= @pref.humanReadableDescription %>, <%= @pref.defaultValue %>),
-<%- if @pref.visibleCondition -%>
-#endif
-<%- end -%>
 <%- if @pref.condition -%>
 #endif
 <%- end -%>

Modified: tags/Safari-606.1.11/Source/WebKit/Shared/WebPreferences.yaml (230079 => 230080)


--- tags/Safari-606.1.11/Source/WebKit/Shared/WebPreferences.yaml	2018-03-29 20:36:06 UTC (rev 230079)
+++ tags/Safari-606.1.11/Source/WebKit/Shared/WebPreferences.yaml	2018-03-29 21:13:03 UTC (rev 230080)
@@ -167,10 +167,6 @@
   type: bool
   defaultValue: false
   condition: ENABLE(FULLSCREEN_API)
-  visibleCondition: PLATFORM(IOS)
-  humanReadableName: "Fullscreen API"
-  humanReadableDescription: "Fullscreen API"
-  category: experimental
 
 AsynchronousSpellCheckingEnabled:
   type: bool
@@ -1207,4 +1203,3 @@
   humanReadableDescription: "Intelligent Tracking Prevention Debug Mode"
   category: experimental
   webcoreBinding: RuntimeEnabledFeatures
-
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to