from:"jmarcell"

[webkit-changes] [220468] branches/safari-604.1.38.0-branch/Source/JavaScriptCore

2017-08-09 Thread jmarcell

Title: [220468] branches/safari-604.1.38.0-branch/Source/_javascript_Core








Revision 220468
Author jmarc...@apple.com
Date 2017-08-09 11:14:51 -0700 (Wed, 09 Aug 2017)


Log Message
Cherry-pick r220346. rdar://problem/33805223

Modified Paths

branches/safari-604.1.38.0-branch/Source/_javascript_Core/ChangeLog
branches/safari-604.1.38.0-branch/Source/_javascript_Core/heap/Heap.cpp
branches/safari-604.1.38.0-branch/Source/_javascript_Core/runtime/Options.h




Diff

Modified: branches/safari-604.1.38.0-branch/Source/_javascript_Core/ChangeLog (220467 => 220468)

--- branches/safari-604.1.38.0-branch/Source/_javascript_Core/ChangeLog	2017-08-09 18:05:24 UTC (rev 220467)
+++ branches/safari-604.1.38.0-branch/Source/_javascript_Core/ChangeLog	2017-08-09 18:14:51 UTC (rev 220468)
@@ -1,3 +1,23 @@
+2017-08-09  Jason Marcell  
+
+Cherry-pick r220346. rdar://problem/33805223
+
+2017-08-07  Commit Queue  
+
+Unreviewed, rolling out r220144.
+https://bugs.webkit.org/show_bug.cgi?id=175276
+
+"It did not actually speed things up in the way I expected"
+(Requested by saamyjoon on #webkit).
+
+Reverted changeset:
+
+"On memory-constrained iOS devices, reduce the rate at which
+the JS heap grows before a GC to try to keep more memory
+available for the system"
+https://bugs.webkit.org/show_bug.cgi?id=175041
+http://trac.webkit.org/changeset/220144
+
 2017-08-02  Jason Marcell  
 
 Cherry-pick r220144. rdar://problem/33687404


Modified: branches/safari-604.1.38.0-branch/Source/_javascript_Core/heap/Heap.cpp (220467 => 220468)

--- branches/safari-604.1.38.0-branch/Source/_javascript_Core/heap/Heap.cpp	2017-08-09 18:05:24 UTC (rev 220467)
+++ branches/safari-604.1.38.0-branch/Source/_javascript_Core/heap/Heap.cpp	2017-08-09 18:14:51 UTC (rev 220468)
@@ -71,7 +71,6 @@
 #include 
 #if PLATFORM(IOS)
 #include 
-#include 
 #endif
 #include 
 #include 
@@ -116,39 +115,9 @@
 return Options::smallHeapSize();
 }
 
-#if PLATFORM(IOS)
-static bool useAggressiveGCTrigger()
-{
-static bool useAggressiveGCTrigger;
-static std::once_flag once;
-std::call_once(once, [] {
-useAggressiveGCTrigger = false;
-
-if (Options::forceAggressiveGCTrigger()) {
-useAggressiveGCTrigger = true;
-return;
-}
-
-uint64_t memSizeInBytes;
-size_t sizeofMemSize = sizeof(memSizeInBytes);
-if (sysctlbyname("hw.memsize", &memSizeInBytes, &sizeofMemSize, nullptr, 0))
-return;
-useAggressiveGCTrigger = memSizeInBytes <= 1 * GB;
-});
-
-return useAggressiveGCTrigger;
-}
-#endif
-
 size_t proportionalHeapSize(size_t heapSize, size_t ramSize)
 {
 #if PLATFORM(IOS)
-if (useAggressiveGCTrigger()) {
-double memoryUsed = bmalloc::api::percentAvailableMemoryInUse();
-double result = ((1 - memoryUsed) / Options::aggressiveGCTriggerScalingValue()) + 1;
-return heapSize * std::max(std::min(result, Options::aggressiveGCTriggerMaxMultiplier()), Options::aggressiveGCTriggerMinMultiplier());
-}
-
 size_t memoryFootprint = bmalloc::api::memoryFootprint();
 if (memoryFootprint < ramSize * Options::smallHeapRAMFraction())
 return Options::smallHeapGrowthFactor() * heapSize;


Modified: branches/safari-604.1.38.0-branch/Source/_javascript_Core/runtime/Options.h (220467 => 220468)

--- branches/safari-604.1.38.0-branch/Source/_javascript_Core/runtime/Options.h	2017-08-09 18:05:24 UTC (rev 220467)
+++ branches/safari-604.1.38.0-branch/Source/_javascript_Core/runtime/Options.h	2017-08-09 18:14:51 UTC (rev 220468)
@@ -210,10 +210,6 @@
 v(double, mediumHeapRAMFraction, 0.5, Normal, nullptr) \
 v(double, mediumHeapGrowthFactor, 1.5, Normal, nullptr) \
 v(double, largeHeapGrowthFactor, 1.24, Normal, nullptr) \
-v(bool, forceAggressiveGCTrigger, false, Normal, "If true, on iOS, we will use a different formula for proportionalHeapSize().") \
-v(double, aggressiveGCTriggerMinMultiplier, 1.07, Normal, "This is the minimum we must grow by for proportionalHeapSize() when doing aggressive triggering.") \
-v(double, aggressiveGCTriggerMaxMultiplier, 2.0, Normal,  "This is the maximum we can grow by for proportionalHeapSize() when doing aggressive triggering.") \
-v(double, aggressiveGCTriggerScalingValue, 3.5, Normal, "This scales the above formula. A larger number is more aggressive in limiting heap growth. A smaller number is more permissive in allowing heap growth.") \
 v(double, criticalGCMemoryThreshold, 0.80, Normal, "percent memory in use the GC considers critical.  The collector is much more aggressive above this threshold") \
 v(double, minimumMutatorUtilization, 0, Normal, nullptr) \
 v(double, maximumMutatorUtilization, 0.7, Normal, nullptr) \






___
webkit-changes mailing list
webkit-changes@l

[webkit-changes] [220470] branches/safari-604.1.38.1-branch/Source/JavaScriptCore

2017-08-09 Thread jmarcell

Title: [220470] branches/safari-604.1.38.1-branch/Source/_javascript_Core








Revision 220470
Author jmarc...@apple.com
Date 2017-08-09 11:24:25 -0700 (Wed, 09 Aug 2017)


Log Message
Cherry-pick r220346. rdar://problem/33805219

Modified Paths

branches/safari-604.1.38.1-branch/Source/_javascript_Core/ChangeLog
branches/safari-604.1.38.1-branch/Source/_javascript_Core/heap/Heap.cpp
branches/safari-604.1.38.1-branch/Source/_javascript_Core/runtime/Options.h




Diff

Modified: branches/safari-604.1.38.1-branch/Source/_javascript_Core/ChangeLog (220469 => 220470)

--- branches/safari-604.1.38.1-branch/Source/_javascript_Core/ChangeLog	2017-08-09 18:14:57 UTC (rev 220469)
+++ branches/safari-604.1.38.1-branch/Source/_javascript_Core/ChangeLog	2017-08-09 18:24:25 UTC (rev 220470)
@@ -1,3 +1,23 @@
+2017-08-09  Jason Marcell  
+
+Cherry-pick r220346. rdar://problem/33805219
+
+2017-08-07  Commit Queue  
+
+Unreviewed, rolling out r220144.
+https://bugs.webkit.org/show_bug.cgi?id=175276
+
+"It did not actually speed things up in the way I expected"
+(Requested by saamyjoon on #webkit).
+
+Reverted changeset:
+
+"On memory-constrained iOS devices, reduce the rate at which
+the JS heap grows before a GC to try to keep more memory
+available for the system"
+https://bugs.webkit.org/show_bug.cgi?id=175041
+http://trac.webkit.org/changeset/220144
+
 2017-08-02  Jason Marcell  
 
 Cherry-pick r220144. rdar://problem/33687404


Modified: branches/safari-604.1.38.1-branch/Source/_javascript_Core/heap/Heap.cpp (220469 => 220470)

--- branches/safari-604.1.38.1-branch/Source/_javascript_Core/heap/Heap.cpp	2017-08-09 18:14:57 UTC (rev 220469)
+++ branches/safari-604.1.38.1-branch/Source/_javascript_Core/heap/Heap.cpp	2017-08-09 18:24:25 UTC (rev 220470)
@@ -71,7 +71,6 @@
 #include 
 #if PLATFORM(IOS)
 #include 
-#include 
 #endif
 #include 
 #include 
@@ -116,39 +115,9 @@
 return Options::smallHeapSize();
 }
 
-#if PLATFORM(IOS)
-static bool useAggressiveGCTrigger()
-{
-static bool useAggressiveGCTrigger;
-static std::once_flag once;
-std::call_once(once, [] {
-useAggressiveGCTrigger = false;
-
-if (Options::forceAggressiveGCTrigger()) {
-useAggressiveGCTrigger = true;
-return;
-}
-
-uint64_t memSizeInBytes;
-size_t sizeofMemSize = sizeof(memSizeInBytes);
-if (sysctlbyname("hw.memsize", &memSizeInBytes, &sizeofMemSize, nullptr, 0))
-return;
-useAggressiveGCTrigger = memSizeInBytes <= 1 * GB;
-});
-
-return useAggressiveGCTrigger;
-}
-#endif
-
 size_t proportionalHeapSize(size_t heapSize, size_t ramSize)
 {
 #if PLATFORM(IOS)
-if (useAggressiveGCTrigger()) {
-double memoryUsed = bmalloc::api::percentAvailableMemoryInUse();
-double result = ((1 - memoryUsed) / Options::aggressiveGCTriggerScalingValue()) + 1;
-return heapSize * std::max(std::min(result, Options::aggressiveGCTriggerMaxMultiplier()), Options::aggressiveGCTriggerMinMultiplier());
-}
-
 size_t memoryFootprint = bmalloc::api::memoryFootprint();
 if (memoryFootprint < ramSize * Options::smallHeapRAMFraction())
 return Options::smallHeapGrowthFactor() * heapSize;


Modified: branches/safari-604.1.38.1-branch/Source/_javascript_Core/runtime/Options.h (220469 => 220470)

--- branches/safari-604.1.38.1-branch/Source/_javascript_Core/runtime/Options.h	2017-08-09 18:14:57 UTC (rev 220469)
+++ branches/safari-604.1.38.1-branch/Source/_javascript_Core/runtime/Options.h	2017-08-09 18:24:25 UTC (rev 220470)
@@ -210,10 +210,6 @@
 v(double, mediumHeapRAMFraction, 0.5, Normal, nullptr) \
 v(double, mediumHeapGrowthFactor, 1.5, Normal, nullptr) \
 v(double, largeHeapGrowthFactor, 1.24, Normal, nullptr) \
-v(bool, forceAggressiveGCTrigger, false, Normal, "If true, on iOS, we will use a different formula for proportionalHeapSize().") \
-v(double, aggressiveGCTriggerMinMultiplier, 1.07, Normal, "This is the minimum we must grow by for proportionalHeapSize() when doing aggressive triggering.") \
-v(double, aggressiveGCTriggerMaxMultiplier, 2.0, Normal,  "This is the maximum we can grow by for proportionalHeapSize() when doing aggressive triggering.") \
-v(double, aggressiveGCTriggerScalingValue, 3.5, Normal, "This scales the above formula. A larger number is more aggressive in limiting heap growth. A smaller number is more permissive in allowing heap growth.") \
 v(double, criticalGCMemoryThreshold, 0.80, Normal, "percent memory in use the GC considers critical.  The collector is much more aggressive above this threshold") \
 v(double, minimumMutatorUtilization, 0, Normal, nullptr) \
 v(double, maximumMutatorUtilization, 0.7, Normal, nullptr) \






___
webkit-changes mailing list
webkit-changes@l

[webkit-changes] [220489] tags/Safari-604.1.38.0.3/

2017-08-09 Thread jmarcell

Title: [220489] tags/Safari-604.1.38.0.3/








Revision 220489
Author jmarc...@apple.com
Date 2017-08-09 15:44:48 -0700 (Wed, 09 Aug 2017)


Log Message
Tag Safari-604.1.38.0.3.

Added Paths

tags/Safari-604.1.38.0.3/




Diff




___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [220490] tags/Safari-604.1.38.1.3/

2017-08-09 Thread jmarcell

Title: [220490] tags/Safari-604.1.38.1.3/








Revision 220490
Author jmarc...@apple.com
Date 2017-08-09 15:45:54 -0700 (Wed, 09 Aug 2017)


Log Message
Tag Safari-604.1.38.1.3.

Added Paths

tags/Safari-604.1.38.1.3/




Diff




___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [220491] branches/safari-604.1.38.0-branch/Source

2017-08-09 Thread jmarcell

Title: [220491] branches/safari-604.1.38.0-branch/Source








Revision 220491
Author jmarc...@apple.com
Date 2017-08-09 15:47:58 -0700 (Wed, 09 Aug 2017)


Log Message
Versioning.

Modified Paths

branches/safari-604.1.38.0-branch/Source/_javascript_Core/Configurations/Version.xcconfig
branches/safari-604.1.38.0-branch/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig
branches/safari-604.1.38.0-branch/Source/WebCore/Configurations/Version.xcconfig
branches/safari-604.1.38.0-branch/Source/WebCore/PAL/Configurations/Version.xcconfig
branches/safari-604.1.38.0-branch/Source/WebInspectorUI/Configurations/Version.xcconfig
branches/safari-604.1.38.0-branch/Source/WebKit/Configurations/Version.xcconfig
branches/safari-604.1.38.0-branch/Source/WebKitLegacy/mac/Configurations/Version.xcconfig




Diff

Modified: branches/safari-604.1.38.0-branch/Source/_javascript_Core/Configurations/Version.xcconfig (220490 => 220491)

--- branches/safari-604.1.38.0-branch/Source/_javascript_Core/Configurations/Version.xcconfig	2017-08-09 22:45:54 UTC (rev 220490)
+++ branches/safari-604.1.38.0-branch/Source/_javascript_Core/Configurations/Version.xcconfig	2017-08-09 22:47:58 UTC (rev 220491)
@@ -25,7 +25,7 @@
 MINOR_VERSION = 1;
 TINY_VERSION = 38;
 MICRO_VERSION = 0;
-NANO_VERSION = 3;
+NANO_VERSION = 4;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION).$(NANO_VERSION);
 
 // The bundle version and short version string are set based on the current build configuration, see below.


Modified: branches/safari-604.1.38.0-branch/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig (220490 => 220491)

--- branches/safari-604.1.38.0-branch/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig	2017-08-09 22:45:54 UTC (rev 220490)
+++ branches/safari-604.1.38.0-branch/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig	2017-08-09 22:47:58 UTC (rev 220491)
@@ -25,7 +25,7 @@
 MINOR_VERSION = 1;
 TINY_VERSION = 38;
 MICRO_VERSION = 0;
-NANO_VERSION = 3;
+NANO_VERSION = 4;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION).$(NANO_VERSION);
 
 // The bundle version and short version string are set based on the current build configuration, see below.


Modified: branches/safari-604.1.38.0-branch/Source/WebCore/Configurations/Version.xcconfig (220490 => 220491)

--- branches/safari-604.1.38.0-branch/Source/WebCore/Configurations/Version.xcconfig	2017-08-09 22:45:54 UTC (rev 220490)
+++ branches/safari-604.1.38.0-branch/Source/WebCore/Configurations/Version.xcconfig	2017-08-09 22:47:58 UTC (rev 220491)
@@ -25,7 +25,7 @@
 MINOR_VERSION = 1;
 TINY_VERSION = 38;
 MICRO_VERSION = 0;
-NANO_VERSION = 3;
+NANO_VERSION = 4;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION).$(NANO_VERSION);
 
 // The bundle version and short version string are set based on the current build configuration, see below.


Modified: branches/safari-604.1.38.0-branch/Source/WebCore/PAL/Configurations/Version.xcconfig (220490 => 220491)

--- branches/safari-604.1.38.0-branch/Source/WebCore/PAL/Configurations/Version.xcconfig	2017-08-09 22:45:54 UTC (rev 220490)
+++ branches/safari-604.1.38.0-branch/Source/WebCore/PAL/Configurations/Version.xcconfig	2017-08-09 22:47:58 UTC (rev 220491)
@@ -25,7 +25,7 @@
 MINOR_VERSION = 1;
 TINY_VERSION = 38;
 MICRO_VERSION = 0;
-NANO_VERSION = 3;
+NANO_VERSION = 4;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION).$(NANO_VERSION);
 
 // The bundle version and short version string are set based on the current build configuration, see below.


Modified: branches/safari-604.1.38.0-branch/Source/WebInspectorUI/Configurations/Version.xcconfig (220490 => 220491)

--- branches/safari-604.1.38.0-branch/Source/WebInspectorUI/Configurations/Version.xcconfig	2017-08-09 22:45:54 UTC (rev 220490)
+++ branches/safari-604.1.38.0-branch/Source/WebInspectorUI/Configurations/Version.xcconfig	2017-08-09 22:47:58 UTC (rev 220491)
@@ -2,7 +2,7 @@
 MINOR_VERSION = 1;
 TINY_VERSION = 38;
 MICRO_VERSION = 0;
-NANO_VERSION = 3;
+NANO_VERSION = 4;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION).$(NANO_VERSION);
 
 // The system version prefix is based on the current system version.


Modified: branches/safari-604.1.38.0-branch/Source/WebKit/Configurations/Version.xcconfig (220490 => 220491)

--- branches/safari-604.1.38.0-branch/Source/WebKit/Configurations/Version.xcconfig	2017-08-09 22:45:54 UTC (rev 220490)
+++ branches/safari-604.1.38.0-branch/Source/WebKit/Configurations/Version.xcconfig	2017-08-09 22:47:58 UTC (rev 220491)
@@ -25,7 +25,7 @@
 MINOR_VERSION = 1;
 TINY_VERSION = 38;
 MICRO_VERSION = 0;
-NANO_VERSION = 3;
+NANO_VERSION = 4;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION).$(NANO_VERSION);
 
 // The bundle version and short version string are set based on the current build configuration, see below.


Modified: branches/saf

[webkit-changes] [220492] branches/safari-604.1.38.1-branch/Source

2017-08-09 Thread jmarcell

Title: [220492] branches/safari-604.1.38.1-branch/Source








Revision 220492
Author jmarc...@apple.com
Date 2017-08-09 15:50:30 -0700 (Wed, 09 Aug 2017)


Log Message
Versioning.

Modified Paths

branches/safari-604.1.38.1-branch/Source/_javascript_Core/Configurations/Version.xcconfig
branches/safari-604.1.38.1-branch/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig
branches/safari-604.1.38.1-branch/Source/WebCore/Configurations/Version.xcconfig
branches/safari-604.1.38.1-branch/Source/WebCore/PAL/Configurations/Version.xcconfig
branches/safari-604.1.38.1-branch/Source/WebInspectorUI/Configurations/Version.xcconfig
branches/safari-604.1.38.1-branch/Source/WebKit/Configurations/Version.xcconfig
branches/safari-604.1.38.1-branch/Source/WebKitLegacy/mac/Configurations/Version.xcconfig




Diff

Modified: branches/safari-604.1.38.1-branch/Source/_javascript_Core/Configurations/Version.xcconfig (220491 => 220492)

--- branches/safari-604.1.38.1-branch/Source/_javascript_Core/Configurations/Version.xcconfig	2017-08-09 22:47:58 UTC (rev 220491)
+++ branches/safari-604.1.38.1-branch/Source/_javascript_Core/Configurations/Version.xcconfig	2017-08-09 22:50:30 UTC (rev 220492)
@@ -25,7 +25,7 @@
 MINOR_VERSION = 1;
 TINY_VERSION = 38;
 MICRO_VERSION = 1;
-NANO_VERSION = 3;
+NANO_VERSION = 4;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION).$(NANO_VERSION);
 
 // The bundle version and short version string are set based on the current build configuration, see below.


Modified: branches/safari-604.1.38.1-branch/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig (220491 => 220492)

--- branches/safari-604.1.38.1-branch/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig	2017-08-09 22:47:58 UTC (rev 220491)
+++ branches/safari-604.1.38.1-branch/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig	2017-08-09 22:50:30 UTC (rev 220492)
@@ -25,7 +25,7 @@
 MINOR_VERSION = 1;
 TINY_VERSION = 38;
 MICRO_VERSION = 1;
-NANO_VERSION = 3;
+NANO_VERSION = 4;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION).$(NANO_VERSION);
 
 // The bundle version and short version string are set based on the current build configuration, see below.


Modified: branches/safari-604.1.38.1-branch/Source/WebCore/Configurations/Version.xcconfig (220491 => 220492)

--- branches/safari-604.1.38.1-branch/Source/WebCore/Configurations/Version.xcconfig	2017-08-09 22:47:58 UTC (rev 220491)
+++ branches/safari-604.1.38.1-branch/Source/WebCore/Configurations/Version.xcconfig	2017-08-09 22:50:30 UTC (rev 220492)
@@ -25,7 +25,7 @@
 MINOR_VERSION = 1;
 TINY_VERSION = 38;
 MICRO_VERSION = 1;
-NANO_VERSION = 3;
+NANO_VERSION = 4;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION).$(NANO_VERSION);
 
 // The bundle version and short version string are set based on the current build configuration, see below.


Modified: branches/safari-604.1.38.1-branch/Source/WebCore/PAL/Configurations/Version.xcconfig (220491 => 220492)

--- branches/safari-604.1.38.1-branch/Source/WebCore/PAL/Configurations/Version.xcconfig	2017-08-09 22:47:58 UTC (rev 220491)
+++ branches/safari-604.1.38.1-branch/Source/WebCore/PAL/Configurations/Version.xcconfig	2017-08-09 22:50:30 UTC (rev 220492)
@@ -25,7 +25,7 @@
 MINOR_VERSION = 1;
 TINY_VERSION = 38;
 MICRO_VERSION = 1;
-NANO_VERSION = 3;
+NANO_VERSION = 4;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION).$(NANO_VERSION);
 
 // The bundle version and short version string are set based on the current build configuration, see below.


Modified: branches/safari-604.1.38.1-branch/Source/WebInspectorUI/Configurations/Version.xcconfig (220491 => 220492)

--- branches/safari-604.1.38.1-branch/Source/WebInspectorUI/Configurations/Version.xcconfig	2017-08-09 22:47:58 UTC (rev 220491)
+++ branches/safari-604.1.38.1-branch/Source/WebInspectorUI/Configurations/Version.xcconfig	2017-08-09 22:50:30 UTC (rev 220492)
@@ -2,7 +2,7 @@
 MINOR_VERSION = 1;
 TINY_VERSION = 38;
 MICRO_VERSION = 1;
-NANO_VERSION = 3;
+NANO_VERSION = 4;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION).$(NANO_VERSION);
 
 // The system version prefix is based on the current system version.


Modified: branches/safari-604.1.38.1-branch/Source/WebKit/Configurations/Version.xcconfig (220491 => 220492)

--- branches/safari-604.1.38.1-branch/Source/WebKit/Configurations/Version.xcconfig	2017-08-09 22:47:58 UTC (rev 220491)
+++ branches/safari-604.1.38.1-branch/Source/WebKit/Configurations/Version.xcconfig	2017-08-09 22:50:30 UTC (rev 220492)
@@ -25,7 +25,7 @@
 MINOR_VERSION = 1;
 TINY_VERSION = 38;
 MICRO_VERSION = 1;
-NANO_VERSION = 3;
+NANO_VERSION = 4;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION).$(NANO_VERSION);
 
 // The bundle version and short version string are set based on the current build configuration, see below.


Modified: branches/saf

[webkit-changes] [220509] branches/safari-604-branch

2017-08-09 Thread jmarcell

Title: [220509] branches/safari-604-branch








Revision 220509
Author jmarc...@apple.com
Date 2017-08-09 21:31:42 -0700 (Wed, 09 Aug 2017)


Log Message
Cherry-pick r220289. rdar://problem/33810941

Modified Paths

branches/safari-604-branch/LayoutTests/ChangeLog
branches/safari-604-branch/Source/WebCore/ChangeLog
branches/safari-604-branch/Source/WebCore/rendering/RenderImageResourceStyleImage.cpp




Diff

Modified: branches/safari-604-branch/LayoutTests/ChangeLog (220508 => 220509)

--- branches/safari-604-branch/LayoutTests/ChangeLog	2017-08-10 04:31:39 UTC (rev 220508)
+++ branches/safari-604-branch/LayoutTests/ChangeLog	2017-08-10 04:31:42 UTC (rev 220509)
@@ -1,3 +1,18 @@
+2017-08-09  Jason Marcell  
+
+Cherry-pick r220289. rdar://problem/33810941
+
+2017-08-04  Said Abou-Hallawa  
+
+RenderImageResourceStyleImage::image() should return the nullImage() if the image is not available
+https://bugs.webkit.org/show_bug.cgi?id=174874
+
+
+Reviewed by Simon Fraser.
+
+* fast/images/image-element-image-content-data-expected.txt: Added.
+* fast/images/image-element-image-content-data.html: Added.
+
 2017-08-07  Jason Marcell  
 
 Cherry-pick r220185. rdar://problem/33713534


Modified: branches/safari-604-branch/Source/WebCore/ChangeLog (220508 => 220509)

--- branches/safari-604-branch/Source/WebCore/ChangeLog	2017-08-10 04:31:39 UTC (rev 220508)
+++ branches/safari-604-branch/Source/WebCore/ChangeLog	2017-08-10 04:31:42 UTC (rev 220509)
@@ -1,3 +1,56 @@
+2017-08-09  Jason Marcell  
+
+Cherry-pick r220289. rdar://problem/33810941
+
+2017-08-04  Said Abou-Hallawa  
+
+RenderImageResourceStyleImage::image() should return the nullImage() if the image is not available
+https://bugs.webkit.org/show_bug.cgi?id=174874
+
+
+Reviewed by Simon Fraser.
+
+If an  element has a non-CachedImage content data, e.g. -webkit-named-image,
+RenderImageResourceStyleImage will be created and  attached to the RenderImage.
+RenderImageResourceStyleImage::m_cachedImage will be set to null at the
+beginning because the m_styleImage->isCachedImage() is false in this case.
+When ImageLoader finishes loading the url of the src attribute,
+RenderImageResource::setCachedImage() will be called to set m_cachedImage.
+
+A crash will happen when the RenderImage is destroyed. Destroying the
+RenderImage calls RenderImageResourceStyleImage::shutdown() which checks
+m_cachedImage and finds it not null, so it calls RenderImageResourceStyleImage::image()
+which ends up calling CSSNamedImageValue::image() which returns a null pointer
+because the size is empty. RenderImageResourceStyleImage::shutdown() calls
+image()->stopAnimation() without checking the return value of image().
+
+Another crash will happen later when deleting the CachedImage from the memory
+cache if CachedImage::canDestroyDecodedData() is called because the client
+it gets from m_clients is a freed pointer. This happens because RenderImageResourceStyleImage
+has m_styleImage of type StyleGeneratedImage but its m_cachedImage is set
+by RenderImageResource::setCachedImage(). When RenderImageResourceStyleImage::shutdown()
+is called, it calls  StyleGeneratedImage::removeClient() which does not
+know anything about RenderImageResourceStyleImage::m_cachedImage. So we
+end up having a freed pointer in the m_clients of the CachedImage.
+
+Test: fast/images/image-element-image-content-data.html
+
+* rendering/RenderImageResourceStyleImage.cpp:
+(WebCore::RenderImageResourceStyleImage::shutdown):  Revert back the changes
+of r208511 in this function. Add a call to image()->stopAnimation() without
+checking the return of image() since it will return the nullImage() if
+the image not available. There is no need to check m_cachedImage before
+calling image() because image() does not check or access m_cachedImage.
+
+If m_styleImage is not a CachedStyleImage but m_cachedImage is not null,
+we need to remove m_renderer from the set of the clients of this m_cachedImage.
+
+(WebCore::RenderImageResourceStyleImage::image const): The base class method
+RenderImageResource::image() returns the nullImage() if the image not
+available. This is because CachedImage::imageForRenderer() returns
+the nullImage() if the image is not available; see CachedImage.h. We should
+do the same for the derived class for consistency.
+
 2017-08-08  Jason Marcell  
 
 Cherry-pick r220248. rdar://problem/33754458


Modified: branches/safari-604-branch/Sour

[webkit-changes] [220514] branches/safari-604-branch

2017-08-09 Thread jmarcell

Title: [220514] branches/safari-604-branch








Revision 220514
Author jmarc...@apple.com
Date 2017-08-09 21:31:58 -0700 (Wed, 09 Aug 2017)


Log Message
Cherry-pick r220473. rdar://problem/33810961

Modified Paths

branches/safari-604-branch/Source/_javascript_Core/ChangeLog
branches/safari-604-branch/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig
branches/safari-604-branch/Source/WebCore/ChangeLog
branches/safari-604-branch/Source/WebCore/Configurations/FeatureDefines.xcconfig
branches/safari-604-branch/Source/WebCore/PAL/ChangeLog
branches/safari-604-branch/Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig
branches/safari-604-branch/Source/WebKit/ChangeLog
branches/safari-604-branch/Source/WebKit/Configurations/FeatureDefines.xcconfig
branches/safari-604-branch/Source/WebKitLegacy/mac/ChangeLog
branches/safari-604-branch/Source/WebKitLegacy/mac/Configurations/FeatureDefines.xcconfig
branches/safari-604-branch/Tools/ChangeLog
branches/safari-604-branch/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig




Diff

Modified: branches/safari-604-branch/Source/_javascript_Core/ChangeLog (220513 => 220514)

--- branches/safari-604-branch/Source/_javascript_Core/ChangeLog	2017-08-10 04:31:53 UTC (rev 220513)
+++ branches/safari-604-branch/Source/_javascript_Core/ChangeLog	2017-08-10 04:31:58 UTC (rev 220514)
@@ -1,5 +1,21 @@
 2017-08-09  Jason Marcell  
 
+Cherry-pick r220473. rdar://problem/33810961
+
+2017-08-09  Wenson Hsieh  
+
+[iOS DnD] ENABLE_DRAG_SUPPORT should be turned off for iOS 10 and enabled by default
+https://bugs.webkit.org/show_bug.cgi?id=175392
+
+
+Reviewed by Tim Horton and Megan Gardner.
+
+Tweak FeatureDefines to enable drag and drop by default, and disable only on unsupported platforms (i.e. iOS 10).
+
+* Configurations/FeatureDefines.xcconfig:
+
+2017-08-09  Jason Marcell  
+
 Cherry-pick r220346. rdar://problem/33810976
 
 2017-08-07  Commit Queue  


Modified: branches/safari-604-branch/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig (220513 => 220514)

--- branches/safari-604-branch/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig	2017-08-10 04:31:53 UTC (rev 220513)
+++ branches/safari-604-branch/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig	2017-08-10 04:31:58 UTC (rev 220514)
@@ -240,9 +240,16 @@
 ENABLE_VARIATION_FONTS_IF_NOT_NO = ENABLE_VARIATION_FONTS;
 ENABLE_VARIATION_FONTS_IF_NOT_YES = ;
 
-ENABLE_DRAG_SUPPORT[sdk=iphoneos11*] = ENABLE_DRAG_SUPPORT;
-ENABLE_DRAG_SUPPORT[sdk=iphonesimulator11*] = ENABLE_DRAG_SUPPORT;
-ENABLE_DATA_INTERACTION[sdk=iphoneos11*] = ENABLE_DATA_INTERACTION;
-ENABLE_DATA_INTERACTION[sdk=iphonesimulator11*] = ENABLE_DATA_INTERACTION;
+ENABLE_DRAG_SUPPORT[sdk=iphone*] = $(ENABLE_DRAG_SUPPORT_$(PLATFORM_NAME));
+ENABLE_DRAG_SUPPORT_iphoneos = ENABLE_DRAG_SUPPORT;
+ENABLE_DRAG_SUPPORT_iphonesimulator = ENABLE_DRAG_SUPPORT;
+ENABLE_DRAG_SUPPORT[sdk=iphoneos10*] = ;
+ENABLE_DRAG_SUPPORT[sdk=iphonesimulator10*] = ;
 
+ENABLE_DATA_INTERACTION[sdk=iphone*] = $(ENABLE_DATA_INTERACTION_$(PLATFORM_NAME));
+ENABLE_DATA_INTERACTION_iphoneos = ENABLE_DATA_INTERACTION;
+ENABLE_DATA_INTERACTION_iphonesimulator = ENABLE_DATA_INTERACTION;
+ENABLE_DATA_INTERACTION[sdk=iphoneos10*] = ;
+ENABLE_DATA_INTERACTION[sdk=iphonesimulator10*] = ;
+
 FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_APPLE_PAY) $(ENABLE_APPLE_PAY_SESSION_V3) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSS_ANIMATIONS_LEVEL_2) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_CSS3_TEXT) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATA_INTERACTION) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DATACUE_VALUE) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DRAG_SUPPORT) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_FAST_JIT_PERMISSIONS) $(ENA
 BLE_FETCH_API) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FTL_JIT) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD_DEPRECATED) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INTERSECTION_OBSERVER) $(ENABLE_INTL) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_JIT) $(ENABLE_

[webkit-changes] [220511] branches/safari-604-branch/Source/JavaScriptCore

2017-08-09 Thread jmarcell

Title: [220511] branches/safari-604-branch/Source/_javascript_Core








Revision 220511
Author jmarc...@apple.com
Date 2017-08-09 21:31:47 -0700 (Wed, 09 Aug 2017)


Log Message
Cherry-pick r220346. rdar://problem/33810976

Modified Paths

branches/safari-604-branch/Source/_javascript_Core/ChangeLog
branches/safari-604-branch/Source/_javascript_Core/heap/Heap.cpp
branches/safari-604-branch/Source/_javascript_Core/runtime/Options.h




Diff

Modified: branches/safari-604-branch/Source/_javascript_Core/ChangeLog (220510 => 220511)

--- branches/safari-604-branch/Source/_javascript_Core/ChangeLog	2017-08-10 04:31:44 UTC (rev 220510)
+++ branches/safari-604-branch/Source/_javascript_Core/ChangeLog	2017-08-10 04:31:47 UTC (rev 220511)
@@ -1,3 +1,23 @@
+2017-08-09  Jason Marcell  
+
+Cherry-pick r220346. rdar://problem/33810976
+
+2017-08-07  Commit Queue  
+
+Unreviewed, rolling out r220144.
+https://bugs.webkit.org/show_bug.cgi?id=175276
+
+"It did not actually speed things up in the way I expected"
+(Requested by saamyjoon on #webkit).
+
+Reverted changeset:
+
+"On memory-constrained iOS devices, reduce the rate at which
+the JS heap grows before a GC to try to keep more memory
+available for the system"
+https://bugs.webkit.org/show_bug.cgi?id=175041
+http://trac.webkit.org/changeset/220144
+
 2017-08-02  Jason Marcell  
 
 Cherry-pick r220144. rdar://problem/33692161


Modified: branches/safari-604-branch/Source/_javascript_Core/heap/Heap.cpp (220510 => 220511)

--- branches/safari-604-branch/Source/_javascript_Core/heap/Heap.cpp	2017-08-10 04:31:44 UTC (rev 220510)
+++ branches/safari-604-branch/Source/_javascript_Core/heap/Heap.cpp	2017-08-10 04:31:47 UTC (rev 220511)
@@ -71,7 +71,6 @@
 #include 
 #if PLATFORM(IOS)
 #include 
-#include 
 #endif
 #include 
 #include 
@@ -116,39 +115,9 @@
 return Options::smallHeapSize();
 }
 
-#if PLATFORM(IOS)
-static bool useAggressiveGCTrigger()
-{
-static bool useAggressiveGCTrigger;
-static std::once_flag once;
-std::call_once(once, [] {
-useAggressiveGCTrigger = false;
-
-if (Options::forceAggressiveGCTrigger()) {
-useAggressiveGCTrigger = true;
-return;
-}
-
-uint64_t memSizeInBytes;
-size_t sizeofMemSize = sizeof(memSizeInBytes);
-if (sysctlbyname("hw.memsize", &memSizeInBytes, &sizeofMemSize, nullptr, 0))
-return;
-useAggressiveGCTrigger = memSizeInBytes <= 1 * GB;
-});
-
-return useAggressiveGCTrigger;
-}
-#endif
-
 size_t proportionalHeapSize(size_t heapSize, size_t ramSize)
 {
 #if PLATFORM(IOS)
-if (useAggressiveGCTrigger()) {
-double memoryUsed = bmalloc::api::percentAvailableMemoryInUse();
-double result = ((1 - memoryUsed) / Options::aggressiveGCTriggerScalingValue()) + 1;
-return heapSize * std::max(std::min(result, Options::aggressiveGCTriggerMaxMultiplier()), Options::aggressiveGCTriggerMinMultiplier());
-}
-
 size_t memoryFootprint = bmalloc::api::memoryFootprint();
 if (memoryFootprint < ramSize * Options::smallHeapRAMFraction())
 return Options::smallHeapGrowthFactor() * heapSize;


Modified: branches/safari-604-branch/Source/_javascript_Core/runtime/Options.h (220510 => 220511)

--- branches/safari-604-branch/Source/_javascript_Core/runtime/Options.h	2017-08-10 04:31:44 UTC (rev 220510)
+++ branches/safari-604-branch/Source/_javascript_Core/runtime/Options.h	2017-08-10 04:31:47 UTC (rev 220511)
@@ -210,10 +210,6 @@
 v(double, mediumHeapRAMFraction, 0.5, Normal, nullptr) \
 v(double, mediumHeapGrowthFactor, 1.5, Normal, nullptr) \
 v(double, largeHeapGrowthFactor, 1.24, Normal, nullptr) \
-v(bool, forceAggressiveGCTrigger, false, Normal, "If true, on iOS, we will use a different formula for proportionalHeapSize().") \
-v(double, aggressiveGCTriggerMinMultiplier, 1.07, Normal, "This is the minimum we must grow by for proportionalHeapSize() when doing aggressive triggering.") \
-v(double, aggressiveGCTriggerMaxMultiplier, 2.0, Normal,  "This is the maximum we can grow by for proportionalHeapSize() when doing aggressive triggering.") \
-v(double, aggressiveGCTriggerScalingValue, 3.5, Normal, "This scales the above formula. A larger number is more aggressive in limiting heap growth. A smaller number is more permissive in allowing heap growth.") \
 v(double, criticalGCMemoryThreshold, 0.80, Normal, "percent memory in use the GC considers critical.  The collector is much more aggressive above this threshold") \
 v(double, minimumMutatorUtilization, 0, Normal, nullptr) \
 v(double, maximumMutatorUtilization, 0.7, Normal, nullptr) \






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [220510] branches/safari-604-branch/Source/WebCore

2017-08-09 Thread jmarcell

Title: [220510] branches/safari-604-branch/Source/WebCore








Revision 220510
Author jmarc...@apple.com
Date 2017-08-09 21:31:44 -0700 (Wed, 09 Aug 2017)


Log Message
Cherry-pick r220333. rdar://problem/33810934

Modified Paths

branches/safari-604-branch/Source/WebCore/ChangeLog
branches/safari-604-branch/Source/WebCore/rendering/RenderView.cpp




Diff

Modified: branches/safari-604-branch/Source/WebCore/ChangeLog (220509 => 220510)

--- branches/safari-604-branch/Source/WebCore/ChangeLog	2017-08-10 04:31:42 UTC (rev 220509)
+++ branches/safari-604-branch/Source/WebCore/ChangeLog	2017-08-10 04:31:44 UTC (rev 220510)
@@ -1,5 +1,29 @@
 2017-08-09  Jason Marcell  
 
+Cherry-pick r220333. rdar://problem/33810934
+
+2017-08-07  Antti Koivisto  
+
+REGRESSION (r219121): Airmail 3 prints header part only.
+https://bugs.webkit.org/show_bug.cgi?id=175258
+
+
+Reviewed by Andreas Kling.
+
+When a WK1 WebViw is printed via AppKit view hierarchy it won't explictly set the page width
+but uses the existing width. r219121 assumes that all printing code paths set the page width.
+
+No test, there appears to be no good way to test AppKit printing behaviors without adding complicated
+new testing infrastructure.
+
+* rendering/RenderView.cpp:
+(WebCore::RenderView::layout):
+
+If we are in printing layout and don't have page width set yet then use the current view width.
+This matches the behavior prior r219121.
+
+2017-08-09  Jason Marcell  
+
 Cherry-pick r220289. rdar://problem/33810941
 
 2017-08-04  Said Abou-Hallawa  


Modified: branches/safari-604-branch/Source/WebCore/rendering/RenderView.cpp (220509 => 220510)

--- branches/safari-604-branch/Source/WebCore/rendering/RenderView.cpp	2017-08-10 04:31:42 UTC (rev 220509)
+++ branches/safari-604-branch/Source/WebCore/rendering/RenderView.cpp	2017-08-10 04:31:44 UTC (rev 220510)
@@ -341,7 +341,8 @@
 m_pageLogicalSize = { };
 
 if (shouldUsePrintingLayout()) {
-ASSERT(m_pageLogicalSize);
+if (!m_pageLogicalSize)
+m_pageLogicalSize = LayoutSize(logicalWidth(), 0);
 m_minPreferredLogicalWidth = m_pageLogicalSize->width();
 m_maxPreferredLogicalWidth = m_minPreferredLogicalWidth;
 }






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [220508] branches/safari-604-branch/Source/WebKitLegacy

2017-08-09 Thread jmarcell

Title: [220508] branches/safari-604-branch/Source/WebKitLegacy








Revision 220508
Author jmarc...@apple.com
Date 2017-08-09 21:31:39 -0700 (Wed, 09 Aug 2017)


Log Message
Cherry-pick r220205. rdar://problem/33810980

Modified Paths

branches/safari-604-branch/Source/WebKitLegacy/ChangeLog
branches/safari-604-branch/Source/WebKitLegacy/WebKitLegacy.vcxproj/WebKitLegacy.proj




Diff

Modified: branches/safari-604-branch/Source/WebKitLegacy/ChangeLog (220507 => 220508)

--- branches/safari-604-branch/Source/WebKitLegacy/ChangeLog	2017-08-10 04:19:34 UTC (rev 220507)
+++ branches/safari-604-branch/Source/WebKitLegacy/ChangeLog	2017-08-10 04:31:39 UTC (rev 220508)
@@ -1,3 +1,20 @@
+2017-08-09  Jason Marcell  
+
+Cherry-pick r220205. rdar://problem/33810980
+
+2017-08-03  Per Arne Vollan  
+
+[Win] WebKit COM header file is not placed in the correct location.
+https://bugs.webkit.org/show_bug.cgi?id=175101
+
+Reviewed by Brent Fulgham.
+
+After the transition to WebKitLegacy, the generated WebKit header files should still
+be placed in the WebKit folder, so WebKit clients will find the header files in the
+same place.
+
+* WebKitLegacy.vcxproj/WebKitLegacy.proj:
+
 2017-08-02  Matthew Hanson  
 
 Cherry-pick r219602. rdar://problem/33537767


Modified: branches/safari-604-branch/Source/WebKitLegacy/WebKitLegacy.vcxproj/WebKitLegacy.proj (220507 => 220508)

--- branches/safari-604-branch/Source/WebKitLegacy/WebKitLegacy.vcxproj/WebKitLegacy.proj	2017-08-10 04:19:34 UTC (rev 220507)
+++ branches/safari-604-branch/Source/WebKitLegacy/WebKitLegacy.vcxproj/WebKitLegacy.proj	2017-08-10 04:31:39 UTC (rev 220508)
@@ -47,7 +47,7 @@
 
 
 
-
+
   
 
   
@@ -65,7 +65,7 @@
 
 
 
-
+
   
 
 
@@ -92,10 +92,10 @@
 
   
 
-
+
   
 
-
+
   
 
 
@@ -104,24 +104,24 @@
 
   
 
-
+
   
 
-
+
   
 
 
-
+
 
 
 
 
 
-
+
 
 
 
-
+
   
 
 






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [220512] branches/safari-604-branch/Source/WebKitLegacy/mac

2017-08-09 Thread jmarcell

Title: [220512] branches/safari-604-branch/Source/WebKitLegacy/mac








Revision 220512
Author jmarc...@apple.com
Date 2017-08-09 21:31:49 -0700 (Wed, 09 Aug 2017)


Log Message
Cherry-pick r220429. rdar://problem/33810973

Modified Paths

branches/safari-604-branch/Source/WebKitLegacy/mac/ChangeLog
branches/safari-604-branch/Source/WebKitLegacy/mac/Misc/WebKitVersionChecks.h
branches/safari-604-branch/Source/WebKitLegacy/mac/WebCoreSupport/WebFrameLoaderClient.mm




Diff

Modified: branches/safari-604-branch/Source/WebKitLegacy/mac/ChangeLog (220511 => 220512)

--- branches/safari-604-branch/Source/WebKitLegacy/mac/ChangeLog	2017-08-10 04:31:47 UTC (rev 220511)
+++ branches/safari-604-branch/Source/WebKitLegacy/mac/ChangeLog	2017-08-10 04:31:49 UTC (rev 220512)
@@ -1,3 +1,19 @@
+2017-08-09  Jason Marcell  
+
+Cherry-pick r220429. rdar://problem/33810973
+
+2017-08-08  Brady Eidson  
+
+Don't enable default icon loading in WK1 for apps linked against old SDKs.
+ and https://bugs.webkit.org/show_bug.cgi?id=175342
+
+Reviewed by Andy Estes.
+
+* Misc/WebKitVersionChecks.h:
+* WebCoreSupport/WebFrameLoaderClient.mm:
+(WebFrameLoaderClient::getLoadDecisionForIcons): Don't do any icon loading unless
+  the app is linked against new WebKit with the new behavior.
+
 2017-07-26  Jason Marcell  
 
 Cherry-pick r219876. rdar://problem/33523847


Modified: branches/safari-604-branch/Source/WebKitLegacy/mac/Misc/WebKitVersionChecks.h (220511 => 220512)

--- branches/safari-604-branch/Source/WebKitLegacy/mac/Misc/WebKitVersionChecks.h	2017-08-10 04:31:47 UTC (rev 220511)
+++ branches/safari-604-branch/Source/WebKitLegacy/mac/Misc/WebKitVersionChecks.h	2017-08-10 04:31:49 UTC (rev 220512)
@@ -61,6 +61,8 @@
 #define WEBKIT_FIRST_VERSION_WITH_CSS_ATTRIBUTE_SETTERS_IGNORING_PRIORITY 0x02170D00 // 535.13.0
 #define WEBKIT_FIRST_VERSION_WITHOUT_LEGACY_BACKGROUNDSIZE_SHORTHAND_BEHAVIOR 0x02190100 // 537.1.0
 #define WEBKIT_FIRST_VERSION_WITH_INSECURE_CONTENT_BLOCKING 0x02590116 // 601.1.22
+#define WEBKIT_FIRST_VERSION_WITH_DEFAULT_ICON_LOADING 0x025C0126 // 604.1.38
+
 #else
 //  Need to implement WebKitLinkedOnOrAfter
 // Actually UIKit version numbers, since applications don't link against WebKit


Modified: branches/safari-604-branch/Source/WebKitLegacy/mac/WebCoreSupport/WebFrameLoaderClient.mm (220511 => 220512)

--- branches/safari-604-branch/Source/WebKitLegacy/mac/WebCoreSupport/WebFrameLoaderClient.mm	2017-08-10 04:31:47 UTC (rev 220511)
+++ branches/safari-604-branch/Source/WebKitLegacy/mac/WebCoreSupport/WebFrameLoaderClient.mm	2017-08-10 04:31:49 UTC (rev 220512)
@@ -55,6 +55,7 @@
 #import "WebKitErrorsPrivate.h"
 #import "WebKitLogging.h"
 #import "WebKitNSStringExtras.h"
+#import "WebKitVersionChecks.h"
 #import "WebNSURLExtras.h"
 #import "WebNavigationData.h"
 #import "WebNetscapePluginPackage.h"
@@ -144,7 +145,6 @@
 #import 
 #import 
 #import 
-#import "WebKitVersionChecks.h"
 #import "WebMailDelegate.h"
 #import "WebUIKitDelegate.h"
 #endif
@@ -2282,6 +2282,15 @@
 DocumentLoader* documentLoader = frame->loader().documentLoader();
 ASSERT(documentLoader);
 
+#if PLATFORM(MAC)
+if (!WebKitLinkedOnOrAfter(WEBKIT_FIRST_VERSION_WITH_DEFAULT_ICON_LOADING)) {
+for (auto& icon : icons)
+documentLoader->didGetLoadDecisionForIcon(false, icon.second, 0);
+
+return;
+}
+#endif
+
 bool disallowedDueToImageLoadSettings = false;
 if (!frame->settings().loadsImagesAutomatically() && !frame->settings().loadsSiteIconsIgnoringImageLoadingSetting())
 disallowedDueToImageLoadSettings = true;






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [220517] branches/safari-604.1.38.0-branch

2017-08-09 Thread jmarcell

Title: [220517] branches/safari-604.1.38.0-branch








Revision 220517
Author jmarc...@apple.com
Date 2017-08-09 23:13:32 -0700 (Wed, 09 Aug 2017)


Log Message
Cherry-pick r220459. rdar://problem/33820787

Modified Paths

branches/safari-604.1.38.0-branch/Source/WebCore/ChangeLog
branches/safari-604.1.38.0-branch/Source/WebCore/loader/EmptyClients.cpp
branches/safari-604.1.38.0-branch/Source/WebCore/loader/FrameLoaderClient.h
branches/safari-604.1.38.0-branch/Source/WebCore/loader/PolicyChecker.cpp
branches/safari-604.1.38.0-branch/Source/WebKit/ChangeLog
branches/safari-604.1.38.0-branch/Source/WebKit/Shared/NavigationActionData.cpp
branches/safari-604.1.38.0-branch/Source/WebKit/Shared/NavigationActionData.h
branches/safari-604.1.38.0-branch/Source/WebKit/UIProcess/API/APINavigationAction.h
branches/safari-604.1.38.0-branch/Source/WebKit/UIProcess/API/Cocoa/WKNavigationAction.mm
branches/safari-604.1.38.0-branch/Source/WebKit/UIProcess/API/Cocoa/WKNavigationActionPrivate.h
branches/safari-604.1.38.0-branch/Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp
branches/safari-604.1.38.0-branch/Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.h
branches/safari-604.1.38.0-branch/Source/WebKitLegacy/mac/ChangeLog
branches/safari-604.1.38.0-branch/Source/WebKitLegacy/mac/WebCoreSupport/WebFrameLoaderClient.h
branches/safari-604.1.38.0-branch/Source/WebKitLegacy/mac/WebCoreSupport/WebFrameLoaderClient.mm
branches/safari-604.1.38.0-branch/Source/WebKitLegacy/win/ChangeLog
branches/safari-604.1.38.0-branch/Source/WebKitLegacy/win/WebCoreSupport/WebFrameLoaderClient.cpp
branches/safari-604.1.38.0-branch/Source/WebKitLegacy/win/WebCoreSupport/WebFrameLoaderClient.h
branches/safari-604.1.38.0-branch/Tools/ChangeLog
branches/safari-604.1.38.0-branch/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/DecidePolicyForNavigationAction.mm
branches/safari-604.1.38.0-branch/Tools/TestWebKitAPI/cocoa/TestProtocol.mm




Diff

Modified: branches/safari-604.1.38.0-branch/Source/WebCore/ChangeLog (220516 => 220517)

--- branches/safari-604.1.38.0-branch/Source/WebCore/ChangeLog	2017-08-10 06:01:56 UTC (rev 220516)
+++ branches/safari-604.1.38.0-branch/Source/WebCore/ChangeLog	2017-08-10 06:13:32 UTC (rev 220517)
@@ -1,5 +1,41 @@
 2017-08-09  Jason Marcell  
 
+Cherry-pick r220459. rdar://problem/33820787
+
+2017-08-09  Daniel Bates  
+
+REGRESSION (r219013): OAuth flows are broken when redirecting back to application after authentication
+https://bugs.webkit.org/show_bug.cgi?id=175247
+
+
+Reviewed by Brady Eidson.
+
+Add SPI so that Safari can differentiate between a form submission and a redirected form submission
+and have PolicyCheck notify the frame loader client if the navigation was in response to receiving a
+redirect response. This is the WebKit portion to fix an issue when a native app makes use of an OAuth
+OAuth flow that bounces to Safari for user login and then bounce back to the app. Microsoft Graph's
+OAuth flow is one example.
+
+Safari was differentiating between a form submission and a redirected form submission based on the
+nullity of WKNavigationAction.sourceFrame because in both cases the navigation type was WKNavigationTypeFormSubmitted.
+The navigation type is the same for both navigations because WebKit always used the navigation
+action from the original request for the redirect request when the original request redirected.
+Prior to r219013, WKNavigationAction.sourceFrame would be nil for a form submission that redirects.
+Following r219013, WKNavigationAction.sourceFrame is non-nil unless the navigation was initiated by
+API. In particular, WKNavigationAction.sourceFrame is non-nil for the redirect navigation corresponding
+to a form submission that redirects.
+
+* loader/EmptyClients.cpp:
+(WebCore::EmptyFrameLoaderClient::dispatchDecidePolicyForNavigationAction):
+* loader/FrameLoaderClient.h:
+Have dispatchDecidePolicyForNavigationAction() take a boolean as to whether the navigation was in
+response to receiving a redirect response.
+* loader/PolicyChecker.cpp:
+(WebCore::PolicyChecker::checkNavigationPolicy): Notify the frame loader client whether the navigation
+is in response to receiving a redirect response.
+
+2017-08-09  Jason Marcell  
+
 Cherry-pick r220456. rdar://problem/33805190
 
 2017-08-09  Andy Estes  


Modified: branches/safari-604.1.38.0-branch/Source/WebCore/loader/EmptyClients.cpp (220516 => 220517)

--- branches/safari-604.1.38.0-branch/Source/WebCore/loader/EmptyClients.cpp	2017-08-10 06:01:56 UTC (rev 220516)
+++ branches/safari-604.1.38.0-branch/Source/WebCore/loader/EmptyClients.cpp	2017-08-10 06:13:32 UTC (rev 220517)
@@ -339,7 +339,7 @@

[webkit-changes] [220518] branches/safari-604.1.38.1-branch

2017-08-09 Thread jmarcell

Title: [220518] branches/safari-604.1.38.1-branch








Revision 220518
Author jmarc...@apple.com
Date 2017-08-09 23:52:52 -0700 (Wed, 09 Aug 2017)


Log Message
Cherry-pick r220459. rdar://problem/33820786

Modified Paths

branches/safari-604.1.38.1-branch/Source/WebCore/ChangeLog
branches/safari-604.1.38.1-branch/Source/WebCore/loader/EmptyClients.cpp
branches/safari-604.1.38.1-branch/Source/WebCore/loader/FrameLoaderClient.h
branches/safari-604.1.38.1-branch/Source/WebCore/loader/PolicyChecker.cpp
branches/safari-604.1.38.1-branch/Source/WebKit/ChangeLog
branches/safari-604.1.38.1-branch/Source/WebKit/Shared/NavigationActionData.cpp
branches/safari-604.1.38.1-branch/Source/WebKit/Shared/NavigationActionData.h
branches/safari-604.1.38.1-branch/Source/WebKit/UIProcess/API/APINavigationAction.h
branches/safari-604.1.38.1-branch/Source/WebKit/UIProcess/API/Cocoa/WKNavigationAction.mm
branches/safari-604.1.38.1-branch/Source/WebKit/UIProcess/API/Cocoa/WKNavigationActionPrivate.h
branches/safari-604.1.38.1-branch/Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp
branches/safari-604.1.38.1-branch/Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.h
branches/safari-604.1.38.1-branch/Source/WebKitLegacy/mac/ChangeLog
branches/safari-604.1.38.1-branch/Source/WebKitLegacy/mac/WebCoreSupport/WebFrameLoaderClient.h
branches/safari-604.1.38.1-branch/Source/WebKitLegacy/mac/WebCoreSupport/WebFrameLoaderClient.mm
branches/safari-604.1.38.1-branch/Source/WebKitLegacy/win/ChangeLog
branches/safari-604.1.38.1-branch/Source/WebKitLegacy/win/WebCoreSupport/WebFrameLoaderClient.cpp
branches/safari-604.1.38.1-branch/Source/WebKitLegacy/win/WebCoreSupport/WebFrameLoaderClient.h
branches/safari-604.1.38.1-branch/Tools/ChangeLog
branches/safari-604.1.38.1-branch/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/DecidePolicyForNavigationAction.mm
branches/safari-604.1.38.1-branch/Tools/TestWebKitAPI/cocoa/TestProtocol.mm




Diff

Modified: branches/safari-604.1.38.1-branch/Source/WebCore/ChangeLog (220517 => 220518)

--- branches/safari-604.1.38.1-branch/Source/WebCore/ChangeLog	2017-08-10 06:13:32 UTC (rev 220517)
+++ branches/safari-604.1.38.1-branch/Source/WebCore/ChangeLog	2017-08-10 06:52:52 UTC (rev 220518)
@@ -1,3 +1,39 @@
+2017-08-09  Jason Marcell  
+
+Cherry-pick r220459. rdar://problem/33820786
+
+2017-08-09  Daniel Bates  
+
+REGRESSION (r219013): OAuth flows are broken when redirecting back to application after authentication
+https://bugs.webkit.org/show_bug.cgi?id=175247
+
+
+Reviewed by Brady Eidson.
+
+Add SPI so that Safari can differentiate between a form submission and a redirected form submission
+and have PolicyCheck notify the frame loader client if the navigation was in response to receiving a
+redirect response. This is the WebKit portion to fix an issue when a native app makes use of an OAuth
+OAuth flow that bounces to Safari for user login and then bounce back to the app. Microsoft Graph's
+OAuth flow is one example.
+
+Safari was differentiating between a form submission and a redirected form submission based on the
+nullity of WKNavigationAction.sourceFrame because in both cases the navigation type was WKNavigationTypeFormSubmitted.
+The navigation type is the same for both navigations because WebKit always used the navigation
+action from the original request for the redirect request when the original request redirected.
+Prior to r219013, WKNavigationAction.sourceFrame would be nil for a form submission that redirects.
+Following r219013, WKNavigationAction.sourceFrame is non-nil unless the navigation was initiated by
+API. In particular, WKNavigationAction.sourceFrame is non-nil for the redirect navigation corresponding
+to a form submission that redirects.
+
+* loader/EmptyClients.cpp:
+(WebCore::EmptyFrameLoaderClient::dispatchDecidePolicyForNavigationAction):
+* loader/FrameLoaderClient.h:
+Have dispatchDecidePolicyForNavigationAction() take a boolean as to whether the navigation was in
+response to receiving a redirect response.
+* loader/PolicyChecker.cpp:
+(WebCore::PolicyChecker::checkNavigationPolicy): Notify the frame loader client whether the navigation
+is in response to receiving a redirect response.
+
 2017-08-08  Jason Marcell  
 
 Cherry-pick r220289. rdar://problem/33789082


Modified: branches/safari-604.1.38.1-branch/Source/WebCore/loader/EmptyClients.cpp (220517 => 220518)

--- branches/safari-604.1.38.1-branch/Source/WebCore/loader/EmptyClients.cpp	2017-08-10 06:13:32 UTC (rev 220517)
+++ branches/safari-604.1.38.1-branch/Source/WebCore/loader/EmptyClients.cpp	2017-08-10 06:52:52 UTC (rev 220518)
@@ -339,7 +339,7 @@
 
 void dispatchDecidePolic

[webkit-changes] [220520] branches/safari-604-branch

2017-08-10 Thread jmarcell

Title: [220520] branches/safari-604-branch








Revision 220520
Author jmarc...@apple.com
Date 2017-08-10 00:30:04 -0700 (Thu, 10 Aug 2017)


Log Message
Cherry-pick r220459. rdar://problem/33820790

Modified Paths

branches/safari-604-branch/Source/WebCore/ChangeLog
branches/safari-604-branch/Source/WebCore/loader/EmptyClients.cpp
branches/safari-604-branch/Source/WebCore/loader/FrameLoaderClient.h
branches/safari-604-branch/Source/WebCore/loader/PolicyChecker.cpp
branches/safari-604-branch/Source/WebKit/ChangeLog
branches/safari-604-branch/Source/WebKit/Shared/NavigationActionData.cpp
branches/safari-604-branch/Source/WebKit/Shared/NavigationActionData.h
branches/safari-604-branch/Source/WebKit/UIProcess/API/APINavigationAction.h
branches/safari-604-branch/Source/WebKit/UIProcess/API/Cocoa/WKNavigationAction.mm
branches/safari-604-branch/Source/WebKit/UIProcess/API/Cocoa/WKNavigationActionPrivate.h
branches/safari-604-branch/Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp
branches/safari-604-branch/Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.h
branches/safari-604-branch/Source/WebKitLegacy/mac/ChangeLog
branches/safari-604-branch/Source/WebKitLegacy/mac/WebCoreSupport/WebFrameLoaderClient.h
branches/safari-604-branch/Source/WebKitLegacy/mac/WebCoreSupport/WebFrameLoaderClient.mm
branches/safari-604-branch/Source/WebKitLegacy/win/ChangeLog
branches/safari-604-branch/Source/WebKitLegacy/win/WebCoreSupport/WebFrameLoaderClient.cpp
branches/safari-604-branch/Source/WebKitLegacy/win/WebCoreSupport/WebFrameLoaderClient.h
branches/safari-604-branch/Tools/ChangeLog
branches/safari-604-branch/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/DecidePolicyForNavigationAction.mm
branches/safari-604-branch/Tools/TestWebKitAPI/cocoa/TestProtocol.mm




Diff

Modified: branches/safari-604-branch/Source/WebCore/ChangeLog (220519 => 220520)

--- branches/safari-604-branch/Source/WebCore/ChangeLog	2017-08-10 07:20:16 UTC (rev 220519)
+++ branches/safari-604-branch/Source/WebCore/ChangeLog	2017-08-10 07:30:04 UTC (rev 220520)
@@ -1,5 +1,41 @@
 2017-08-09  Jason Marcell  
 
+Cherry-pick r220459. rdar://problem/33820790
+
+2017-08-09  Daniel Bates  
+
+REGRESSION (r219013): OAuth flows are broken when redirecting back to application after authentication
+https://bugs.webkit.org/show_bug.cgi?id=175247
+
+
+Reviewed by Brady Eidson.
+
+Add SPI so that Safari can differentiate between a form submission and a redirected form submission
+and have PolicyCheck notify the frame loader client if the navigation was in response to receiving a
+redirect response. This is the WebKit portion to fix an issue when a native app makes use of an OAuth
+OAuth flow that bounces to Safari for user login and then bounce back to the app. Microsoft Graph's
+OAuth flow is one example.
+
+Safari was differentiating between a form submission and a redirected form submission based on the
+nullity of WKNavigationAction.sourceFrame because in both cases the navigation type was WKNavigationTypeFormSubmitted.
+The navigation type is the same for both navigations because WebKit always used the navigation
+action from the original request for the redirect request when the original request redirected.
+Prior to r219013, WKNavigationAction.sourceFrame would be nil for a form submission that redirects.
+Following r219013, WKNavigationAction.sourceFrame is non-nil unless the navigation was initiated by
+API. In particular, WKNavigationAction.sourceFrame is non-nil for the redirect navigation corresponding
+to a form submission that redirects.
+
+* loader/EmptyClients.cpp:
+(WebCore::EmptyFrameLoaderClient::dispatchDecidePolicyForNavigationAction):
+* loader/FrameLoaderClient.h:
+Have dispatchDecidePolicyForNavigationAction() take a boolean as to whether the navigation was in
+response to receiving a redirect response.
+* loader/PolicyChecker.cpp:
+(WebCore::PolicyChecker::checkNavigationPolicy): Notify the frame loader client whether the navigation
+is in response to receiving a redirect response.
+
+2017-08-09  Jason Marcell  
+
 Cherry-pick r220473. rdar://problem/33810961
 
 2017-08-09  Wenson Hsieh  


Modified: branches/safari-604-branch/Source/WebCore/loader/EmptyClients.cpp (220519 => 220520)

--- branches/safari-604-branch/Source/WebCore/loader/EmptyClients.cpp	2017-08-10 07:20:16 UTC (rev 220519)
+++ branches/safari-604-branch/Source/WebCore/loader/EmptyClients.cpp	2017-08-10 07:30:04 UTC (rev 220520)
@@ -339,7 +339,7 @@
 
 void dispatchDecidePolicyForResponse(const ResourceResponse&, const ResourceRequest&, FramePolicyFunction&&) final { }
 void dispatchDecidePolicyForNewWindowAction(const NavigationAc

[webkit-changes] [220545] tags/Safari-604.2.1.1/

2017-08-10 Thread jmarcell

Title: [220545] tags/Safari-604.2.1.1/








Revision 220545
Author jmarc...@apple.com
Date 2017-08-10 13:50:04 -0700 (Thu, 10 Aug 2017)


Log Message
Tag Safari-604.2.1.1.

Added Paths

tags/Safari-604.2.1.1/




Diff




___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [220546] tags/Safari-604.2.1.1/Source

2017-08-10 Thread jmarcell

Title: [220546] tags/Safari-604.2.1.1/Source








Revision 220546
Author jmarc...@apple.com
Date 2017-08-10 14:05:12 -0700 (Thu, 10 Aug 2017)


Log Message
Versioning.

Modified Paths

tags/Safari-604.2.1.1/Source/_javascript_Core/Configurations/Version.xcconfig
tags/Safari-604.2.1.1/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig
tags/Safari-604.2.1.1/Source/WebCore/Configurations/Version.xcconfig
tags/Safari-604.2.1.1/Source/WebCore/PAL/Configurations/Version.xcconfig
tags/Safari-604.2.1.1/Source/WebInspectorUI/Configurations/Version.xcconfig
tags/Safari-604.2.1.1/Source/WebKit/Configurations/Version.xcconfig
tags/Safari-604.2.1.1/Source/WebKitLegacy/mac/Configurations/Version.xcconfig




Diff

Modified: tags/Safari-604.2.1.1/Source/_javascript_Core/Configurations/Version.xcconfig (220545 => 220546)

--- tags/Safari-604.2.1.1/Source/_javascript_Core/Configurations/Version.xcconfig	2017-08-10 20:50:04 UTC (rev 220545)
+++ tags/Safari-604.2.1.1/Source/_javascript_Core/Configurations/Version.xcconfig	2017-08-10 21:05:12 UTC (rev 220546)
@@ -24,9 +24,9 @@
 MAJOR_VERSION = 604;
 MINOR_VERSION = 2;
 TINY_VERSION = 1;
-MICRO_VERSION = 0;
+MICRO_VERSION = 1;
 NANO_VERSION = 0;
-FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION);
+FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION);
 
 // The bundle version and short version string are set based on the current build configuration, see below.
 BUNDLE_VERSION = $(BUNDLE_VERSION_$(CONFIGURATION));


Modified: tags/Safari-604.2.1.1/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig (220545 => 220546)

--- tags/Safari-604.2.1.1/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig	2017-08-10 20:50:04 UTC (rev 220545)
+++ tags/Safari-604.2.1.1/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig	2017-08-10 21:05:12 UTC (rev 220546)
@@ -24,9 +24,9 @@
 MAJOR_VERSION = 604;
 MINOR_VERSION = 2;
 TINY_VERSION = 1;
-MICRO_VERSION = 0;
+MICRO_VERSION = 1;
 NANO_VERSION = 0;
-FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION);
+FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION);
 
 // The bundle version and short version string are set based on the current build configuration, see below.
 BUNDLE_VERSION = $(BUNDLE_VERSION_$(CONFIGURATION));


Modified: tags/Safari-604.2.1.1/Source/WebCore/Configurations/Version.xcconfig (220545 => 220546)

--- tags/Safari-604.2.1.1/Source/WebCore/Configurations/Version.xcconfig	2017-08-10 20:50:04 UTC (rev 220545)
+++ tags/Safari-604.2.1.1/Source/WebCore/Configurations/Version.xcconfig	2017-08-10 21:05:12 UTC (rev 220546)
@@ -24,9 +24,9 @@
 MAJOR_VERSION = 604;
 MINOR_VERSION = 2;
 TINY_VERSION = 1;
-MICRO_VERSION = 0;
+MICRO_VERSION = 1;
 NANO_VERSION = 0;
-FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION);
+FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION);
 
 // The bundle version and short version string are set based on the current build configuration, see below.
 BUNDLE_VERSION = $(BUNDLE_VERSION_$(CONFIGURATION));


Modified: tags/Safari-604.2.1.1/Source/WebCore/PAL/Configurations/Version.xcconfig (220545 => 220546)

--- tags/Safari-604.2.1.1/Source/WebCore/PAL/Configurations/Version.xcconfig	2017-08-10 20:50:04 UTC (rev 220545)
+++ tags/Safari-604.2.1.1/Source/WebCore/PAL/Configurations/Version.xcconfig	2017-08-10 21:05:12 UTC (rev 220546)
@@ -24,9 +24,9 @@
 MAJOR_VERSION = 604;
 MINOR_VERSION = 2;
 TINY_VERSION = 1;
-MICRO_VERSION = 0;
+MICRO_VERSION = 1;
 NANO_VERSION = 0;
-FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION);
+FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION);
 
 // The bundle version and short version string are set based on the current build configuration, see below.
 BUNDLE_VERSION = $(BUNDLE_VERSION_$(CONFIGURATION));


Modified: tags/Safari-604.2.1.1/Source/WebInspectorUI/Configurations/Version.xcconfig (220545 => 220546)

--- tags/Safari-604.2.1.1/Source/WebInspectorUI/Configurations/Version.xcconfig	2017-08-10 20:50:04 UTC (rev 220545)
+++ tags/Safari-604.2.1.1/Source/WebInspectorUI/Configurations/Version.xcconfig	2017-08-10 21:05:12 UTC (rev 220546)
@@ -1,9 +1,9 @@
 MAJOR_VERSION = 604;
 MINOR_VERSION = 2;
 TINY_VERSION = 1;
-MICRO_VERSION = 0;
+MICRO_VERSION = 1;
 NANO_VERSION = 0;
-FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION);
+FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION);
 
 // The system version prefix is based on the current system version.
 SYSTEM_VERSION_PREFIX[sdk=iphone*] = 8;


Modified: tags/Safari-604.2.1.1/Source/WebKit/Configurations/Version.xcconfig (220545 => 220546)

--- tags/Safari-604.2.1.1/Source/WebKit/Configurations/Version.xcconfig	2017-08-10 20:50:04 UTC (rev 220545)
+++ tags/Safari-604.2.1.1/Source/WebKit/Configurations/Version.xcconfig	2017-08-10 21:05:12 UTC (rev 220546)
@@ -24,9 +24,9 @@
 MAJOR_VERSION = 604;

[webkit-changes] [220547] tags/Safari-604.2.1.1

2017-08-10 Thread jmarcell

Title: [220547] tags/Safari-604.2.1.1








Revision 220547
Author jmarc...@apple.com
Date 2017-08-10 14:06:04 -0700 (Thu, 10 Aug 2017)


Log Message
Cherry-pick r220473. rdar://problem/33834103

Modified Paths

tags/Safari-604.2.1.1/Source/_javascript_Core/ChangeLog
tags/Safari-604.2.1.1/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig
tags/Safari-604.2.1.1/Source/WebCore/ChangeLog
tags/Safari-604.2.1.1/Source/WebCore/Configurations/FeatureDefines.xcconfig
tags/Safari-604.2.1.1/Source/WebCore/PAL/ChangeLog
tags/Safari-604.2.1.1/Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig
tags/Safari-604.2.1.1/Source/WebKit/ChangeLog
tags/Safari-604.2.1.1/Source/WebKit/Configurations/FeatureDefines.xcconfig
tags/Safari-604.2.1.1/Source/WebKitLegacy/mac/ChangeLog
tags/Safari-604.2.1.1/Source/WebKitLegacy/mac/Configurations/FeatureDefines.xcconfig
tags/Safari-604.2.1.1/Tools/ChangeLog
tags/Safari-604.2.1.1/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig




Diff

Modified: tags/Safari-604.2.1.1/Source/_javascript_Core/ChangeLog (220546 => 220547)

--- tags/Safari-604.2.1.1/Source/_javascript_Core/ChangeLog	2017-08-10 21:05:12 UTC (rev 220546)
+++ tags/Safari-604.2.1.1/Source/_javascript_Core/ChangeLog	2017-08-10 21:06:04 UTC (rev 220547)
@@ -1,3 +1,19 @@
+2017-08-10  Jason Marcell  
+
+Cherry-pick r220473. rdar://problem/33834103
+
+2017-08-09  Wenson Hsieh  
+
+[iOS DnD] ENABLE_DRAG_SUPPORT should be turned off for iOS 10 and enabled by default
+https://bugs.webkit.org/show_bug.cgi?id=175392
+
+
+Reviewed by Tim Horton and Megan Gardner.
+
+Tweak FeatureDefines to enable drag and drop by default, and disable only on unsupported platforms (i.e. iOS 10).
+
+* Configurations/FeatureDefines.xcconfig:
+
 2017-08-02  Jason Marcell  
 
 Cherry-pick r220144. rdar://problem/33692161


Modified: tags/Safari-604.2.1.1/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig (220546 => 220547)

--- tags/Safari-604.2.1.1/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig	2017-08-10 21:05:12 UTC (rev 220546)
+++ tags/Safari-604.2.1.1/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig	2017-08-10 21:06:04 UTC (rev 220547)
@@ -240,9 +240,16 @@
 ENABLE_VARIATION_FONTS_IF_NOT_NO = ENABLE_VARIATION_FONTS;
 ENABLE_VARIATION_FONTS_IF_NOT_YES = ;
 
-ENABLE_DRAG_SUPPORT[sdk=iphoneos11*] = ENABLE_DRAG_SUPPORT;
-ENABLE_DRAG_SUPPORT[sdk=iphonesimulator11*] = ENABLE_DRAG_SUPPORT;
-ENABLE_DATA_INTERACTION[sdk=iphoneos11*] = ENABLE_DATA_INTERACTION;
-ENABLE_DATA_INTERACTION[sdk=iphonesimulator11*] = ENABLE_DATA_INTERACTION;
+ENABLE_DRAG_SUPPORT[sdk=iphone*] = $(ENABLE_DRAG_SUPPORT_$(PLATFORM_NAME));
+ENABLE_DRAG_SUPPORT_iphoneos = ENABLE_DRAG_SUPPORT;
+ENABLE_DRAG_SUPPORT_iphonesimulator = ENABLE_DRAG_SUPPORT;
+ENABLE_DRAG_SUPPORT[sdk=iphoneos10*] = ;
+ENABLE_DRAG_SUPPORT[sdk=iphonesimulator10*] = ;
 
+ENABLE_DATA_INTERACTION[sdk=iphone*] = $(ENABLE_DATA_INTERACTION_$(PLATFORM_NAME));
+ENABLE_DATA_INTERACTION_iphoneos = ENABLE_DATA_INTERACTION;
+ENABLE_DATA_INTERACTION_iphonesimulator = ENABLE_DATA_INTERACTION;
+ENABLE_DATA_INTERACTION[sdk=iphoneos10*] = ;
+ENABLE_DATA_INTERACTION[sdk=iphonesimulator10*] = ;
+
 FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_APPLE_PAY) $(ENABLE_APPLE_PAY_SESSION_V3) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSS_ANIMATIONS_LEVEL_2) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_CSS3_TEXT) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATA_INTERACTION) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DATACUE_VALUE) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DRAG_SUPPORT) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_FAST_JIT_PERMISSIONS) $(ENA
 BLE_FETCH_API) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FTL_JIT) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD_DEPRECATED) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INTERSECTION_OBSERVER) $(ENABLE_INTL) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_JIT) $(ENABLE_KEYBOARD_KEY_ATTRIBUTE) $(ENABLE_KEYBOARD_CODE_ATTRIBUTE) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_ENCRYPTED_MEDIA) $

[webkit-changes] [220552] tags/Safari-604.1.38.0.4/

2017-08-10 Thread jmarcell

Title: [220552] tags/Safari-604.1.38.0.4/








Revision 220552
Author jmarc...@apple.com
Date 2017-08-10 15:39:48 -0700 (Thu, 10 Aug 2017)


Log Message
Tag Safari-604.1.38.0.4.

Added Paths

tags/Safari-604.1.38.0.4/




Diff




___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [220554] tags/Safari-604.1.38.1.4/

2017-08-10 Thread jmarcell

Title: [220554] tags/Safari-604.1.38.1.4/








Revision 220554
Author jmarc...@apple.com
Date 2017-08-10 15:44:14 -0700 (Thu, 10 Aug 2017)


Log Message
Tag Safari-604.1.38.1.4.

Added Paths

tags/Safari-604.1.38.1.4/




Diff




___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [220557] tags/Safari-604.2.2/

2017-08-10 Thread jmarcell

Title: [220557] tags/Safari-604.2.2/








Revision 220557
Author jmarc...@apple.com
Date 2017-08-10 16:14:19 -0700 (Thu, 10 Aug 2017)


Log Message
Tag Safari-604.2.2.

Added Paths

tags/Safari-604.2.2/




Diff




___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [220558] branches/safari-604-branch/Source

2017-08-10 Thread jmarcell

Title: [220558] branches/safari-604-branch/Source








Revision 220558
Author jmarc...@apple.com
Date 2017-08-10 16:16:42 -0700 (Thu, 10 Aug 2017)


Log Message
Versioning.

Modified Paths

branches/safari-604-branch/Source/_javascript_Core/Configurations/Version.xcconfig
branches/safari-604-branch/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig
branches/safari-604-branch/Source/WebCore/Configurations/Version.xcconfig
branches/safari-604-branch/Source/WebCore/PAL/Configurations/Version.xcconfig
branches/safari-604-branch/Source/WebInspectorUI/Configurations/Version.xcconfig
branches/safari-604-branch/Source/WebKit/Configurations/Version.xcconfig
branches/safari-604-branch/Source/WebKitLegacy/mac/Configurations/Version.xcconfig




Diff

Modified: branches/safari-604-branch/Source/_javascript_Core/Configurations/Version.xcconfig (220557 => 220558)

--- branches/safari-604-branch/Source/_javascript_Core/Configurations/Version.xcconfig	2017-08-10 23:14:19 UTC (rev 220557)
+++ branches/safari-604-branch/Source/_javascript_Core/Configurations/Version.xcconfig	2017-08-10 23:16:42 UTC (rev 220558)
@@ -23,7 +23,7 @@
 
 MAJOR_VERSION = 604;
 MINOR_VERSION = 2;
-TINY_VERSION = 2;
+TINY_VERSION = 3;
 MICRO_VERSION = 0;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION);


Modified: branches/safari-604-branch/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig (220557 => 220558)

--- branches/safari-604-branch/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig	2017-08-10 23:14:19 UTC (rev 220557)
+++ branches/safari-604-branch/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig	2017-08-10 23:16:42 UTC (rev 220558)
@@ -23,7 +23,7 @@
 
 MAJOR_VERSION = 604;
 MINOR_VERSION = 2;
-TINY_VERSION = 2;
+TINY_VERSION = 3;
 MICRO_VERSION = 0;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION);


Modified: branches/safari-604-branch/Source/WebCore/Configurations/Version.xcconfig (220557 => 220558)

--- branches/safari-604-branch/Source/WebCore/Configurations/Version.xcconfig	2017-08-10 23:14:19 UTC (rev 220557)
+++ branches/safari-604-branch/Source/WebCore/Configurations/Version.xcconfig	2017-08-10 23:16:42 UTC (rev 220558)
@@ -23,7 +23,7 @@
 
 MAJOR_VERSION = 604;
 MINOR_VERSION = 2;
-TINY_VERSION = 2;
+TINY_VERSION = 3;
 MICRO_VERSION = 0;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION);


Modified: branches/safari-604-branch/Source/WebCore/PAL/Configurations/Version.xcconfig (220557 => 220558)

--- branches/safari-604-branch/Source/WebCore/PAL/Configurations/Version.xcconfig	2017-08-10 23:14:19 UTC (rev 220557)
+++ branches/safari-604-branch/Source/WebCore/PAL/Configurations/Version.xcconfig	2017-08-10 23:16:42 UTC (rev 220558)
@@ -23,7 +23,7 @@
 
 MAJOR_VERSION = 604;
 MINOR_VERSION = 2;
-TINY_VERSION = 2;
+TINY_VERSION = 3;
 MICRO_VERSION = 0;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION);


Modified: branches/safari-604-branch/Source/WebInspectorUI/Configurations/Version.xcconfig (220557 => 220558)

--- branches/safari-604-branch/Source/WebInspectorUI/Configurations/Version.xcconfig	2017-08-10 23:14:19 UTC (rev 220557)
+++ branches/safari-604-branch/Source/WebInspectorUI/Configurations/Version.xcconfig	2017-08-10 23:16:42 UTC (rev 220558)
@@ -1,6 +1,6 @@
 MAJOR_VERSION = 604;
 MINOR_VERSION = 2;
-TINY_VERSION = 2;
+TINY_VERSION = 3;
 MICRO_VERSION = 0;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION);


Modified: branches/safari-604-branch/Source/WebKit/Configurations/Version.xcconfig (220557 => 220558)

--- branches/safari-604-branch/Source/WebKit/Configurations/Version.xcconfig	2017-08-10 23:14:19 UTC (rev 220557)
+++ branches/safari-604-branch/Source/WebKit/Configurations/Version.xcconfig	2017-08-10 23:16:42 UTC (rev 220558)
@@ -23,7 +23,7 @@
 
 MAJOR_VERSION = 604;
 MINOR_VERSION = 2;
-TINY_VERSION = 2;
+TINY_VERSION = 3;
 MICRO_VERSION = 0;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION);


Modified: branches/safari-604-branch/Source/WebKitLegacy/mac/Configurations/Version.xcconfig (220557 => 220558)

--- branches/safari-604-branch/Source/WebKitLegacy/mac/Configurations/Version.xcconfig	2017-08-10 23:14:19 UTC (rev 220557)
+++ branches/safari-604-branch/Source/WebKitLegacy/mac/Configurations/Version.xcconfig	2017-08-10 23:16:42 UTC (rev 220558)
@@ -23,7 +23,7 @@
 
 MAJOR_VERSION = 604;
 MINOR_VERSION = 2;
-TINY_VERSION = 2;
+TINY_VERSION = 3;
 MICRO_VERSION = 0;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION);






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [220559] branches/safari-604.1.38.0-branch/Source

2017-08-10 Thread jmarcell

Title: [220559] branches/safari-604.1.38.0-branch/Source








Revision 220559
Author jmarc...@apple.com
Date 2017-08-10 16:18:13 -0700 (Thu, 10 Aug 2017)


Log Message
Versioning.

Modified Paths

branches/safari-604.1.38.0-branch/Source/_javascript_Core/Configurations/Version.xcconfig
branches/safari-604.1.38.0-branch/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig
branches/safari-604.1.38.0-branch/Source/WebCore/Configurations/Version.xcconfig
branches/safari-604.1.38.0-branch/Source/WebCore/PAL/Configurations/Version.xcconfig
branches/safari-604.1.38.0-branch/Source/WebInspectorUI/Configurations/Version.xcconfig
branches/safari-604.1.38.0-branch/Source/WebKit/Configurations/Version.xcconfig
branches/safari-604.1.38.0-branch/Source/WebKitLegacy/mac/Configurations/Version.xcconfig




Diff

Modified: branches/safari-604.1.38.0-branch/Source/_javascript_Core/Configurations/Version.xcconfig (220558 => 220559)

--- branches/safari-604.1.38.0-branch/Source/_javascript_Core/Configurations/Version.xcconfig	2017-08-10 23:16:42 UTC (rev 220558)
+++ branches/safari-604.1.38.0-branch/Source/_javascript_Core/Configurations/Version.xcconfig	2017-08-10 23:18:13 UTC (rev 220559)
@@ -25,7 +25,7 @@
 MINOR_VERSION = 1;
 TINY_VERSION = 38;
 MICRO_VERSION = 0;
-NANO_VERSION = 4;
+NANO_VERSION = 5;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION).$(NANO_VERSION);
 
 // The bundle version and short version string are set based on the current build configuration, see below.


Modified: branches/safari-604.1.38.0-branch/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig (220558 => 220559)

--- branches/safari-604.1.38.0-branch/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig	2017-08-10 23:16:42 UTC (rev 220558)
+++ branches/safari-604.1.38.0-branch/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig	2017-08-10 23:18:13 UTC (rev 220559)
@@ -25,7 +25,7 @@
 MINOR_VERSION = 1;
 TINY_VERSION = 38;
 MICRO_VERSION = 0;
-NANO_VERSION = 4;
+NANO_VERSION = 5;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION).$(NANO_VERSION);
 
 // The bundle version and short version string are set based on the current build configuration, see below.


Modified: branches/safari-604.1.38.0-branch/Source/WebCore/Configurations/Version.xcconfig (220558 => 220559)

--- branches/safari-604.1.38.0-branch/Source/WebCore/Configurations/Version.xcconfig	2017-08-10 23:16:42 UTC (rev 220558)
+++ branches/safari-604.1.38.0-branch/Source/WebCore/Configurations/Version.xcconfig	2017-08-10 23:18:13 UTC (rev 220559)
@@ -25,7 +25,7 @@
 MINOR_VERSION = 1;
 TINY_VERSION = 38;
 MICRO_VERSION = 0;
-NANO_VERSION = 4;
+NANO_VERSION = 5;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION).$(NANO_VERSION);
 
 // The bundle version and short version string are set based on the current build configuration, see below.


Modified: branches/safari-604.1.38.0-branch/Source/WebCore/PAL/Configurations/Version.xcconfig (220558 => 220559)

--- branches/safari-604.1.38.0-branch/Source/WebCore/PAL/Configurations/Version.xcconfig	2017-08-10 23:16:42 UTC (rev 220558)
+++ branches/safari-604.1.38.0-branch/Source/WebCore/PAL/Configurations/Version.xcconfig	2017-08-10 23:18:13 UTC (rev 220559)
@@ -25,7 +25,7 @@
 MINOR_VERSION = 1;
 TINY_VERSION = 38;
 MICRO_VERSION = 0;
-NANO_VERSION = 4;
+NANO_VERSION = 5;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION).$(NANO_VERSION);
 
 // The bundle version and short version string are set based on the current build configuration, see below.


Modified: branches/safari-604.1.38.0-branch/Source/WebInspectorUI/Configurations/Version.xcconfig (220558 => 220559)

--- branches/safari-604.1.38.0-branch/Source/WebInspectorUI/Configurations/Version.xcconfig	2017-08-10 23:16:42 UTC (rev 220558)
+++ branches/safari-604.1.38.0-branch/Source/WebInspectorUI/Configurations/Version.xcconfig	2017-08-10 23:18:13 UTC (rev 220559)
@@ -2,7 +2,7 @@
 MINOR_VERSION = 1;
 TINY_VERSION = 38;
 MICRO_VERSION = 0;
-NANO_VERSION = 4;
+NANO_VERSION = 5;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION).$(NANO_VERSION);
 
 // The system version prefix is based on the current system version.


Modified: branches/safari-604.1.38.0-branch/Source/WebKit/Configurations/Version.xcconfig (220558 => 220559)

--- branches/safari-604.1.38.0-branch/Source/WebKit/Configurations/Version.xcconfig	2017-08-10 23:16:42 UTC (rev 220558)
+++ branches/safari-604.1.38.0-branch/Source/WebKit/Configurations/Version.xcconfig	2017-08-10 23:18:13 UTC (rev 220559)
@@ -25,7 +25,7 @@
 MINOR_VERSION = 1;
 TINY_VERSION = 38;
 MICRO_VERSION = 0;
-NANO_VERSION = 4;
+NANO_VERSION = 5;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION).$(NANO_VERSION);
 
 // The bundle version and short version string are set based on the current build configuration, see below.


Modified: branches/saf

[webkit-changes] [220560] branches/safari-604.1.38.1-branch/Source

2017-08-10 Thread jmarcell

Title: [220560] branches/safari-604.1.38.1-branch/Source








Revision 220560
Author jmarc...@apple.com
Date 2017-08-10 16:20:26 -0700 (Thu, 10 Aug 2017)


Log Message
Versioning.

Modified Paths

branches/safari-604.1.38.1-branch/Source/_javascript_Core/Configurations/Version.xcconfig
branches/safari-604.1.38.1-branch/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig
branches/safari-604.1.38.1-branch/Source/WebCore/Configurations/Version.xcconfig
branches/safari-604.1.38.1-branch/Source/WebCore/PAL/Configurations/Version.xcconfig
branches/safari-604.1.38.1-branch/Source/WebInspectorUI/Configurations/Version.xcconfig
branches/safari-604.1.38.1-branch/Source/WebKit/Configurations/Version.xcconfig
branches/safari-604.1.38.1-branch/Source/WebKitLegacy/mac/Configurations/Version.xcconfig




Diff

Modified: branches/safari-604.1.38.1-branch/Source/_javascript_Core/Configurations/Version.xcconfig (220559 => 220560)

--- branches/safari-604.1.38.1-branch/Source/_javascript_Core/Configurations/Version.xcconfig	2017-08-10 23:18:13 UTC (rev 220559)
+++ branches/safari-604.1.38.1-branch/Source/_javascript_Core/Configurations/Version.xcconfig	2017-08-10 23:20:26 UTC (rev 220560)
@@ -25,7 +25,7 @@
 MINOR_VERSION = 1;
 TINY_VERSION = 38;
 MICRO_VERSION = 1;
-NANO_VERSION = 4;
+NANO_VERSION = 5;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION).$(NANO_VERSION);
 
 // The bundle version and short version string are set based on the current build configuration, see below.


Modified: branches/safari-604.1.38.1-branch/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig (220559 => 220560)

--- branches/safari-604.1.38.1-branch/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig	2017-08-10 23:18:13 UTC (rev 220559)
+++ branches/safari-604.1.38.1-branch/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig	2017-08-10 23:20:26 UTC (rev 220560)
@@ -25,7 +25,7 @@
 MINOR_VERSION = 1;
 TINY_VERSION = 38;
 MICRO_VERSION = 1;
-NANO_VERSION = 4;
+NANO_VERSION = 5;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION).$(NANO_VERSION);
 
 // The bundle version and short version string are set based on the current build configuration, see below.


Modified: branches/safari-604.1.38.1-branch/Source/WebCore/Configurations/Version.xcconfig (220559 => 220560)

--- branches/safari-604.1.38.1-branch/Source/WebCore/Configurations/Version.xcconfig	2017-08-10 23:18:13 UTC (rev 220559)
+++ branches/safari-604.1.38.1-branch/Source/WebCore/Configurations/Version.xcconfig	2017-08-10 23:20:26 UTC (rev 220560)
@@ -25,7 +25,7 @@
 MINOR_VERSION = 1;
 TINY_VERSION = 38;
 MICRO_VERSION = 1;
-NANO_VERSION = 4;
+NANO_VERSION = 5;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION).$(NANO_VERSION);
 
 // The bundle version and short version string are set based on the current build configuration, see below.


Modified: branches/safari-604.1.38.1-branch/Source/WebCore/PAL/Configurations/Version.xcconfig (220559 => 220560)

--- branches/safari-604.1.38.1-branch/Source/WebCore/PAL/Configurations/Version.xcconfig	2017-08-10 23:18:13 UTC (rev 220559)
+++ branches/safari-604.1.38.1-branch/Source/WebCore/PAL/Configurations/Version.xcconfig	2017-08-10 23:20:26 UTC (rev 220560)
@@ -25,7 +25,7 @@
 MINOR_VERSION = 1;
 TINY_VERSION = 38;
 MICRO_VERSION = 1;
-NANO_VERSION = 4;
+NANO_VERSION = 5;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION).$(NANO_VERSION);
 
 // The bundle version and short version string are set based on the current build configuration, see below.


Modified: branches/safari-604.1.38.1-branch/Source/WebInspectorUI/Configurations/Version.xcconfig (220559 => 220560)

--- branches/safari-604.1.38.1-branch/Source/WebInspectorUI/Configurations/Version.xcconfig	2017-08-10 23:18:13 UTC (rev 220559)
+++ branches/safari-604.1.38.1-branch/Source/WebInspectorUI/Configurations/Version.xcconfig	2017-08-10 23:20:26 UTC (rev 220560)
@@ -2,7 +2,7 @@
 MINOR_VERSION = 1;
 TINY_VERSION = 38;
 MICRO_VERSION = 1;
-NANO_VERSION = 4;
+NANO_VERSION = 5;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION).$(NANO_VERSION);
 
 // The system version prefix is based on the current system version.


Modified: branches/safari-604.1.38.1-branch/Source/WebKit/Configurations/Version.xcconfig (220559 => 220560)

--- branches/safari-604.1.38.1-branch/Source/WebKit/Configurations/Version.xcconfig	2017-08-10 23:18:13 UTC (rev 220559)
+++ branches/safari-604.1.38.1-branch/Source/WebKit/Configurations/Version.xcconfig	2017-08-10 23:20:26 UTC (rev 220560)
@@ -25,7 +25,7 @@
 MINOR_VERSION = 1;
 TINY_VERSION = 38;
 MICRO_VERSION = 1;
-NANO_VERSION = 4;
+NANO_VERSION = 5;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION).$(NANO_VERSION);
 
 // The bundle version and short version string are set based on the current build configuration, see below.


Modified: branches/saf

[webkit-changes] [220573] branches/safari-604.1.38.0-branch/Source/WebKit

2017-08-10 Thread jmarcell

Title: [220573] branches/safari-604.1.38.0-branch/Source/WebKit








Revision 220573
Author jmarc...@apple.com
Date 2017-08-10 19:58:04 -0700 (Thu, 10 Aug 2017)


Log Message
Cherry-pick r220505. rdar://problem/33829964

Modified Paths

branches/safari-604.1.38.0-branch/Source/WebKit/ChangeLog
branches/safari-604.1.38.0-branch/Source/WebKit/UIProcess/WebResourceLoadStatisticsStore.h




Diff

Modified: branches/safari-604.1.38.0-branch/Source/WebKit/ChangeLog (220572 => 220573)

--- branches/safari-604.1.38.0-branch/Source/WebKit/ChangeLog	2017-08-11 02:17:10 UTC (rev 220572)
+++ branches/safari-604.1.38.0-branch/Source/WebKit/ChangeLog	2017-08-11 02:58:04 UTC (rev 220573)
@@ -1,3 +1,17 @@
+2017-08-10  Jason Marcell  
+
+Cherry-pick r220505. rdar://problem/33829964
+
+2017-08-09  John Wilander  
+
+Resource Load Statistics: Increase grandfathering time to 3 days
+https://bugs.webkit.org/show_bug.cgi?id=175414
+
+
+Reviewed by Brent Fulgham.
+
+* UIProcess/WebResourceLoadStatisticsStore.h:
+
 2017-08-09  Jason Marcell  
 
 Cherry-pick r220459. rdar://problem/33820787


Modified: branches/safari-604.1.38.0-branch/Source/WebKit/UIProcess/WebResourceLoadStatisticsStore.h (220572 => 220573)

--- branches/safari-604.1.38.0-branch/Source/WebKit/UIProcess/WebResourceLoadStatisticsStore.h	2017-08-11 02:17:10 UTC (rev 220572)
+++ branches/safari-604.1.38.0-branch/Source/WebKit/UIProcess/WebResourceLoadStatisticsStore.h	2017-08-11 02:58:04 UTC (rev 220573)
@@ -163,7 +163,7 @@
 std::optional timeToLiveUserInteraction;
 Seconds timeToLiveCookiePartitionFree { 24_h };
 Seconds minimumTimeBetweenDataRecordsRemoval { 1_h };
-Seconds grandfatheringTime { 1_h };
+Seconds grandfatheringTime { 72_h };
 bool shouldNotifyPagesWhenDataRecordsWereScanned { false };
 bool shouldClassifyResourcesBeforeDataRecordsRemoval { true };
 bool shouldSubmitTelemetry { true };






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [220576] branches/safari-604.1.38.1-branch/Source/WebKit

2017-08-10 Thread jmarcell

Title: [220576] branches/safari-604.1.38.1-branch/Source/WebKit








Revision 220576
Author jmarc...@apple.com
Date 2017-08-10 20:37:00 -0700 (Thu, 10 Aug 2017)


Log Message
Cherry-pick r220505. rdar://problem/33829962

Modified Paths

branches/safari-604.1.38.1-branch/Source/WebKit/ChangeLog
branches/safari-604.1.38.1-branch/Source/WebKit/UIProcess/WebResourceLoadStatisticsStore.h




Diff

Modified: branches/safari-604.1.38.1-branch/Source/WebKit/ChangeLog (220575 => 220576)

--- branches/safari-604.1.38.1-branch/Source/WebKit/ChangeLog	2017-08-11 03:06:56 UTC (rev 220575)
+++ branches/safari-604.1.38.1-branch/Source/WebKit/ChangeLog	2017-08-11 03:37:00 UTC (rev 220576)
@@ -1,3 +1,17 @@
+2017-08-10  Jason Marcell  
+
+Cherry-pick r220505. rdar://problem/33829962
+
+2017-08-09  John Wilander  
+
+Resource Load Statistics: Increase grandfathering time to 3 days
+https://bugs.webkit.org/show_bug.cgi?id=175414
+
+
+Reviewed by Brent Fulgham.
+
+* UIProcess/WebResourceLoadStatisticsStore.h:
+
 2017-08-09  Jason Marcell  
 
 Cherry-pick r220459. rdar://problem/33820786


Modified: branches/safari-604.1.38.1-branch/Source/WebKit/UIProcess/WebResourceLoadStatisticsStore.h (220575 => 220576)

--- branches/safari-604.1.38.1-branch/Source/WebKit/UIProcess/WebResourceLoadStatisticsStore.h	2017-08-11 03:06:56 UTC (rev 220575)
+++ branches/safari-604.1.38.1-branch/Source/WebKit/UIProcess/WebResourceLoadStatisticsStore.h	2017-08-11 03:37:00 UTC (rev 220576)
@@ -163,7 +163,7 @@
 std::optional timeToLiveUserInteraction;
 Seconds timeToLiveCookiePartitionFree { 24_h };
 Seconds minimumTimeBetweenDataRecordsRemoval { 1_h };
-Seconds grandfatheringTime { 1_h };
+Seconds grandfatheringTime { 72_h };
 bool shouldNotifyPagesWhenDataRecordsWereScanned { false };
 bool shouldClassifyResourcesBeforeDataRecordsRemoval { true };
 bool shouldSubmitTelemetry { true };






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [220587] branches/safari-604.1.38.1-branch

2017-08-11 Thread jmarcell

Title: [220587] branches/safari-604.1.38.1-branch








Revision 220587
Author jmarc...@apple.com
Date 2017-08-11 08:16:56 -0700 (Fri, 11 Aug 2017)


Log Message
Cherry-pick r220463. rdar://problem/33594320

Modified Paths

branches/safari-604.1.38.1-branch/LayoutTests/ChangeLog
branches/safari-604.1.38.1-branch/Source/WebCore/ChangeLog
branches/safari-604.1.38.1-branch/Source/WebCore/rendering/RenderBlockFlow.cpp


Added Paths

branches/safari-604.1.38.1-branch/LayoutTests/accessibility/add-children-pseudo-element-expected.txt
branches/safari-604.1.38.1-branch/LayoutTests/accessibility/add-children-pseudo-element.html
branches/safari-604.1.38.1-branch/LayoutTests/accessibility/resources/svg-circle.svg




Diff

Modified: branches/safari-604.1.38.1-branch/LayoutTests/ChangeLog (220586 => 220587)

--- branches/safari-604.1.38.1-branch/LayoutTests/ChangeLog	2017-08-11 13:46:59 UTC (rev 220586)
+++ branches/safari-604.1.38.1-branch/LayoutTests/ChangeLog	2017-08-11 15:16:56 UTC (rev 220587)
@@ -1,3 +1,19 @@
+2017-08-11  Jason Marcell  
+
+Cherry-pick r220463. rdar://problem/33594320
+
+2017-08-09  Nan Wang  
+
+AX: crash at WebCore::AccessibilityObject::supportsARIALiveRegion() const + 24
+https://bugs.webkit.org/show_bug.cgi?id=175340
+
+
+Reviewed by Chris Fleizach.
+
+* accessibility/add-children-pseudo-element-expected.txt: Added.
+* accessibility/add-children-pseudo-element.html: Added.
+* accessibility/resources/svg-circle.svg: Added.
+
 2017-08-10  Ryan Haddad  
 
 Unreviwed test gardening. rdar://problem/33789505


Added: branches/safari-604.1.38.1-branch/LayoutTests/accessibility/add-children-pseudo-element-expected.txt (0 => 220587)

--- branches/safari-604.1.38.1-branch/LayoutTests/accessibility/add-children-pseudo-element-expected.txt	(rev 0)
+++ branches/safari-604.1.38.1-branch/LayoutTests/accessibility/add-children-pseudo-element-expected.txt	2017-08-11 15:16:56 UTC (rev 220587)
@@ -0,0 +1,12 @@
+Language Email 
+Make sure that we are updating the render block flow element's children correctly.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS element.childrenCount is 3
+PASS element.childrenCount is 2
+PASS successfullyParsed is true
+
+TEST COMPLETE
+


Added: branches/safari-604.1.38.1-branch/LayoutTests/accessibility/add-children-pseudo-element.html (0 => 220587)

--- branches/safari-604.1.38.1-branch/LayoutTests/accessibility/add-children-pseudo-element.html	(rev 0)
+++ branches/safari-604.1.38.1-branch/LayoutTests/accessibility/add-children-pseudo-element.html	2017-08-11 15:16:56 UTC (rev 220587)
@@ -0,0 +1,70 @@
+
+
+
+
+
+
+
+
+
+
+
+Language
+
+
+
+
+Email
+
+
+
+
+
+
+
+
+