from:"matthew

[webkit-changes] [224881] branches/safari-604.4.7.1-branch/Source

2017-11-15 Thread matthew_hanson

Title: [224881] branches/safari-604.4.7.1-branch/Source








Revision 224881
Author matthew_han...@apple.com
Date 2017-11-15 10:04:16 -0800 (Wed, 15 Nov 2017)


Log Message
Versioning.

Modified Paths

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




Diff

Modified: branches/safari-604.4.7.1-branch/Source/_javascript_Core/Configurations/Version.xcconfig (224880 => 224881)

--- branches/safari-604.4.7.1-branch/Source/_javascript_Core/Configurations/Version.xcconfig	2017-11-15 18:00:24 UTC (rev 224880)
+++ branches/safari-604.4.7.1-branch/Source/_javascript_Core/Configurations/Version.xcconfig	2017-11-15 18:04:16 UTC (rev 224881)
@@ -25,7 +25,7 @@
 MINOR_VERSION = 4;
 TINY_VERSION = 7;
 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.4.7.1-branch/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig (224880 => 224881)

--- branches/safari-604.4.7.1-branch/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig	2017-11-15 18:00:24 UTC (rev 224880)
+++ branches/safari-604.4.7.1-branch/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig	2017-11-15 18:04:16 UTC (rev 224881)
@@ -25,7 +25,7 @@
 MINOR_VERSION = 4;
 TINY_VERSION = 7;
 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.4.7.1-branch/Source/WebCore/Configurations/Version.xcconfig (224880 => 224881)

--- branches/safari-604.4.7.1-branch/Source/WebCore/Configurations/Version.xcconfig	2017-11-15 18:00:24 UTC (rev 224880)
+++ branches/safari-604.4.7.1-branch/Source/WebCore/Configurations/Version.xcconfig	2017-11-15 18:04:16 UTC (rev 224881)
@@ -25,7 +25,7 @@
 MINOR_VERSION = 4;
 TINY_VERSION = 7;
 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.4.7.1-branch/Source/WebCore/PAL/Configurations/Version.xcconfig (224880 => 224881)

--- branches/safari-604.4.7.1-branch/Source/WebCore/PAL/Configurations/Version.xcconfig	2017-11-15 18:00:24 UTC (rev 224880)
+++ branches/safari-604.4.7.1-branch/Source/WebCore/PAL/Configurations/Version.xcconfig	2017-11-15 18:04:16 UTC (rev 224881)
@@ -25,7 +25,7 @@
 MINOR_VERSION = 4;
 TINY_VERSION = 7;
 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.4.7.1-branch/Source/WebInspectorUI/Configurations/Version.xcconfig (224880 => 224881)

--- branches/safari-604.4.7.1-branch/Source/WebInspectorUI/Configurations/Version.xcconfig	2017-11-15 18:00:24 UTC (rev 224880)
+++ branches/safari-604.4.7.1-branch/Source/WebInspectorUI/Configurations/Version.xcconfig	2017-11-15 18:04:16 UTC (rev 224881)
@@ -2,7 +2,7 @@
 MINOR_VERSION = 4;
 TINY_VERSION = 7;
 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.4.7.1-branch/Source/WebKit/Configurations/Version.xcconfig (224880 => 224881)

--- branches/safari-604.4.7.1-branch/Source/WebKit/Configurations/Version.xcconfig	2017-11-15 18:00:24 UTC (rev 224880)
+++ branches/safari-604.4.7.1-branch/Source/WebKit/Configurations/Version.xcconfig	2017-11-15 18:04:16 UTC (rev 224881)
@@ -25,7 +25,7 @@
 MINOR_VERSION = 4;
 TINY_VERSION = 7;
 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:

[webkit-changes] [224847] tags/Safari-604.4.7.1.4/

2017-11-14 Thread matthew_hanson

Title: [224847] tags/Safari-604.4.7.1.4/








Revision 224847
Author matthew_han...@apple.com
Date 2017-11-14 14:23:29 -0800 (Tue, 14 Nov 2017)


Log Message
Tag Safari-604.4.7.1.4.

Added Paths

tags/Safari-604.4.7.1.4/




Diff




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

[webkit-changes] [224844] tags/Safari-605.1.13.3/Source

2017-11-14 Thread matthew_hanson

Title: [224844] tags/Safari-605.1.13.3/Source








Revision 224844
Author matthew_han...@apple.com
Date 2017-11-14 13:55:57 -0800 (Tue, 14 Nov 2017)


Log Message
Versioning.

Modified Paths

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




Diff

Modified: tags/Safari-605.1.13.3/Source/_javascript_Core/Configurations/Version.xcconfig (224843 => 224844)

--- tags/Safari-605.1.13.3/Source/_javascript_Core/Configurations/Version.xcconfig	2017-11-14 21:53:41 UTC (rev 224843)
+++ tags/Safari-605.1.13.3/Source/_javascript_Core/Configurations/Version.xcconfig	2017-11-14 21:55:57 UTC (rev 224844)
@@ -24,7 +24,7 @@
 MAJOR_VERSION = 605;
 MINOR_VERSION = 1;
 TINY_VERSION = 13;
-MICRO_VERSION = 2;
+MICRO_VERSION = 3;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION);
 


Modified: tags/Safari-605.1.13.3/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig (224843 => 224844)

--- tags/Safari-605.1.13.3/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig	2017-11-14 21:53:41 UTC (rev 224843)
+++ tags/Safari-605.1.13.3/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig	2017-11-14 21:55:57 UTC (rev 224844)
@@ -24,7 +24,7 @@
 MAJOR_VERSION = 605;
 MINOR_VERSION = 1;
 TINY_VERSION = 13;
-MICRO_VERSION = 2;
+MICRO_VERSION = 3;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION);
 


Modified: tags/Safari-605.1.13.3/Source/WebCore/Configurations/Version.xcconfig (224843 => 224844)

--- tags/Safari-605.1.13.3/Source/WebCore/Configurations/Version.xcconfig	2017-11-14 21:53:41 UTC (rev 224843)
+++ tags/Safari-605.1.13.3/Source/WebCore/Configurations/Version.xcconfig	2017-11-14 21:55:57 UTC (rev 224844)
@@ -24,7 +24,7 @@
 MAJOR_VERSION = 605;
 MINOR_VERSION = 1;
 TINY_VERSION = 13;
-MICRO_VERSION = 2;
+MICRO_VERSION = 3;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION);
 


Modified: tags/Safari-605.1.13.3/Source/WebCore/PAL/Configurations/Version.xcconfig (224843 => 224844)

--- tags/Safari-605.1.13.3/Source/WebCore/PAL/Configurations/Version.xcconfig	2017-11-14 21:53:41 UTC (rev 224843)
+++ tags/Safari-605.1.13.3/Source/WebCore/PAL/Configurations/Version.xcconfig	2017-11-14 21:55:57 UTC (rev 224844)
@@ -24,7 +24,7 @@
 MAJOR_VERSION = 605;
 MINOR_VERSION = 1;
 TINY_VERSION = 13;
-MICRO_VERSION = 2;
+MICRO_VERSION = 3;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION);
 


Modified: tags/Safari-605.1.13.3/Source/WebInspectorUI/Configurations/Version.xcconfig (224843 => 224844)

--- tags/Safari-605.1.13.3/Source/WebInspectorUI/Configurations/Version.xcconfig	2017-11-14 21:53:41 UTC (rev 224843)
+++ tags/Safari-605.1.13.3/Source/WebInspectorUI/Configurations/Version.xcconfig	2017-11-14 21:55:57 UTC (rev 224844)
@@ -1,7 +1,7 @@
 MAJOR_VERSION = 605;
 MINOR_VERSION = 1;
 TINY_VERSION = 13;
-MICRO_VERSION = 2;
+MICRO_VERSION = 3;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION);
 


Modified: tags/Safari-605.1.13.3/Source/WebKit/Configurations/Version.xcconfig (224843 => 224844)

--- tags/Safari-605.1.13.3/Source/WebKit/Configurations/Version.xcconfig	2017-11-14 21:53:41 UTC (rev 224843)
+++ tags/Safari-605.1.13.3/Source/WebKit/Configurations/Version.xcconfig	2017-11-14 21:55:57 UTC (rev 224844)
@@ -24,7 +24,7 @@
 MAJOR_VERSION = 605;
 MINOR_VERSION = 1;
 TINY_VERSION = 13;
-MICRO_VERSION = 2;
+MICRO_VERSION = 3;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION);
 


Modified: tags/Safari-605.1.13.3/Source/WebKitLegacy/mac/Configurations/Version.xcconfig (224843 => 224844)

--- tags/Safari-605.1.13.3/Source/WebKitLegacy/mac/Configurations/Version.xcconfig	2017-11-14 21:53:41 UTC (rev 224843)
+++ tags/Safari-605.1.13.3/Source/WebKitLegacy/mac/Configurations/Version.xcconfig	2017-11-14 21:55:57 UTC (rev 224844)
@@ -24,7 +24,7 @@
 MAJOR_VERSION = 605;
 MINOR_VERSION = 1;
 TINY_VERSION = 13;
-MICRO_VERSION = 2;
+MICRO_VERSION = 3;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION);
 






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

[webkit-changes] [224842] tags/Safari-605.1.13.3/

2017-11-14 Thread matthew_hanson

Title: [224842] tags/Safari-605.1.13.3/








Revision 224842
Author matthew_han...@apple.com
Date 2017-11-14 13:49:55 -0800 (Tue, 14 Nov 2017)


Log Message
Tag Safari-605.1.13.3.

Added Paths

tags/Safari-605.1.13.3/




Diff




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

[webkit-changes] [224839] branches/safari-604.3.5.1-branch/Source

2017-11-14 Thread matthew_hanson

Title: [224839] branches/safari-604.3.5.1-branch/Source








Revision 224839
Author matthew_han...@apple.com
Date 2017-11-14 13:22:51 -0800 (Tue, 14 Nov 2017)


Log Message
Versioning.

Modified Paths

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




Diff

Modified: branches/safari-604.3.5.1-branch/Source/_javascript_Core/Configurations/Version.xcconfig (224838 => 224839)

--- branches/safari-604.3.5.1-branch/Source/_javascript_Core/Configurations/Version.xcconfig	2017-11-14 21:16:24 UTC (rev 224838)
+++ branches/safari-604.3.5.1-branch/Source/_javascript_Core/Configurations/Version.xcconfig	2017-11-14 21:22:51 UTC (rev 224839)
@@ -25,7 +25,7 @@
 MINOR_VERSION = 3;
 TINY_VERSION = 5;
 MICRO_VERSION = 1;
-NANO_VERSION = 2;
+NANO_VERSION = 3;
 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.3.5.1-branch/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig (224838 => 224839)

--- branches/safari-604.3.5.1-branch/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig	2017-11-14 21:16:24 UTC (rev 224838)
+++ branches/safari-604.3.5.1-branch/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig	2017-11-14 21:22:51 UTC (rev 224839)
@@ -25,7 +25,7 @@
 MINOR_VERSION = 3;
 TINY_VERSION = 5;
 MICRO_VERSION = 1;
-NANO_VERSION = 2;
+NANO_VERSION = 3;
 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.3.5.1-branch/Source/WebCore/Configurations/Version.xcconfig (224838 => 224839)

--- branches/safari-604.3.5.1-branch/Source/WebCore/Configurations/Version.xcconfig	2017-11-14 21:16:24 UTC (rev 224838)
+++ branches/safari-604.3.5.1-branch/Source/WebCore/Configurations/Version.xcconfig	2017-11-14 21:22:51 UTC (rev 224839)
@@ -25,7 +25,7 @@
 MINOR_VERSION = 3;
 TINY_VERSION = 5;
 MICRO_VERSION = 1;
-NANO_VERSION = 2;
+NANO_VERSION = 3;
 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.3.5.1-branch/Source/WebCore/PAL/Configurations/Version.xcconfig (224838 => 224839)

--- branches/safari-604.3.5.1-branch/Source/WebCore/PAL/Configurations/Version.xcconfig	2017-11-14 21:16:24 UTC (rev 224838)
+++ branches/safari-604.3.5.1-branch/Source/WebCore/PAL/Configurations/Version.xcconfig	2017-11-14 21:22:51 UTC (rev 224839)
@@ -25,7 +25,7 @@
 MINOR_VERSION = 3;
 TINY_VERSION = 5;
 MICRO_VERSION = 1;
-NANO_VERSION = 2;
+NANO_VERSION = 3;
 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.3.5.1-branch/Source/WebInspectorUI/Configurations/Version.xcconfig (224838 => 224839)

--- branches/safari-604.3.5.1-branch/Source/WebInspectorUI/Configurations/Version.xcconfig	2017-11-14 21:16:24 UTC (rev 224838)
+++ branches/safari-604.3.5.1-branch/Source/WebInspectorUI/Configurations/Version.xcconfig	2017-11-14 21:22:51 UTC (rev 224839)
@@ -2,7 +2,7 @@
 MINOR_VERSION = 3;
 TINY_VERSION = 5;
 MICRO_VERSION = 1;
-NANO_VERSION = 2;
+NANO_VERSION = 3;
 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.3.5.1-branch/Source/WebKit/Configurations/Version.xcconfig (224838 => 224839)

--- branches/safari-604.3.5.1-branch/Source/WebKit/Configurations/Version.xcconfig	2017-11-14 21:16:24 UTC (rev 224838)
+++ branches/safari-604.3.5.1-branch/Source/WebKit/Configurations/Version.xcconfig	2017-11-14 21:22:51 UTC (rev 224839)
@@ -25,7 +25,7 @@
 MINOR_VERSION = 3;
 TINY_VERSION = 5;
 MICRO_VERSION = 1;
-NANO_VERSION = 2;
+NANO_VERSION = 3;
 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:

[webkit-changes] [224778] tags/Safari-605.1.13.2/Source

2017-11-13 Thread matthew_hanson

Title: [224778] tags/Safari-605.1.13.2/Source








Revision 224778
Author matthew_han...@apple.com
Date 2017-11-13 13:45:42 -0800 (Mon, 13 Nov 2017)


Log Message
Versioning.

Modified Paths

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




Diff

Modified: tags/Safari-605.1.13.2/Source/_javascript_Core/Configurations/Version.xcconfig (224777 => 224778)

--- tags/Safari-605.1.13.2/Source/_javascript_Core/Configurations/Version.xcconfig	2017-11-13 21:43:11 UTC (rev 224777)
+++ tags/Safari-605.1.13.2/Source/_javascript_Core/Configurations/Version.xcconfig	2017-11-13 21:45:42 UTC (rev 224778)
@@ -24,7 +24,7 @@
 MAJOR_VERSION = 605;
 MINOR_VERSION = 1;
 TINY_VERSION = 13;
-MICRO_VERSION = 1;
+MICRO_VERSION = 2;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION);
 


Modified: tags/Safari-605.1.13.2/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig (224777 => 224778)

--- tags/Safari-605.1.13.2/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig	2017-11-13 21:43:11 UTC (rev 224777)
+++ tags/Safari-605.1.13.2/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig	2017-11-13 21:45:42 UTC (rev 224778)
@@ -24,7 +24,7 @@
 MAJOR_VERSION = 605;
 MINOR_VERSION = 1;
 TINY_VERSION = 13;
-MICRO_VERSION = 1;
+MICRO_VERSION = 2;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION);
 


Modified: tags/Safari-605.1.13.2/Source/WebCore/Configurations/Version.xcconfig (224777 => 224778)

--- tags/Safari-605.1.13.2/Source/WebCore/Configurations/Version.xcconfig	2017-11-13 21:43:11 UTC (rev 224777)
+++ tags/Safari-605.1.13.2/Source/WebCore/Configurations/Version.xcconfig	2017-11-13 21:45:42 UTC (rev 224778)
@@ -24,7 +24,7 @@
 MAJOR_VERSION = 605;
 MINOR_VERSION = 1;
 TINY_VERSION = 13;
-MICRO_VERSION = 1;
+MICRO_VERSION = 2;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION);
 


Modified: tags/Safari-605.1.13.2/Source/WebCore/PAL/Configurations/Version.xcconfig (224777 => 224778)

--- tags/Safari-605.1.13.2/Source/WebCore/PAL/Configurations/Version.xcconfig	2017-11-13 21:43:11 UTC (rev 224777)
+++ tags/Safari-605.1.13.2/Source/WebCore/PAL/Configurations/Version.xcconfig	2017-11-13 21:45:42 UTC (rev 224778)
@@ -24,7 +24,7 @@
 MAJOR_VERSION = 605;
 MINOR_VERSION = 1;
 TINY_VERSION = 13;
-MICRO_VERSION = 1;
+MICRO_VERSION = 2;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION);
 


Modified: tags/Safari-605.1.13.2/Source/WebInspectorUI/Configurations/Version.xcconfig (224777 => 224778)

--- tags/Safari-605.1.13.2/Source/WebInspectorUI/Configurations/Version.xcconfig	2017-11-13 21:43:11 UTC (rev 224777)
+++ tags/Safari-605.1.13.2/Source/WebInspectorUI/Configurations/Version.xcconfig	2017-11-13 21:45:42 UTC (rev 224778)
@@ -1,7 +1,7 @@
 MAJOR_VERSION = 605;
 MINOR_VERSION = 1;
 TINY_VERSION = 13;
-MICRO_VERSION = 1;
+MICRO_VERSION = 2;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION);
 


Modified: tags/Safari-605.1.13.2/Source/WebKit/Configurations/Version.xcconfig (224777 => 224778)

--- tags/Safari-605.1.13.2/Source/WebKit/Configurations/Version.xcconfig	2017-11-13 21:43:11 UTC (rev 224777)
+++ tags/Safari-605.1.13.2/Source/WebKit/Configurations/Version.xcconfig	2017-11-13 21:45:42 UTC (rev 224778)
@@ -24,7 +24,7 @@
 MAJOR_VERSION = 605;
 MINOR_VERSION = 1;
 TINY_VERSION = 13;
-MICRO_VERSION = 1;
+MICRO_VERSION = 2;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION);
 


Modified: tags/Safari-605.1.13.2/Source/WebKitLegacy/mac/Configurations/Version.xcconfig (224777 => 224778)

--- tags/Safari-605.1.13.2/Source/WebKitLegacy/mac/Configurations/Version.xcconfig	2017-11-13 21:43:11 UTC (rev 224777)
+++ tags/Safari-605.1.13.2/Source/WebKitLegacy/mac/Configurations/Version.xcconfig	2017-11-13 21:45:42 UTC (rev 224778)
@@ -24,7 +24,7 @@
 MAJOR_VERSION = 605;
 MINOR_VERSION = 1;
 TINY_VERSION = 13;
-MICRO_VERSION = 1;
+MICRO_VERSION = 2;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION);
 






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

[webkit-changes] [224777] tags/Safari-605.1.13.2/

2017-11-13 Thread matthew_hanson

Title: [224777] tags/Safari-605.1.13.2/








Revision 224777
Author matthew_han...@apple.com
Date 2017-11-13 13:43:11 -0800 (Mon, 13 Nov 2017)


Log Message
Tag Safari-605.1.13.2.

Added Paths

tags/Safari-605.1.13.2/




Diff




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

[webkit-changes] [224739] tags/Safari-604.3.5.1.2/

2017-11-12 Thread matthew_hanson

Title: [224739] tags/Safari-604.3.5.1.2/








Revision 224739
Author matthew_han...@apple.com
Date 2017-11-12 16:27:30 -0800 (Sun, 12 Nov 2017)


Log Message
Tag Safari-604.3.5.1.2.

Added Paths

tags/Safari-604.3.5.1.2/




Diff




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

[webkit-changes] [224738] trunk/Source

2017-11-12 Thread matthew_hanson

Title: [224738] trunk/Source








Revision 224738
Author matthew_han...@apple.com
Date 2017-11-12 16:23:00 -0800 (Sun, 12 Nov 2017)


Log Message
Versioning.

Modified Paths

trunk/Source/_javascript_Core/Configurations/Version.xcconfig
trunk/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig
trunk/Source/WebCore/Configurations/Version.xcconfig
trunk/Source/WebCore/PAL/Configurations/Version.xcconfig
trunk/Source/WebInspectorUI/Configurations/Version.xcconfig
trunk/Source/WebKit/Configurations/Version.xcconfig
trunk/Source/WebKitLegacy/mac/Configurations/Version.xcconfig




Diff

Modified: trunk/Source/_javascript_Core/Configurations/Version.xcconfig (224737 => 224738)

--- trunk/Source/_javascript_Core/Configurations/Version.xcconfig	2017-11-12 19:50:58 UTC (rev 224737)
+++ trunk/Source/_javascript_Core/Configurations/Version.xcconfig	2017-11-13 00:23:00 UTC (rev 224738)
@@ -23,7 +23,7 @@
 
 MAJOR_VERSION = 605;
 MINOR_VERSION = 1;
-TINY_VERSION = 13;
+TINY_VERSION = 14;
 MICRO_VERSION = 0;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION);


Modified: trunk/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig (224737 => 224738)

--- trunk/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig	2017-11-12 19:50:58 UTC (rev 224737)
+++ trunk/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig	2017-11-13 00:23:00 UTC (rev 224738)
@@ -23,7 +23,7 @@
 
 MAJOR_VERSION = 605;
 MINOR_VERSION = 1;
-TINY_VERSION = 13;
+TINY_VERSION = 14;
 MICRO_VERSION = 0;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION);


Modified: trunk/Source/WebCore/Configurations/Version.xcconfig (224737 => 224738)

--- trunk/Source/WebCore/Configurations/Version.xcconfig	2017-11-12 19:50:58 UTC (rev 224737)
+++ trunk/Source/WebCore/Configurations/Version.xcconfig	2017-11-13 00:23:00 UTC (rev 224738)
@@ -23,7 +23,7 @@
 
 MAJOR_VERSION = 605;
 MINOR_VERSION = 1;
-TINY_VERSION = 13;
+TINY_VERSION = 14;
 MICRO_VERSION = 0;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION);


Modified: trunk/Source/WebCore/PAL/Configurations/Version.xcconfig (224737 => 224738)

--- trunk/Source/WebCore/PAL/Configurations/Version.xcconfig	2017-11-12 19:50:58 UTC (rev 224737)
+++ trunk/Source/WebCore/PAL/Configurations/Version.xcconfig	2017-11-13 00:23:00 UTC (rev 224738)
@@ -23,7 +23,7 @@
 
 MAJOR_VERSION = 605;
 MINOR_VERSION = 1;
-TINY_VERSION = 13;
+TINY_VERSION = 14;
 MICRO_VERSION = 0;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION);


Modified: trunk/Source/WebInspectorUI/Configurations/Version.xcconfig (224737 => 224738)

--- trunk/Source/WebInspectorUI/Configurations/Version.xcconfig	2017-11-12 19:50:58 UTC (rev 224737)
+++ trunk/Source/WebInspectorUI/Configurations/Version.xcconfig	2017-11-13 00:23:00 UTC (rev 224738)
@@ -1,6 +1,6 @@
 MAJOR_VERSION = 605;
 MINOR_VERSION = 1;
-TINY_VERSION = 13;
+TINY_VERSION = 14;
 MICRO_VERSION = 0;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION);


Modified: trunk/Source/WebKit/Configurations/Version.xcconfig (224737 => 224738)

--- trunk/Source/WebKit/Configurations/Version.xcconfig	2017-11-12 19:50:58 UTC (rev 224737)
+++ trunk/Source/WebKit/Configurations/Version.xcconfig	2017-11-13 00:23:00 UTC (rev 224738)
@@ -23,7 +23,7 @@
 
 MAJOR_VERSION = 605;
 MINOR_VERSION = 1;
-TINY_VERSION = 13;
+TINY_VERSION = 14;
 MICRO_VERSION = 0;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION);


Modified: trunk/Source/WebKitLegacy/mac/Configurations/Version.xcconfig (224737 => 224738)

--- trunk/Source/WebKitLegacy/mac/Configurations/Version.xcconfig	2017-11-12 19:50:58 UTC (rev 224737)
+++ trunk/Source/WebKitLegacy/mac/Configurations/Version.xcconfig	2017-11-13 00:23:00 UTC (rev 224738)
@@ -23,7 +23,7 @@
 
 MAJOR_VERSION = 605;
 MINOR_VERSION = 1;
-TINY_VERSION = 13;
+TINY_VERSION = 14;
 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] [224694] tags/Safari-605.1.13.1

2017-11-10 Thread matthew_hanson

Title: [224694] tags/Safari-605.1.13.1








Revision 224694
Author matthew_han...@apple.com
Date 2017-11-10 10:06:29 -0800 (Fri, 10 Nov 2017)


Log Message
Cherry-pick r224687. rdar://problem/35445245

Modified Paths

tags/Safari-605.1.13.1/Source/WTF/ChangeLog
tags/Safari-605.1.13.1/Source/WTF/wtf/MainThread.cpp
tags/Safari-605.1.13.1/Source/WTF/wtf/MainThread.h
tags/Safari-605.1.13.1/Source/WTF/wtf/generic/MainThreadGeneric.cpp
tags/Safari-605.1.13.1/Source/WTF/wtf/mac/MainThreadMac.mm
tags/Safari-605.1.13.1/Source/WTF/wtf/win/MainThreadWin.cpp
tags/Safari-605.1.13.1/Source/WebCore/ChangeLog
tags/Safari-605.1.13.1/Source/WebCore/platform/network/mac/WebCoreResourceHandleAsOperationQueueDelegate.mm
tags/Safari-605.1.13.1/Tools/ChangeLog
tags/Safari-605.1.13.1/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj


Added Paths

tags/Safari-605.1.13.1/Tools/TestWebKitAPI/Tests/mac/WebViewScheduleInRunLoop.mm




Diff

Modified: tags/Safari-605.1.13.1/Source/WTF/ChangeLog (224693 => 224694)

--- tags/Safari-605.1.13.1/Source/WTF/ChangeLog	2017-11-10 18:02:19 UTC (rev 224693)
+++ tags/Safari-605.1.13.1/Source/WTF/ChangeLog	2017-11-10 18:06:29 UTC (rev 224694)
@@ -1,3 +1,28 @@
+2017-11-10  Matthew Hanson  
+
+Cherry-pick r224687. rdar://problem/35445245
+
+2017-11-10  Alex Christensen  
+
+REGRESSION(r224267): WebViews scheduled with custom run loop modes don't load
+https://bugs.webkit.org/show_bug.cgi?id=179515
+
+
+Reviewed by Andy Estes.
+
+* wtf/MainThread.cpp:
+(WTF::callOnMainThread):
+* wtf/MainThread.h:
+(WTF::callOnMainThread):
+(WTF::scheduleDispatchFunctionsOnMainThread):
+* wtf/generic/MainThreadGeneric.cpp:
+(WTF::scheduleDispatchFunctionsOnMainThread):
+* wtf/mac/MainThreadMac.mm:
+(WTF::scheduleDispatchFunctionsOnMainThread):
+* wtf/win/MainThreadWin.cpp:
+(WTF::scheduleDispatchFunctionsOnMainThread):
+Add an optional parameter which is an array of run loop mode names to pass to performSelectorOnMainThread.
+
 2017-11-07  Maciej Stachowiak  
 
 Get rid of unsightly hex numbers from unified build object files


Modified: tags/Safari-605.1.13.1/Source/WTF/wtf/MainThread.cpp (224693 => 224694)

--- tags/Safari-605.1.13.1/Source/WTF/wtf/MainThread.cpp	2017-11-10 18:02:19 UTC (rev 224693)
+++ tags/Safari-605.1.13.1/Source/WTF/wtf/MainThread.cpp	2017-11-10 18:06:29 UTC (rev 224694)
@@ -142,7 +142,7 @@
 }
 }
 
-void callOnMainThread(Function&& function)
+void callOnMainThread(Function&& function, SchedulePairHashSet* pairs)
 {
 ASSERT(function);
 
@@ -155,7 +155,7 @@
 }
 
 if (needToSchedule)
-scheduleDispatchFunctionsOnMainThread();
+scheduleDispatchFunctionsOnMainThread(pairs);
 }
 
 void setMainThreadCallbacksPaused(bool paused)


Modified: tags/Safari-605.1.13.1/Source/WTF/wtf/MainThread.h (224693 => 224694)

--- tags/Safari-605.1.13.1/Source/WTF/wtf/MainThread.h	2017-11-10 18:02:19 UTC (rev 224693)
+++ tags/Safari-605.1.13.1/Source/WTF/wtf/MainThread.h	2017-11-10 18:06:29 UTC (rev 224694)
@@ -31,6 +31,7 @@
 #define MainThread_h
 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -38,11 +39,14 @@
 namespace WTF {
 
 class PrintStream;
+class SchedulePair;
+struct SchedulePairHash;
+typedef HashSet SchedulePairHashSet;
 
 // Must be called from the main thread.
 WTF_EXPORT_PRIVATE void initializeMainThread();
 
-WTF_EXPORT_PRIVATE void callOnMainThread(Function&&);
+WTF_EXPORT_PRIVATE void callOnMainThread(Function&&, SchedulePairHashSet* = nullptr);
 
 #if PLATFORM(COCOA)
 WTF_EXPORT_PRIVATE void callOnWebThreadOrDispatchAsyncOnMainThread(void (^block)());
@@ -81,7 +85,7 @@
 
 // NOTE: these functions are internal to the callOnMainThread implementation.
 void initializeMainThreadPlatform();
-void scheduleDispatchFunctionsOnMainThread();
+void scheduleDispatchFunctionsOnMainThread(SchedulePairHashSet* = nullptr);
 void dispatchFunctionsFromMainThread();
 
 #if OS(DARWIN) && !USE(GLIB)


Modified: tags/Safari-605.1.13.1/Source/WTF/wtf/generic/MainThreadGeneric.cpp (224693 => 224694)

--- tags/Safari-605.1.13.1/Source/WTF/wtf/generic/MainThreadGeneric.cpp	2017-11-10 18:02:19 UTC (rev 224693)
+++ tags/Safari-605.1.13.1/Source/WTF/wtf/generic/MainThreadGeneric.cpp	2017-11-10 18:06:29 UTC (rev 224694)
@@ -67,7 +67,7 @@
 {
 }
 
-void scheduleDispatchFunctionsOnMainThread()
+void scheduleDispatchFunctionsOnMainThread(SchedulePairHashSet*)
 {
 // Use a RunLoop::Timer instead of RunLoop::dispatch() to be able to use a different priority and
 // avoid the double queue because dispatchOnMainThread also queues the functions.


Modified: tags/Safari-605.1.13.1/Source/WTF/wtf/mac/MainThreadMac.mm (224693 => 224694)

---

[webkit-changes] [224693] tags/Safari-605.1.13.1/Source

2017-11-10 Thread matthew_hanson

Title: [224693] tags/Safari-605.1.13.1/Source








Revision 224693
Author matthew_han...@apple.com
Date 2017-11-10 10:02:19 -0800 (Fri, 10 Nov 2017)


Log Message
Versioning.

Modified Paths

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




Diff

Modified: tags/Safari-605.1.13.1/Source/_javascript_Core/Configurations/Version.xcconfig (224692 => 224693)

--- tags/Safari-605.1.13.1/Source/_javascript_Core/Configurations/Version.xcconfig	2017-11-10 17:59:48 UTC (rev 224692)
+++ tags/Safari-605.1.13.1/Source/_javascript_Core/Configurations/Version.xcconfig	2017-11-10 18:02:19 UTC (rev 224693)
@@ -24,9 +24,9 @@
 MAJOR_VERSION = 605;
 MINOR_VERSION = 1;
 TINY_VERSION = 13;
-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-605.1.13.1/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig (224692 => 224693)

--- tags/Safari-605.1.13.1/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig	2017-11-10 17:59:48 UTC (rev 224692)
+++ tags/Safari-605.1.13.1/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig	2017-11-10 18:02:19 UTC (rev 224693)
@@ -24,9 +24,9 @@
 MAJOR_VERSION = 605;
 MINOR_VERSION = 1;
 TINY_VERSION = 13;
-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-605.1.13.1/Source/WebCore/Configurations/Version.xcconfig (224692 => 224693)

--- tags/Safari-605.1.13.1/Source/WebCore/Configurations/Version.xcconfig	2017-11-10 17:59:48 UTC (rev 224692)
+++ tags/Safari-605.1.13.1/Source/WebCore/Configurations/Version.xcconfig	2017-11-10 18:02:19 UTC (rev 224693)
@@ -24,9 +24,9 @@
 MAJOR_VERSION = 605;
 MINOR_VERSION = 1;
 TINY_VERSION = 13;
-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-605.1.13.1/Source/WebCore/PAL/Configurations/Version.xcconfig (224692 => 224693)

--- tags/Safari-605.1.13.1/Source/WebCore/PAL/Configurations/Version.xcconfig	2017-11-10 17:59:48 UTC (rev 224692)
+++ tags/Safari-605.1.13.1/Source/WebCore/PAL/Configurations/Version.xcconfig	2017-11-10 18:02:19 UTC (rev 224693)
@@ -24,9 +24,9 @@
 MAJOR_VERSION = 605;
 MINOR_VERSION = 1;
 TINY_VERSION = 13;
-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-605.1.13.1/Source/WebInspectorUI/Configurations/Version.xcconfig (224692 => 224693)

--- tags/Safari-605.1.13.1/Source/WebInspectorUI/Configurations/Version.xcconfig	2017-11-10 17:59:48 UTC (rev 224692)
+++ tags/Safari-605.1.13.1/Source/WebInspectorUI/Configurations/Version.xcconfig	2017-11-10 18:02:19 UTC (rev 224693)
@@ -1,9 +1,9 @@
 MAJOR_VERSION = 605;
 MINOR_VERSION = 1;
 TINY_VERSION = 13;
-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-605.1.13.1/Source/WebKit/Configurations/Version.xcconfig (224692 => 224693)

--- tags/Safari-605.1.13.1/Source/WebKit/Configurations/Version.xcconfig	2017-11-10 17:59:48 UTC (rev 224692)
+++ tags/Safari-605.1.13.1/Source/WebKit/Configurations/Version.xcconfig	2017-11-10 18:02:19 UTC (rev 224693)
@@

[webkit-changes] [224692] tags/Safari-605.1.13.1/

2017-11-10 Thread matthew_hanson

Title: [224692] tags/Safari-605.1.13.1/








Revision 224692
Author matthew_han...@apple.com
Date 2017-11-10 09:59:48 -0800 (Fri, 10 Nov 2017)


Log Message
New tag.

Added Paths

tags/Safari-605.1.13.1/




Diff




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

[webkit-changes] [224627] tags/Safari-605.1.13/Source/WebCore

2017-11-09 Thread matthew_hanson

Title: [224627] tags/Safari-605.1.13/Source/WebCore








Revision 224627
Author matthew_han...@apple.com
Date 2017-11-09 07:22:00 -0800 (Thu, 09 Nov 2017)


Log Message
Cherry-pick r224604. rdar://problem/35421652

Modified Paths

tags/Safari-605.1.13/Source/WebCore/ChangeLog
tags/Safari-605.1.13/Source/WebCore/dom/Document.cpp




Diff

Modified: tags/Safari-605.1.13/Source/WebCore/ChangeLog (224626 => 224627)

--- tags/Safari-605.1.13/Source/WebCore/ChangeLog	2017-11-09 15:16:22 UTC (rev 224626)
+++ tags/Safari-605.1.13/Source/WebCore/ChangeLog	2017-11-09 15:22:00 UTC (rev 224627)
@@ -1,3 +1,20 @@
+2017-11-09  Jason Marcell  
+
+Cherry-pick r224604. rdar://problem/35421652
+
+2017-11-08  Ryosuke Niwa  
+
+REGRESSION(r224534): Crash inside Document::updateStyleIfNeeded
+https://bugs.webkit.org/show_bug.cgi?id=179442
+
+Reviewed by Simon Fraser.
+
+Disable the assertion when the web thread is used.
+
+* dom/Document.cpp:
+(WebCore::Document::updateStyleIfNeeded):
+(WebCore::Document::updateLayout):
+
 2017-11-08  Zalan Bujtas  
 
 [LayoutState cleanup] Make public data members private.


Modified: tags/Safari-605.1.13/Source/WebCore/dom/Document.cpp (224626 => 224627)

--- tags/Safari-605.1.13/Source/WebCore/dom/Document.cpp	2017-11-09 15:16:22 UTC (rev 224626)
+++ tags/Safari-605.1.13/Source/WebCore/dom/Document.cpp	2017-11-09 15:22:00 UTC (rev 224627)
@@ -1939,7 +1939,9 @@
 }
 
 // The early exit for needsStyleRecalc() is needed when updateWidgetPositions() is called in runOrScheduleAsynchronousTasks().
+#if !USE(WEB_THREAD)
 RELEASE_ASSERT_WITH_SECURITY_IMPLICATION(NoEventDispatchAssertion::InMainThread::isEventAllowed() || (frameView && frameView->isInChildFrameWithFrameFlattening()));
+#endif
 
 resolveStyle();
 return true;
@@ -1956,9 +1958,10 @@
 ASSERT_NOT_REACHED();
 return;
 }
+#if !USE(WEB_THREAD)
 RELEASE_ASSERT_WITH_SECURITY_IMPLICATION(NoEventDispatchAssertion::InMainThread::isEventAllowed() || (frameView && frameView->isInChildFrameWithFrameFlattening()));
+#endif
 
-
 RenderView::RepaintRegionAccumulator repaintRegionAccumulator(renderView());
 
 if (HTMLFrameOwnerElement* owner = ownerElement())






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

[webkit-changes] [224598] tags/Safari-605.1.13/

2017-11-08 Thread matthew_hanson

Title: [224598] tags/Safari-605.1.13/








Revision 224598
Author matthew_han...@apple.com
Date 2017-11-08 15:07:19 -0800 (Wed, 08 Nov 2017)


Log Message
Tag Safari-605.1.13.

Added Paths

tags/Safari-605.1.13/




Diff




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

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

2017-10-06 Thread matthew_hanson

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








Revision 223000
Author matthew_han...@apple.com
Date 2017-10-06 14:45:53 -0700 (Fri, 06 Oct 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 (222999 => 223000)

--- branches/safari-604-branch/Source/_javascript_Core/Configurations/Version.xcconfig	2017-10-06 21:41:01 UTC (rev 222999)
+++ branches/safari-604-branch/Source/_javascript_Core/Configurations/Version.xcconfig	2017-10-06 21:45:53 UTC (rev 223000)
@@ -22,8 +22,8 @@
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
 
 MAJOR_VERSION = 604;
-MINOR_VERSION = 3;
-TINY_VERSION = 5;
+MINOR_VERSION = 4;
+TINY_VERSION = 1;
 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 (222999 => 223000)

--- branches/safari-604-branch/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig	2017-10-06 21:41:01 UTC (rev 222999)
+++ branches/safari-604-branch/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig	2017-10-06 21:45:53 UTC (rev 223000)
@@ -22,8 +22,8 @@
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
 
 MAJOR_VERSION = 604;
-MINOR_VERSION = 3;
-TINY_VERSION = 5;
+MINOR_VERSION = 4;
+TINY_VERSION = 1;
 MICRO_VERSION = 0;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION);


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

--- branches/safari-604-branch/Source/WebCore/Configurations/Version.xcconfig	2017-10-06 21:41:01 UTC (rev 222999)
+++ branches/safari-604-branch/Source/WebCore/Configurations/Version.xcconfig	2017-10-06 21:45:53 UTC (rev 223000)
@@ -22,8 +22,8 @@
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
 
 MAJOR_VERSION = 604;
-MINOR_VERSION = 3;
-TINY_VERSION = 5;
+MINOR_VERSION = 4;
+TINY_VERSION = 1;
 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 (222999 => 223000)

--- branches/safari-604-branch/Source/WebCore/PAL/Configurations/Version.xcconfig	2017-10-06 21:41:01 UTC (rev 222999)
+++ branches/safari-604-branch/Source/WebCore/PAL/Configurations/Version.xcconfig	2017-10-06 21:45:53 UTC (rev 223000)
@@ -22,8 +22,8 @@
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
 
 MAJOR_VERSION = 604;
-MINOR_VERSION = 3;
-TINY_VERSION = 5;
+MINOR_VERSION = 4;
+TINY_VERSION = 1;
 MICRO_VERSION = 0;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION);


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

--- branches/safari-604-branch/Source/WebInspectorUI/Configurations/Version.xcconfig	2017-10-06 21:41:01 UTC (rev 222999)
+++ branches/safari-604-branch/Source/WebInspectorUI/Configurations/Version.xcconfig	2017-10-06 21:45:53 UTC (rev 223000)
@@ -1,6 +1,6 @@
 MAJOR_VERSION = 604;
-MINOR_VERSION = 3;
-TINY_VERSION = 5;
+MINOR_VERSION = 4;
+TINY_VERSION = 1;
 MICRO_VERSION = 0;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION);


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

--- branches/safari-604-branch/Source/WebKit/Configurations/Version.xcconfig	2017-10-06 21:41:01 UTC (rev 222999)
+++ branches/safari-604-branch/Source/WebKit/Configurations/Version.xcconfig	2017-10-06 21:45:53 UTC (rev 223000)
@@ -22,8 +22,8 @@
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
 
 MAJOR_VERSION = 604;
-MINOR_VERSION = 3;
-TINY_VERSION = 5;
+MINOR_VERSION = 4;
+TINY_VERSION = 1;
 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 (222999 => 223000)

--- branches/safari-604-branch/Source/WebKitLegacy/mac/Configurations/Version.xcconfig	2017-10-06 21:41:01 UTC (rev 222999)
+++ branches/safari-604-branch/Source/WebKitLegacy/mac/Configurations/Version.xcconfig	2017-10-06 21:45:53 UTC (rev 223000)
@@ -22,8 +22,8 @@
 // OF THIS

[webkit-changes] [222998] trunk/Source

2017-10-06 Thread matthew_hanson

Title: [222998] trunk/Source








Revision 222998
Author matthew_han...@apple.com
Date 2017-10-06 14:40:31 -0700 (Fri, 06 Oct 2017)


Log Message
Versioning.

Modified Paths

trunk/Source/_javascript_Core/Configurations/Version.xcconfig
trunk/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig
trunk/Source/WebCore/Configurations/Version.xcconfig
trunk/Source/WebCore/PAL/Configurations/Version.xcconfig
trunk/Source/WebInspectorUI/Configurations/Version.xcconfig
trunk/Source/WebKit/Configurations/Version.xcconfig
trunk/Source/WebKitLegacy/mac/Configurations/Version.xcconfig




Diff

Modified: trunk/Source/_javascript_Core/Configurations/Version.xcconfig (222997 => 222998)

--- trunk/Source/_javascript_Core/Configurations/Version.xcconfig	2017-10-06 21:29:01 UTC (rev 222997)
+++ trunk/Source/_javascript_Core/Configurations/Version.xcconfig	2017-10-06 21:40:31 UTC (rev 222998)
@@ -23,7 +23,7 @@
 
 MAJOR_VERSION = 605;
 MINOR_VERSION = 1;
-TINY_VERSION = 9;
+TINY_VERSION = 10;
 MICRO_VERSION = 0;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION);


Modified: trunk/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig (222997 => 222998)

--- trunk/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig	2017-10-06 21:29:01 UTC (rev 222997)
+++ trunk/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig	2017-10-06 21:40:31 UTC (rev 222998)
@@ -23,7 +23,7 @@
 
 MAJOR_VERSION = 605;
 MINOR_VERSION = 1;
-TINY_VERSION = 9;
+TINY_VERSION = 10;
 MICRO_VERSION = 0;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION);


Modified: trunk/Source/WebCore/Configurations/Version.xcconfig (222997 => 222998)

--- trunk/Source/WebCore/Configurations/Version.xcconfig	2017-10-06 21:29:01 UTC (rev 222997)
+++ trunk/Source/WebCore/Configurations/Version.xcconfig	2017-10-06 21:40:31 UTC (rev 222998)
@@ -23,7 +23,7 @@
 
 MAJOR_VERSION = 605;
 MINOR_VERSION = 1;
-TINY_VERSION = 9;
+TINY_VERSION = 10;
 MICRO_VERSION = 0;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION);


Modified: trunk/Source/WebCore/PAL/Configurations/Version.xcconfig (222997 => 222998)

--- trunk/Source/WebCore/PAL/Configurations/Version.xcconfig	2017-10-06 21:29:01 UTC (rev 222997)
+++ trunk/Source/WebCore/PAL/Configurations/Version.xcconfig	2017-10-06 21:40:31 UTC (rev 222998)
@@ -23,7 +23,7 @@
 
 MAJOR_VERSION = 605;
 MINOR_VERSION = 1;
-TINY_VERSION = 9;
+TINY_VERSION = 10;
 MICRO_VERSION = 0;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION);


Modified: trunk/Source/WebInspectorUI/Configurations/Version.xcconfig (222997 => 222998)

--- trunk/Source/WebInspectorUI/Configurations/Version.xcconfig	2017-10-06 21:29:01 UTC (rev 222997)
+++ trunk/Source/WebInspectorUI/Configurations/Version.xcconfig	2017-10-06 21:40:31 UTC (rev 222998)
@@ -1,6 +1,6 @@
 MAJOR_VERSION = 605;
 MINOR_VERSION = 1;
-TINY_VERSION = 9;
+TINY_VERSION = 10;
 MICRO_VERSION = 0;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION);


Modified: trunk/Source/WebKit/Configurations/Version.xcconfig (222997 => 222998)

--- trunk/Source/WebKit/Configurations/Version.xcconfig	2017-10-06 21:29:01 UTC (rev 222997)
+++ trunk/Source/WebKit/Configurations/Version.xcconfig	2017-10-06 21:40:31 UTC (rev 222998)
@@ -23,7 +23,7 @@
 
 MAJOR_VERSION = 605;
 MINOR_VERSION = 1;
-TINY_VERSION = 9;
+TINY_VERSION = 10;
 MICRO_VERSION = 0;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION);


Modified: trunk/Source/WebKitLegacy/mac/Configurations/Version.xcconfig (222997 => 222998)

--- trunk/Source/WebKitLegacy/mac/Configurations/Version.xcconfig	2017-10-06 21:29:01 UTC (rev 222997)
+++ trunk/Source/WebKitLegacy/mac/Configurations/Version.xcconfig	2017-10-06 21:40:31 UTC (rev 222998)
@@ -23,7 +23,7 @@
 
 MAJOR_VERSION = 605;
 MINOR_VERSION = 1;
-TINY_VERSION = 9;
+TINY_VERSION = 10;
 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] [222912] branches/safari-604-branch/Tools

2017-10-05 Thread matthew_hanson

Title: [222912] branches/safari-604-branch/Tools








Revision 222912
Author matthew_han...@apple.com
Date 2017-10-05 10:11:51 -0700 (Thu, 05 Oct 2017)


Log Message
Revert r222453. rdar://problem/34826998

Modified Paths

branches/safari-604-branch/Tools/ChangeLog
branches/safari-604-branch/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/_javascript_DuringNavigation.mm




Diff

Modified: branches/safari-604-branch/Tools/ChangeLog (222911 => 222912)

--- branches/safari-604-branch/Tools/ChangeLog	2017-10-05 14:04:27 UTC (rev 222911)
+++ branches/safari-604-branch/Tools/ChangeLog	2017-10-05 17:11:51 UTC (rev 222912)
@@ -1,3 +1,7 @@
+2017-10-05  Matthew Hanson  
+
+Revert r222453. rdar://problem/34826998
+
 2017-09-25  Alex Christensen  
 
 Fix branch test build after r222431.


Modified: branches/safari-604-branch/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/_javascript_DuringNavigation.mm (222911 => 222912)

--- branches/safari-604-branch/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/_javascript_DuringNavigation.mm	2017-10-05 14:04:27 UTC (rev 222911)
+++ branches/safari-604-branch/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/_javascript_DuringNavigation.mm	2017-10-05 17:11:51 UTC (rev 222912)
@@ -50,7 +50,7 @@
 
 - (void)webView:(WKWebView *)webView decidePolicyForNavigationAction:(WKNavigationAction *)navigationAction decisionHandler:(void (^)(WKNavigationActionPolicy))decisionHandler
 {
-if ([navigationAction.request.URL.absoluteString isEqualToString:[secondURL absoluteString]]) {
+if ([navigationAction.request.URL isEqualTo:secondURL.get()]) {
 [webView evaluateJavaScript:@"alert(document.location);" completionHandler:^(id, NSError *) {
 decisionHandler(WKNavigationActionPolicyAllow);
 }];
@@ -60,7 +60,7 @@
 
 - (void)webView:(WKWebView *)webView decidePolicyForNavigationResponse:(WKNavigationResponse *)navigationResponse decisionHandler:(void (^)(WKNavigationResponsePolicy))decisionHandler
 {
-if ([navigationResponse.response.URL.absoluteString isEqualToString:[secondURL absoluteString]]) {
+if ([navigationResponse.response.URL isEqualTo:secondURL.get()]) {
 [webView evaluateJavaScript:@"alert(document.location);" completionHandler:^(id, NSError *) {
 decisionHandler(WKNavigationResponsePolicyAllow);
 }];






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

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

2017-10-05 Thread matthew_hanson

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








Revision 222913
Author matthew_han...@apple.com
Date 2017-10-05 10:11:57 -0700 (Thu, 05 Oct 2017)


Log Message
Revert r222431. rdar://problem/34826998

Modified Paths

branches/safari-604-branch/Source/WebKit/ChangeLog
branches/safari-604-branch/Source/WebKit/UIProcess/API/C/WKPage.cpp
branches/safari-604-branch/Source/WebKit/UIProcess/WebPageProxy.cpp
branches/safari-604-branch/Source/WebKit/UIProcess/WebPageProxy.h
branches/safari-604-branch/Source/WebKit/UIProcess/WebPageProxy.messages.in
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/WebKit/WebProcess/WebPage/WebFrame.cpp
branches/safari-604-branch/Source/WebKit/WebProcess/WebPage/WebFrame.h
branches/safari-604-branch/Source/WebKit/WebProcess/WebPage/WebPage.cpp
branches/safari-604-branch/Source/WebKit/WebProcess/WebPage/WebPage.h
branches/safari-604-branch/Source/WebKit/WebProcess/WebPage/WebPage.messages.in
branches/safari-604-branch/Tools/ChangeLog
branches/safari-604-branch/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj


Removed Paths

branches/safari-604-branch/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/_javascript_DuringNavigation.mm




Diff

Modified: branches/safari-604-branch/Source/WebKit/ChangeLog (222912 => 222913)

--- branches/safari-604-branch/Source/WebKit/ChangeLog	2017-10-05 17:11:51 UTC (rev 222912)
+++ branches/safari-604-branch/Source/WebKit/ChangeLog	2017-10-05 17:11:57 UTC (rev 222913)
@@ -1,3 +1,7 @@
+2017-10-05  Matthew Hanson  
+
+Revert r222431. rdar://problem/34826998
+
 2017-09-23  Alex Christensen  
 
 REGRESSION(r214201): WebProcess hangs during policy decisions


Modified: branches/safari-604-branch/Source/WebKit/UIProcess/API/C/WKPage.cpp (222912 => 222913)

--- branches/safari-604-branch/Source/WebKit/UIProcess/API/C/WKPage.cpp	2017-10-05 17:11:51 UTC (rev 222912)
+++ branches/safari-604-branch/Source/WebKit/UIProcess/API/C/WKPage.cpp	2017-10-05 17:11:57 UTC (rev 222913)
@@ -2159,17 +2159,19 @@
 private:
 void decidePolicyForNavigationAction(WebPageProxy& page, API::NavigationAction& navigationAction, Ref&& listener, API::Object* userData) override
 {
-if (!m_client.decidePolicyForNavigationAction)
+if (!m_client.decidePolicyForNavigationAction) {
+listener->use({ });
 return;
-
+}
 m_client.decidePolicyForNavigationAction(toAPI(), toAPI(), toAPI(listener.ptr()), toAPI(userData), m_client.base.clientInfo);
 }
 
 void decidePolicyForNavigationResponse(WebPageProxy& page, API::NavigationResponse& navigationResponse, Ref&& listener, API::Object* userData) override
 {
-if (!m_client.decidePolicyForNavigationResponse)
+if (!m_client.decidePolicyForNavigationResponse) {
+listener->use({ });
 return;
-
+}
 m_client.decidePolicyForNavigationResponse(toAPI(), toAPI(), toAPI(listener.ptr()), toAPI(userData), m_client.base.clientInfo);
 }
 


Modified: branches/safari-604-branch/Source/WebKit/UIProcess/WebPageProxy.cpp (222912 => 222913)

--- branches/safari-604-branch/Source/WebKit/UIProcess/WebPageProxy.cpp	2017-10-05 17:11:51 UTC (rev 222912)
+++ branches/safari-604-branch/Source/WebKit/UIProcess/WebPageProxy.cpp	2017-10-05 17:11:57 UTC (rev 222913)
@@ -2260,32 +2260,31 @@
 DownloadID downloadID = { };
 if (action == PolicyDownload) {
 // Create a download proxy.
-const ResourceRequest& downloadRequest = m_decidePolicyForResponseRequest ? *m_decidePolicyForResponseRequest : ResourceRequest();
-DownloadProxy* download = m_process->processPool().createDownloadProxy(downloadRequest);
+DownloadProxy* download = m_process->processPool().createDownloadProxy(m_decidePolicyForResponseRequest);
 downloadID = download->downloadID();
 handleDownloadRequest(download);
+m_decidePolicyForResponseRequest = { };
 }
 
 // If we received a policy decision while in decidePolicyForResponse the decision will
 // be sent back to the web process by decidePolicyForResponse.
-if (m_inDecidePolicyForResponseSync) {
-m_syncMimeTypePolicyActionIsValid = true;
-m_syncMimeTypePolicyAction = action;
-m_syncMimeTypePolicyDownloadID = downloadID;
+if (m_responsePolicyReply) {
+m_responsePolicyReply->send(action, downloadID);
+ASSERT(!m_newNavigationID);
+m_responsePolicyReply = nullptr;
 return;
 }
 
 // If we received a policy decision while in decidePolicyForNavigationAction the decision will 
 // be sent back to the web process by decidePolicyForNavigationAction. 
-if

[webkit-changes] [222884] tags/Safari-605.1.9/

2017-10-04 Thread matthew_hanson

Title: [222884] tags/Safari-605.1.9/








Revision 222884
Author matthew_han...@apple.com
Date 2017-10-04 15:13:58 -0700 (Wed, 04 Oct 2017)


Log Message
Tag Safari-605.1.9.

Added Paths

tags/Safari-605.1.9/




Diff




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

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

2017-10-04 Thread matthew_hanson

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








Revision 222882
Author matthew_han...@apple.com
Date 2017-10-04 15:07:46 -0700 (Wed, 04 Oct 2017)


Log Message
Revert r222786. rdar://problem/34706688

Modified Paths

branches/safari-604-branch/Source/WebCore/ChangeLog
branches/safari-604-branch/Source/WebCore/testing/cocoa/WebArchiveDumpSupport.mm




Diff

Modified: branches/safari-604-branch/Source/WebCore/ChangeLog (222881 => 222882)

--- branches/safari-604-branch/Source/WebCore/ChangeLog	2017-10-04 21:29:50 UTC (rev 222881)
+++ branches/safari-604-branch/Source/WebCore/ChangeLog	2017-10-04 22:07:46 UTC (rev 222882)
@@ -1,3 +1,7 @@
+2017-10-04  Kocsen Chung  
+
+Revert r222786. rdar://problem/34706688
+
 2017-10-03  Jason Marcell  
 
 Cherry-pick r222786. rdar://problem/34706688


Modified: branches/safari-604-branch/Source/WebCore/testing/cocoa/WebArchiveDumpSupport.mm (222881 => 222882)

--- branches/safari-604-branch/Source/WebCore/testing/cocoa/WebArchiveDumpSupport.mm	2017-10-04 21:29:50 UTC (rev 222881)
+++ branches/safari-604-branch/Source/WebCore/testing/cocoa/WebArchiveDumpSupport.mm	2017-10-04 22:07:46 UTC (rev 222882)
@@ -41,14 +41,13 @@
 static CFURLResponseRef createCFURLResponseFromResponseData(CFDataRef responseData)
 {
 RetainPtr unarchiver = adoptNS([[NSKeyedUnarchiver alloc] initForReadingWithData:(NSData *)responseData]);
+[unarchiver setRequiresSecureCoding:YES];
 NSURLResponse *response;
+@try {
 #if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300) || PLATFORM(IOS)
-// Because of  we can't use this for decoding in older OS's.
-[unarchiver setRequiresSecureCoding:YES];
-@try {
+// Because of  we can't use this for decoding in older OS's.
 response = [unarchiver decodeObjectOfClass:[NSURLResponse class] forKey:@"WebResourceResponse"]; // WebResourceResponseKey in WebResource.m
 #else
-@try {
 response = [unarchiver decodeObjectForKey:@"WebResourceResponse"]; // WebResourceResponseKey in WebResource.m
 #endif
 [unarchiver finishDecoding];






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

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

2017-10-04 Thread matthew_hanson

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








Revision 222883
Author matthew_han...@apple.com
Date 2017-10-04 15:07:49 -0700 (Wed, 04 Oct 2017)


Log Message
Revert r222779. rdar://problem/34706688

Modified Paths

branches/safari-604-branch/LayoutTests/ChangeLog
branches/safari-604-branch/LayoutTests/platform/ios/TestExpectations
branches/safari-604-branch/LayoutTests/platform/mac/TestExpectations
branches/safari-604-branch/Source/WebCore/ChangeLog
branches/safari-604-branch/Source/WebCore/loader/archive/cf/LegacyWebArchiveMac.mm
branches/safari-604-branch/Source/WebCore/testing/cocoa/WebArchiveDumpSupport.mm




Diff

Modified: branches/safari-604-branch/LayoutTests/ChangeLog (222882 => 222883)

--- branches/safari-604-branch/LayoutTests/ChangeLog	2017-10-04 22:07:46 UTC (rev 222882)
+++ branches/safari-604-branch/LayoutTests/ChangeLog	2017-10-04 22:07:49 UTC (rev 222883)
@@ -1,3 +1,7 @@
+2017-10-04  Kocsen Chung  
+
+Revert r222779. rdar://problem/34706688
+
 2017-10-03  Jason Marcell  
 
 Cherry-pick r222779. rdar://problem/34706688


Modified: branches/safari-604-branch/LayoutTests/platform/ios/TestExpectations (222882 => 222883)

--- branches/safari-604-branch/LayoutTests/platform/ios/TestExpectations	2017-10-04 22:07:46 UTC (rev 222882)
+++ branches/safari-604-branch/LayoutTests/platform/ios/TestExpectations	2017-10-04 22:07:49 UTC (rev 222883)
@@ -1119,10 +1119,6 @@
 webarchive/test-css-url-resources-inline-styles.html [ Failure ]
 webarchive/test-link-rel-icon.html [ Failure ]
 
-# The following two tests are expected to fail until  is available on test systems.
-webarchive/loading/cache-expired-subresource.html [ Failure ]
-webarchive/loading/test-loading-archive-subresource-null-mimetype.html [ Crash ]
-
 # Webarchive tests that fail due to :
 http/tests/webarchive/test-css-url-encoding-shift-jis.html
 http/tests/webarchive/test-css-url-encoding-utf-8.html


Modified: branches/safari-604-branch/LayoutTests/platform/mac/TestExpectations (222882 => 222883)

--- branches/safari-604-branch/LayoutTests/platform/mac/TestExpectations	2017-10-04 22:07:46 UTC (rev 222882)
+++ branches/safari-604-branch/LayoutTests/platform/mac/TestExpectations	2017-10-04 22:07:49 UTC (rev 222883)
@@ -221,10 +221,6 @@
 
 webkit.org/b/56685 webarchive/test-link-rel-icon.html [ Failure ]
 
-# The following two tests are expected to fail until  is available on test systems.
-webarchive/loading/cache-expired-subresource.html [ Failure ]
-webarchive/loading/test-loading-archive-subresource-null-mimetype.html [ Crash ]
-
 # Quota API is not supported.
 storage/storageinfo-missing-arguments.html
 storage/storageinfo-no-callbacks.html


Modified: branches/safari-604-branch/Source/WebCore/ChangeLog (222882 => 222883)

--- branches/safari-604-branch/Source/WebCore/ChangeLog	2017-10-04 22:07:46 UTC (rev 222882)
+++ branches/safari-604-branch/Source/WebCore/ChangeLog	2017-10-04 22:07:49 UTC (rev 222883)
@@ -1,5 +1,9 @@
 2017-10-04  Kocsen Chung  
 
+Revert r222779. rdar://problem/34706688
+
+2017-10-04  Kocsen Chung  
+
 Revert r222786. rdar://problem/34706688
 
 2017-10-03  Jason Marcell  


Modified: branches/safari-604-branch/Source/WebCore/loader/archive/cf/LegacyWebArchiveMac.mm (222882 => 222883)

--- branches/safari-604-branch/Source/WebCore/loader/archive/cf/LegacyWebArchiveMac.mm	2017-10-04 22:07:46 UTC (rev 222882)
+++ branches/safari-604-branch/Source/WebCore/loader/archive/cf/LegacyWebArchiveMac.mm	2017-10-04 22:07:49 UTC (rev 222883)
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008-2017 Apple Inc. All rights reserved.
+ * Copyright (C) 2008, 2009 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -43,20 +43,12 @@
 
 NSURLResponse *response = nil;
 NSKeyedUnarchiver *unarchiver = [[NSKeyedUnarchiver alloc] initForReadingWithData:(NSData *)responseData];
-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300) || PLATFORM(IOS)
-// Because of  we can't use this for decoding in older OS's.
-[unarchiver setRequiresSecureCoding:YES];
 @try {
-response = [unarchiver decodeObjectOfClass:[NSURLResponse class] forKey:LegacyWebArchiveResourceResponseKey];
-#else
-@try {
 id responseObject = [unarchiver decodeObjectForKey:LegacyWebArchiveResourceResponseKey];
 if ([responseObject isKindOfClass:[NSURLResponse class]])
 response = responseObject;
-#endif
 [unarchiver finishDecoding];
-} @catch (NSException *exception) {
-LOG_ERROR("Failed to decode NS(HTTP)URLResponse: %@", exception);
+} @catch(id) {
 response = nil;
 }
 [unarchiver release];
@@ -74,10 +66,6 @@
 CFMutableDataRef responseData = CFDataCreateMutable(0, 0);
 
 NSKeyedArchiver

[webkit-changes] [221739] tags/Safari-605.1.5/Source/WebCore/PAL

2017-09-07 Thread matthew_hanson

Title: [221739] tags/Safari-605.1.5/Source/WebCore/PAL








Revision 221739
Author matthew_han...@apple.com
Date 2017-09-07 10:20:42 -0700 (Thu, 07 Sep 2017)


Log Message
Cherry-pick r221738. rdar://problem/34296289

Modified Paths

tags/Safari-605.1.5/Source/WebCore/PAL/ChangeLog
tags/Safari-605.1.5/Source/WebCore/PAL/pal/spi/cocoa/NSTouchBarSPI.h




Diff

Modified: tags/Safari-605.1.5/Source/WebCore/PAL/ChangeLog (221738 => 221739)

--- tags/Safari-605.1.5/Source/WebCore/PAL/ChangeLog	2017-09-07 17:03:49 UTC (rev 221738)
+++ tags/Safari-605.1.5/Source/WebCore/PAL/ChangeLog	2017-09-07 17:20:42 UTC (rev 221739)
@@ -1,3 +1,20 @@
+2017-09-07  Matthew Hanson  
+
+Cherry-pick r221738. rdar://problem/34296289
+
+2017-09-07  Wenson Hsieh  
+
+[Mac] Stop importing NSFunctionBar_Private.h in NSTouchBarSPI.h on the macOS 10.13+ SDK
+https://bugs.webkit.org/show_bug.cgi?id=176521
+
+
+Reviewed by Andy Estes.
+
+We don't need to import NSFunctionBar_Private.h when building against the macOS 10.13 SDK, or later. Guard this
+header import with an SDK version check.
+
+* pal/spi/cocoa/NSTouchBarSPI.h:
+
 2017-09-04  Commit Queue  
 
 Unreviewed, rolling out r221494 and r221500.


Modified: tags/Safari-605.1.5/Source/WebCore/PAL/pal/spi/cocoa/NSTouchBarSPI.h (221738 => 221739)

--- tags/Safari-605.1.5/Source/WebCore/PAL/pal/spi/cocoa/NSTouchBarSPI.h	2017-09-07 17:03:49 UTC (rev 221738)
+++ tags/Safari-605.1.5/Source/WebCore/PAL/pal/spi/cocoa/NSTouchBarSPI.h	2017-09-07 17:20:42 UTC (rev 221739)
@@ -28,12 +28,15 @@
 #if USE(APPLE_INTERNAL_SDK)
 
 #import 
-#import 
 #import 
 #import 
 
+#if __MAC_OS_X_VERSION_MAX_ALLOWED < 101300
+#import 
 #endif
 
+#endif
+
 NS_ASSUME_NONNULL_BEGIN
 
 #if !USE(APPLE_INTERNAL_SDK)






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

[webkit-changes] [221730] tags/Safari-605.1.5/

2017-09-07 Thread matthew_hanson

Title: [221730] tags/Safari-605.1.5/








Revision 221730
Author matthew_han...@apple.com
Date 2017-09-07 08:30:04 -0700 (Thu, 07 Sep 2017)


Log Message
Tag Safari-605.1.5.

Added Paths

tags/Safari-605.1.5/




Diff




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

[webkit-changes] [221729] trunk/Source

2017-09-07 Thread matthew_hanson

Title: [221729] trunk/Source








Revision 221729
Author matthew_han...@apple.com
Date 2017-09-07 07:53:48 -0700 (Thu, 07 Sep 2017)


Log Message
Versioning.

Modified Paths

trunk/Source/_javascript_Core/Configurations/Version.xcconfig
trunk/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig
trunk/Source/WebCore/Configurations/Version.xcconfig
trunk/Source/WebCore/PAL/Configurations/Version.xcconfig
trunk/Source/WebInspectorUI/Configurations/Version.xcconfig
trunk/Source/WebKit/Configurations/Version.xcconfig
trunk/Source/WebKitLegacy/mac/Configurations/Version.xcconfig




Diff

Modified: trunk/Source/_javascript_Core/Configurations/Version.xcconfig (221728 => 221729)

--- trunk/Source/_javascript_Core/Configurations/Version.xcconfig	2017-09-07 12:57:14 UTC (rev 221728)
+++ trunk/Source/_javascript_Core/Configurations/Version.xcconfig	2017-09-07 14:53:48 UTC (rev 221729)
@@ -23,7 +23,7 @@
 
 MAJOR_VERSION = 605;
 MINOR_VERSION = 1;
-TINY_VERSION = 5;
+TINY_VERSION = 6;
 MICRO_VERSION = 0;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION);


Modified: trunk/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig (221728 => 221729)

--- trunk/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig	2017-09-07 12:57:14 UTC (rev 221728)
+++ trunk/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig	2017-09-07 14:53:48 UTC (rev 221729)
@@ -23,7 +23,7 @@
 
 MAJOR_VERSION = 605;
 MINOR_VERSION = 1;
-TINY_VERSION = 5;
+TINY_VERSION = 6;
 MICRO_VERSION = 0;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION);


Modified: trunk/Source/WebCore/Configurations/Version.xcconfig (221728 => 221729)

--- trunk/Source/WebCore/Configurations/Version.xcconfig	2017-09-07 12:57:14 UTC (rev 221728)
+++ trunk/Source/WebCore/Configurations/Version.xcconfig	2017-09-07 14:53:48 UTC (rev 221729)
@@ -23,7 +23,7 @@
 
 MAJOR_VERSION = 605;
 MINOR_VERSION = 1;
-TINY_VERSION = 5;
+TINY_VERSION = 6;
 MICRO_VERSION = 0;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION);


Modified: trunk/Source/WebCore/PAL/Configurations/Version.xcconfig (221728 => 221729)

--- trunk/Source/WebCore/PAL/Configurations/Version.xcconfig	2017-09-07 12:57:14 UTC (rev 221728)
+++ trunk/Source/WebCore/PAL/Configurations/Version.xcconfig	2017-09-07 14:53:48 UTC (rev 221729)
@@ -23,7 +23,7 @@
 
 MAJOR_VERSION = 605;
 MINOR_VERSION = 1;
-TINY_VERSION = 5;
+TINY_VERSION = 6;
 MICRO_VERSION = 0;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION);


Modified: trunk/Source/WebInspectorUI/Configurations/Version.xcconfig (221728 => 221729)

--- trunk/Source/WebInspectorUI/Configurations/Version.xcconfig	2017-09-07 12:57:14 UTC (rev 221728)
+++ trunk/Source/WebInspectorUI/Configurations/Version.xcconfig	2017-09-07 14:53:48 UTC (rev 221729)
@@ -1,6 +1,6 @@
 MAJOR_VERSION = 605;
 MINOR_VERSION = 1;
-TINY_VERSION = 5;
+TINY_VERSION = 6;
 MICRO_VERSION = 0;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION);


Modified: trunk/Source/WebKit/Configurations/Version.xcconfig (221728 => 221729)

--- trunk/Source/WebKit/Configurations/Version.xcconfig	2017-09-07 12:57:14 UTC (rev 221728)
+++ trunk/Source/WebKit/Configurations/Version.xcconfig	2017-09-07 14:53:48 UTC (rev 221729)
@@ -23,7 +23,7 @@
 
 MAJOR_VERSION = 605;
 MINOR_VERSION = 1;
-TINY_VERSION = 5;
+TINY_VERSION = 6;
 MICRO_VERSION = 0;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION);


Modified: trunk/Source/WebKitLegacy/mac/Configurations/Version.xcconfig (221728 => 221729)

--- trunk/Source/WebKitLegacy/mac/Configurations/Version.xcconfig	2017-09-07 12:57:14 UTC (rev 221728)
+++ trunk/Source/WebKitLegacy/mac/Configurations/Version.xcconfig	2017-09-07 14:53:48 UTC (rev 221729)
@@ -23,7 +23,7 @@
 
 MAJOR_VERSION = 605;
 MINOR_VERSION = 1;
-TINY_VERSION = 5;
+TINY_VERSION = 6;
 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] [221697] branches/safari-604-branch/Source

2017-09-06 Thread matthew_hanson

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








Revision 221697
Author matthew_han...@apple.com
Date 2017-09-06 13:24:56 -0700 (Wed, 06 Sep 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 (221696 => 221697)

--- branches/safari-604-branch/Source/_javascript_Core/Configurations/Version.xcconfig	2017-09-06 20:21:47 UTC (rev 221696)
+++ branches/safari-604-branch/Source/_javascript_Core/Configurations/Version.xcconfig	2017-09-06 20:24:56 UTC (rev 221697)
@@ -23,7 +23,7 @@
 
 MAJOR_VERSION = 604;
 MINOR_VERSION = 2;
-TINY_VERSION = 8;
+TINY_VERSION = 9;
 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 (221696 => 221697)

--- branches/safari-604-branch/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig	2017-09-06 20:21:47 UTC (rev 221696)
+++ branches/safari-604-branch/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig	2017-09-06 20:24:56 UTC (rev 221697)
@@ -23,7 +23,7 @@
 
 MAJOR_VERSION = 604;
 MINOR_VERSION = 2;
-TINY_VERSION = 8;
+TINY_VERSION = 9;
 MICRO_VERSION = 0;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION);


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

--- branches/safari-604-branch/Source/WebCore/Configurations/Version.xcconfig	2017-09-06 20:21:47 UTC (rev 221696)
+++ branches/safari-604-branch/Source/WebCore/Configurations/Version.xcconfig	2017-09-06 20:24:56 UTC (rev 221697)
@@ -23,7 +23,7 @@
 
 MAJOR_VERSION = 604;
 MINOR_VERSION = 2;
-TINY_VERSION = 8;
+TINY_VERSION = 9;
 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 (221696 => 221697)

--- branches/safari-604-branch/Source/WebCore/PAL/Configurations/Version.xcconfig	2017-09-06 20:21:47 UTC (rev 221696)
+++ branches/safari-604-branch/Source/WebCore/PAL/Configurations/Version.xcconfig	2017-09-06 20:24:56 UTC (rev 221697)
@@ -23,7 +23,7 @@
 
 MAJOR_VERSION = 604;
 MINOR_VERSION = 2;
-TINY_VERSION = 8;
+TINY_VERSION = 9;
 MICRO_VERSION = 0;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION);


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

--- branches/safari-604-branch/Source/WebInspectorUI/Configurations/Version.xcconfig	2017-09-06 20:21:47 UTC (rev 221696)
+++ branches/safari-604-branch/Source/WebInspectorUI/Configurations/Version.xcconfig	2017-09-06 20:24:56 UTC (rev 221697)
@@ -1,6 +1,6 @@
 MAJOR_VERSION = 604;
 MINOR_VERSION = 2;
-TINY_VERSION = 8;
+TINY_VERSION = 9;
 MICRO_VERSION = 0;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION);


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

--- branches/safari-604-branch/Source/WebKit/Configurations/Version.xcconfig	2017-09-06 20:21:47 UTC (rev 221696)
+++ branches/safari-604-branch/Source/WebKit/Configurations/Version.xcconfig	2017-09-06 20:24:56 UTC (rev 221697)
@@ -23,7 +23,7 @@
 
 MAJOR_VERSION = 604;
 MINOR_VERSION = 2;
-TINY_VERSION = 8;
+TINY_VERSION = 9;
 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 (221696 => 221697)

--- branches/safari-604-branch/Source/WebKitLegacy/mac/Configurations/Version.xcconfig	2017-09-06 20:21:47 UTC (rev 221696)
+++ branches/safari-604-branch/Source/WebKitLegacy/mac/Configurations/Version.xcconfig	2017-09-06 20:24:56 UTC (rev 221697)
@@ -23,7 +23,7 @@
 
 MAJOR_VERSION = 604;
 MINOR_VERSION = 2;
-TINY_VERSION = 8;
+TINY_VERSION = 9;
 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] [221654] tags/Safari-605.1.4.1/Source/WebKit

2017-09-05 Thread matthew_hanson

Title: [221654] tags/Safari-605.1.4.1/Source/WebKit








Revision 221654
Author matthew_han...@apple.com
Date 2017-09-05 17:58:33 -0700 (Tue, 05 Sep 2017)


Log Message
Cherry-pick r221457. rdar://problem/34186977

Modified Paths

tags/Safari-605.1.4.1/Source/WebKit/ChangeLog
tags/Safari-605.1.4.1/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm




Diff

Modified: tags/Safari-605.1.4.1/Source/WebKit/ChangeLog (221653 => 221654)

--- tags/Safari-605.1.4.1/Source/WebKit/ChangeLog	2017-09-06 00:58:30 UTC (rev 221653)
+++ tags/Safari-605.1.4.1/Source/WebKit/ChangeLog	2017-09-06 00:58:33 UTC (rev 221654)
@@ -1,3 +1,19 @@
+2017-09-05  Matthew Hanson  
+
+Cherry-pick r221457. rdar://problem/34186977
+
+2017-08-31  Megan Gardner  
+
+Fix error in protocol revving
+https://bugs.webkit.org/show_bug.cgi?id=176191
+
+Protocol definition was mastered out of later iOS submissions, causing them to not build.
+
+Reviewed by Tim Horton.
+
+* UIProcess/ios/WKContentViewInteraction.mm:
+(-[WKContentView changeSelectionWithGestureAt:withGesture:withState:]):
+
 2017-08-30  Jason Marcell  
 
 Revert r221068. rdar://problem/33925559


Modified: tags/Safari-605.1.4.1/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm (221653 => 221654)

--- tags/Safari-605.1.4.1/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm	2017-09-06 00:58:30 UTC (rev 221653)
+++ tags/Safari-605.1.4.1/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm	2017-09-06 00:58:33 UTC (rev 221654)
@@ -2544,12 +2544,10 @@
 return _textSelectionAssistant != nil;
 }
 
-#if __IPHONE_OS_VERSION_MAX_ALLOWED < 12
 - (void)changeSelectionWithGestureAt:(CGPoint)point withGesture:(UIWKGestureType)gestureType withState:(UIGestureRecognizerState)state
 {
 [self changeSelectionWithGestureAt:point withGesture:gestureType withState:state withFlags:UIWKNone];
 }
-#endif
 
 - (void)changeSelectionWithGestureAt:(CGPoint)point withGesture:(UIWKGestureType)gestureType withState:(UIGestureRecognizerState)state withFlags:(UIWKSelectionFlags)flags
 {






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

[webkit-changes] [221653] tags/Safari-605.1.4.1/Source

2017-09-05 Thread matthew_hanson

Title: [221653] tags/Safari-605.1.4.1/Source








Revision 221653
Author matthew_han...@apple.com
Date 2017-09-05 17:58:30 -0700 (Tue, 05 Sep 2017)


Log Message
Versioning.

Modified Paths

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




Diff

Modified: tags/Safari-605.1.4.1/Source/_javascript_Core/Configurations/Version.xcconfig (221652 => 221653)

--- tags/Safari-605.1.4.1/Source/_javascript_Core/Configurations/Version.xcconfig	2017-09-06 00:53:57 UTC (rev 221652)
+++ tags/Safari-605.1.4.1/Source/_javascript_Core/Configurations/Version.xcconfig	2017-09-06 00:58:30 UTC (rev 221653)
@@ -24,9 +24,9 @@
 MAJOR_VERSION = 605;
 MINOR_VERSION = 1;
 TINY_VERSION = 4;
-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-605.1.4.1/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig (221652 => 221653)

--- tags/Safari-605.1.4.1/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig	2017-09-06 00:53:57 UTC (rev 221652)
+++ tags/Safari-605.1.4.1/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig	2017-09-06 00:58:30 UTC (rev 221653)
@@ -24,9 +24,9 @@
 MAJOR_VERSION = 605;
 MINOR_VERSION = 1;
 TINY_VERSION = 4;
-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-605.1.4.1/Source/WebCore/Configurations/Version.xcconfig (221652 => 221653)

--- tags/Safari-605.1.4.1/Source/WebCore/Configurations/Version.xcconfig	2017-09-06 00:53:57 UTC (rev 221652)
+++ tags/Safari-605.1.4.1/Source/WebCore/Configurations/Version.xcconfig	2017-09-06 00:58:30 UTC (rev 221653)
@@ -24,9 +24,9 @@
 MAJOR_VERSION = 605;
 MINOR_VERSION = 1;
 TINY_VERSION = 4;
-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-605.1.4.1/Source/WebCore/PAL/Configurations/Version.xcconfig (221652 => 221653)

--- tags/Safari-605.1.4.1/Source/WebCore/PAL/Configurations/Version.xcconfig	2017-09-06 00:53:57 UTC (rev 221652)
+++ tags/Safari-605.1.4.1/Source/WebCore/PAL/Configurations/Version.xcconfig	2017-09-06 00:58:30 UTC (rev 221653)
@@ -24,9 +24,9 @@
 MAJOR_VERSION = 605;
 MINOR_VERSION = 1;
 TINY_VERSION = 4;
-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-605.1.4.1/Source/WebInspectorUI/Configurations/Version.xcconfig (221652 => 221653)

--- tags/Safari-605.1.4.1/Source/WebInspectorUI/Configurations/Version.xcconfig	2017-09-06 00:53:57 UTC (rev 221652)
+++ tags/Safari-605.1.4.1/Source/WebInspectorUI/Configurations/Version.xcconfig	2017-09-06 00:58:30 UTC (rev 221653)
@@ -1,9 +1,9 @@
 MAJOR_VERSION = 605;
 MINOR_VERSION = 1;
 TINY_VERSION = 4;
-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-605.1.4.1/Source/WebKit/Configurations/Version.xcconfig (221652 => 221653)

--- tags/Safari-605.1.4.1/Source/WebKit/Configurations/Version.xcconfig	2017-09-06 00:53:57 UTC (rev 221652)
+++ tags/Safari-605.1.4.1/Source/WebKit/Configurations/Version.xcconfig	2017-09-06 00:58:30 UTC (rev 221653)
@@ -24,9 +24,9 @@
 MAJOR_VERSION =

[webkit-changes] [221652] tags/Safari-605.1.4.1/

2017-09-05 Thread matthew_hanson

Title: [221652] tags/Safari-605.1.4.1/








Revision 221652
Author matthew_han...@apple.com
Date 2017-09-05 17:53:57 -0700 (Tue, 05 Sep 2017)


Log Message
New Tag.

Added Paths

tags/Safari-605.1.4.1/




Diff




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

[webkit-changes] [221651] tags/Safari-604.1.38.1.7/

2017-09-05 Thread matthew_hanson

Title: [221651] tags/Safari-604.1.38.1.7/








Revision 221651
Author matthew_han...@apple.com
Date 2017-09-05 17:10:34 -0700 (Tue, 05 Sep 2017)


Log Message
Tag Safari-604.1.38.1.7.

Added Paths

tags/Safari-604.1.38.1.7/




Diff




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

[webkit-changes] [221650] tags/Safari-604.2.8/

2017-09-05 Thread matthew_hanson

Title: [221650] tags/Safari-604.2.8/








Revision 221650
Author matthew_han...@apple.com
Date 2017-09-05 17:09:48 -0700 (Tue, 05 Sep 2017)


Log Message
Tag Safari-604.2.8.

Added Paths

tags/Safari-604.2.8/




Diff




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

[webkit-changes] [221644] tags/Safari-605.1.4/Source

2017-09-05 Thread matthew_hanson

Title: [221644] tags/Safari-605.1.4/Source








Revision 221644
Author matthew_han...@apple.com
Date 2017-09-05 16:25:32 -0700 (Tue, 05 Sep 2017)


Log Message
Revert r221640. rdar://problem/34186977

Modified Paths

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




Diff

Modified: tags/Safari-605.1.4/Source/_javascript_Core/Configurations/Version.xcconfig (221643 => 221644)

--- tags/Safari-605.1.4/Source/_javascript_Core/Configurations/Version.xcconfig	2017-09-05 23:25:28 UTC (rev 221643)
+++ tags/Safari-605.1.4/Source/_javascript_Core/Configurations/Version.xcconfig	2017-09-05 23:25:32 UTC (rev 221644)
@@ -24,9 +24,9 @@
 MAJOR_VERSION = 605;
 MINOR_VERSION = 1;
 TINY_VERSION = 4;
-MICRO_VERSION = 1;
+MICRO_VERSION = 0;
 NANO_VERSION = 0;
-FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION);
+FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_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-605.1.4/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig (221643 => 221644)

--- tags/Safari-605.1.4/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig	2017-09-05 23:25:28 UTC (rev 221643)
+++ tags/Safari-605.1.4/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig	2017-09-05 23:25:32 UTC (rev 221644)
@@ -24,9 +24,9 @@
 MAJOR_VERSION = 605;
 MINOR_VERSION = 1;
 TINY_VERSION = 4;
-MICRO_VERSION = 1;
+MICRO_VERSION = 0;
 NANO_VERSION = 0;
-FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION);
+FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_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-605.1.4/Source/WebCore/Configurations/Version.xcconfig (221643 => 221644)

--- tags/Safari-605.1.4/Source/WebCore/Configurations/Version.xcconfig	2017-09-05 23:25:28 UTC (rev 221643)
+++ tags/Safari-605.1.4/Source/WebCore/Configurations/Version.xcconfig	2017-09-05 23:25:32 UTC (rev 221644)
@@ -24,9 +24,9 @@
 MAJOR_VERSION = 605;
 MINOR_VERSION = 1;
 TINY_VERSION = 4;
-MICRO_VERSION = 1;
+MICRO_VERSION = 0;
 NANO_VERSION = 0;
-FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION);
+FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_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-605.1.4/Source/WebCore/PAL/Configurations/Version.xcconfig (221643 => 221644)

--- tags/Safari-605.1.4/Source/WebCore/PAL/Configurations/Version.xcconfig	2017-09-05 23:25:28 UTC (rev 221643)
+++ tags/Safari-605.1.4/Source/WebCore/PAL/Configurations/Version.xcconfig	2017-09-05 23:25:32 UTC (rev 221644)
@@ -24,9 +24,9 @@
 MAJOR_VERSION = 605;
 MINOR_VERSION = 1;
 TINY_VERSION = 4;
-MICRO_VERSION = 1;
+MICRO_VERSION = 0;
 NANO_VERSION = 0;
-FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION);
+FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_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-605.1.4/Source/WebInspectorUI/Configurations/Version.xcconfig (221643 => 221644)

--- tags/Safari-605.1.4/Source/WebInspectorUI/Configurations/Version.xcconfig	2017-09-05 23:25:28 UTC (rev 221643)
+++ tags/Safari-605.1.4/Source/WebInspectorUI/Configurations/Version.xcconfig	2017-09-05 23:25:32 UTC (rev 221644)
@@ -1,9 +1,9 @@
 MAJOR_VERSION = 605;
 MINOR_VERSION = 1;
 TINY_VERSION = 4;
-MICRO_VERSION = 1;
+MICRO_VERSION = 0;
 NANO_VERSION = 0;
-FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION);
+FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION);
 
 // The system version prefix is based on the current system version.
 SYSTEM_VERSION_PREFIX[sdk=iphone*] = 8;


Modified: tags/Safari-605.1.4/Source/WebKit/Configurations/Version.xcconfig (221643 => 221644)

--- tags/Safari-605.1.4/Source/WebKit/Configurations/Version.xcconfig	2017-09-05 23:25:28 UTC (rev 221643)
+++ tags/Safari-605.1.4/Source/WebKit/Configurations/Version.xcconfig	2017-09-05 23:25:32 UTC (rev 221644)
@@ -24,9 +24,9 @@
 MAJOR_VERSION = 605;
 MINOR_VERSION =

[webkit-changes] [221643] tags/Safari-605.1.4/Source/WebKit

2017-09-05 Thread matthew_hanson

Title: [221643] tags/Safari-605.1.4/Source/WebKit








Revision 221643
Author matthew_han...@apple.com
Date 2017-09-05 16:25:28 -0700 (Tue, 05 Sep 2017)


Log Message
Revert r221641. rdar://problem/34186977

Modified Paths

tags/Safari-605.1.4/Source/WebKit/ChangeLog
tags/Safari-605.1.4/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm




Diff

Modified: tags/Safari-605.1.4/Source/WebKit/ChangeLog (221642 => 221643)

--- tags/Safari-605.1.4/Source/WebKit/ChangeLog	2017-09-05 23:18:44 UTC (rev 221642)
+++ tags/Safari-605.1.4/Source/WebKit/ChangeLog	2017-09-05 23:25:28 UTC (rev 221643)
@@ -1,5 +1,9 @@
 2017-09-05  Matthew Hanson  
 
+Revert r221641. rdar://problem/34186977
+
+2017-09-05  Matthew Hanson  
+
 Cherry-pick r221457. rdar://problem/34186977
 
 2017-08-31  Megan Gardner  


Modified: tags/Safari-605.1.4/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm (221642 => 221643)

--- tags/Safari-605.1.4/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm	2017-09-05 23:18:44 UTC (rev 221642)
+++ tags/Safari-605.1.4/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm	2017-09-05 23:25:28 UTC (rev 221643)
@@ -2544,10 +2544,12 @@
 return _textSelectionAssistant != nil;
 }
 
+#if __IPHONE_OS_VERSION_MAX_ALLOWED < 12
 - (void)changeSelectionWithGestureAt:(CGPoint)point withGesture:(UIWKGestureType)gestureType withState:(UIGestureRecognizerState)state
 {
 [self changeSelectionWithGestureAt:point withGesture:gestureType withState:state withFlags:UIWKNone];
 }
+#endif
 
 - (void)changeSelectionWithGestureAt:(CGPoint)point withGesture:(UIWKGestureType)gestureType withState:(UIGestureRecognizerState)state withFlags:(UIWKSelectionFlags)flags
 {






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

[webkit-changes] [221641] tags/Safari-605.1.4/Source/WebKit

2017-09-05 Thread matthew_hanson

Title: [221641] tags/Safari-605.1.4/Source/WebKit








Revision 221641
Author matthew_han...@apple.com
Date 2017-09-05 16:04:00 -0700 (Tue, 05 Sep 2017)


Log Message
Cherry-pick r221457. rdar://problem/34186977

Modified Paths

tags/Safari-605.1.4/Source/WebKit/ChangeLog
tags/Safari-605.1.4/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm




Diff

Modified: tags/Safari-605.1.4/Source/WebKit/ChangeLog (221640 => 221641)

--- tags/Safari-605.1.4/Source/WebKit/ChangeLog	2017-09-05 23:01:04 UTC (rev 221640)
+++ tags/Safari-605.1.4/Source/WebKit/ChangeLog	2017-09-05 23:04:00 UTC (rev 221641)
@@ -1,3 +1,19 @@
+2017-09-05  Matthew Hanson  
+
+Cherry-pick r221457. rdar://problem/34186977
+
+2017-08-31  Megan Gardner  
+
+Fix error in protocol revving
+https://bugs.webkit.org/show_bug.cgi?id=176191
+
+Protocol definition was mastered out of later iOS submissions, causing them to not build.
+
+Reviewed by Tim Horton.
+
+* UIProcess/ios/WKContentViewInteraction.mm:
+(-[WKContentView changeSelectionWithGestureAt:withGesture:withState:]):
+
 2017-08-30  Jason Marcell  
 
 Revert r221068. rdar://problem/33925559


Modified: tags/Safari-605.1.4/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm (221640 => 221641)

--- tags/Safari-605.1.4/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm	2017-09-05 23:01:04 UTC (rev 221640)
+++ tags/Safari-605.1.4/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm	2017-09-05 23:04:00 UTC (rev 221641)
@@ -2544,12 +2544,10 @@
 return _textSelectionAssistant != nil;
 }
 
-#if __IPHONE_OS_VERSION_MAX_ALLOWED < 12
 - (void)changeSelectionWithGestureAt:(CGPoint)point withGesture:(UIWKGestureType)gestureType withState:(UIGestureRecognizerState)state
 {
 [self changeSelectionWithGestureAt:point withGesture:gestureType withState:state withFlags:UIWKNone];
 }
-#endif
 
 - (void)changeSelectionWithGestureAt:(CGPoint)point withGesture:(UIWKGestureType)gestureType withState:(UIGestureRecognizerState)state withFlags:(UIWKSelectionFlags)flags
 {






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

[webkit-changes] [221640] tags/Safari-605.1.4/Source

2017-09-05 Thread matthew_hanson

Title: [221640] tags/Safari-605.1.4/Source








Revision 221640
Author matthew_han...@apple.com
Date 2017-09-05 16:01:04 -0700 (Tue, 05 Sep 2017)


Log Message
Versioning.

Modified Paths

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




Diff

Modified: tags/Safari-605.1.4/Source/_javascript_Core/Configurations/Version.xcconfig (221639 => 221640)

--- tags/Safari-605.1.4/Source/_javascript_Core/Configurations/Version.xcconfig	2017-09-05 22:53:59 UTC (rev 221639)
+++ tags/Safari-605.1.4/Source/_javascript_Core/Configurations/Version.xcconfig	2017-09-05 23:01:04 UTC (rev 221640)
@@ -24,9 +24,9 @@
 MAJOR_VERSION = 605;
 MINOR_VERSION = 1;
 TINY_VERSION = 4;
-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-605.1.4/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig (221639 => 221640)

--- tags/Safari-605.1.4/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig	2017-09-05 22:53:59 UTC (rev 221639)
+++ tags/Safari-605.1.4/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig	2017-09-05 23:01:04 UTC (rev 221640)
@@ -24,9 +24,9 @@
 MAJOR_VERSION = 605;
 MINOR_VERSION = 1;
 TINY_VERSION = 4;
-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-605.1.4/Source/WebCore/Configurations/Version.xcconfig (221639 => 221640)

--- tags/Safari-605.1.4/Source/WebCore/Configurations/Version.xcconfig	2017-09-05 22:53:59 UTC (rev 221639)
+++ tags/Safari-605.1.4/Source/WebCore/Configurations/Version.xcconfig	2017-09-05 23:01:04 UTC (rev 221640)
@@ -24,9 +24,9 @@
 MAJOR_VERSION = 605;
 MINOR_VERSION = 1;
 TINY_VERSION = 4;
-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-605.1.4/Source/WebCore/PAL/Configurations/Version.xcconfig (221639 => 221640)

--- tags/Safari-605.1.4/Source/WebCore/PAL/Configurations/Version.xcconfig	2017-09-05 22:53:59 UTC (rev 221639)
+++ tags/Safari-605.1.4/Source/WebCore/PAL/Configurations/Version.xcconfig	2017-09-05 23:01:04 UTC (rev 221640)
@@ -24,9 +24,9 @@
 MAJOR_VERSION = 605;
 MINOR_VERSION = 1;
 TINY_VERSION = 4;
-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-605.1.4/Source/WebInspectorUI/Configurations/Version.xcconfig (221639 => 221640)

--- tags/Safari-605.1.4/Source/WebInspectorUI/Configurations/Version.xcconfig	2017-09-05 22:53:59 UTC (rev 221639)
+++ tags/Safari-605.1.4/Source/WebInspectorUI/Configurations/Version.xcconfig	2017-09-05 23:01:04 UTC (rev 221640)
@@ -1,9 +1,9 @@
 MAJOR_VERSION = 605;
 MINOR_VERSION = 1;
 TINY_VERSION = 4;
-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-605.1.4/Source/WebKit/Configurations/Version.xcconfig (221639 => 221640)

--- tags/Safari-605.1.4/Source/WebKit/Configurations/Version.xcconfig	2017-09-05 22:53:59 UTC (rev 221639)
+++ tags/Safari-605.1.4/Source/WebKit/Configurations/Version.xcconfig	2017-09-05 23:01:04 UTC (rev 221640)
@@ -24,9 +24,9 @@
 MAJOR_VERSION = 605;
 MINOR_VERSION = 1;
 TINY_VERSION = 4;

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

2017-08-15 Thread matthew_hanson

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








Revision 220749
Author matthew_han...@apple.com
Date 2017-08-15 10:57:56 -0700 (Tue, 15 Aug 2017)


Log Message
Cherry-pick r220722. rdar://problem/33890577

Modified Paths

branches/safari-604-branch/Source/WebCore/ChangeLog
branches/safari-604-branch/Source/WebCore/WebCore.xcodeproj/project.pbxproj
branches/safari-604-branch/Source/WebCore/loader/ios/PreviewLoader.h
branches/safari-604-branch/Source/WebCore/loader/ios/PreviewLoader.mm
branches/safari-604-branch/Tools/ChangeLog
branches/safari-604-branch/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj


Added Paths

branches/safari-604-branch/Tools/TestWebKitAPI/Tests/WebCore/ios/
branches/safari-604-branch/Tools/TestWebKitAPI/Tests/WebCore/ios/PreviewLoader.cpp




Diff

Modified: branches/safari-604-branch/Source/WebCore/ChangeLog (220748 => 220749)

--- branches/safari-604-branch/Source/WebCore/ChangeLog	2017-08-15 17:50:05 UTC (rev 220748)
+++ branches/safari-604-branch/Source/WebCore/ChangeLog	2017-08-15 17:57:56 UTC (rev 220749)
@@ -1,3 +1,23 @@
+2017-08-15  Matthew Hanson  
+
+Cherry-pick r220722. rdar://problem/33890577
+
+2017-08-14  Andy Estes  
+
+REGRESSION (r220456): Crash in PreviewLoader::shouldCreateForMIMEType() when a ResourceResponse has a null MIME type
+https://bugs.webkit.org/show_bug.cgi?id=175548
+
+
+Reviewed by Brady Eidson.
+
+New API test: QuickLook.ShouldCreateForMIMEType
+
+* WebCore.xcodeproj/project.pbxproj:
+* loader/ios/PreviewLoader.h:
+* loader/ios/PreviewLoader.mm:
+(WebCore::PreviewLoader::shouldCreateForMIMEType): Check if mimeType is a null String before
+calling HashSet::contains().
+
 2017-08-14  Jason Marcell  
 
 Revert r217197. rdar://problem/33890650


Modified: branches/safari-604-branch/Source/WebCore/WebCore.xcodeproj/project.pbxproj (220748 => 220749)

--- branches/safari-604-branch/Source/WebCore/WebCore.xcodeproj/project.pbxproj	2017-08-15 17:50:05 UTC (rev 220748)
+++ branches/safari-604-branch/Source/WebCore/WebCore.xcodeproj/project.pbxproj	2017-08-15 17:57:56 UTC (rev 220749)
@@ -4303,7 +4303,7 @@
 		A17D275E1EAC579800BF01E7 /* MediaSelectionOption.h in Headers */ = {isa = PBXBuildFile; fileRef = A17D275D1EAC579800BF01E7 /* MediaSelectionOption.h */; settings = {ATTRIBUTES = (Private, ); }; };
 		A182D5B71BE722670087A7CC /* SettingsCocoa.mm in Sources */ = {isa = PBXBuildFile; fileRef = A182D5B61BE722620087A7CC /* SettingsCocoa.mm */; };
 		A185B4291E8211A100DC9118 /* PreviewLoader.mm in Sources */ = {isa = PBXBuildFile; fileRef = A185B4271E8211A100DC9118 /* PreviewLoader.mm */; };
-		A185B42A1E8211A100DC9118 /* PreviewLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = A185B4281E8211A100DC9118 /* PreviewLoader.h */; };
+		A185B42A1E8211A100DC9118 /* PreviewLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = A185B4281E8211A100DC9118 /* PreviewLoader.h */; settings = {ATTRIBUTES = (Private, ); }; };
 		A18890AE1AA13F250026C301 /* ParentalControlsContentFilter.mm in Sources */ = {isa = PBXBuildFile; fileRef = A18890AC1AA13F250026C301 /* ParentalControlsContentFilter.mm */; };
 		A18890AF1AA13F250026C301 /* ParentalControlsContentFilter.h in Headers */ = {isa = PBXBuildFile; fileRef = A18890AD1AA13F250026C301 /* ParentalControlsContentFilter.h */; };
 		A18F7A361ECA73640059E1E1 /* RuntimeApplicationChecks.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A18F7A351ECA73640059E1E1 /* RuntimeApplicationChecks.cpp */; };


Modified: branches/safari-604-branch/Source/WebCore/loader/ios/PreviewLoader.h (220748 => 220749)

--- branches/safari-604-branch/Source/WebCore/loader/ios/PreviewLoader.h	2017-08-15 17:50:05 UTC (rev 220748)
+++ branches/safari-604-branch/Source/WebCore/loader/ios/PreviewLoader.h	2017-08-15 17:57:56 UTC (rev 220749)
@@ -41,7 +41,7 @@
 class PreviewLoader {
 WTF_MAKE_NONCOPYABLE(PreviewLoader);
 public:
-static bool shouldCreateForMIMEType(const String&);
+WEBCORE_EXPORT static bool shouldCreateForMIMEType(const String&);
 static std::unique_ptr create(ResourceLoader&, const ResourceResponse&);
 ~PreviewLoader();
 


Modified: branches/safari-604-branch/Source/WebCore/loader/ios/PreviewLoader.mm (220748 => 220749)

--- branches/safari-604-branch/Source/WebCore/loader/ios/PreviewLoader.mm	2017-08-15 17:50:05 UTC (rev 220748)
+++ branches/safari-604-branch/Source/WebCore/loader/ios/PreviewLoader.mm	2017-08-15 17:57:56 UTC (rev 220749)
@@ -210,6 +210,9 @@
 supportedMIMETypes.get().add(mimeType);
 });
 
+if (mimeType.isNull())
+return false;
+
 return supportedMIMETypes.get().contains(mimeType);
 }
 


Modified: branches/safari-604-branch/Tools/ChangeLog (220748 => 220749)

--- branches/safari-604-branch/Tools/ChangeLog	2017-08-15 17:50:05 UTC (rev 220748)
+++

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

2017-08-15 Thread matthew_hanson

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








Revision 220748
Author matthew_han...@apple.com
Date 2017-08-15 10:50:05 -0700 (Tue, 15 Aug 2017)


Log Message
Cherry-pick r220722. rdar://problem/33890575

Modified Paths

branches/safari-604.1.38.0-branch/Source/WebCore/ChangeLog
branches/safari-604.1.38.0-branch/Source/WebCore/WebCore.xcodeproj/project.pbxproj
branches/safari-604.1.38.0-branch/Source/WebCore/loader/ios/PreviewLoader.h
branches/safari-604.1.38.0-branch/Source/WebCore/loader/ios/PreviewLoader.mm
branches/safari-604.1.38.0-branch/Tools/ChangeLog
branches/safari-604.1.38.0-branch/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj


Added Paths

branches/safari-604.1.38.0-branch/Tools/TestWebKitAPI/Tests/WebCore/ios/
branches/safari-604.1.38.0-branch/Tools/TestWebKitAPI/Tests/WebCore/ios/PreviewLoader.cpp




Diff

Modified: branches/safari-604.1.38.0-branch/Source/WebCore/ChangeLog (220747 => 220748)

--- branches/safari-604.1.38.0-branch/Source/WebCore/ChangeLog	2017-08-15 17:47:10 UTC (rev 220747)
+++ branches/safari-604.1.38.0-branch/Source/WebCore/ChangeLog	2017-08-15 17:50:05 UTC (rev 220748)
@@ -1,3 +1,23 @@
+2017-08-15  Matthew Hanson  
+
+Cherry-pick r220722. rdar://problem/33890575
+
+2017-08-14  Andy Estes  
+
+REGRESSION (r220456): Crash in PreviewLoader::shouldCreateForMIMEType() when a ResourceResponse has a null MIME type
+https://bugs.webkit.org/show_bug.cgi?id=175548
+
+
+Reviewed by Brady Eidson.
+
+New API test: QuickLook.ShouldCreateForMIMEType
+
+* WebCore.xcodeproj/project.pbxproj:
+* loader/ios/PreviewLoader.h:
+* loader/ios/PreviewLoader.mm:
+(WebCore::PreviewLoader::shouldCreateForMIMEType): Check if mimeType is a null String before
+calling HashSet::contains().
+
 2017-08-14  Jason Marcell  
 
 Revert r217197. rdar://problem/33890636


Modified: branches/safari-604.1.38.0-branch/Source/WebCore/WebCore.xcodeproj/project.pbxproj (220747 => 220748)

--- branches/safari-604.1.38.0-branch/Source/WebCore/WebCore.xcodeproj/project.pbxproj	2017-08-15 17:47:10 UTC (rev 220747)
+++ branches/safari-604.1.38.0-branch/Source/WebCore/WebCore.xcodeproj/project.pbxproj	2017-08-15 17:50:05 UTC (rev 220748)
@@ -4303,7 +4303,7 @@
 		A17D275E1EAC579800BF01E7 /* MediaSelectionOption.h in Headers */ = {isa = PBXBuildFile; fileRef = A17D275D1EAC579800BF01E7 /* MediaSelectionOption.h */; settings = {ATTRIBUTES = (Private, ); }; };
 		A182D5B71BE722670087A7CC /* SettingsCocoa.mm in Sources */ = {isa = PBXBuildFile; fileRef = A182D5B61BE722620087A7CC /* SettingsCocoa.mm */; };
 		A185B4291E8211A100DC9118 /* PreviewLoader.mm in Sources */ = {isa = PBXBuildFile; fileRef = A185B4271E8211A100DC9118 /* PreviewLoader.mm */; };
-		A185B42A1E8211A100DC9118 /* PreviewLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = A185B4281E8211A100DC9118 /* PreviewLoader.h */; };
+		A185B42A1E8211A100DC9118 /* PreviewLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = A185B4281E8211A100DC9118 /* PreviewLoader.h */; settings = {ATTRIBUTES = (Private, ); }; };
 		A18890AE1AA13F250026C301 /* ParentalControlsContentFilter.mm in Sources */ = {isa = PBXBuildFile; fileRef = A18890AC1AA13F250026C301 /* ParentalControlsContentFilter.mm */; };
 		A18890AF1AA13F250026C301 /* ParentalControlsContentFilter.h in Headers */ = {isa = PBXBuildFile; fileRef = A18890AD1AA13F250026C301 /* ParentalControlsContentFilter.h */; };
 		A18F7A361ECA73640059E1E1 /* RuntimeApplicationChecks.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A18F7A351ECA73640059E1E1 /* RuntimeApplicationChecks.cpp */; };


Modified: branches/safari-604.1.38.0-branch/Source/WebCore/loader/ios/PreviewLoader.h (220747 => 220748)

--- branches/safari-604.1.38.0-branch/Source/WebCore/loader/ios/PreviewLoader.h	2017-08-15 17:47:10 UTC (rev 220747)
+++ branches/safari-604.1.38.0-branch/Source/WebCore/loader/ios/PreviewLoader.h	2017-08-15 17:50:05 UTC (rev 220748)
@@ -41,7 +41,7 @@
 class PreviewLoader {
 WTF_MAKE_NONCOPYABLE(PreviewLoader);
 public:
-static bool shouldCreateForMIMEType(const String&);
+WEBCORE_EXPORT static bool shouldCreateForMIMEType(const String&);
 static std::unique_ptr create(ResourceLoader&, const ResourceResponse&);
 ~PreviewLoader();
 


Modified: branches/safari-604.1.38.0-branch/Source/WebCore/loader/ios/PreviewLoader.mm (220747 => 220748)

--- branches/safari-604.1.38.0-branch/Source/WebCore/loader/ios/PreviewLoader.mm	2017-08-15 17:47:10 UTC (rev 220747)
+++ branches/safari-604.1.38.0-branch/Source/WebCore/loader/ios/PreviewLoader.mm	2017-08-15 17:50:05 UTC (rev 220748)
@@ -210,6 +210,9 @@
 supportedMIMETypes.get().add(mimeType);
 });
 
+if (mimeType.isNull())
+return false;
+
 return supportedMIMETypes.get().contains(mimeType);
 }
 


Modified:

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

2017-08-07 Thread matthew_hanson

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








Revision 220359
Author matthew_han...@apple.com
Date 2017-08-07 15:26:53 -0700 (Mon, 07 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 (220358 => 220359)

--- branches/safari-604.1.38.1-branch/Source/_javascript_Core/Configurations/Version.xcconfig	2017-08-07 22:24:30 UTC (rev 220358)
+++ branches/safari-604.1.38.1-branch/Source/_javascript_Core/Configurations/Version.xcconfig	2017-08-07 22:26:53 UTC (rev 220359)
@@ -23,10 +23,10 @@
 
 MAJOR_VERSION = 604;
 MINOR_VERSION = 1;
-TINY_VERSION = 39;
-MICRO_VERSION = 0;
-NANO_VERSION = 0;
-FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION);
+TINY_VERSION = 38;
+MICRO_VERSION = 1;
+NANO_VERSION = 1;
+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.
 BUNDLE_VERSION = $(BUNDLE_VERSION_$(CONFIGURATION));


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

--- branches/safari-604.1.38.1-branch/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig	2017-08-07 22:24:30 UTC (rev 220358)
+++ branches/safari-604.1.38.1-branch/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig	2017-08-07 22:26:53 UTC (rev 220359)
@@ -23,10 +23,10 @@
 
 MAJOR_VERSION = 604;
 MINOR_VERSION = 1;
-TINY_VERSION = 39;
-MICRO_VERSION = 0;
-NANO_VERSION = 0;
-FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION);
+TINY_VERSION = 38;
+MICRO_VERSION = 1;
+NANO_VERSION = 1;
+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.
 BUNDLE_VERSION = $(BUNDLE_VERSION_$(CONFIGURATION));


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

--- branches/safari-604.1.38.1-branch/Source/WebCore/Configurations/Version.xcconfig	2017-08-07 22:24:30 UTC (rev 220358)
+++ branches/safari-604.1.38.1-branch/Source/WebCore/Configurations/Version.xcconfig	2017-08-07 22:26:53 UTC (rev 220359)
@@ -23,10 +23,10 @@
 
 MAJOR_VERSION = 604;
 MINOR_VERSION = 1;
-TINY_VERSION = 39;
-MICRO_VERSION = 0;
-NANO_VERSION = 0;
-FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION);
+TINY_VERSION = 38;
+MICRO_VERSION = 1;
+NANO_VERSION = 1;
+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.
 BUNDLE_VERSION = $(BUNDLE_VERSION_$(CONFIGURATION));


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

--- branches/safari-604.1.38.1-branch/Source/WebCore/PAL/Configurations/Version.xcconfig	2017-08-07 22:24:30 UTC (rev 220358)
+++ branches/safari-604.1.38.1-branch/Source/WebCore/PAL/Configurations/Version.xcconfig	2017-08-07 22:26:53 UTC (rev 220359)
@@ -23,10 +23,10 @@
 
 MAJOR_VERSION = 604;
 MINOR_VERSION = 1;
-TINY_VERSION = 39;
-MICRO_VERSION = 0;
-NANO_VERSION = 0;
-FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION);
+TINY_VERSION = 38;
+MICRO_VERSION = 1;
+NANO_VERSION = 1;
+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.
 BUNDLE_VERSION = $(BUNDLE_VERSION_$(CONFIGURATION));


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

--- branches/safari-604.1.38.1-branch/Source/WebInspectorUI/Configurations/Version.xcconfig	2017-08-07 22:24:30 UTC (rev 220358)
+++ branches/safari-604.1.38.1-branch/Source/WebInspectorUI/Configurations/Version.xcconfig	2017-08-07 22:26:53 UTC (rev 220359)
@@ -1,9 +1,9 @@
 MAJOR_VERSION = 604;
 MINOR_VERSION = 1;
-TINY_VERSION = 39;
-MICRO_VERSION = 0;
-NANO_VERSION = 0;
-FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION);
+TINY_VERSION = 38;
+MICRO_VERSION = 1;

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

2017-08-07 Thread matthew_hanson

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








Revision 220358
Author matthew_han...@apple.com
Date 2017-08-07 15:24:30 -0700 (Mon, 07 Aug 2017)


Log Message
New branch.

Added Paths

branches/safari-604.1.38.1-branch/




Diff




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

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

2017-08-07 Thread matthew_hanson

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








Revision 220357
Author matthew_han...@apple.com
Date 2017-08-07 15:22:37 -0700 (Mon, 07 Aug 2017)


Log Message
Cherry-pick r220273. rdar://problem/33732757

Modified Paths

branches/safari-604.1.38.0-branch/Source/WebKit/ChangeLog
branches/safari-604.1.38.0-branch/Source/WebKit/NetworkProcess/NetworkLoad.cpp




Diff

Modified: branches/safari-604.1.38.0-branch/Source/WebKit/ChangeLog (220356 => 220357)

--- branches/safari-604.1.38.0-branch/Source/WebKit/ChangeLog	2017-08-07 22:20:49 UTC (rev 220356)
+++ branches/safari-604.1.38.0-branch/Source/WebKit/ChangeLog	2017-08-07 22:22:37 UTC (rev 220357)
@@ -1,3 +1,21 @@
+2017-08-07  Jason Marcell  
+
+Cherry-pick r220273. rdar://problem/33732757
+
+2017-08-04  Andreas Kling  
+
+NetworkLoad should always invoke its redirect completion handler
+https://bugs.webkit.org/show_bug.cgi?id=175179
+
+
+Reviewed by Chris Dumez.
+
+Make sure the redirect completion handler is always invoked,
+just like we already did for the response completion handler.
+
+* NetworkProcess/NetworkLoad.cpp:
+(WebKit::NetworkLoad::~NetworkLoad):
+
 2017-08-04  Jason Marcell  
 
 Revert r219896. rdar://problem/33711000


Modified: branches/safari-604.1.38.0-branch/Source/WebKit/NetworkProcess/NetworkLoad.cpp (220356 => 220357)

--- branches/safari-604.1.38.0-branch/Source/WebKit/NetworkProcess/NetworkLoad.cpp	2017-08-07 22:20:49 UTC (rev 220356)
+++ branches/safari-604.1.38.0-branch/Source/WebKit/NetworkProcess/NetworkLoad.cpp	2017-08-07 22:22:37 UTC (rev 220357)
@@ -135,6 +135,8 @@
 #if USE(NETWORK_SESSION)
 if (m_responseCompletionHandler)
 m_responseCompletionHandler(PolicyIgnore);
+if (m_redirectCompletionHandler)
+m_redirectCompletionHandler({ });
 #if USE(PROTECTION_SPACE_AUTH_CALLBACK)
 if (m_challengeCompletionHandler)
 m_challengeCompletionHandler(AuthenticationChallengeDisposition::Cancel, { });






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

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

2017-08-07 Thread matthew_hanson

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








Revision 220356
Author matthew_han...@apple.com
Date 2017-08-07 15:20:49 -0700 (Mon, 07 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 (220355 => 220356)

--- branches/safari-604.1.38.0-branch/Source/_javascript_Core/Configurations/Version.xcconfig	2017-08-07 22:09:49 UTC (rev 220355)
+++ branches/safari-604.1.38.0-branch/Source/_javascript_Core/Configurations/Version.xcconfig	2017-08-07 22:20:49 UTC (rev 220356)
@@ -25,8 +25,8 @@
 MINOR_VERSION = 1;
 TINY_VERSION = 38;
 MICRO_VERSION = 0;
-NANO_VERSION = 0;
-FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION);
+NANO_VERSION = 1;
+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.
 BUNDLE_VERSION = $(BUNDLE_VERSION_$(CONFIGURATION));


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

--- branches/safari-604.1.38.0-branch/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig	2017-08-07 22:09:49 UTC (rev 220355)
+++ branches/safari-604.1.38.0-branch/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig	2017-08-07 22:20:49 UTC (rev 220356)
@@ -25,8 +25,8 @@
 MINOR_VERSION = 1;
 TINY_VERSION = 38;
 MICRO_VERSION = 0;
-NANO_VERSION = 0;
-FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION);
+NANO_VERSION = 1;
+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.
 BUNDLE_VERSION = $(BUNDLE_VERSION_$(CONFIGURATION));


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

--- branches/safari-604.1.38.0-branch/Source/WebCore/Configurations/Version.xcconfig	2017-08-07 22:09:49 UTC (rev 220355)
+++ branches/safari-604.1.38.0-branch/Source/WebCore/Configurations/Version.xcconfig	2017-08-07 22:20:49 UTC (rev 220356)
@@ -25,8 +25,8 @@
 MINOR_VERSION = 1;
 TINY_VERSION = 38;
 MICRO_VERSION = 0;
-NANO_VERSION = 0;
-FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION);
+NANO_VERSION = 1;
+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.
 BUNDLE_VERSION = $(BUNDLE_VERSION_$(CONFIGURATION));


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

--- branches/safari-604.1.38.0-branch/Source/WebCore/PAL/Configurations/Version.xcconfig	2017-08-07 22:09:49 UTC (rev 220355)
+++ branches/safari-604.1.38.0-branch/Source/WebCore/PAL/Configurations/Version.xcconfig	2017-08-07 22:20:49 UTC (rev 220356)
@@ -25,8 +25,8 @@
 MINOR_VERSION = 1;
 TINY_VERSION = 38;
 MICRO_VERSION = 0;
-NANO_VERSION = 0;
-FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION);
+NANO_VERSION = 1;
+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.
 BUNDLE_VERSION = $(BUNDLE_VERSION_$(CONFIGURATION));


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

--- branches/safari-604.1.38.0-branch/Source/WebInspectorUI/Configurations/Version.xcconfig	2017-08-07 22:09:49 UTC (rev 220355)
+++ branches/safari-604.1.38.0-branch/Source/WebInspectorUI/Configurations/Version.xcconfig	2017-08-07 22:20:49 UTC (rev 220356)
@@ -2,8 +2,8 @@
 MINOR_VERSION = 1;
 TINY_VERSION = 38;
 MICRO_VERSION = 0;
-NANO_VERSION = 0;
-FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION);
+NANO_VERSION = 1;
+FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION).$(NANO_VERSION);
 
 // The system version prefix is based on the current system version.
 SYSTEM_VERSION_PREFIX[sdk=iphone*] = 8;


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

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

2017-08-07 Thread matthew_hanson

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








Revision 220355
Author matthew_han...@apple.com
Date 2017-08-07 15:09:49 -0700 (Mon, 07 Aug 2017)


Log Message
New branch.

Added Paths

branches/safari-604.1.38.0-branch/




Diff




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

[webkit-changes] [220349] branches/safari-604.1-branch/Source/WebCore

2017-08-07 Thread matthew_hanson

Title: [220349] branches/safari-604.1-branch/Source/WebCore








Revision 220349
Author matthew_han...@apple.com
Date 2017-08-07 11:58:06 -0700 (Mon, 07 Aug 2017)


Log Message
Cherry-pick r220248. rdar://problem/33754446

Modified Paths

branches/safari-604.1-branch/Source/WebCore/ChangeLog
branches/safari-604.1-branch/Source/WebCore/platform/mac/WebVideoFullscreenController.mm




Diff

Modified: branches/safari-604.1-branch/Source/WebCore/ChangeLog (220348 => 220349)

--- branches/safari-604.1-branch/Source/WebCore/ChangeLog	2017-08-07 18:55:59 UTC (rev 220348)
+++ branches/safari-604.1-branch/Source/WebCore/ChangeLog	2017-08-07 18:58:06 UTC (rev 220349)
@@ -1,5 +1,29 @@
 2017-08-07  Jason Marcell  
 
+Cherry-pick r220248. rdar://problem/33754446
+
+2017-08-03  Jeremy Jones  
+
+Improve WebKitLegacy video fullscreen animation begin and end rects.
+https://bugs.webkit.org/show_bug.cgi?id=175152
+rdar://problem/32840576
+
+Reviewed by Eric Carlson.
+
+No new tests, becuase this change has no effect on the DOM.
+
+This change uses different rects for fullscreen animation to prevent the animation
+from failing, and to improve the aesthetics of the animation.
+
+* platform/mac/WebVideoFullscreenController.mm:
+(frameExpandedToRatioOfFrame):
+(-[WebVideoFullscreenController enterFullscreen:]):
+(-[WebVideoFullscreenController exitFullscreen]):
+(-[WebVideoFullscreenWindow animateFromRect:toRect:withSubAnimation:controllerAction:]):
+(constrainFrameToRatioOfFrame): Deleted.
+
+2017-08-07  Jason Marcell  
+
 Cherry-pick r220247. rdar://problem/33754440
 
 2017-08-03  Jer Noble  


Modified: branches/safari-604.1-branch/Source/WebCore/platform/mac/WebVideoFullscreenController.mm (220348 => 220349)

--- branches/safari-604.1-branch/Source/WebCore/platform/mac/WebVideoFullscreenController.mm	2017-08-07 18:55:59 UTC (rev 220348)
+++ branches/safari-604.1-branch/Source/WebCore/platform/mac/WebVideoFullscreenController.mm	2017-08-07 18:58:06 UTC (rev 220349)
@@ -233,22 +233,24 @@
 // MARK: -
 // MARK: Exposed Interface
 
-static void constrainFrameToRatioOfFrame(NSRect *frameToConstrain, const NSRect *frame)
+static NSRect frameExpandedToRatioOfFrame(NSRect frameToExpand, NSRect frame)
 {
 // Keep a constrained aspect ratio for the destination window
-CGFloat originalRatio = frame->size.width / frame->size.height;
-CGFloat newRatio = frameToConstrain->size.width / frameToConstrain->size.height;
+NSRect result = frameToExpand;
+CGFloat newRatio = frame.size.width / frame.size.height;
+CGFloat originalRatio = frameToExpand.size.width / frameToExpand.size.height;
 if (newRatio > originalRatio) {
-CGFloat newWidth = originalRatio * frameToConstrain->size.height;
-CGFloat diff = frameToConstrain->size.width - newWidth;
-frameToConstrain->size.width = newWidth;
-frameToConstrain->origin.x += diff / 2;
+CGFloat newWidth = newRatio * frameToExpand.size.height;
+CGFloat diff = newWidth - frameToExpand.size.width;
+result.size.width = newWidth;
+result.origin.x -= diff / 2;
 } else {
-CGFloat newHeight = frameToConstrain->size.width / originalRatio;
-CGFloat diff = frameToConstrain->size.height - newHeight;
-frameToConstrain->size.height = newHeight;
-frameToConstrain->origin.y += diff / 2;
-}
+CGFloat newHeight = frameToExpand.size.width / newRatio;
+CGFloat diff = newHeight - frameToExpand.size.height;
+result.size.height = newHeight;
+result.origin.y -= diff / 2;
+}
+return result;
 }
 
 static NSWindow *createBackgroundFullscreenWindow(NSRect frame, int level)
@@ -277,9 +279,8 @@
 if (!screen)
 screen = [NSScreen mainScreen];
 
-NSRect frame = [self videoElementRect];
 NSRect endFrame = [screen frame];
-constrainFrameToRatioOfFrame(, );
+NSRect frame = frameExpandedToRatioOfFrame([self videoElementRect], endFrame);
 
 // Create a black window if needed
 if (!_backgroundFullscreenWindow)
@@ -316,8 +317,11 @@
 // If our owner releases us we could crash if this is not the case.
 // Balanced in windowDidExitFullscreen
 [self retain];
-
-[[self fullscreenWindow] animateFromRect:[[self window] frame] toRect:endFrame withSubAnimation:_fadeAnimation controllerAction:@selector(windowDidExitFullscreen)];
+
+NSRect startFrame = [[self window] frame];
+endFrame = frameExpandedToRatioOfFrame(endFrame, startFrame);
+
+[[self fullscreenWindow] animateFromRect:startFrame toRect:endFrame withSubAnimation:_fadeAnimation controllerAction:@selector(windowDidExitFullscreen)];
 }
 
 -

[webkit-changes] [220348] branches/safari-604.1-branch/Source/WebKit

2017-08-07 Thread matthew_hanson

Title: [220348] branches/safari-604.1-branch/Source/WebKit








Revision 220348
Author matthew_han...@apple.com
Date 2017-08-07 11:55:59 -0700 (Mon, 07 Aug 2017)


Log Message
Cherry-pick r220273. rdar://problem/33732754

Modified Paths

branches/safari-604.1-branch/Source/WebKit/ChangeLog
branches/safari-604.1-branch/Source/WebKit/NetworkProcess/NetworkLoad.cpp




Diff

Modified: branches/safari-604.1-branch/Source/WebKit/ChangeLog (220347 => 220348)

--- branches/safari-604.1-branch/Source/WebKit/ChangeLog	2017-08-07 18:55:56 UTC (rev 220347)
+++ branches/safari-604.1-branch/Source/WebKit/ChangeLog	2017-08-07 18:55:59 UTC (rev 220348)
@@ -1,3 +1,21 @@
+2017-08-07  Jason Marcell  
+
+Cherry-pick r220273. rdar://problem/33732754
+
+2017-08-04  Andreas Kling  
+
+NetworkLoad should always invoke its redirect completion handler
+https://bugs.webkit.org/show_bug.cgi?id=175179
+
+
+Reviewed by Chris Dumez.
+
+Make sure the redirect completion handler is always invoked,
+just like we already did for the response completion handler.
+
+* NetworkProcess/NetworkLoad.cpp:
+(WebKit::NetworkLoad::~NetworkLoad):
+
 2017-08-04  Jason Marcell  
 
 Revert r219896. rdar://problem/33711000


Modified: branches/safari-604.1-branch/Source/WebKit/NetworkProcess/NetworkLoad.cpp (220347 => 220348)

--- branches/safari-604.1-branch/Source/WebKit/NetworkProcess/NetworkLoad.cpp	2017-08-07 18:55:56 UTC (rev 220347)
+++ branches/safari-604.1-branch/Source/WebKit/NetworkProcess/NetworkLoad.cpp	2017-08-07 18:55:59 UTC (rev 220348)
@@ -135,6 +135,8 @@
 #if USE(NETWORK_SESSION)
 if (m_responseCompletionHandler)
 m_responseCompletionHandler(PolicyIgnore);
+if (m_redirectCompletionHandler)
+m_redirectCompletionHandler({ });
 #if USE(PROTECTION_SPACE_AUTH_CALLBACK)
 if (m_challengeCompletionHandler)
 m_challengeCompletionHandler(AuthenticationChallengeDisposition::Cancel, { });






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

[webkit-changes] [220347] branches/safari-604.1-branch/Source/WebCore

2017-08-07 Thread matthew_hanson

Title: [220347] branches/safari-604.1-branch/Source/WebCore








Revision 220347
Author matthew_han...@apple.com
Date 2017-08-07 11:55:56 -0700 (Mon, 07 Aug 2017)


Log Message
Cherry-pick r220247. rdar://problem/33754440

Modified Paths

branches/safari-604.1-branch/Source/WebCore/ChangeLog
branches/safari-604.1-branch/Source/WebCore/Modules/encryptedmedia/legacy/WebKitMediaKeySession.cpp
branches/safari-604.1-branch/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionAVContentKeySession.mm
branches/safari-604.1-branch/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionMediaSourceAVFObjC.mm




Diff

Modified: branches/safari-604.1-branch/Source/WebCore/ChangeLog (220346 => 220347)

--- branches/safari-604.1-branch/Source/WebCore/ChangeLog	2017-08-07 18:42:34 UTC (rev 220346)
+++ branches/safari-604.1-branch/Source/WebCore/ChangeLog	2017-08-07 18:55:56 UTC (rev 220347)
@@ -1,3 +1,28 @@
+2017-08-07  Jason Marcell  
+
+Cherry-pick r220247. rdar://problem/33754440
+
+2017-08-03  Jer Noble  
+
+[EME][Mac] SecureStop left on disk in Private Browsing mode.
+https://bugs.webkit.org/show_bug.cgi?id=175162
+
+Reviewed by Eric Carlson.
+
+Return an empty string from mediaKeysStorageDirectory() when the page indicates that storage should
+be ephemeral(). Previously, an empty string in this case would be treated as an error. Instead, treat
+an empty string as valid, and do not try to store or retrieve session information to disk in that case.
+
+* Modules/encryptedmedia/legacy/WebKitMediaKeySession.cpp:
+(WebCore::WebKitMediaKeySession::mediaKeysStorageDirectory const):
+* platform/graphics/avfoundation/objc/CDMSessionAVContentKeySession.mm:
+(WebCore::CDMSessionAVContentKeySession::releaseKeys):
+(WebCore::CDMSessionAVContentKeySession::update):
+(WebCore::CDMSessionAVContentKeySession::generateKeyReleaseMessage):
+(WebCore::CDMSessionAVContentKeySession::contentKeySession):
+* platform/graphics/avfoundation/objc/CDMSessionMediaSourceAVFObjC.mm:
+(WebCore::CDMSessionMediaSourceAVFObjC::storagePath const):
+
 2017-08-04  Jason Marcell  
 
 Revert r219896. rdar://problem/33711000


Modified: branches/safari-604.1-branch/Source/WebCore/Modules/encryptedmedia/legacy/WebKitMediaKeySession.cpp (220346 => 220347)

--- branches/safari-604.1-branch/Source/WebCore/Modules/encryptedmedia/legacy/WebKitMediaKeySession.cpp	2017-08-07 18:42:34 UTC (rev 220346)
+++ branches/safari-604.1-branch/Source/WebCore/Modules/encryptedmedia/legacy/WebKitMediaKeySession.cpp	2017-08-07 18:55:56 UTC (rev 220347)
@@ -32,6 +32,7 @@
 #include "EventNames.h"
 #include "ExceptionCode.h"
 #include "FileSystem.h"
+#include "Page.h"
 #include "SecurityOriginData.h"
 #include "Settings.h"
 #include "WebKitMediaKeyError.h"
@@ -223,6 +224,10 @@
 if (!document)
 return emptyString();
 
+auto* page = document->page();
+if (!page || page->usesEphemeralSession())
+return emptyString();
+
 auto storageDirectory = document->settings().mediaKeysStorageDirectory();
 if (storageDirectory.isEmpty())
 return emptyString();


Modified: branches/safari-604.1-branch/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionAVContentKeySession.mm (220346 => 220347)

--- branches/safari-604.1-branch/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionAVContentKeySession.mm	2017-08-07 18:42:34 UTC (rev 220346)
+++ branches/safari-604.1-branch/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionAVContentKeySession.mm	2017-08-07 18:55:56 UTC (rev 220347)
@@ -45,8 +45,12 @@
 SOFT_LINK_CLASS(AVFoundation, AVStreamDataParser);
 SOFT_LINK_CLASS_OPTIONAL(AVFoundation, AVContentKeySession);
 SOFT_LINK_CONSTANT_MAY_FAIL(AVFoundation, AVContentKeyRequestProtocolVersionsKey, NSString *)
+SOFT_LINK_CONSTANT_MAY_FAIL(AVFoundation, AVContentKeySystemFairPlayStreaming, NSString *)
 
+typedef NSString *AVContentKeySystem;
+
 @interface AVContentKeySession : NSObject
++ (instancetype)contentKeySessionWithKeySystem:(AVContentKeySystem)keySystem;
 - (instancetype)initWithStorageDirectoryAtURL:(NSURL *)storageURL;
 @property (assign) id delegate;
 - (void)addStreamDataParser:(AVStreamDataParser *)streamDataParser;
@@ -191,8 +195,12 @@
 if (![getAVContentKeySessionClass() respondsToSelector:@selector(pendingExpiredSessionReportsWithAppIdentifier:storageDirectoryAtURL:)])
 return;
 
+auto storagePath = this->storagePath();
+if (storagePath.isEmpty())
+return;
+
 RetainPtr certificateData = adoptNS([[NSData alloc] initWithBytes:m_certificate->data() length:m_certificate->length()]);
-NSArray* expiredSessions = [getAVContentKeySessionClass()

[webkit-changes] [220341] branches/safari-604-branch/Source/WebKit

2017-08-07 Thread matthew_hanson

Title: [220341] branches/safari-604-branch/Source/WebKit








Revision 220341
Author matthew_han...@apple.com
Date 2017-08-07 09:42:41 -0700 (Mon, 07 Aug 2017)


Log Message
Cherry-pick r220273. rdar://problem/33732762

Modified Paths

branches/safari-604-branch/Source/WebKit/ChangeLog
branches/safari-604-branch/Source/WebKit/NetworkProcess/NetworkLoad.cpp




Diff

Modified: branches/safari-604-branch/Source/WebKit/ChangeLog (220340 => 220341)

--- branches/safari-604-branch/Source/WebKit/ChangeLog	2017-08-07 16:42:38 UTC (rev 220340)
+++ branches/safari-604-branch/Source/WebKit/ChangeLog	2017-08-07 16:42:41 UTC (rev 220341)
@@ -1,5 +1,23 @@
 2017-08-07  Jason Marcell  
 
+Cherry-pick r220273. rdar://problem/33732762
+
+2017-08-04  Andreas Kling  
+
+NetworkLoad should always invoke its redirect completion handler
+https://bugs.webkit.org/show_bug.cgi?id=175179
+
+
+Reviewed by Chris Dumez.
+
+Make sure the redirect completion handler is always invoked,
+just like we already did for the response completion handler.
+
+* NetworkProcess/NetworkLoad.cpp:
+(WebKit::NetworkLoad::~NetworkLoad):
+
+2017-08-07  Jason Marcell  
+
 Cherry-pick r220185. rdar://problem/33713534
 
 2017-08-02  Chris Dumez  


Modified: branches/safari-604-branch/Source/WebKit/NetworkProcess/NetworkLoad.cpp (220340 => 220341)

--- branches/safari-604-branch/Source/WebKit/NetworkProcess/NetworkLoad.cpp	2017-08-07 16:42:38 UTC (rev 220340)
+++ branches/safari-604-branch/Source/WebKit/NetworkProcess/NetworkLoad.cpp	2017-08-07 16:42:41 UTC (rev 220341)
@@ -135,6 +135,8 @@
 #if USE(NETWORK_SESSION)
 if (m_responseCompletionHandler)
 m_responseCompletionHandler(PolicyIgnore);
+if (m_redirectCompletionHandler)
+m_redirectCompletionHandler({ });
 #if USE(PROTECTION_SPACE_AUTH_CALLBACK)
 if (m_challengeCompletionHandler)
 m_challengeCompletionHandler(AuthenticationChallengeDisposition::Cancel, { });






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

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

2017-08-07 Thread matthew_hanson

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








Revision 220340
Author matthew_han...@apple.com
Date 2017-08-07 09:42:38 -0700 (Mon, 07 Aug 2017)


Log Message
Cherry-pick r220185. rdar://problem/33713534

Modified Paths

branches/safari-604-branch/LayoutTests/ChangeLog
branches/safari-604-branch/LayoutTests/http/tests/cache/disk-cache/disk-cache-redirect-expected.txt
branches/safari-604-branch/LayoutTests/http/tests/cache/disk-cache/disk-cache-redirect.html
branches/safari-604-branch/Source/WebKit/ChangeLog
branches/safari-604-branch/Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp
branches/safari-604-branch/Source/WebKit/NetworkProcess/NetworkResourceLoader.h




Diff

Modified: branches/safari-604-branch/LayoutTests/ChangeLog (220339 => 220340)

--- branches/safari-604-branch/LayoutTests/ChangeLog	2017-08-07 16:42:35 UTC (rev 220339)
+++ branches/safari-604-branch/LayoutTests/ChangeLog	2017-08-07 16:42:38 UTC (rev 220340)
@@ -1,5 +1,23 @@
 2017-08-07  Jason Marcell  
 
+Cherry-pick r220185. rdar://problem/33713534
+
+2017-08-02  Chris Dumez  
+
+NetworkResourceLoader::setDefersLoading() may cause start() to be called multiple times
+https://bugs.webkit.org/show_bug.cgi?id=175109
+
+
+Reviewed by Brady Eidson.
+
+Extend test coverage to cover cacheable redirects to a resource that needs
+revalidation, similarly to the case in the radar.
+
+* http/tests/cache/disk-cache/disk-cache-redirect-expected.txt:
+* http/tests/cache/disk-cache/disk-cache-redirect.html:
+
+2017-08-07  Jason Marcell  
+
 Cherry-pick r220163. rdar://problem/33711032
 
 2017-08-02  Andy Estes  


Modified: branches/safari-604-branch/LayoutTests/http/tests/cache/disk-cache/disk-cache-redirect-expected.txt (220339 => 220340)

--- branches/safari-604-branch/LayoutTests/http/tests/cache/disk-cache/disk-cache-redirect-expected.txt	2017-08-07 16:42:35 UTC (rev 220339)
+++ branches/safari-604-branch/LayoutTests/http/tests/cache/disk-cache/disk-cache-redirect-expected.txt	2017-08-07 16:42:38 UTC (rev 220340)
@@ -3,7 +3,7 @@
 On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
 
 
-running 12 tests
+running 24 tests
 
 Testing loads from disk cache
 response headers: {"Status":"301","Location":"unique-cacheable"}
@@ -18,6 +18,18 @@
 response headers: {"Status":"307","Location":"unique-cacheable"}
 response source: Network
 
+response headers: {"Status":"301","Location":"/cache/resources/compass-no-cache.jpg"}
+response source: Disk cache after validation
+
+response headers: {"Status":"302","Location":"/cache/resources/compass-no-cache.jpg"}
+response source: Network
+
+response headers: {"Status":"303","Location":"/cache/resources/compass-no-cache.jpg"}
+response source: Network
+
+response headers: {"Status":"307","Location":"/cache/resources/compass-no-cache.jpg"}
+response source: Network
+
 response headers: {"Status":"301","Location":"unique-cacheable","Cache-control":"max-age=0"}
 response source: Network
 
@@ -30,6 +42,18 @@
 response headers: {"Status":"307","Location":"unique-cacheable","Cache-control":"max-age=0"}
 response source: Network
 
+response headers: {"Status":"301","Location":"/cache/resources/compass-no-cache.jpg","Cache-control":"max-age=0"}
+response source: Network
+
+response headers: {"Status":"302","Location":"/cache/resources/compass-no-cache.jpg","Cache-control":"max-age=0"}
+response source: Network
+
+response headers: {"Status":"303","Location":"/cache/resources/compass-no-cache.jpg","Cache-control":"max-age=0"}
+response source: Network
+
+response headers: {"Status":"307","Location":"/cache/resources/compass-no-cache.jpg","Cache-control":"max-age=0"}
+response source: Network
+
 response headers: {"Status":"301","Location":"unique-cacheable","Cache-control":"max-age=100"}
 response source: Disk cache
 
@@ -42,6 +66,18 @@
 response headers: {"Status":"307","Location":"unique-cacheable","Cache-control":"max-age=100"}
 response source: Disk cache
 
+response headers: {"Status":"301","Location":"/cache/resources/compass-no-cache.jpg","Cache-control":"max-age=100"}
+response source: Disk cache after validation
+
+response headers: {"Status":"302","Location":"/cache/resources/compass-no-cache.jpg","Cache-control":"max-age=100"}
+response source: Disk cache after validation
+
+response headers: {"Status":"303","Location":"/cache/resources/compass-no-cache.jpg","Cache-control":"max-age=100"}
+response source: Disk cache after validation
+
+response headers: {"Status":"307","Location":"/cache/resources/compass-no-cache.jpg","Cache-control":"max-age=100"}
+response source: Disk cache after validation
+
 Testing loads through memory cache (XHR behavior)
 response headers: {"Status":"301","Location":"unique-cacheable"}
 response source: Memory cache
@@

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

2017-08-07 Thread matthew_hanson

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








Revision 220338
Author matthew_han...@apple.com
Date 2017-08-07 09:42:30 -0700 (Mon, 07 Aug 2017)


Log Message
Cherry-pick r220153. rdar://problem/33711047

Modified Paths

branches/safari-604-branch/Source/WebCore/ChangeLog
branches/safari-604-branch/Source/WebCore/Modules/mediasource/SourceBuffer.cpp




Diff

Modified: branches/safari-604-branch/Source/WebCore/ChangeLog (220337 => 220338)

--- branches/safari-604-branch/Source/WebCore/ChangeLog	2017-08-07 16:32:24 UTC (rev 220337)
+++ branches/safari-604-branch/Source/WebCore/ChangeLog	2017-08-07 16:42:30 UTC (rev 220338)
@@ -1,3 +1,19 @@
+2017-08-07  Jason Marcell  
+
+Cherry-pick r220153. rdar://problem/33711047
+
+2017-08-02  Jer Noble  
+
+[MSE] Removing samples when presentation order does not match decode order can cause bad behavior.
+https://bugs.webkit.org/show_bug.cgi?id=175091
+
+Reviewed by Eric Carlson.
+
+Address follow-up comments to r219519.
+
+* Modules/mediasource/SourceBuffer.cpp:
+(WebCore::SourceBuffer::removeCodedFrames):
+
 2017-08-02  Jason Marcell  
 
 Cherry-pick r220112. rdar://problem/33692164


Modified: branches/safari-604-branch/Source/WebCore/Modules/mediasource/SourceBuffer.cpp (220337 => 220338)

--- branches/safari-604-branch/Source/WebCore/Modules/mediasource/SourceBuffer.cpp	2017-08-07 16:32:24 UTC (rev 220337)
+++ branches/safari-604-branch/Source/WebCore/Modules/mediasource/SourceBuffer.cpp	2017-08-07 16:42:30 UTC (rev 220338)
@@ -770,7 +770,7 @@
 
 auto removePresentationStart = trackBuffer.samples.presentationOrder().findSampleContainingOrAfterPresentationTime(start);
 auto removePresentationEnd = trackBuffer.samples.presentationOrder().findSampleStartingAfterPresentationTime(end);
-if (start == end)
+if (removePresentationStart == removePresentationEnd)
 continue;
 
 // 3.3 Remove all media data, from this track buffer, that contain starting timestamps greater than or equal to






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

[webkit-changes] [220301] branches/safari-604.1-branch/Source

2017-08-04 Thread matthew_hanson

Title: [220301] branches/safari-604.1-branch/Source








Revision 220301
Author matthew_han...@apple.com
Date 2017-08-04 15:19:28 -0700 (Fri, 04 Aug 2017)


Log Message
Versioning.

Modified Paths

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




Diff

Modified: branches/safari-604.1-branch/Source/_javascript_Core/Configurations/Version.xcconfig (220300 => 220301)

--- branches/safari-604.1-branch/Source/_javascript_Core/Configurations/Version.xcconfig	2017-08-04 22:14:30 UTC (rev 220300)
+++ branches/safari-604.1-branch/Source/_javascript_Core/Configurations/Version.xcconfig	2017-08-04 22:19:28 UTC (rev 220301)
@@ -23,7 +23,7 @@
 
 MAJOR_VERSION = 604;
 MINOR_VERSION = 1;
-TINY_VERSION = 38;
+TINY_VERSION = 39;
 MICRO_VERSION = 0;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION);


Modified: branches/safari-604.1-branch/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig (220300 => 220301)

--- branches/safari-604.1-branch/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig	2017-08-04 22:14:30 UTC (rev 220300)
+++ branches/safari-604.1-branch/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig	2017-08-04 22:19:28 UTC (rev 220301)
@@ -23,7 +23,7 @@
 
 MAJOR_VERSION = 604;
 MINOR_VERSION = 1;
-TINY_VERSION = 38;
+TINY_VERSION = 39;
 MICRO_VERSION = 0;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION);


Modified: branches/safari-604.1-branch/Source/WebCore/Configurations/Version.xcconfig (220300 => 220301)

--- branches/safari-604.1-branch/Source/WebCore/Configurations/Version.xcconfig	2017-08-04 22:14:30 UTC (rev 220300)
+++ branches/safari-604.1-branch/Source/WebCore/Configurations/Version.xcconfig	2017-08-04 22:19:28 UTC (rev 220301)
@@ -23,7 +23,7 @@
 
 MAJOR_VERSION = 604;
 MINOR_VERSION = 1;
-TINY_VERSION = 38;
+TINY_VERSION = 39;
 MICRO_VERSION = 0;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION);


Modified: branches/safari-604.1-branch/Source/WebCore/PAL/Configurations/Version.xcconfig (220300 => 220301)

--- branches/safari-604.1-branch/Source/WebCore/PAL/Configurations/Version.xcconfig	2017-08-04 22:14:30 UTC (rev 220300)
+++ branches/safari-604.1-branch/Source/WebCore/PAL/Configurations/Version.xcconfig	2017-08-04 22:19:28 UTC (rev 220301)
@@ -23,7 +23,7 @@
 
 MAJOR_VERSION = 604;
 MINOR_VERSION = 1;
-TINY_VERSION = 38;
+TINY_VERSION = 39;
 MICRO_VERSION = 0;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION);


Modified: branches/safari-604.1-branch/Source/WebInspectorUI/Configurations/Version.xcconfig (220300 => 220301)

--- branches/safari-604.1-branch/Source/WebInspectorUI/Configurations/Version.xcconfig	2017-08-04 22:14:30 UTC (rev 220300)
+++ branches/safari-604.1-branch/Source/WebInspectorUI/Configurations/Version.xcconfig	2017-08-04 22:19:28 UTC (rev 220301)
@@ -1,6 +1,6 @@
 MAJOR_VERSION = 604;
 MINOR_VERSION = 1;
-TINY_VERSION = 38;
+TINY_VERSION = 39;
 MICRO_VERSION = 0;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION);


Modified: branches/safari-604.1-branch/Source/WebKit/Configurations/Version.xcconfig (220300 => 220301)

--- branches/safari-604.1-branch/Source/WebKit/Configurations/Version.xcconfig	2017-08-04 22:14:30 UTC (rev 220300)
+++ branches/safari-604.1-branch/Source/WebKit/Configurations/Version.xcconfig	2017-08-04 22:19:28 UTC (rev 220301)
@@ -23,7 +23,7 @@
 
 MAJOR_VERSION = 604;
 MINOR_VERSION = 1;
-TINY_VERSION = 38;
+TINY_VERSION = 39;
 MICRO_VERSION = 0;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION);


Modified: branches/safari-604.1-branch/Source/WebKitLegacy/mac/Configurations/Version.xcconfig (220300 => 220301)

--- branches/safari-604.1-branch/Source/WebKitLegacy/mac/Configurations/Version.xcconfig	2017-08-04 22:14:30 UTC (rev 220300)
+++ branches/safari-604.1-branch/Source/WebKitLegacy/mac/Configurations/Version.xcconfig	2017-08-04 22:19:28 UTC (rev 220301)
@@ -23,7 +23,7 @@
 
 MAJOR_VERSION = 604;
 MINOR_VERSION = 1;
-TINY_VERSION = 38;
+TINY_VERSION = 39;
 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] [220300] tags/Safari-604.1.38/

2017-08-04 Thread matthew_hanson

Title: [220300] tags/Safari-604.1.38/








Revision 220300
Author matthew_han...@apple.com
Date 2017-08-04 15:14:30 -0700 (Fri, 04 Aug 2017)


Log Message
Tag Safari-604.1.38.

Added Paths

tags/Safari-604.1.38/




Diff




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

[webkit-changes] [220277] branches/safari-604.1-branch

2017-08-04 Thread matthew_hanson

Title: [220277] branches/safari-604.1-branch








Revision 220277
Author matthew_han...@apple.com
Date 2017-08-04 10:10:36 -0700 (Fri, 04 Aug 2017)


Log Message
Revert r219896. rdar://problem/33711000

Modified Paths

branches/safari-604.1-branch/LayoutTests/ChangeLog
branches/safari-604.1-branch/LayoutTests/http/tests/ssl/applepay/ApplePaySession-expected.txt
branches/safari-604.1-branch/LayoutTests/http/tests/ssl/applepay/ApplePaySession.html
branches/safari-604.1-branch/LayoutTests/http/tests/ssl/applepay/ApplePaySessionV3.html
branches/safari-604.1-branch/Source/WebCore/ChangeLog
branches/safari-604.1-branch/Source/WebCore/Modules/applepay/PaymentRequest.cpp
branches/safari-604.1-branch/Source/WebKit/ChangeLog
branches/safari-604.1-branch/Source/WebKit/UIProcess/ApplePay/cocoa/WebPaymentCoordinatorProxyCocoa.mm




Diff

Modified: branches/safari-604.1-branch/LayoutTests/ChangeLog (220276 => 220277)

--- branches/safari-604.1-branch/LayoutTests/ChangeLog	2017-08-04 16:45:28 UTC (rev 220276)
+++ branches/safari-604.1-branch/LayoutTests/ChangeLog	2017-08-04 17:10:36 UTC (rev 220277)
@@ -1,3 +1,7 @@
+2017-08-04  Jason Marcell  
+
+Revert r219896. rdar://problem/33711000
+
 2017-08-03  Jason Marcell  
 
 Cherry-pick r220185. rdar://problem/33713528


Modified: branches/safari-604.1-branch/LayoutTests/http/tests/ssl/applepay/ApplePaySession-expected.txt (220276 => 220277)

--- branches/safari-604.1-branch/LayoutTests/http/tests/ssl/applepay/ApplePaySession-expected.txt	2017-08-04 16:45:28 UTC (rev 220276)
+++ branches/safari-604.1-branch/LayoutTests/http/tests/ssl/applepay/ApplePaySession-expected.txt	2017-08-04 17:10:36 UTC (rev 220277)
@@ -76,9 +76,6 @@
 SETUP: request = validRequest(); request.supportedNetworks = ['invalidNetwork', 'visa'];
 PASS new ApplePaySession(2, request) threw exception TypeError: "invalidNetwork" is not a valid payment network..
 
-SETUP: request = validRequest(); request.supportedNetworks = ['carteBancaire'];
-PASS new ApplePaySession(2, request) threw exception TypeError: "carteBancaire" is not a valid payment network..
-
 SETUP: request = validRequest(); request.supportedNetworks = ['visa', 'visa'];
 PASS new ApplePaySession(2, request) did not throw exception.
 


Modified: branches/safari-604.1-branch/LayoutTests/http/tests/ssl/applepay/ApplePaySession.html (220276 => 220277)

--- branches/safari-604.1-branch/LayoutTests/http/tests/ssl/applepay/ApplePaySession.html	2017-08-04 16:45:28 UTC (rev 220276)
+++ branches/safari-604.1-branch/LayoutTests/http/tests/ssl/applepay/ApplePaySession.html	2017-08-04 17:10:36 UTC (rev 220277)
@@ -72,7 +72,6 @@
 logAndShouldThrow("request = validRequest(); request.supportedNetworks = [];", "new ApplePaySession(2, request)")
 logAndShouldThrow("request = validRequest(); request.supportedNetworks = ['invalidNetwork'];", "new ApplePaySession(2, request)")
 logAndShouldThrow("request = validRequest(); request.supportedNetworks = ['invalidNetwork', 'visa'];", "new ApplePaySession(2, request)")
-logAndShouldThrow("request = validRequest(); request.supportedNetworks = ['carteBancaire'];", "new ApplePaySession(2, request)")
 // FIXME: Should duplicate supportedNetworks be allowed?
 logAndShouldNotThrow("request = validRequest(); request.supportedNetworks = ['visa', 'visa'];", "new ApplePaySession(2, request)")
 


Modified: branches/safari-604.1-branch/LayoutTests/http/tests/ssl/applepay/ApplePaySessionV3.html (220276 => 220277)

--- branches/safari-604.1-branch/LayoutTests/http/tests/ssl/applepay/ApplePaySessionV3.html	2017-08-04 16:45:28 UTC (rev 220276)
+++ branches/safari-604.1-branch/LayoutTests/http/tests/ssl/applepay/ApplePaySessionV3.html	2017-08-04 17:10:36 UTC (rev 220277)
@@ -15,7 +15,7 @@
 return {
   countryCode: 'US',
   currencyCode: 'USD',
-  supportedNetworks: ['visa', 'masterCard', 'carteBancaire'],
+  supportedNetworks: ['visa', 'masterCard'],
   merchantCapabilities: ['supports3DS'],
   total: { label: 'Your Label', amount: '10.00' },
 }


Modified: branches/safari-604.1-branch/Source/WebCore/ChangeLog (220276 => 220277)

--- branches/safari-604.1-branch/Source/WebCore/ChangeLog	2017-08-04 16:45:28 UTC (rev 220276)
+++ branches/safari-604.1-branch/Source/WebCore/ChangeLog	2017-08-04 17:10:36 UTC (rev 220277)
@@ -1,3 +1,7 @@
+2017-08-04  Jason Marcell  
+
+Revert r219896. rdar://problem/33711000
+
 2017-08-03  Jason Marcell  
 
 Cherry-pick r220163. rdar://problem/33711018


Modified: branches/safari-604.1-branch/Source/WebCore/Modules/applepay/PaymentRequest.cpp (220276 => 220277)

--- branches/safari-604.1-branch/Source/WebCore/Modules/applepay/PaymentRequest.cpp	2017-08-04 16:45:28 UTC (rev 220276)
+++ branches/safari-604.1-branch/Source/WebCore/Modules/applepay/PaymentRequest.cpp	2017-08-04 17:10:36 UTC (rev 220277)
@@ -59,8 +59,6

[webkit-changes] [220254] branches/safari-604.1-branch

2017-08-04 Thread matthew_hanson

Title: [220254] branches/safari-604.1-branch








Revision 220254
Author matthew_han...@apple.com
Date 2017-08-03 23:38:20 -0700 (Thu, 03 Aug 2017)


Log Message
Cherry-pick r219896. rdar://problem/33711000

Modified Paths

branches/safari-604.1-branch/LayoutTests/ChangeLog
branches/safari-604.1-branch/LayoutTests/http/tests/ssl/applepay/ApplePaySession-expected.txt
branches/safari-604.1-branch/LayoutTests/http/tests/ssl/applepay/ApplePaySession.html
branches/safari-604.1-branch/LayoutTests/http/tests/ssl/applepay/ApplePaySessionV3.html
branches/safari-604.1-branch/Source/WebCore/ChangeLog
branches/safari-604.1-branch/Source/WebCore/Modules/applepay/PaymentRequest.cpp
branches/safari-604.1-branch/Source/WebKit/ChangeLog
branches/safari-604.1-branch/Source/WebKit/UIProcess/ApplePay/cocoa/WebPaymentCoordinatorProxyCocoa.mm




Diff

Modified: branches/safari-604.1-branch/LayoutTests/ChangeLog (220253 => 220254)

--- branches/safari-604.1-branch/LayoutTests/ChangeLog	2017-08-04 06:13:23 UTC (rev 220253)
+++ branches/safari-604.1-branch/LayoutTests/ChangeLog	2017-08-04 06:38:20 UTC (rev 220254)
@@ -1,3 +1,19 @@
+2017-08-03  Jason Marcell  
+
+Cherry-pick r219896. rdar://problem/33711000
+
+2017-07-25  Andy Estes  
+
+[Apple Pay] Add "carteBancaire" as a supported payment network
+https://bugs.webkit.org/show_bug.cgi?id=174841
+
+
+Reviewed by Alex Christensen.
+
+* http/tests/ssl/applepay/ApplePaySession-expected.txt:
+* http/tests/ssl/applepay/ApplePaySession.html:
+* http/tests/ssl/applepay/ApplePaySessionV3.html:
+
 2017-08-02  Jason Marcell  
 
 Cherry-pick r220112. rdar://problem/33687415


Modified: branches/safari-604.1-branch/LayoutTests/http/tests/ssl/applepay/ApplePaySession-expected.txt (220253 => 220254)

--- branches/safari-604.1-branch/LayoutTests/http/tests/ssl/applepay/ApplePaySession-expected.txt	2017-08-04 06:13:23 UTC (rev 220253)
+++ branches/safari-604.1-branch/LayoutTests/http/tests/ssl/applepay/ApplePaySession-expected.txt	2017-08-04 06:38:20 UTC (rev 220254)
@@ -76,6 +76,9 @@
 SETUP: request = validRequest(); request.supportedNetworks = ['invalidNetwork', 'visa'];
 PASS new ApplePaySession(2, request) threw exception TypeError: "invalidNetwork" is not a valid payment network..
 
+SETUP: request = validRequest(); request.supportedNetworks = ['carteBancaire'];
+PASS new ApplePaySession(2, request) threw exception TypeError: "carteBancaire" is not a valid payment network..
+
 SETUP: request = validRequest(); request.supportedNetworks = ['visa', 'visa'];
 PASS new ApplePaySession(2, request) did not throw exception.
 


Modified: branches/safari-604.1-branch/LayoutTests/http/tests/ssl/applepay/ApplePaySession.html (220253 => 220254)

--- branches/safari-604.1-branch/LayoutTests/http/tests/ssl/applepay/ApplePaySession.html	2017-08-04 06:13:23 UTC (rev 220253)
+++ branches/safari-604.1-branch/LayoutTests/http/tests/ssl/applepay/ApplePaySession.html	2017-08-04 06:38:20 UTC (rev 220254)
@@ -72,6 +72,7 @@
 logAndShouldThrow("request = validRequest(); request.supportedNetworks = [];", "new ApplePaySession(2, request)")
 logAndShouldThrow("request = validRequest(); request.supportedNetworks = ['invalidNetwork'];", "new ApplePaySession(2, request)")
 logAndShouldThrow("request = validRequest(); request.supportedNetworks = ['invalidNetwork', 'visa'];", "new ApplePaySession(2, request)")
+logAndShouldThrow("request = validRequest(); request.supportedNetworks = ['carteBancaire'];", "new ApplePaySession(2, request)")
 // FIXME: Should duplicate supportedNetworks be allowed?
 logAndShouldNotThrow("request = validRequest(); request.supportedNetworks = ['visa', 'visa'];", "new ApplePaySession(2, request)")
 


Modified: branches/safari-604.1-branch/LayoutTests/http/tests/ssl/applepay/ApplePaySessionV3.html (220253 => 220254)

--- branches/safari-604.1-branch/LayoutTests/http/tests/ssl/applepay/ApplePaySessionV3.html	2017-08-04 06:13:23 UTC (rev 220253)
+++ branches/safari-604.1-branch/LayoutTests/http/tests/ssl/applepay/ApplePaySessionV3.html	2017-08-04 06:38:20 UTC (rev 220254)
@@ -15,7 +15,7 @@
 return {
   countryCode: 'US',
   currencyCode: 'USD',
-  supportedNetworks: ['visa', 'masterCard'],
+  supportedNetworks: ['visa', 'masterCard', 'carteBancaire'],
   merchantCapabilities: ['supports3DS'],
   total: { label: 'Your Label', amount: '10.00' },
 }


Modified: branches/safari-604.1-branch/Source/WebCore/ChangeLog (220253 => 220254)

--- branches/safari-604.1-branch/Source/WebCore/ChangeLog	2017-08-04 06:13:23 UTC (rev 220253)
+++ branches/safari-604.1-branch/Source/WebCore/ChangeLog	2017-08-04 06:38:20 UTC (rev 220254)
@@ -1,3 +1,21 @@
+2017-08-03  Jason Marcell  
+
+Cherry-pick r219896. rdar://problem/33711000
+
+

[webkit-changes] [220257] branches/safari-604.1-branch

2017-08-04 Thread matthew_hanson

Title: [220257] branches/safari-604.1-branch








Revision 220257
Author matthew_han...@apple.com
Date 2017-08-03 23:38:31 -0700 (Thu, 03 Aug 2017)


Log Message
Cherry-pick r220185. rdar://problem/33713528

Modified Paths

branches/safari-604.1-branch/LayoutTests/ChangeLog
branches/safari-604.1-branch/LayoutTests/http/tests/cache/disk-cache/disk-cache-redirect-expected.txt
branches/safari-604.1-branch/LayoutTests/http/tests/cache/disk-cache/disk-cache-redirect.html
branches/safari-604.1-branch/Source/WebKit/ChangeLog
branches/safari-604.1-branch/Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp
branches/safari-604.1-branch/Source/WebKit/NetworkProcess/NetworkResourceLoader.h




Diff

Modified: branches/safari-604.1-branch/LayoutTests/ChangeLog (220256 => 220257)

--- branches/safari-604.1-branch/LayoutTests/ChangeLog	2017-08-04 06:38:27 UTC (rev 220256)
+++ branches/safari-604.1-branch/LayoutTests/ChangeLog	2017-08-04 06:38:31 UTC (rev 220257)
@@ -1,5 +1,23 @@
 2017-08-03  Jason Marcell  
 
+Cherry-pick r220185. rdar://problem/33713528
+
+2017-08-02  Chris Dumez  
+
+NetworkResourceLoader::setDefersLoading() may cause start() to be called multiple times
+https://bugs.webkit.org/show_bug.cgi?id=175109
+
+
+Reviewed by Brady Eidson.
+
+Extend test coverage to cover cacheable redirects to a resource that needs
+revalidation, similarly to the case in the radar.
+
+* http/tests/cache/disk-cache/disk-cache-redirect-expected.txt:
+* http/tests/cache/disk-cache/disk-cache-redirect.html:
+
+2017-08-03  Jason Marcell  
+
 Cherry-pick r220163. rdar://problem/33711018
 
 2017-08-02  Andy Estes  


Modified: branches/safari-604.1-branch/LayoutTests/http/tests/cache/disk-cache/disk-cache-redirect-expected.txt (220256 => 220257)

--- branches/safari-604.1-branch/LayoutTests/http/tests/cache/disk-cache/disk-cache-redirect-expected.txt	2017-08-04 06:38:27 UTC (rev 220256)
+++ branches/safari-604.1-branch/LayoutTests/http/tests/cache/disk-cache/disk-cache-redirect-expected.txt	2017-08-04 06:38:31 UTC (rev 220257)
@@ -3,7 +3,7 @@
 On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
 
 
-running 12 tests
+running 24 tests
 
 Testing loads from disk cache
 response headers: {"Status":"301","Location":"unique-cacheable"}
@@ -18,6 +18,18 @@
 response headers: {"Status":"307","Location":"unique-cacheable"}
 response source: Network
 
+response headers: {"Status":"301","Location":"/cache/resources/compass-no-cache.jpg"}
+response source: Disk cache after validation
+
+response headers: {"Status":"302","Location":"/cache/resources/compass-no-cache.jpg"}
+response source: Network
+
+response headers: {"Status":"303","Location":"/cache/resources/compass-no-cache.jpg"}
+response source: Network
+
+response headers: {"Status":"307","Location":"/cache/resources/compass-no-cache.jpg"}
+response source: Network
+
 response headers: {"Status":"301","Location":"unique-cacheable","Cache-control":"max-age=0"}
 response source: Network
 
@@ -30,6 +42,18 @@
 response headers: {"Status":"307","Location":"unique-cacheable","Cache-control":"max-age=0"}
 response source: Network
 
+response headers: {"Status":"301","Location":"/cache/resources/compass-no-cache.jpg","Cache-control":"max-age=0"}
+response source: Network
+
+response headers: {"Status":"302","Location":"/cache/resources/compass-no-cache.jpg","Cache-control":"max-age=0"}
+response source: Network
+
+response headers: {"Status":"303","Location":"/cache/resources/compass-no-cache.jpg","Cache-control":"max-age=0"}
+response source: Network
+
+response headers: {"Status":"307","Location":"/cache/resources/compass-no-cache.jpg","Cache-control":"max-age=0"}
+response source: Network
+
 response headers: {"Status":"301","Location":"unique-cacheable","Cache-control":"max-age=100"}
 response source: Disk cache
 
@@ -42,6 +66,18 @@
 response headers: {"Status":"307","Location":"unique-cacheable","Cache-control":"max-age=100"}
 response source: Disk cache
 
+response headers: {"Status":"301","Location":"/cache/resources/compass-no-cache.jpg","Cache-control":"max-age=100"}
+response source: Disk cache after validation
+
+response headers: {"Status":"302","Location":"/cache/resources/compass-no-cache.jpg","Cache-control":"max-age=100"}
+response source: Disk cache after validation
+
+response headers: {"Status":"303","Location":"/cache/resources/compass-no-cache.jpg","Cache-control":"max-age=100"}
+response source: Disk cache after validation
+
+response headers: {"Status":"307","Location":"/cache/resources/compass-no-cache.jpg","Cache-control":"max-age=100"}
+response source: Disk cache after validation
+
 Testing loads through memory cache (XHR behavior)
 response headers: {"Status":"301","Location":"unique-cacheable"}
 response

[webkit-changes] [220255] branches/safari-604.1-branch/Source/WebCore

2017-08-04 Thread matthew_hanson

Title: [220255] branches/safari-604.1-branch/Source/WebCore








Revision 220255
Author matthew_han...@apple.com
Date 2017-08-03 23:38:24 -0700 (Thu, 03 Aug 2017)


Log Message
Cherry-pick r220153. rdar://problem/33711038

Modified Paths

branches/safari-604.1-branch/Source/WebCore/ChangeLog
branches/safari-604.1-branch/Source/WebCore/Modules/mediasource/SourceBuffer.cpp




Diff

Modified: branches/safari-604.1-branch/Source/WebCore/ChangeLog (220254 => 220255)

--- branches/safari-604.1-branch/Source/WebCore/ChangeLog	2017-08-04 06:38:20 UTC (rev 220254)
+++ branches/safari-604.1-branch/Source/WebCore/ChangeLog	2017-08-04 06:38:24 UTC (rev 220255)
@@ -1,5 +1,21 @@
 2017-08-03  Jason Marcell  
 
+Cherry-pick r220153. rdar://problem/33711038
+
+2017-08-02  Jer Noble  
+
+[MSE] Removing samples when presentation order does not match decode order can cause bad behavior.
+https://bugs.webkit.org/show_bug.cgi?id=175091
+
+Reviewed by Eric Carlson.
+
+Address follow-up comments to r219519.
+
+* Modules/mediasource/SourceBuffer.cpp:
+(WebCore::SourceBuffer::removeCodedFrames):
+
+2017-08-03  Jason Marcell  
+
 Cherry-pick r219896. rdar://problem/33711000
 
 2017-07-25  Andy Estes  


Modified: branches/safari-604.1-branch/Source/WebCore/Modules/mediasource/SourceBuffer.cpp (220254 => 220255)

--- branches/safari-604.1-branch/Source/WebCore/Modules/mediasource/SourceBuffer.cpp	2017-08-04 06:38:20 UTC (rev 220254)
+++ branches/safari-604.1-branch/Source/WebCore/Modules/mediasource/SourceBuffer.cpp	2017-08-04 06:38:24 UTC (rev 220255)
@@ -770,7 +770,7 @@
 
 auto removePresentationStart = trackBuffer.samples.presentationOrder().findSampleContainingOrAfterPresentationTime(start);
 auto removePresentationEnd = trackBuffer.samples.presentationOrder().findSampleStartingAfterPresentationTime(end);
-if (start == end)
+if (removePresentationStart == removePresentationEnd)
 continue;
 
 // 3.3 Remove all media data, from this track buffer, that contain starting timestamps greater than or equal to






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

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

2017-08-03 Thread matthew_hanson

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








Revision 220242
Author matthew_han...@apple.com
Date 2017-08-03 17:14:58 -0700 (Thu, 03 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 (220241 => 220242)

--- branches/safari-604-branch/Source/_javascript_Core/Configurations/Version.xcconfig	2017-08-03 23:54:36 UTC (rev 220241)
+++ branches/safari-604-branch/Source/_javascript_Core/Configurations/Version.xcconfig	2017-08-04 00:14:58 UTC (rev 220242)
@@ -23,7 +23,7 @@
 
 MAJOR_VERSION = 604;
 MINOR_VERSION = 2;
-TINY_VERSION = 1;
+TINY_VERSION = 2;
 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 (220241 => 220242)

--- branches/safari-604-branch/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig	2017-08-03 23:54:36 UTC (rev 220241)
+++ branches/safari-604-branch/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig	2017-08-04 00:14:58 UTC (rev 220242)
@@ -23,7 +23,7 @@
 
 MAJOR_VERSION = 604;
 MINOR_VERSION = 2;
-TINY_VERSION = 1;
+TINY_VERSION = 2;
 MICRO_VERSION = 0;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION);


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

--- branches/safari-604-branch/Source/WebCore/Configurations/Version.xcconfig	2017-08-03 23:54:36 UTC (rev 220241)
+++ branches/safari-604-branch/Source/WebCore/Configurations/Version.xcconfig	2017-08-04 00:14:58 UTC (rev 220242)
@@ -23,7 +23,7 @@
 
 MAJOR_VERSION = 604;
 MINOR_VERSION = 2;
-TINY_VERSION = 1;
+TINY_VERSION = 2;
 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 (220241 => 220242)

--- branches/safari-604-branch/Source/WebCore/PAL/Configurations/Version.xcconfig	2017-08-03 23:54:36 UTC (rev 220241)
+++ branches/safari-604-branch/Source/WebCore/PAL/Configurations/Version.xcconfig	2017-08-04 00:14:58 UTC (rev 220242)
@@ -23,7 +23,7 @@
 
 MAJOR_VERSION = 604;
 MINOR_VERSION = 2;
-TINY_VERSION = 1;
+TINY_VERSION = 2;
 MICRO_VERSION = 0;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION);


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

--- branches/safari-604-branch/Source/WebInspectorUI/Configurations/Version.xcconfig	2017-08-03 23:54:36 UTC (rev 220241)
+++ branches/safari-604-branch/Source/WebInspectorUI/Configurations/Version.xcconfig	2017-08-04 00:14:58 UTC (rev 220242)
@@ -1,6 +1,6 @@
 MAJOR_VERSION = 604;
 MINOR_VERSION = 2;
-TINY_VERSION = 1;
+TINY_VERSION = 2;
 MICRO_VERSION = 0;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION);


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

--- branches/safari-604-branch/Source/WebKit/Configurations/Version.xcconfig	2017-08-03 23:54:36 UTC (rev 220241)
+++ branches/safari-604-branch/Source/WebKit/Configurations/Version.xcconfig	2017-08-04 00:14:58 UTC (rev 220242)
@@ -23,7 +23,7 @@
 
 MAJOR_VERSION = 604;
 MINOR_VERSION = 2;
-TINY_VERSION = 1;
+TINY_VERSION = 2;
 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 (220241 => 220242)

--- branches/safari-604-branch/Source/WebKitLegacy/mac/Configurations/Version.xcconfig	2017-08-03 23:54:36 UTC (rev 220241)
+++ branches/safari-604-branch/Source/WebKitLegacy/mac/Configurations/Version.xcconfig	2017-08-04 00:14:58 UTC (rev 220242)
@@ -23,7 +23,7 @@
 
 MAJOR_VERSION = 604;
 MINOR_VERSION = 2;
-TINY_VERSION = 1;
+TINY_VERSION = 2;
 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] [220240] tags/Safari-604.2.1/

2017-08-03 Thread matthew_hanson

Title: [220240] tags/Safari-604.2.1/








Revision 220240
Author matthew_han...@apple.com
Date 2017-08-03 16:38:41 -0700 (Thu, 03 Aug 2017)


Log Message
Tag Safari-604.2.1.

Added Paths

tags/Safari-604.2.1/




Diff




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

[webkit-changes] [220239] tags/Safari-604.1.37/

2017-08-03 Thread matthew_hanson

Title: [220239] tags/Safari-604.1.37/








Revision 220239
Author matthew_han...@apple.com
Date 2017-08-03 16:27:46 -0700 (Thu, 03 Aug 2017)


Log Message
Tag Safari-604.1.37.

Added Paths

tags/Safari-604.1.37/




Diff




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

[webkit-changes] [220237] branches/safari-604.1-branch/Source

2017-08-03 Thread matthew_hanson

Title: [220237] branches/safari-604.1-branch/Source








Revision 220237
Author matthew_han...@apple.com
Date 2017-08-03 16:11:22 -0700 (Thu, 03 Aug 2017)


Log Message
Versioning.

Modified Paths

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




Diff

Modified: branches/safari-604.1-branch/Source/_javascript_Core/Configurations/Version.xcconfig (220236 => 220237)

--- branches/safari-604.1-branch/Source/_javascript_Core/Configurations/Version.xcconfig	2017-08-03 23:11:18 UTC (rev 220236)
+++ branches/safari-604.1-branch/Source/_javascript_Core/Configurations/Version.xcconfig	2017-08-03 23:11:22 UTC (rev 220237)
@@ -23,7 +23,7 @@
 
 MAJOR_VERSION = 604;
 MINOR_VERSION = 1;
-TINY_VERSION = 37;
+TINY_VERSION = 38;
 MICRO_VERSION = 0;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION);


Modified: branches/safari-604.1-branch/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig (220236 => 220237)

--- branches/safari-604.1-branch/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig	2017-08-03 23:11:18 UTC (rev 220236)
+++ branches/safari-604.1-branch/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig	2017-08-03 23:11:22 UTC (rev 220237)
@@ -23,7 +23,7 @@
 
 MAJOR_VERSION = 604;
 MINOR_VERSION = 1;
-TINY_VERSION = 37;
+TINY_VERSION = 38;
 MICRO_VERSION = 0;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION);


Modified: branches/safari-604.1-branch/Source/WebCore/Configurations/Version.xcconfig (220236 => 220237)

--- branches/safari-604.1-branch/Source/WebCore/Configurations/Version.xcconfig	2017-08-03 23:11:18 UTC (rev 220236)
+++ branches/safari-604.1-branch/Source/WebCore/Configurations/Version.xcconfig	2017-08-03 23:11:22 UTC (rev 220237)
@@ -23,7 +23,7 @@
 
 MAJOR_VERSION = 604;
 MINOR_VERSION = 1;
-TINY_VERSION = 37;
+TINY_VERSION = 38;
 MICRO_VERSION = 0;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION);


Modified: branches/safari-604.1-branch/Source/WebCore/PAL/Configurations/Version.xcconfig (220236 => 220237)

--- branches/safari-604.1-branch/Source/WebCore/PAL/Configurations/Version.xcconfig	2017-08-03 23:11:18 UTC (rev 220236)
+++ branches/safari-604.1-branch/Source/WebCore/PAL/Configurations/Version.xcconfig	2017-08-03 23:11:22 UTC (rev 220237)
@@ -23,7 +23,7 @@
 
 MAJOR_VERSION = 604;
 MINOR_VERSION = 1;
-TINY_VERSION = 37;
+TINY_VERSION = 38;
 MICRO_VERSION = 0;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION);


Modified: branches/safari-604.1-branch/Source/WebInspectorUI/Configurations/Version.xcconfig (220236 => 220237)

--- branches/safari-604.1-branch/Source/WebInspectorUI/Configurations/Version.xcconfig	2017-08-03 23:11:18 UTC (rev 220236)
+++ branches/safari-604.1-branch/Source/WebInspectorUI/Configurations/Version.xcconfig	2017-08-03 23:11:22 UTC (rev 220237)
@@ -1,6 +1,6 @@
 MAJOR_VERSION = 604;
 MINOR_VERSION = 1;
-TINY_VERSION = 37;
+TINY_VERSION = 38;
 MICRO_VERSION = 0;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION);


Modified: branches/safari-604.1-branch/Source/WebKit/Configurations/Version.xcconfig (220236 => 220237)

--- branches/safari-604.1-branch/Source/WebKit/Configurations/Version.xcconfig	2017-08-03 23:11:18 UTC (rev 220236)
+++ branches/safari-604.1-branch/Source/WebKit/Configurations/Version.xcconfig	2017-08-03 23:11:22 UTC (rev 220237)
@@ -23,7 +23,7 @@
 
 MAJOR_VERSION = 604;
 MINOR_VERSION = 1;
-TINY_VERSION = 37;
+TINY_VERSION = 38;
 MICRO_VERSION = 0;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION);


Modified: branches/safari-604.1-branch/Source/WebKitLegacy/mac/Configurations/Version.xcconfig (220236 => 220237)

--- branches/safari-604.1-branch/Source/WebKitLegacy/mac/Configurations/Version.xcconfig	2017-08-03 23:11:18 UTC (rev 220236)
+++ branches/safari-604.1-branch/Source/WebKitLegacy/mac/Configurations/Version.xcconfig	2017-08-03 23:11:22 UTC (rev 220237)
@@ -23,7 +23,7 @@
 
 MAJOR_VERSION = 604;
 MINOR_VERSION = 1;
-TINY_VERSION = 37;
+TINY_VERSION = 38;
 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] [220236] branches/safari-604.1-branch/Source

2017-08-03 Thread matthew_hanson

Title: [220236] branches/safari-604.1-branch/Source








Revision 220236
Author matthew_han...@apple.com
Date 2017-08-03 16:11:18 -0700 (Thu, 03 Aug 2017)


Log Message
Versioning.

Modified Paths

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




Diff

Modified: branches/safari-604.1-branch/Source/_javascript_Core/Configurations/Version.xcconfig (220235 => 220236)

--- branches/safari-604.1-branch/Source/_javascript_Core/Configurations/Version.xcconfig	2017-08-03 23:10:57 UTC (rev 220235)
+++ branches/safari-604.1-branch/Source/_javascript_Core/Configurations/Version.xcconfig	2017-08-03 23:11:18 UTC (rev 220236)
@@ -23,7 +23,7 @@
 
 MAJOR_VERSION = 604;
 MINOR_VERSION = 1;
-TINY_VERSION = 38;
+TINY_VERSION = 37;
 MICRO_VERSION = 0;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION);


Modified: branches/safari-604.1-branch/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig (220235 => 220236)

--- branches/safari-604.1-branch/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig	2017-08-03 23:10:57 UTC (rev 220235)
+++ branches/safari-604.1-branch/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig	2017-08-03 23:11:18 UTC (rev 220236)
@@ -23,7 +23,7 @@
 
 MAJOR_VERSION = 604;
 MINOR_VERSION = 1;
-TINY_VERSION = 38;
+TINY_VERSION = 37;
 MICRO_VERSION = 0;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION);


Modified: branches/safari-604.1-branch/Source/WebCore/Configurations/Version.xcconfig (220235 => 220236)

--- branches/safari-604.1-branch/Source/WebCore/Configurations/Version.xcconfig	2017-08-03 23:10:57 UTC (rev 220235)
+++ branches/safari-604.1-branch/Source/WebCore/Configurations/Version.xcconfig	2017-08-03 23:11:18 UTC (rev 220236)
@@ -23,7 +23,7 @@
 
 MAJOR_VERSION = 604;
 MINOR_VERSION = 1;
-TINY_VERSION = 38;
+TINY_VERSION = 37;
 MICRO_VERSION = 0;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION);


Modified: branches/safari-604.1-branch/Source/WebCore/PAL/Configurations/Version.xcconfig (220235 => 220236)

--- branches/safari-604.1-branch/Source/WebCore/PAL/Configurations/Version.xcconfig	2017-08-03 23:10:57 UTC (rev 220235)
+++ branches/safari-604.1-branch/Source/WebCore/PAL/Configurations/Version.xcconfig	2017-08-03 23:11:18 UTC (rev 220236)
@@ -23,7 +23,7 @@
 
 MAJOR_VERSION = 604;
 MINOR_VERSION = 1;
-TINY_VERSION = 38;
+TINY_VERSION = 37;
 MICRO_VERSION = 0;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION);


Modified: branches/safari-604.1-branch/Source/WebInspectorUI/Configurations/Version.xcconfig (220235 => 220236)

--- branches/safari-604.1-branch/Source/WebInspectorUI/Configurations/Version.xcconfig	2017-08-03 23:10:57 UTC (rev 220235)
+++ branches/safari-604.1-branch/Source/WebInspectorUI/Configurations/Version.xcconfig	2017-08-03 23:11:18 UTC (rev 220236)
@@ -1,6 +1,6 @@
 MAJOR_VERSION = 604;
 MINOR_VERSION = 1;
-TINY_VERSION = 38;
+TINY_VERSION = 37;
 MICRO_VERSION = 0;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION);


Modified: branches/safari-604.1-branch/Source/WebKit/Configurations/Version.xcconfig (220235 => 220236)

--- branches/safari-604.1-branch/Source/WebKit/Configurations/Version.xcconfig	2017-08-03 23:10:57 UTC (rev 220235)
+++ branches/safari-604.1-branch/Source/WebKit/Configurations/Version.xcconfig	2017-08-03 23:11:18 UTC (rev 220236)
@@ -23,7 +23,7 @@
 
 MAJOR_VERSION = 604;
 MINOR_VERSION = 1;
-TINY_VERSION = 38;
+TINY_VERSION = 37;
 MICRO_VERSION = 0;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION);


Modified: branches/safari-604.1-branch/Source/WebKitLegacy/mac/Configurations/Version.xcconfig (220235 => 220236)

--- branches/safari-604.1-branch/Source/WebKitLegacy/mac/Configurations/Version.xcconfig	2017-08-03 23:10:57 UTC (rev 220235)
+++ branches/safari-604.1-branch/Source/WebKitLegacy/mac/Configurations/Version.xcconfig	2017-08-03 23:11:18 UTC (rev 220236)
@@ -23,7 +23,7 @@
 
 MAJOR_VERSION = 604;
 MINOR_VERSION = 1;
-TINY_VERSION = 38;
+TINY_VERSION = 37;
 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] [220234] branches/safari-604.1-branch/Source/WebKitLegacy

2017-08-03 Thread matthew_hanson

Title: [220234] branches/safari-604.1-branch/Source/WebKitLegacy








Revision 220234
Author matthew_han...@apple.com
Date 2017-08-03 16:09:06 -0700 (Thu, 03 Aug 2017)


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

Modified Paths

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




Diff

Modified: branches/safari-604.1-branch/Source/WebKitLegacy/ChangeLog (220233 => 220234)

--- branches/safari-604.1-branch/Source/WebKitLegacy/ChangeLog	2017-08-03 22:31:44 UTC (rev 220233)
+++ branches/safari-604.1-branch/Source/WebKitLegacy/ChangeLog	2017-08-03 23:09:06 UTC (rev 220234)
@@ -1,3 +1,20 @@
+2017-08-03  Jason Marcell  
+
+Cherry-pick r220205. rdar://problem/33711361
+
+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.1-branch/Source/WebKitLegacy/WebKitLegacy.vcxproj/WebKitLegacy.proj (220233 => 220234)

--- branches/safari-604.1-branch/Source/WebKitLegacy/WebKitLegacy.vcxproj/WebKitLegacy.proj	2017-08-03 22:31:44 UTC (rev 220233)
+++ branches/safari-604.1-branch/Source/WebKitLegacy/WebKitLegacy.vcxproj/WebKitLegacy.proj	2017-08-03 23:09:06 UTC (rev 220234)
@@ -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] [220228] branches/safari-604-branch/Source/WebCore/ChangeLog

2017-08-03 Thread matthew_hanson

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








Revision 220228
Author matthew_han...@apple.com
Date 2017-08-03 13:27:52 -0700 (Thu, 03 Aug 2017)


Log Message
Cherry-pick r220085. rdar://problem/33692157

Modified Paths

branches/safari-604-branch/Source/WebCore/ChangeLog




Diff

Modified: branches/safari-604-branch/Source/WebCore/ChangeLog (220227 => 220228)

--- branches/safari-604-branch/Source/WebCore/ChangeLog	2017-08-03 20:27:50 UTC (rev 220227)
+++ branches/safari-604-branch/Source/WebCore/ChangeLog	2017-08-03 20:27:52 UTC (rev 220228)
@@ -1,5 +1,31 @@
 2017-08-02  Jason Marcell  
 
+Cherry-pick r220085. rdar://problem/33692157
+
+2017-07-31  Matt Rajca  
+
+Support quirk for letting media autoplay if the user interacted with at least one media element.
+https://bugs.webkit.org/show_bug.cgi?id=175005
+
+
+Reviewed by Eric Carlson.
+
+If the user has interacted with at least one media element, let other media elements auto-play
+as a quirk.
+
+* dom/Document.cpp:
+(WebCore::Document::updateIsPlayingMedia):
+* dom/Document.h:
+(WebCore::Document::noteUserInteractionWithMediaElement):
+* html/HTMLMediaElement.cpp:
+(WebCore::HTMLMediaElement::removeBehaviorsRestrictionsAfterFirstUserGesture):
+* html/MediaElementSession.cpp:
+(WebCore::needsDocumentLevelMediaUserGestureQuirk):
+(WebCore::MediaElementSession::playbackPermitted const):
+* page/MediaProducer.h:
+
+2017-08-02  Jason Marcell  
+
 Cherry-pick r220084. rdar://problem/33692167
 
 2017-07-31  Nan Wang  






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

[webkit-changes] [220230] branches/safari-604-branch/Source/WebKit

2017-08-03 Thread matthew_hanson

Title: [220230] branches/safari-604-branch/Source/WebKit








Revision 220230
Author matthew_han...@apple.com
Date 2017-08-03 13:27:58 -0700 (Thu, 03 Aug 2017)


Log Message
Cherry-pick r220138. rdar://problem/33692550

Modified Paths

branches/safari-604-branch/Source/WebKit/ChangeLog
branches/safari-604-branch/Source/WebKit/Platform/spi/ios/UIKitSPI.h
branches/safari-604-branch/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm
branches/safari-604-branch/Source/WebKit/UIProcess/API/Cocoa/WKWebViewInternal.h
branches/safari-604-branch/Source/WebKit/UIProcess/ios/WKPDFView.mm




Diff

Modified: branches/safari-604-branch/Source/WebKit/ChangeLog (220229 => 220230)

--- branches/safari-604-branch/Source/WebKit/ChangeLog	2017-08-03 20:27:54 UTC (rev 220229)
+++ branches/safari-604-branch/Source/WebKit/ChangeLog	2017-08-03 20:27:58 UTC (rev 220230)
@@ -1,3 +1,74 @@
+2017-08-02  Jason Marcell  
+
+Cherry-pick r220138. rdar://problem/33692550
+
+2017-08-02  Tim Horton  
+
+WKPDFView doesn't respect safe area insets
+https://bugs.webkit.org/show_bug.cgi?id=175046
+
+
+Reviewed by Wenson Hsieh.
+
+* Platform/spi/ios/UIKitSPI.h:
+Add some SPI.
+
+* UIProcess/API/Cocoa/WKWebView.mm:
+(-[WKWebView _setHasCustomContentView:loadedMIMEType:]):
+Drive-by fix two small custom content view issues:
+
+- Reset _scrollViewBackgroundColor; it is used to early-return from
+updating the background color if it hasn't changed, but if you go from a
+site with (for example) a white background, to a PDF, to another site
+with a white background, we will early-return and not reset the background
+color from the grey WKPDFView background.
+
+- When installing a custom content view, scroll to the origin. We miss
+the usual mechanism for scrolling to the origin when custom content views
+are installed, so do it here.
+
+(-[WKWebView _effectiveObscuredInsetEdgesAffectedBySafeArea]):
+Ignore _obscuredInsetEdgesAffectedBySafeArea for custom content views.
+This is fairly arbitrary, and we should find a different way to
+express different edge sets for different kinds of content (perhaps
+bake this into default viewports?), but for now this works.
+
+(-[WKWebView _computedContentInset]):
+Use _effectiveObscuredInsetEdgesAffectedBySafeArea instead of the ivar directly.
+
+(-[WKWebView _safeAreaShouldAffectObscuredInsets]):
+Force safe areas to not affect obscured insets for custom content views,
+so that it's up to every custom content view to take safe areas into
+account themselves.
+
+* UIProcess/API/Cocoa/WKWebViewInternal.h:
+Expose _computedUnobscuredSafeAreaInset for WKPDFView's use.
+
+* UIProcess/ios/WKPDFView.mm:
+(-[WKPDFView web_setMinimumSize:]):
+Avoid rebuilding the WKPDFView if the minimum size didn't change.
+
+(-[WKPDFView _offsetForPageNumberIndicator]):
+Take unobscured safe area insets into account when insetting
+the page number indicator.
+
+(-[WKPDFView web_computedContentInsetDidChange]):
+Watch for unobscured safe area inset changes, and apply them to the
+layout of the WKPDFView.
+
+(-[WKPDFView _computePageAndDocumentFrames]):
+Make it possible to only update the WKPDFView's size and position, without
+rebuilding its subviews, if the width did not change. This prevents lots
+of flashing of the child UIPDFPageViews when the unobscured safe area
+insets change dynamically.
+
+Take the safe area insets into account when determining what width
+to lay out to.
+
+(-[WKPDFView _updateDocumentFrame]):
+Take the safe area insets into account when positioning the WKPDFView
+inside the WKScrollView.
+
 2017-07-31  Jason Marcell  
 
 Cherry-pick r220033. rdar://problem/33619596


Modified: branches/safari-604-branch/Source/WebKit/Platform/spi/ios/UIKitSPI.h (220229 => 220230)

--- branches/safari-604-branch/Source/WebKit/Platform/spi/ios/UIKitSPI.h	2017-08-03 20:27:54 UTC (rev 220229)
+++ branches/safari-604-branch/Source/WebKit/Platform/spi/ios/UIKitSPI.h	2017-08-03 20:27:58 UTC (rev 220230)
@@ -968,4 +968,6 @@
 extern const NSString *UIPreviewDataAttachmentList;
 extern const NSString *UIPreviewDataAttachmentIndex;
 
+UIEdgeInsets UIEdgeInsetsAdd(UIEdgeInsets lhs, UIEdgeInsets rhs, UIRectEdge);
+
 WTF_EXTERN_C_END


Modified: branches/safari-604-branch/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm (220229 => 220230)

---

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

2017-08-03 Thread matthew_hanson

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








Revision 220227
Author matthew_han...@apple.com
Date 2017-08-03 13:27:50 -0700 (Thu, 03 Aug 2017)


Log Message
Cherry-pick r220084. rdar://problem/33692167

Modified Paths

branches/safari-604-branch/Source/WebCore/ChangeLog




Diff

Modified: branches/safari-604-branch/Source/WebCore/ChangeLog (220226 => 220227)

--- branches/safari-604-branch/Source/WebCore/ChangeLog	2017-08-03 20:27:49 UTC (rev 220226)
+++ branches/safari-604-branch/Source/WebCore/ChangeLog	2017-08-03 20:27:50 UTC (rev 220227)
@@ -1,5 +1,26 @@
 2017-08-02  Jason Marcell  
 
+Cherry-pick r220084. rdar://problem/33692167
+
+2017-07-31  Nan Wang  
+
+AX: CFEqual is failing on text markers with exact same data
+https://bugs.webkit.org/show_bug.cgi?id=175002
+
+
+Reviewed by Chris Fleizach.
+
+We should zero the memory of the TextMarkerData instance so that it
+can be tested for byte-equivalence.
+
+Made sure this change won't break any of the existing tests.
+
+* accessibility/AXObjectCache.cpp:
+(WebCore::AXObjectCache::textMarkerDataForVisiblePosition):
+(WebCore::AXObjectCache::textMarkerDataForFirstPositionInTextControl):
+
+2017-08-02  Jason Marcell  
+
 Cherry-pick r220077. rdar://problem/33692157
 
 2017-07-28  Matt Rajca  






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

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

2017-08-03 Thread matthew_hanson

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








Revision 220231
Author matthew_han...@apple.com
Date 2017-08-03 13:28:00 -0700 (Thu, 03 Aug 2017)


Log Message
Cherry-pick r220144. rdar://problem/33692161

Modified Paths

branches/safari-604-branch/Source/_javascript_Core/ChangeLog




Diff

Modified: branches/safari-604-branch/Source/_javascript_Core/ChangeLog (220230 => 220231)

--- branches/safari-604-branch/Source/_javascript_Core/ChangeLog	2017-08-03 20:27:58 UTC (rev 220230)
+++ branches/safari-604-branch/Source/_javascript_Core/ChangeLog	2017-08-03 20:28:00 UTC (rev 220231)
@@ -1,5 +1,28 @@
 2017-08-02  Jason Marcell  
 
+Cherry-pick r220144. rdar://problem/33692161
+
+2017-08-02  Saam Barati  
+
+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
+
+
+Reviewed by Filip Pizlo.
+
+The testing I have done shows that this new function is a ~10%
+progression running JetStream on 1GB iOS devices. I've also tried
+this on a few > 1GB iOS devices, and the testing shows this is either neutral
+or a regression. Right now, we'll just enable this for <= 1GB devices
+since it's a win. In the future, we might want to either look into
+tweaking these parameters or coming up with a new function for > 1GB
+devices.
+
+* heap/Heap.cpp:
+* runtime/Options.h:
+
+2017-08-02  Jason Marcell  
+
 Cherry-pick r220144. rdar://problem/33687404
 
 2017-08-02  Saam Barati  






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

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

2017-08-03 Thread matthew_hanson

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








Revision 220229
Author matthew_han...@apple.com
Date 2017-08-03 13:27:54 -0700 (Thu, 03 Aug 2017)


Log Message
Cherry-pick r220112. rdar://problem/33692164

Modified Paths

branches/safari-604-branch/LayoutTests/ChangeLog
branches/safari-604-branch/Source/WebCore/ChangeLog




Diff

Modified: branches/safari-604-branch/LayoutTests/ChangeLog (220228 => 220229)

--- branches/safari-604-branch/LayoutTests/ChangeLog	2017-08-03 20:27:52 UTC (rev 220228)
+++ branches/safari-604-branch/LayoutTests/ChangeLog	2017-08-03 20:27:54 UTC (rev 220229)
@@ -1,5 +1,21 @@
 2017-08-02  Jason Marcell  
 
+Cherry-pick r220112. rdar://problem/33692164
+
+2017-08-01  Zalan Bujtas  
+
+REGRESSION (r217197): New Yorker website hangs for a long time on load, lots of blank tiles
+https://bugs.webkit.org/show_bug.cgi?id=175009
+
+
+Reviewed by Simon Fraser.
+
+* fast/frames/flattening/media-query-growing-content-expected.txt: Added.
+* fast/frames/flattening/media-query-growing-content.html: Added.
+* fast/frames/flattening/resources/media-query-min-height-with-flattening.html: Added.
+
+2017-08-02  Jason Marcell  
+
 Cherry-pick r220035. rdar://problem/33692157
 
 2017-07-28  Matt Rajca  


Modified: branches/safari-604-branch/Source/WebCore/ChangeLog (220228 => 220229)

--- branches/safari-604-branch/Source/WebCore/ChangeLog	2017-08-03 20:27:52 UTC (rev 220228)
+++ branches/safari-604-branch/Source/WebCore/ChangeLog	2017-08-03 20:27:54 UTC (rev 220229)
@@ -1,5 +1,34 @@
 2017-08-02  Jason Marcell  
 
+Cherry-pick r220112. rdar://problem/33692164
+
+2017-08-01  Zalan Bujtas  
+
+REGRESSION (r217197): New Yorker website hangs for a long time on load, lots of blank tiles
+https://bugs.webkit.org/show_bug.cgi?id=175009
+
+
+Reviewed by Simon Fraser.
+
+This patch ensures that we report the desktop, non-frame-flattened frame size for media queries in subframes.
+Some websites don't expect the iframes to be expanded to the size of the content and when the media query
+callback mutates the content (triggering frame resize), they might end up getting into a never ending layout.
+
+Test: fast/frames/flattening/media-query-growing-content.html
+
+* css/MediaQueryEvaluator.cpp:
+(WebCore::orientationEvaluate):
+(WebCore::aspectRatioEvaluate):
+(WebCore::heightEvaluate):
+(WebCore::widthEvaluate):
+* page/FrameView.cpp:
+(WebCore::FrameView::layout):
+(WebCore::FrameView::layoutSizeForMediaQuery const):
+(WebCore::FrameView::evaluateMediaQueryList):
+* page/FrameView.h:
+
+2017-08-02  Jason Marcell  
+
 Cherry-pick r220085. rdar://problem/33692157
 
 2017-07-31  Matt Rajca  






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

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

2017-08-03 Thread matthew_hanson

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








Revision 220225
Author matthew_han...@apple.com
Date 2017-08-03 13:27:47 -0700 (Thu, 03 Aug 2017)


Log Message
Cherry-pick r220077. rdar://problem/33692157

Modified Paths

branches/safari-604-branch/Source/WebCore/ChangeLog




Diff

Modified: branches/safari-604-branch/Source/WebCore/ChangeLog (220224 => 220225)

--- branches/safari-604-branch/Source/WebCore/ChangeLog	2017-08-03 20:27:42 UTC (rev 220224)
+++ branches/safari-604-branch/Source/WebCore/ChangeLog	2017-08-03 20:27:47 UTC (rev 220225)
@@ -1,5 +1,26 @@
 2017-08-02  Jason Marcell  
 
+Cherry-pick r220077. rdar://problem/33692157
+
+2017-07-28  Matt Rajca  
+
+Propagate user gesture tokens when script elements are loaded.
+https://bugs.webkit.org/show_bug.cgi?id=174959
+
+Reviewed by Eric Carlson.
+
+Propagate user gesture tokens when script elements are loaded (i.e. between the time an
+element is created and its onload handler is invoked).
+
+* dom/ScriptElement.cpp:
+(WebCore::ScriptElement::ScriptElement):
+(WebCore::ScriptElement::dispatchLoadEventRespectingUserGestureIndicator):
+(WebCore::ScriptElement::executeScriptAndDispatchEvent):
+(WebCore::ScriptElement::executePendingScript):
+* dom/ScriptElement.h:
+
+2017-08-02  Jason Marcell  
+
 Cherry-pick r220035. rdar://problem/33692157
 
 2017-07-28  Matt Rajca  






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

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

2017-08-03 Thread matthew_hanson

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








Revision 220224
Author matthew_han...@apple.com
Date 2017-08-03 13:27:42 -0700 (Thu, 03 Aug 2017)


Log Message
Cherry-pick r220035. rdar://problem/33692157

Modified Paths

branches/safari-604-branch/LayoutTests/ChangeLog
branches/safari-604-branch/Source/WebCore/ChangeLog




Diff

Modified: branches/safari-604-branch/LayoutTests/ChangeLog (220223 => 220224)

--- branches/safari-604-branch/LayoutTests/ChangeLog	2017-08-03 20:21:29 UTC (rev 220223)
+++ branches/safari-604-branch/LayoutTests/ChangeLog	2017-08-03 20:27:42 UTC (rev 220224)
@@ -1,5 +1,26 @@
 2017-08-02  Jason Marcell  
 
+Cherry-pick r220035. rdar://problem/33692157
+
+2017-07-28  Matt Rajca  
+
+Don't add autoplay restrictions to media elements created in response to user gestures.
+https://bugs.webkit.org/show_bug.cgi?id=174947
+
+Reviewed by Eric Carlson.
+
+Skip the test on iOS because "runWithKeyDown" does not work there.
+
+Jer: "Turns out the problem with iOS is that the WKTR EventSender is basically unwritten. It
+doesn't support sending mouse, key, or touch events, so our "do this during a user gesture"
+helper in video-test.js doesn't work."
+
+* media/video-create-with-user-gesture-expected.txt: Added.
+* media/video-create-with-user-gesture.html: Added.
+* platform/ios/TestExpectations:
+
+2017-08-02  Jason Marcell  
+
 Cherry-pick r220112. rdar://problem/33687415
 
 2017-08-01  Zalan Bujtas  


Modified: branches/safari-604-branch/Source/WebCore/ChangeLog (220223 => 220224)

--- branches/safari-604-branch/Source/WebCore/ChangeLog	2017-08-03 20:21:29 UTC (rev 220223)
+++ branches/safari-604-branch/Source/WebCore/ChangeLog	2017-08-03 20:27:42 UTC (rev 220224)
@@ -1,5 +1,21 @@
 2017-08-02  Jason Marcell  
 
+Cherry-pick r220035. rdar://problem/33692157
+
+2017-07-28  Matt Rajca  
+
+Don't add autoplay restrictions to media elements created in response to user gestures.
+https://bugs.webkit.org/show_bug.cgi?id=174947
+
+Reviewed by Eric Carlson.
+
+Test: media/video-create-with-user-gesture.html
+
+* html/HTMLMediaElement.cpp:
+(WebCore::HTMLMediaElement::HTMLMediaElement):
+
+2017-08-02  Jason Marcell  
+
 Cherry-pick r220112. rdar://problem/33687415
 
 2017-08-01  Zalan Bujtas  






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

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

2017-08-03 Thread matthew_hanson

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








Revision 220216
Author matthew_han...@apple.com
Date 2017-08-03 11:58:21 -0700 (Thu, 03 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 (220215 => 220216)

--- branches/safari-604-branch/Source/_javascript_Core/Configurations/Version.xcconfig	2017-08-03 18:55:08 UTC (rev 220215)
+++ branches/safari-604-branch/Source/_javascript_Core/Configurations/Version.xcconfig	2017-08-03 18:58:21 UTC (rev 220216)
@@ -22,8 +22,8 @@
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
 
 MAJOR_VERSION = 604;
-MINOR_VERSION = 1;
-TINY_VERSION = 37;
+MINOR_VERSION = 2;
+TINY_VERSION = 1;
 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 (220215 => 220216)

--- branches/safari-604-branch/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig	2017-08-03 18:55:08 UTC (rev 220215)
+++ branches/safari-604-branch/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig	2017-08-03 18:58:21 UTC (rev 220216)
@@ -22,8 +22,8 @@
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
 
 MAJOR_VERSION = 604;
-MINOR_VERSION = 1;
-TINY_VERSION = 37;
+MINOR_VERSION = 2;
+TINY_VERSION = 1;
 MICRO_VERSION = 0;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION);


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

--- branches/safari-604-branch/Source/WebCore/Configurations/Version.xcconfig	2017-08-03 18:55:08 UTC (rev 220215)
+++ branches/safari-604-branch/Source/WebCore/Configurations/Version.xcconfig	2017-08-03 18:58:21 UTC (rev 220216)
@@ -22,8 +22,8 @@
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
 
 MAJOR_VERSION = 604;
-MINOR_VERSION = 1;
-TINY_VERSION = 37;
+MINOR_VERSION = 2;
+TINY_VERSION = 1;
 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 (220215 => 220216)

--- branches/safari-604-branch/Source/WebCore/PAL/Configurations/Version.xcconfig	2017-08-03 18:55:08 UTC (rev 220215)
+++ branches/safari-604-branch/Source/WebCore/PAL/Configurations/Version.xcconfig	2017-08-03 18:58:21 UTC (rev 220216)
@@ -22,8 +22,8 @@
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
 
 MAJOR_VERSION = 604;
-MINOR_VERSION = 1;
-TINY_VERSION = 37;
+MINOR_VERSION = 2;
+TINY_VERSION = 1;
 MICRO_VERSION = 0;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION);


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

--- branches/safari-604-branch/Source/WebInspectorUI/Configurations/Version.xcconfig	2017-08-03 18:55:08 UTC (rev 220215)
+++ branches/safari-604-branch/Source/WebInspectorUI/Configurations/Version.xcconfig	2017-08-03 18:58:21 UTC (rev 220216)
@@ -1,6 +1,6 @@
 MAJOR_VERSION = 604;
-MINOR_VERSION = 1;
-TINY_VERSION = 37;
+MINOR_VERSION = 2;
+TINY_VERSION = 1;
 MICRO_VERSION = 0;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION);


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

--- branches/safari-604-branch/Source/WebKit/Configurations/Version.xcconfig	2017-08-03 18:55:08 UTC (rev 220215)
+++ branches/safari-604-branch/Source/WebKit/Configurations/Version.xcconfig	2017-08-03 18:58:21 UTC (rev 220216)
@@ -22,8 +22,8 @@
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
 
 MAJOR_VERSION = 604;
-MINOR_VERSION = 1;
-TINY_VERSION = 37;
+MINOR_VERSION = 2;
+TINY_VERSION = 1;
 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 (220215 => 220216)

--- branches/safari-604-branch/Source/WebKitLegacy/mac/Configurations/Version.xcconfig	2017-08-03 18:55:08 UTC (rev 220215)
+++ branches/safari-604-branch/Source/WebKitLegacy/mac/Configurations/Version.xcconfig	2017-08-03 18:58:21 UTC (rev 220216)
@@ -22,8 +22,8 @@
 // OF THIS

[webkit-changes] [220215] branches/safari-604.1-branch/Source

2017-08-03 Thread matthew_hanson

Title: [220215] branches/safari-604.1-branch/Source








Revision 220215
Author matthew_han...@apple.com
Date 2017-08-03 11:55:08 -0700 (Thu, 03 Aug 2017)


Log Message
Versioning.

Modified Paths

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




Diff

Modified: branches/safari-604.1-branch/Source/_javascript_Core/Configurations/Version.xcconfig (220214 => 220215)

--- branches/safari-604.1-branch/Source/_javascript_Core/Configurations/Version.xcconfig	2017-08-03 18:29:16 UTC (rev 220214)
+++ branches/safari-604.1-branch/Source/_javascript_Core/Configurations/Version.xcconfig	2017-08-03 18:55:08 UTC (rev 220215)
@@ -23,7 +23,7 @@
 
 MAJOR_VERSION = 604;
 MINOR_VERSION = 1;
-TINY_VERSION = 37;
+TINY_VERSION = 38;
 MICRO_VERSION = 0;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION);


Modified: branches/safari-604.1-branch/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig (220214 => 220215)

--- branches/safari-604.1-branch/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig	2017-08-03 18:29:16 UTC (rev 220214)
+++ branches/safari-604.1-branch/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig	2017-08-03 18:55:08 UTC (rev 220215)
@@ -23,7 +23,7 @@
 
 MAJOR_VERSION = 604;
 MINOR_VERSION = 1;
-TINY_VERSION = 37;
+TINY_VERSION = 38;
 MICRO_VERSION = 0;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION);


Modified: branches/safari-604.1-branch/Source/WebCore/Configurations/Version.xcconfig (220214 => 220215)

--- branches/safari-604.1-branch/Source/WebCore/Configurations/Version.xcconfig	2017-08-03 18:29:16 UTC (rev 220214)
+++ branches/safari-604.1-branch/Source/WebCore/Configurations/Version.xcconfig	2017-08-03 18:55:08 UTC (rev 220215)
@@ -23,7 +23,7 @@
 
 MAJOR_VERSION = 604;
 MINOR_VERSION = 1;
-TINY_VERSION = 37;
+TINY_VERSION = 38;
 MICRO_VERSION = 0;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION);


Modified: branches/safari-604.1-branch/Source/WebCore/PAL/Configurations/Version.xcconfig (220214 => 220215)

--- branches/safari-604.1-branch/Source/WebCore/PAL/Configurations/Version.xcconfig	2017-08-03 18:29:16 UTC (rev 220214)
+++ branches/safari-604.1-branch/Source/WebCore/PAL/Configurations/Version.xcconfig	2017-08-03 18:55:08 UTC (rev 220215)
@@ -23,7 +23,7 @@
 
 MAJOR_VERSION = 604;
 MINOR_VERSION = 1;
-TINY_VERSION = 37;
+TINY_VERSION = 38;
 MICRO_VERSION = 0;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION);


Modified: branches/safari-604.1-branch/Source/WebInspectorUI/Configurations/Version.xcconfig (220214 => 220215)

--- branches/safari-604.1-branch/Source/WebInspectorUI/Configurations/Version.xcconfig	2017-08-03 18:29:16 UTC (rev 220214)
+++ branches/safari-604.1-branch/Source/WebInspectorUI/Configurations/Version.xcconfig	2017-08-03 18:55:08 UTC (rev 220215)
@@ -1,6 +1,6 @@
 MAJOR_VERSION = 604;
 MINOR_VERSION = 1;
-TINY_VERSION = 37;
+TINY_VERSION = 38;
 MICRO_VERSION = 0;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION);


Modified: branches/safari-604.1-branch/Source/WebKit/Configurations/Version.xcconfig (220214 => 220215)

--- branches/safari-604.1-branch/Source/WebKit/Configurations/Version.xcconfig	2017-08-03 18:29:16 UTC (rev 220214)
+++ branches/safari-604.1-branch/Source/WebKit/Configurations/Version.xcconfig	2017-08-03 18:55:08 UTC (rev 220215)
@@ -23,7 +23,7 @@
 
 MAJOR_VERSION = 604;
 MINOR_VERSION = 1;
-TINY_VERSION = 37;
+TINY_VERSION = 38;
 MICRO_VERSION = 0;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION);


Modified: branches/safari-604.1-branch/Source/WebKitLegacy/mac/Configurations/Version.xcconfig (220214 => 220215)

--- branches/safari-604.1-branch/Source/WebKitLegacy/mac/Configurations/Version.xcconfig	2017-08-03 18:29:16 UTC (rev 220214)
+++ branches/safari-604.1-branch/Source/WebKitLegacy/mac/Configurations/Version.xcconfig	2017-08-03 18:55:08 UTC (rev 220215)
@@ -23,7 +23,7 @@
 
 MAJOR_VERSION = 604;
 MINOR_VERSION = 1;
-TINY_VERSION = 37;
+TINY_VERSION = 38;
 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] [220213] branches/safari-604.1-branch/

2017-08-03 Thread matthew_hanson

Title: [220213] branches/safari-604.1-branch/








Revision 220213
Author matthew_han...@apple.com
Date 2017-08-03 11:06:54 -0700 (Thu, 03 Aug 2017)


Log Message
New Tag.

Added Paths

branches/safari-604.1-branch/




Diff




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

[webkit-changes] [220142] tags/Safari-604.1.35.1

2017-08-02 Thread matthew_hanson

Title: [220142] tags/Safari-604.1.35.1








Revision 220142
Author matthew_han...@apple.com
Date 2017-08-02 11:10:22 -0700 (Wed, 02 Aug 2017)


Log Message
Cherry-pick r219602. rdar://problem/33537767

Modified Paths

tags/Safari-604.1.35.1/CMakeLists.txt
tags/Safari-604.1.35.1/ChangeLog
tags/Safari-604.1.35.1/Source/WTF/ChangeLog
tags/Safari-604.1.35.1/Source/WTF/wtf/PlatformGTK.cmake
tags/Safari-604.1.35.1/Source/WTF/wtf/PlatformMac.cmake
tags/Safari-604.1.35.1/Source/WebCore/ChangeLog
tags/Safari-604.1.35.1/Source/WebCore/PlatformMac.cmake
tags/Safari-604.1.35.1/Source/WebKitLegacy/ChangeLog
tags/Safari-604.1.35.1/Source/WebKitLegacy/PlatformMac.cmake
tags/Safari-604.1.35.1/Source/WebKitLegacy/PlatformWin.cmake
tags/Safari-604.1.35.1/Source/cmake/OptionsMac.cmake
tags/Safari-604.1.35.1/Source/cmake/OptionsWPE.cmake
tags/Safari-604.1.35.1/Source/cmake/OptionsWin.cmake




Diff

Modified: tags/Safari-604.1.35.1/CMakeLists.txt (220141 => 220142)

--- tags/Safari-604.1.35.1/CMakeLists.txt	2017-08-02 18:10:18 UTC (rev 220141)
+++ tags/Safari-604.1.35.1/CMakeLists.txt	2017-08-02 18:10:22 UTC (rev 220142)
@@ -119,6 +119,7 @@
 set(WebCore_LIBRARY_TYPE STATIC)
 endif ()
 
+set(WTF_LIBRARY_TYPE STATIC)
 set(_javascript_Core_LIBRARY_TYPE SHARED)
 set(PAL_LIBRARY_TYPE STATIC)
 set(WebKit_LIBRARY_TYPE SHARED)


Modified: tags/Safari-604.1.35.1/ChangeLog (220141 => 220142)

--- tags/Safari-604.1.35.1/ChangeLog	2017-08-02 18:10:18 UTC (rev 220141)
+++ tags/Safari-604.1.35.1/ChangeLog	2017-08-02 18:10:22 UTC (rev 220142)
@@ -1,3 +1,24 @@
+2017-08-02  Matthew Hanson  
+
+Cherry-pick r219602. rdar://problem/33537767
+
+2017-07-17  Konstantin Tokarev  
+
+[cmake] Set library types before their targets are created
+https://bugs.webkit.org/show_bug.cgi?id=174600
+
+Reviewed by Michael Catanzaro.
+
+Since r219560 library targets are created before PlatformXXX.cmake
+files are processed, however library type must be passed in
+add_library() call and cannot be changed afterwards. Set these
+variables in OptionsXXX.cmake.
+
+* CMakeLists.txt:
+* Source/cmake/OptionsMac.cmake:
+* Source/cmake/OptionsWPE.cmake:
+* Source/cmake/OptionsWin.cmake:
+
 2017-07-17  Konstantin Tokarev  
 
 [CMake] Create targets before WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS is called


Modified: tags/Safari-604.1.35.1/Source/WTF/ChangeLog (220141 => 220142)

--- tags/Safari-604.1.35.1/Source/WTF/ChangeLog	2017-08-02 18:10:18 UTC (rev 220141)
+++ tags/Safari-604.1.35.1/Source/WTF/ChangeLog	2017-08-02 18:10:22 UTC (rev 220142)
@@ -1,3 +1,22 @@
+2017-08-02  Matthew Hanson  
+
+Cherry-pick r219602. rdar://problem/33537767
+
+2017-07-17  Konstantin Tokarev  
+
+[cmake] Set library types before their targets are created
+https://bugs.webkit.org/show_bug.cgi?id=174600
+
+Reviewed by Michael Catanzaro.
+
+Since r219560 library targets are created before PlatformXXX.cmake
+files are processed, however library type must be passed in
+add_library() call and cannot be changed afterwards. Set these
+variables in OptionsXXX.cmake.
+
+* wtf/PlatformGTK.cmake:
+* wtf/PlatformMac.cmake:
+
 2017-07-17  Konstantin Tokarev  
 
 [CMake] Create targets before WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS is called


Modified: tags/Safari-604.1.35.1/Source/WTF/wtf/PlatformGTK.cmake (220141 => 220142)

--- tags/Safari-604.1.35.1/Source/WTF/wtf/PlatformGTK.cmake	2017-08-02 18:10:18 UTC (rev 220141)
+++ tags/Safari-604.1.35.1/Source/WTF/wtf/PlatformGTK.cmake	2017-08-02 18:10:22 UTC (rev 220142)
@@ -1,4 +1,3 @@
-set(WTF_LIBRARY_TYPE STATIC)
 set(WTF_OUTPUT_NAME WTFGTK)
 
 list(APPEND WTF_SOURCES


Modified: tags/Safari-604.1.35.1/Source/WTF/wtf/PlatformMac.cmake (220141 => 220142)

--- tags/Safari-604.1.35.1/Source/WTF/wtf/PlatformMac.cmake	2017-08-02 18:10:18 UTC (rev 220141)
+++ tags/Safari-604.1.35.1/Source/WTF/wtf/PlatformMac.cmake	2017-08-02 18:10:22 UTC (rev 220142)
@@ -1,5 +1,3 @@
-set(WTF_LIBRARY_TYPE STATIC)
-
 find_library(COCOA_LIBRARY Cocoa)
 find_library(COREFOUNDATION_LIBRARY CoreFoundation)
 find_library(READLINE_LIBRARY Readline)


Modified: tags/Safari-604.1.35.1/Source/WebCore/ChangeLog (220141 => 220142)

--- tags/Safari-604.1.35.1/Source/WebCore/ChangeLog	2017-08-02 18:10:18 UTC (rev 220141)
+++ tags/Safari-604.1.35.1/Source/WebCore/ChangeLog	2017-08-02 18:10:22 UTC (rev 220142)
@@ -1,3 +1,23 @@
+2017-08-02  Matthew Hanson  
+
+Cherry-pick r219602. rdar://problem/33537767
+
+2017-07-17  Konstantin Tokarev  
+
+[cmake] Set library types before their targets are created
+

[webkit-changes] [220143] tags/Safari-604.1.35.1/Source/WebKitLegacy

2017-08-02 Thread matthew_hanson

Title: [220143] tags/Safari-604.1.35.1/Source/WebKitLegacy








Revision 220143
Author matthew_han...@apple.com
Date 2017-08-02 11:10:24 -0700 (Wed, 02 Aug 2017)


Log Message
Cherry-pick r220128. rdar://problem/33537767

Modified Paths

tags/Safari-604.1.35.1/Source/WebKitLegacy/ChangeLog
tags/Safari-604.1.35.1/Source/WebKitLegacy/WebKitLegacy.vcxproj/WebKitLegacy.proj




Diff

Modified: tags/Safari-604.1.35.1/Source/WebKitLegacy/ChangeLog (220142 => 220143)

--- tags/Safari-604.1.35.1/Source/WebKitLegacy/ChangeLog	2017-08-02 18:10:22 UTC (rev 220142)
+++ tags/Safari-604.1.35.1/Source/WebKitLegacy/ChangeLog	2017-08-02 18:10:24 UTC (rev 220143)
@@ -1,5 +1,18 @@
 2017-08-02  Matthew Hanson  
 
+Cherry-pick r220128. rdar://problem/33537767
+
+2017-08-02  Matthew Hanson  
+
+Build-fix for Windows in Visual Studio after directory rename.
+
+Reviewed by Per Arne Vollan.
+
+* WebKitLegacy.vcxproj/WebKitLegacy.proj:
+We still build WebKit.dll, not WebKitLegacy.dll.
+
+2017-08-02  Matthew Hanson  
+
 Cherry-pick r219602. rdar://problem/33537767
 
 2017-07-17  Konstantin Tokarev  


Modified: tags/Safari-604.1.35.1/Source/WebKitLegacy/WebKitLegacy.vcxproj/WebKitLegacy.proj (220142 => 220143)

--- tags/Safari-604.1.35.1/Source/WebKitLegacy/WebKitLegacy.vcxproj/WebKitLegacy.proj	2017-08-02 18:10:22 UTC (rev 220142)
+++ tags/Safari-604.1.35.1/Source/WebKitLegacy/WebKitLegacy.vcxproj/WebKitLegacy.proj	2017-08-02 18:10:24 UTC (rev 220143)
@@ -74,10 +74,10 @@
 
   
 
-
+
   
 
-
+
   
 
 






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

[webkit-changes] [220141] tags/Safari-604.1.35.1/Source

2017-08-02 Thread matthew_hanson

Title: [220141] tags/Safari-604.1.35.1/Source








Revision 220141
Author matthew_han...@apple.com
Date 2017-08-02 11:10:18 -0700 (Wed, 02 Aug 2017)


Log Message
Versioning.

Modified Paths

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




Diff

Modified: tags/Safari-604.1.35.1/Source/_javascript_Core/Configurations/Version.xcconfig (220140 => 220141)

--- tags/Safari-604.1.35.1/Source/_javascript_Core/Configurations/Version.xcconfig	2017-08-02 17:57:24 UTC (rev 220140)
+++ tags/Safari-604.1.35.1/Source/_javascript_Core/Configurations/Version.xcconfig	2017-08-02 18:10:18 UTC (rev 220141)
@@ -24,9 +24,9 @@
 MAJOR_VERSION = 604;
 MINOR_VERSION = 1;
 TINY_VERSION = 35;
-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.1.35.1/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig (220140 => 220141)

--- tags/Safari-604.1.35.1/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig	2017-08-02 17:57:24 UTC (rev 220140)
+++ tags/Safari-604.1.35.1/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig	2017-08-02 18:10:18 UTC (rev 220141)
@@ -24,9 +24,9 @@
 MAJOR_VERSION = 604;
 MINOR_VERSION = 1;
 TINY_VERSION = 35;
-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.1.35.1/Source/WebCore/Configurations/Version.xcconfig (220140 => 220141)

--- tags/Safari-604.1.35.1/Source/WebCore/Configurations/Version.xcconfig	2017-08-02 17:57:24 UTC (rev 220140)
+++ tags/Safari-604.1.35.1/Source/WebCore/Configurations/Version.xcconfig	2017-08-02 18:10:18 UTC (rev 220141)
@@ -24,9 +24,9 @@
 MAJOR_VERSION = 604;
 MINOR_VERSION = 1;
 TINY_VERSION = 35;
-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.1.35.1/Source/WebCore/PAL/Configurations/Version.xcconfig (220140 => 220141)

--- tags/Safari-604.1.35.1/Source/WebCore/PAL/Configurations/Version.xcconfig	2017-08-02 17:57:24 UTC (rev 220140)
+++ tags/Safari-604.1.35.1/Source/WebCore/PAL/Configurations/Version.xcconfig	2017-08-02 18:10:18 UTC (rev 220141)
@@ -24,9 +24,9 @@
 MAJOR_VERSION = 604;
 MINOR_VERSION = 1;
 TINY_VERSION = 35;
-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.1.35.1/Source/WebInspectorUI/Configurations/Version.xcconfig (220140 => 220141)

--- tags/Safari-604.1.35.1/Source/WebInspectorUI/Configurations/Version.xcconfig	2017-08-02 17:57:24 UTC (rev 220140)
+++ tags/Safari-604.1.35.1/Source/WebInspectorUI/Configurations/Version.xcconfig	2017-08-02 18:10:18 UTC (rev 220141)
@@ -1,9 +1,9 @@
 MAJOR_VERSION = 604;
 MINOR_VERSION = 1;
 TINY_VERSION = 35;
-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.1.35.1/Source/WebKit/Configurations/Version.xcconfig (220140 => 220141)

--- tags/Safari-604.1.35.1/Source/WebKit/Configurations/Version.xcconfig	2017-08-02 17:57:24 UTC (rev 220140)
+++ tags/Safari-604.1.35.1/Source/WebKit/Configurations/Version.xcconfig	2017-08-02 18:10:18 UTC (rev 220141)
@@

[webkit-changes] [220140] tags/Safari-604.1.35.1/

2017-08-02 Thread matthew_hanson

Title: [220140] tags/Safari-604.1.35.1/








Revision 220140
Author matthew_han...@apple.com
Date 2017-08-02 10:57:24 -0700 (Wed, 02 Aug 2017)


Log Message
New Tag.

Added Paths

tags/Safari-604.1.35.1/




Diff




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

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

2017-08-02 Thread matthew_hanson

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








Revision 220133
Author matthew_han...@apple.com
Date 2017-08-02 10:28:04 -0700 (Wed, 02 Aug 2017)


Log Message
Cherry-pick r219602. rdar://problem/33537767

Modified Paths

branches/safari-604-branch/CMakeLists.txt
branches/safari-604-branch/ChangeLog
branches/safari-604-branch/Source/WTF/ChangeLog
branches/safari-604-branch/Source/WTF/wtf/PlatformGTK.cmake
branches/safari-604-branch/Source/WTF/wtf/PlatformMac.cmake
branches/safari-604-branch/Source/WebCore/ChangeLog
branches/safari-604-branch/Source/WebCore/PlatformMac.cmake
branches/safari-604-branch/Source/WebKitLegacy/ChangeLog
branches/safari-604-branch/Source/WebKitLegacy/PlatformMac.cmake
branches/safari-604-branch/Source/WebKitLegacy/PlatformWin.cmake
branches/safari-604-branch/Source/cmake/OptionsMac.cmake
branches/safari-604-branch/Source/cmake/OptionsWPE.cmake
branches/safari-604-branch/Source/cmake/OptionsWin.cmake




Diff

Modified: branches/safari-604-branch/CMakeLists.txt (220132 => 220133)

--- branches/safari-604-branch/CMakeLists.txt	2017-08-02 17:03:48 UTC (rev 220132)
+++ branches/safari-604-branch/CMakeLists.txt	2017-08-02 17:28:04 UTC (rev 220133)
@@ -119,6 +119,7 @@
 set(WebCore_LIBRARY_TYPE STATIC)
 endif ()
 
+set(WTF_LIBRARY_TYPE STATIC)
 set(_javascript_Core_LIBRARY_TYPE SHARED)
 set(PAL_LIBRARY_TYPE STATIC)
 set(WebKit_LIBRARY_TYPE SHARED)


Modified: branches/safari-604-branch/ChangeLog (220132 => 220133)

--- branches/safari-604-branch/ChangeLog	2017-08-02 17:03:48 UTC (rev 220132)
+++ branches/safari-604-branch/ChangeLog	2017-08-02 17:28:04 UTC (rev 220133)
@@ -1,3 +1,24 @@
+2017-08-02  Matthew Hanson  
+
+Cherry-pick r219602. rdar://problem/33537767
+
+2017-07-17  Konstantin Tokarev  
+
+[cmake] Set library types before their targets are created
+https://bugs.webkit.org/show_bug.cgi?id=174600
+
+Reviewed by Michael Catanzaro.
+
+Since r219560 library targets are created before PlatformXXX.cmake
+files are processed, however library type must be passed in
+add_library() call and cannot be changed afterwards. Set these
+variables in OptionsXXX.cmake.
+
+* CMakeLists.txt:
+* Source/cmake/OptionsMac.cmake:
+* Source/cmake/OptionsWPE.cmake:
+* Source/cmake/OptionsWin.cmake:
+
 2017-07-17  Konstantin Tokarev  
 
 [CMake] Create targets before WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS is called


Modified: branches/safari-604-branch/Source/WTF/ChangeLog (220132 => 220133)

--- branches/safari-604-branch/Source/WTF/ChangeLog	2017-08-02 17:03:48 UTC (rev 220132)
+++ branches/safari-604-branch/Source/WTF/ChangeLog	2017-08-02 17:28:04 UTC (rev 220133)
@@ -1,3 +1,22 @@
+2017-08-02  Matthew Hanson  
+
+Cherry-pick r219602. rdar://problem/33537767
+
+2017-07-17  Konstantin Tokarev  
+
+[cmake] Set library types before their targets are created
+https://bugs.webkit.org/show_bug.cgi?id=174600
+
+Reviewed by Michael Catanzaro.
+
+Since r219560 library targets are created before PlatformXXX.cmake
+files are processed, however library type must be passed in
+add_library() call and cannot be changed afterwards. Set these
+variables in OptionsXXX.cmake.
+
+* wtf/PlatformGTK.cmake:
+* wtf/PlatformMac.cmake:
+
 2017-07-17  Konstantin Tokarev  
 
 [CMake] Create targets before WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS is called


Modified: branches/safari-604-branch/Source/WTF/wtf/PlatformGTK.cmake (220132 => 220133)

--- branches/safari-604-branch/Source/WTF/wtf/PlatformGTK.cmake	2017-08-02 17:03:48 UTC (rev 220132)
+++ branches/safari-604-branch/Source/WTF/wtf/PlatformGTK.cmake	2017-08-02 17:28:04 UTC (rev 220133)
@@ -1,4 +1,3 @@
-set(WTF_LIBRARY_TYPE STATIC)
 set(WTF_OUTPUT_NAME WTFGTK)
 
 list(APPEND WTF_SOURCES


Modified: branches/safari-604-branch/Source/WTF/wtf/PlatformMac.cmake (220132 => 220133)

--- branches/safari-604-branch/Source/WTF/wtf/PlatformMac.cmake	2017-08-02 17:03:48 UTC (rev 220132)
+++ branches/safari-604-branch/Source/WTF/wtf/PlatformMac.cmake	2017-08-02 17:28:04 UTC (rev 220133)
@@ -1,5 +1,3 @@
-set(WTF_LIBRARY_TYPE STATIC)
-
 find_library(COCOA_LIBRARY Cocoa)
 find_library(COREFOUNDATION_LIBRARY CoreFoundation)
 find_library(READLINE_LIBRARY Readline)


Modified: branches/safari-604-branch/Source/WebCore/ChangeLog (220132 => 220133)

--- branches/safari-604-branch/Source/WebCore/ChangeLog	2017-08-02 17:03:48 UTC (rev 220132)
+++ branches/safari-604-branch/Source/WebCore/ChangeLog	2017-08-02 17:28:04 UTC (rev 220133)
@@ -1,3 +1,23 @@
+2017-08-02  Matthew Hanson  
+
+Cherry-pick r219602. rdar://problem/33537767
+
+2017-07-17  Konstantin

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

2017-08-02 Thread matthew_hanson

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








Revision 220129
Author matthew_han...@apple.com
Date 2017-08-02 07:07:15 -0700 (Wed, 02 Aug 2017)


Log Message
Cherry-pick r220128. rdar://problem/33537767

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 (220128 => 220129)

--- branches/safari-604-branch/Source/WebKitLegacy/ChangeLog	2017-08-02 13:53:35 UTC (rev 220128)
+++ branches/safari-604-branch/Source/WebKitLegacy/ChangeLog	2017-08-02 14:07:15 UTC (rev 220129)
@@ -1,3 +1,16 @@
+2017-08-02  Matthew Hanson  
+
+Cherry-pick r220128. rdar://problem/33537767
+
+2017-08-02  Matthew Hanson  
+
+Build-fix for Windows in Visual Studio after directory rename.
+
+Reviewed by Per Arne Vollan.
+
+* WebKitLegacy.vcxproj/WebKitLegacy.proj:
+We still build WebKit.dll, not WebKitLegacy.dll.
+
 2017-07-17  Konstantin Tokarev  
 
 [CMake] Create targets before WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS is called


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

--- branches/safari-604-branch/Source/WebKitLegacy/WebKitLegacy.vcxproj/WebKitLegacy.proj	2017-08-02 13:53:35 UTC (rev 220128)
+++ branches/safari-604-branch/Source/WebKitLegacy/WebKitLegacy.vcxproj/WebKitLegacy.proj	2017-08-02 14:07:15 UTC (rev 220129)
@@ -74,10 +74,10 @@
 
   
 
-
+
   
 
-
+
   
 
 






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

[webkit-changes] [220128] trunk/Source/WebKitLegacy

2017-08-02 Thread matthew_hanson

Title: [220128] trunk/Source/WebKitLegacy








Revision 220128
Author matthew_han...@apple.com
Date 2017-08-02 06:53:35 -0700 (Wed, 02 Aug 2017)


Log Message
Build-fix for Windows in Visual Studio after directory rename.

Reviewed by Per Arne Vollan.

* WebKitLegacy.vcxproj/WebKitLegacy.proj:
We still build WebKit.dll, not WebKitLegacy.dll.

Modified Paths

trunk/Source/WebKitLegacy/ChangeLog
trunk/Source/WebKitLegacy/WebKitLegacy.vcxproj/WebKitLegacy.proj




Diff

Modified: trunk/Source/WebKitLegacy/ChangeLog (220127 => 220128)

--- trunk/Source/WebKitLegacy/ChangeLog	2017-08-02 13:25:36 UTC (rev 220127)
+++ trunk/Source/WebKitLegacy/ChangeLog	2017-08-02 13:53:35 UTC (rev 220128)
@@ -1,3 +1,12 @@
+2017-08-02  Matthew Hanson  
+
+Build-fix for Windows in Visual Studio after directory rename.
+
+Reviewed by Per Arne Vollan.
+
+* WebKitLegacy.vcxproj/WebKitLegacy.proj:
+We still build WebKit.dll, not WebKitLegacy.dll.
+
 2017-07-31  Sam Weinig  
 
 Remove unnecessary exceptions from storage code


Modified: trunk/Source/WebKitLegacy/WebKitLegacy.vcxproj/WebKitLegacy.proj (220127 => 220128)

--- trunk/Source/WebKitLegacy/WebKitLegacy.vcxproj/WebKitLegacy.proj	2017-08-02 13:25:36 UTC (rev 220127)
+++ trunk/Source/WebKitLegacy/WebKitLegacy.vcxproj/WebKitLegacy.proj	2017-08-02 13:53:35 UTC (rev 220128)
@@ -74,10 +74,10 @@
 
   
 
-
+
   
 
-
+
   
 
 






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

[webkit-changes] [219957] branches/safari-604-branch/LayoutTests

2017-07-26 Thread matthew_hanson

Title: [219957] branches/safari-604-branch/LayoutTests








Revision 219957
Author matthew_han...@apple.com
Date 2017-07-26 12:24:33 -0700 (Wed, 26 Jul 2017)


Log Message
Cherry-pick r219877. rdar://problem/33523803

Modified Paths

branches/safari-604-branch/LayoutTests/ChangeLog
branches/safari-604-branch/LayoutTests/fast/events/touch/ios/touches-client-coords-after-zoom-expected.txt




Diff

Modified: branches/safari-604-branch/LayoutTests/ChangeLog (219956 => 219957)

--- branches/safari-604-branch/LayoutTests/ChangeLog	2017-07-26 19:24:29 UTC (rev 219956)
+++ branches/safari-604-branch/LayoutTests/ChangeLog	2017-07-26 19:24:33 UTC (rev 219957)
@@ -1,5 +1,18 @@
 2017-07-26  Jason Marcell  
 
+Cherry-pick r219877. rdar://problem/33523803
+
+2017-07-25  Matt Lewis  
+
+Rebaselined missed test.
+https://bugs.webkit.org/show_bug.cgi?id=174734
+
+Unreviewed test gardening.
+
+* fast/events/touch/ios/touches-client-coords-after-zoom-expected.txt:
+
+2017-07-26  Jason Marcell  
+
 Cherry-pick r219876. rdar://problem/33523847
 
 2017-07-25  Said Abou-Hallawa  


Modified: branches/safari-604-branch/LayoutTests/fast/events/touch/ios/touches-client-coords-after-zoom-expected.txt (219956 => 219957)

--- branches/safari-604-branch/LayoutTests/fast/events/touch/ios/touches-client-coords-after-zoom-expected.txt	2017-07-26 19:24:29 UTC (rev 219956)
+++ branches/safari-604-branch/LayoutTests/fast/events/touch/ios/touches-client-coords-after-zoom-expected.txt	2017-07-26 19:24:33 UTC (rev 219957)
@@ -1,6 +1,6 @@
 
 These two events should have the same client coordinates:
 
-Received event touchstart with client coords 150, 160
-Received event click with client coords 150, 160
+Received event touchstart with client coords 83, 110
+Received event click with client coords 83, 110
 






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

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

2017-07-26 Thread matthew_hanson

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








Revision 219955
Author matthew_han...@apple.com
Date 2017-07-26 12:24:10 -0700 (Wed, 26 Jul 2017)


Log Message
Cherry-pick r219620. rdar://problem/33523847

Modified Paths

branches/safari-604-branch/LayoutTests/ChangeLog
branches/safari-604-branch/LayoutTests/fast/images/async-image-background-image-repeated.html
branches/safari-604-branch/LayoutTests/fast/images/async-image-background-image.html
branches/safari-604-branch/LayoutTests/fast/images/async-image-multiple-clients-repaint.html
branches/safari-604-branch/LayoutTests/platform/ios-wk1/TestExpectations
branches/safari-604-branch/LayoutTests/platform/mac-wk1/TestExpectations
branches/safari-604-branch/Source/WebCore/ChangeLog
branches/safari-604-branch/Source/WebCore/page/PageOverlayController.cpp
branches/safari-604-branch/Source/WebCore/page/PageOverlayController.h
branches/safari-604-branch/Source/WebCore/page/linux/ResourceUsageOverlayLinux.cpp
branches/safari-604-branch/Source/WebCore/page/mac/ServicesOverlayController.h
branches/safari-604-branch/Source/WebCore/page/mac/ServicesOverlayController.mm
branches/safari-604-branch/Source/WebCore/platform/graphics/BitmapImage.h
branches/safari-604-branch/Source/WebCore/platform/graphics/GraphicsLayer.cpp
branches/safari-604-branch/Source/WebCore/platform/graphics/GraphicsLayer.h
branches/safari-604-branch/Source/WebCore/platform/graphics/GraphicsLayerClient.h
branches/safari-604-branch/Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp
branches/safari-604-branch/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp
branches/safari-604-branch/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.h
branches/safari-604-branch/Source/WebCore/platform/graphics/ca/PlatformCALayer.h
branches/safari-604-branch/Source/WebCore/platform/graphics/ca/PlatformCALayerClient.h
branches/safari-604-branch/Source/WebCore/platform/graphics/ca/TileCoverageMap.cpp
branches/safari-604-branch/Source/WebCore/platform/graphics/ca/TileCoverageMap.h
branches/safari-604-branch/Source/WebCore/platform/graphics/ca/TileGrid.cpp
branches/safari-604-branch/Source/WebCore/platform/graphics/ca/TileGrid.h
branches/safari-604-branch/Source/WebCore/platform/graphics/ca/cocoa/PlatformCALayerCocoa.mm
branches/safari-604-branch/Source/WebCore/platform/graphics/ca/win/PlatformCALayerWin.cpp
branches/safari-604-branch/Source/WebCore/platform/graphics/ca/win/PlatformCALayerWinInternal.cpp
branches/safari-604-branch/Source/WebCore/platform/graphics/ca/win/WebTiledBackingLayerWin.cpp
branches/safari-604-branch/Source/WebCore/platform/graphics/mac/WebLayer.mm
branches/safari-604-branch/Source/WebCore/rendering/RenderBoxModelObject.cpp
branches/safari-604-branch/Source/WebCore/rendering/RenderElement.h
branches/safari-604-branch/Source/WebCore/rendering/RenderLayerBacking.cpp
branches/safari-604-branch/Source/WebCore/rendering/RenderLayerBacking.h
branches/safari-604-branch/Source/WebCore/rendering/RenderLayerCompositor.cpp
branches/safari-604-branch/Source/WebCore/rendering/RenderLayerCompositor.h
branches/safari-604-branch/Source/WebCore/testing/Internals.cpp
branches/safari-604-branch/Source/WebCore/testing/Internals.h
branches/safari-604-branch/Source/WebCore/testing/Internals.idl
branches/safari-604-branch/Source/WebKit/ChangeLog
branches/safari-604-branch/Source/WebKit/Shared/mac/RemoteLayerBackingStore.mm
branches/safari-604-branch/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/CompositingCoordinator.cpp
branches/safari-604-branch/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/CompositingCoordinator.h
branches/safari-604-branch/Source/WebKitLegacy/win/ChangeLog
branches/safari-604-branch/Source/WebKitLegacy/win/FullscreenVideoController.cpp
branches/safari-604-branch/Source/WebKitLegacy/win/WebCoreSupport/AcceleratedCompositingContext.cpp
branches/safari-604-branch/Source/WebKitLegacy/win/WebCoreSupport/AcceleratedCompositingContext.h


Removed Paths

branches/safari-604-branch/LayoutTests/fast/images/async-image-background-change-expected.html
branches/safari-604-branch/LayoutTests/fast/images/async-image-background-change.html
branches/safari-604-branch/LayoutTests/fast/images/async-image-src-change-expected.html
branches/safari-604-branch/LayoutTests/fast/images/async-image-src-change.html
branches/safari-604-branch/LayoutTests/fast/images/resources/green-400x400.png
branches/safari-604-branch/LayoutTests/fast/images/resources/red-100x100.png
branches/safari-604-branch/LayoutTests/fast/images/resources/red-400x400.png
branches/safari-604-branch/LayoutTests/http/tests/multipart/multipart-async-image-expected.txt
branches/safari-604-branch/LayoutTests/http/tests/multipart/multipart-async-image.html




Diff

Modified: branches/safari-604-branch/LayoutTests/ChangeLog (219954 => 219955)

--- branches/safari-604-branch/LayoutTests/ChangeLog	2017-07-26 18:40:50 UTC (rev 219954)
+++ branches/safari-604-branch/LayoutTests/ChangeLog	2017-07-26

[webkit-changes] [219617] tags/Safari-604.1.32.0.1

2017-07-18 Thread matthew_hanson

Title: [219617] tags/Safari-604.1.32.0.1








Revision 219617
Author matthew_han...@apple.com
Date 2017-07-18 10:05:34 -0700 (Tue, 18 Jul 2017)


Log Message
Revert r219413. rdar://problem/7335

Modified Paths

tags/Safari-604.1.32.0.1/Source/_javascript_Core/ChangeLog
tags/Safari-604.1.32.0.1/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig
tags/Safari-604.1.32.0.1/Source/_javascript_Core/runtime/Options.h
tags/Safari-604.1.32.0.1/Source/WebCore/ChangeLog
tags/Safari-604.1.32.0.1/Source/WebCore/Configurations/FeatureDefines.xcconfig
tags/Safari-604.1.32.0.1/Source/WebCore/PAL/ChangeLog
tags/Safari-604.1.32.0.1/Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig
tags/Safari-604.1.32.0.1/Source/WebCore/page/Settings.in
tags/Safari-604.1.32.0.1/Source/WebKit/ChangeLog
tags/Safari-604.1.32.0.1/Source/WebKit/Configurations/FeatureDefines.xcconfig
tags/Safari-604.1.32.0.1/Source/WebKit/Shared/WebPreferencesDefinitions.h
tags/Safari-604.1.32.0.1/Source/WebKitLegacy/mac/ChangeLog
tags/Safari-604.1.32.0.1/Source/WebKitLegacy/mac/Configurations/FeatureDefines.xcconfig
tags/Safari-604.1.32.0.1/Tools/ChangeLog
tags/Safari-604.1.32.0.1/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig




Diff

Modified: tags/Safari-604.1.32.0.1/Source/_javascript_Core/ChangeLog (219616 => 219617)

--- tags/Safari-604.1.32.0.1/Source/_javascript_Core/ChangeLog	2017-07-18 17:05:27 UTC (rev 219616)
+++ tags/Safari-604.1.32.0.1/Source/_javascript_Core/ChangeLog	2017-07-18 17:05:34 UTC (rev 219617)
@@ -1,3 +1,7 @@
+2017-07-18  Matthew Hanson  
+
+Revert r219413. rdar://problem/7335
+
 2017-07-17  Jason Marcell  
 
 Cherry-pick r219413. rdar://problem/7335


Modified: tags/Safari-604.1.32.0.1/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig (219616 => 219617)

--- tags/Safari-604.1.32.0.1/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig	2017-07-18 17:05:27 UTC (rev 219616)
+++ tags/Safari-604.1.32.0.1/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig	2017-07-18 17:05:34 UTC (rev 219617)
@@ -74,7 +74,7 @@
 ENABLE_CONTENT_FILTERING[sdk=appletv*] = ;
 ENABLE_CONTENT_FILTERING[sdk=iphone*] = ENABLE_CONTENT_FILTERING;
 ENABLE_CONTENT_FILTERING[sdk=macosx*] = ENABLE_CONTENT_FILTERING;
-ENABLE_CSS_ANIMATIONS_LEVEL_2 = ;
+ENABLE_CSS_ANIMATIONS_LEVEL_2 = ENABLE_CSS_ANIMATIONS_LEVEL_2;
 ENABLE_CSS_BOX_DECORATION_BREAK = ENABLE_CSS_BOX_DECORATION_BREAK;
 ENABLE_CSS_COMPOSITING = ENABLE_CSS_COMPOSITING;
 ENABLE_CSS_DEVICE_ADAPTATION = ;
@@ -101,8 +101,8 @@
 ENABLE_SERVICE_CONTROLS[sdk=macosx*] = ENABLE_SERVICE_CONTROLS;
 ENABLE_INDEXED_DATABASE = ENABLE_INDEXED_DATABASE;
 ENABLE_INDEXED_DATABASE_IN_WORKERS = ENABLE_INDEXED_DATABASE_IN_WORKERS;
-ENABLE_INPUT_TYPE_COLOR[sdk=macosx*] = ;
-ENABLE_INPUT_TYPE_COLOR_POPOVER[sdk=macosx*] = ;
+ENABLE_INPUT_TYPE_COLOR[sdk=macosx*] = ENABLE_INPUT_TYPE_COLOR;
+ENABLE_INPUT_TYPE_COLOR_POPOVER[sdk=macosx*] = ENABLE_INPUT_TYPE_COLOR_POPOVER;
 ENABLE_INPUT_TYPE_DATE[sdk=iphone*] = ENABLE_INPUT_TYPE_DATE;
 ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE = ;
 ENABLE_INPUT_TYPE_DATETIMELOCAL[sdk=iphone*] = ENABLE_INPUT_TYPE_DATETIMELOCAL;
@@ -150,7 +150,7 @@
 ENABLE_MHTML = ;
 ENABLE_MOUSE_CURSOR_SCALE[sdk=macosx*] = ENABLE_MOUSE_CURSOR_SCALE;
 ENABLE_NAVIGATOR_CONTENT_UTILS = ;
-ENABLE_NAVIGATOR_STANDALONE[sdk=iphone*] = ;
+ENABLE_NAVIGATOR_STANDALONE[sdk=iphone*] = ENABLE_NAVIGATOR_STANDALONE;
 ENABLE_NOTIFICATIONS[sdk=macosx*] = ENABLE_NOTIFICATIONS;
 ENABLE_PDFKIT_PLUGIN[sdk=macosx*] = ENABLE_PDFKIT_PLUGIN;
 ENABLE_POINTER_LOCK[sdk=macosx*] = ENABLE_POINTER_LOCK;
@@ -208,10 +208,10 @@
 ENABLE_VIEW_MODE_CSS_MEDIA = ;
 ENABLE_WEBASSEMBLY = ;
 ENABLE_WEBGL = ENABLE_WEBGL;
-ENABLE_WEBGL2 = ;
+ENABLE_WEBGL2 = ENABLE_WEBGL2;
 ENABLE_WEBGPU = ENABLE_WEBGPU;
 ENABLE_WEBGPU[sdk=iphonesimulator*] = ;
-ENABLE_WEB_ANIMATIONS = ;
+ENABLE_WEB_ANIMATIONS = ENABLE_WEB_ANIMATIONS;
 ENABLE_WEB_AUDIO = ENABLE_WEB_AUDIO;
 ENABLE_WEB_SOCKETS = ENABLE_WEB_SOCKETS;
 


Modified: tags/Safari-604.1.32.0.1/Source/_javascript_Core/runtime/Options.h (219616 => 219617)

--- tags/Safari-604.1.32.0.1/Source/_javascript_Core/runtime/Options.h	2017-07-18 17:05:27 UTC (rev 219616)
+++ tags/Safari-604.1.32.0.1/Source/_javascript_Core/runtime/Options.h	2017-07-18 17:05:34 UTC (rev 219617)
@@ -464,7 +464,7 @@
 v(bool, useWebAssemblyFastTLS, true, Normal, "If true, we will try to use fast thread-local storage if available on the current platform.") \
 v(bool, useFastTLSForWasmContext, true, Normal, "If true (and fast TLS is enabled), we will store context in fast TLS. If false, we will pin it to a register.") \
 v(bool, useCallICsForWebAssemblyToJSCalls, true, Normal, "If true, we will use CallLinkInfo to inline cache Wasm to JS calls.") \
-v(bool, useObjectRestSpread, false, Normal, "If true, we will enable Object Rest/Spread feature.") \
+v(bool, useObjectRestSpread, true, Normal, "If true, we

[webkit-changes] [219616] tags/Safari-604.1.32.0.1/Source

2017-07-18 Thread matthew_hanson

Title: [219616] tags/Safari-604.1.32.0.1/Source








Revision 219616
Author matthew_han...@apple.com
Date 2017-07-18 10:05:27 -0700 (Tue, 18 Jul 2017)


Log Message
Revert r219423. rdar://problem/7335

Modified Paths

tags/Safari-604.1.32.0.1/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig
tags/Safari-604.1.32.0.1/Source/WebCore/Configurations/FeatureDefines.xcconfig
tags/Safari-604.1.32.0.1/Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig
tags/Safari-604.1.32.0.1/Source/WebKit/Configurations/FeatureDefines.xcconfig
tags/Safari-604.1.32.0.1/Source/WebKitLegacy/mac/Configurations/FeatureDefines.xcconfig




Diff

Modified: tags/Safari-604.1.32.0.1/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig (219615 => 219616)

--- tags/Safari-604.1.32.0.1/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig	2017-07-18 17:03:48 UTC (rev 219615)
+++ tags/Safari-604.1.32.0.1/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig	2017-07-18 17:05:27 UTC (rev 219616)
@@ -150,7 +150,7 @@
 ENABLE_MHTML = ;
 ENABLE_MOUSE_CURSOR_SCALE[sdk=macosx*] = ENABLE_MOUSE_CURSOR_SCALE;
 ENABLE_NAVIGATOR_CONTENT_UTILS = ;
-ENABLE_NAVIGATOR_STANDALONE[sdk=iphone*] = ENABLE_NAVIGATOR_STANDALONE;
+ENABLE_NAVIGATOR_STANDALONE[sdk=iphone*] = ;
 ENABLE_NOTIFICATIONS[sdk=macosx*] = ENABLE_NOTIFICATIONS;
 ENABLE_PDFKIT_PLUGIN[sdk=macosx*] = ENABLE_PDFKIT_PLUGIN;
 ENABLE_POINTER_LOCK[sdk=macosx*] = ENABLE_POINTER_LOCK;


Modified: tags/Safari-604.1.32.0.1/Source/WebCore/Configurations/FeatureDefines.xcconfig (219615 => 219616)

--- tags/Safari-604.1.32.0.1/Source/WebCore/Configurations/FeatureDefines.xcconfig	2017-07-18 17:03:48 UTC (rev 219615)
+++ tags/Safari-604.1.32.0.1/Source/WebCore/Configurations/FeatureDefines.xcconfig	2017-07-18 17:05:27 UTC (rev 219616)
@@ -150,7 +150,7 @@
 ENABLE_MHTML = ;
 ENABLE_MOUSE_CURSOR_SCALE[sdk=macosx*] = ENABLE_MOUSE_CURSOR_SCALE;
 ENABLE_NAVIGATOR_CONTENT_UTILS = ;
-ENABLE_NAVIGATOR_STANDALONE[sdk=iphone*] = ENABLE_NAVIGATOR_STANDALONE;
+ENABLE_NAVIGATOR_STANDALONE[sdk=iphone*] = ;
 ENABLE_NOTIFICATIONS[sdk=macosx*] = ENABLE_NOTIFICATIONS;
 ENABLE_PDFKIT_PLUGIN[sdk=macosx*] = ENABLE_PDFKIT_PLUGIN;
 ENABLE_POINTER_LOCK[sdk=macosx*] = ENABLE_POINTER_LOCK;


Modified: tags/Safari-604.1.32.0.1/Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig (219615 => 219616)

--- tags/Safari-604.1.32.0.1/Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig	2017-07-18 17:03:48 UTC (rev 219615)
+++ tags/Safari-604.1.32.0.1/Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig	2017-07-18 17:05:27 UTC (rev 219616)
@@ -150,7 +150,7 @@
 ENABLE_MHTML = ;
 ENABLE_MOUSE_CURSOR_SCALE[sdk=macosx*] = ENABLE_MOUSE_CURSOR_SCALE;
 ENABLE_NAVIGATOR_CONTENT_UTILS = ;
-ENABLE_NAVIGATOR_STANDALONE[sdk=iphone*] = ENABLE_NAVIGATOR_STANDALONE;
+ENABLE_NAVIGATOR_STANDALONE[sdk=iphone*] = ;
 ENABLE_NOTIFICATIONS[sdk=macosx*] = ENABLE_NOTIFICATIONS;
 ENABLE_PDFKIT_PLUGIN[sdk=macosx*] = ENABLE_PDFKIT_PLUGIN;
 ENABLE_POINTER_LOCK[sdk=macosx*] = ENABLE_POINTER_LOCK;


Modified: tags/Safari-604.1.32.0.1/Source/WebKit/Configurations/FeatureDefines.xcconfig (219615 => 219616)

--- tags/Safari-604.1.32.0.1/Source/WebKit/Configurations/FeatureDefines.xcconfig	2017-07-18 17:03:48 UTC (rev 219615)
+++ tags/Safari-604.1.32.0.1/Source/WebKit/Configurations/FeatureDefines.xcconfig	2017-07-18 17:05:27 UTC (rev 219616)
@@ -150,7 +150,7 @@
 ENABLE_MHTML = ;
 ENABLE_MOUSE_CURSOR_SCALE[sdk=macosx*] = ENABLE_MOUSE_CURSOR_SCALE;
 ENABLE_NAVIGATOR_CONTENT_UTILS = ;
-ENABLE_NAVIGATOR_STANDALONE[sdk=iphone*] = ENABLE_NAVIGATOR_STANDALONE;
+ENABLE_NAVIGATOR_STANDALONE[sdk=iphone*] = ;
 ENABLE_NOTIFICATIONS[sdk=macosx*] = ENABLE_NOTIFICATIONS;
 ENABLE_PDFKIT_PLUGIN[sdk=macosx*] = ENABLE_PDFKIT_PLUGIN;
 ENABLE_POINTER_LOCK[sdk=macosx*] = ENABLE_POINTER_LOCK;


Modified: tags/Safari-604.1.32.0.1/Source/WebKitLegacy/mac/Configurations/FeatureDefines.xcconfig (219615 => 219616)

--- tags/Safari-604.1.32.0.1/Source/WebKitLegacy/mac/Configurations/FeatureDefines.xcconfig	2017-07-18 17:03:48 UTC (rev 219615)
+++ tags/Safari-604.1.32.0.1/Source/WebKitLegacy/mac/Configurations/FeatureDefines.xcconfig	2017-07-18 17:05:27 UTC (rev 219616)
@@ -150,7 +150,7 @@
 ENABLE_MHTML = ;
 ENABLE_MOUSE_CURSOR_SCALE[sdk=macosx*] = ENABLE_MOUSE_CURSOR_SCALE;
 ENABLE_NAVIGATOR_CONTENT_UTILS = ;
-ENABLE_NAVIGATOR_STANDALONE[sdk=iphone*] = ENABLE_NAVIGATOR_STANDALONE;
+ENABLE_NAVIGATOR_STANDALONE[sdk=iphone*] = ;
 ENABLE_NOTIFICATIONS[sdk=macosx*] = ENABLE_NOTIFICATIONS;
 ENABLE_PDFKIT_PLUGIN[sdk=macosx*] = ENABLE_PDFKIT_PLUGIN;
 ENABLE_POINTER_LOCK[sdk=macosx*] = ENABLE_POINTER_LOCK;






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

[webkit-changes] [219494] trunk

2017-07-13 Thread matthew_hanson

Title: [219494] trunk








Revision 219494
Author matthew_han...@apple.com
Date 2017-07-13 20:36:38 -0700 (Thu, 13 Jul 2017)


Log Message
Fix the Mac CMake build.

Unreviewed build fix.

Fix the Mac CMake build after r219488 broke it. r219488 erroneously updated
the variable name DERIVED_SOURCES_WEBKITLEGACY_DIR to DERIVED_SOURCES_WEBKIT_LEGACY_DIR
without updating subsequent users of that variable.

* Source/cmake/WebKitFS.cmake:
Rename DERIVED_SOURCES_WEBKIT_LEGACY_DIR back to DERIVED_SOURCES_WEBKITLEGACY_DIR.

Modified Paths

trunk/ChangeLog
trunk/Source/cmake/WebKitFS.cmake




Diff

Modified: trunk/ChangeLog (219493 => 219494)

--- trunk/ChangeLog	2017-07-14 03:09:54 UTC (rev 219493)
+++ trunk/ChangeLog	2017-07-14 03:36:38 UTC (rev 219494)
@@ -1,5 +1,18 @@
 2017-07-13  Matthew Hanson  
 
+Fix the Mac CMake build.
+
+Unreviewed build fix.
+
+Fix the Mac CMake build after r219488 broke it. r219488 erroneously updated
+the variable name DERIVED_SOURCES_WEBKITLEGACY_DIR to DERIVED_SOURCES_WEBKIT_LEGACY_DIR
+without updating subsequent users of that variable.
+
+* Source/cmake/WebKitFS.cmake:
+Rename DERIVED_SOURCES_WEBKIT_LEGACY_DIR back to DERIVED_SOURCES_WEBKITLEGACY_DIR.
+
+2017-07-13  Matthew Hanson  
+
 Fix the cMake builds (GTK and WPE.)
 https://bugs.webkit.org/show_bug.cgi?id=174164
 rdar://problem/33137595


Modified: trunk/Source/cmake/WebKitFS.cmake (219493 => 219494)

--- trunk/Source/cmake/WebKitFS.cmake	2017-07-14 03:09:54 UTC (rev 219493)
+++ trunk/Source/cmake/WebKitFS.cmake	2017-07-14 03:36:38 UTC (rev 219494)
@@ -29,7 +29,7 @@
 set(DERIVED_SOURCES_DIR "${CMAKE_BINARY_DIR}/DerivedSources")
 set(DERIVED_SOURCES_JAVASCRIPTCORE_DIR "${CMAKE_BINARY_DIR}/DerivedSources/_javascript_Core")
 set(DERIVED_SOURCES_WEBCORE_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebCore")
-set(DERIVED_SOURCES_WEBKIT_LEGACY_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebKitLegacy")
+set(DERIVED_SOURCES_WEBKITLEGACY_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebKitLegacy")
 set(DERIVED_SOURCES_WEBKIT_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebKit")
 set(DERIVED_SOURCES_WEBKIT2_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebKit2")
 set(DERIVED_SOURCES_WEBINSPECTORUI_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebInspectorUI")
@@ -53,6 +53,6 @@
 endif ()
 
 if (ENABLE_WEBKIT_LEGACY)
-file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBKIT_LEGACY_DIR})
+file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBKITLEGACY_DIR})
 file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBKIT_DIR})
 endif ()






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

[webkit-changes] [219493] trunk/Tools

2017-07-13 Thread matthew_hanson

Title: [219493] trunk/Tools








Revision 219493
Author matthew_han...@apple.com
Date 2017-07-13 20:09:54 -0700 (Thu, 13 Jul 2017)


Log Message
Use the old WebKit/WebKit2 targets for CMake builds. (v2)

Unreviewed build fix.

r219492 missed one hunk from its partial revert of r219489.
This patch reverts that hunk.

* TestWebKitAPI/CMakeLists.txt:

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/TestWebKitAPI/CMakeLists.txt




Diff

Modified: trunk/Tools/ChangeLog (219492 => 219493)

--- trunk/Tools/ChangeLog	2017-07-14 02:56:11 UTC (rev 219492)
+++ trunk/Tools/ChangeLog	2017-07-14 03:09:54 UTC (rev 219493)
@@ -1,5 +1,16 @@
 2017-07-13  Matthew Hanson  
 
+Use the old WebKit/WebKit2 targets for CMake builds. (v2)
+
+Unreviewed build fix.
+
+r219492 missed one hunk from its partial revert of r219489.
+This patch reverts that hunk.
+
+* TestWebKitAPI/CMakeLists.txt:
+
+2017-07-13  Matthew Hanson  
+
 Use the old WebKit/WebKit2 targets for CMake builds.
 
 Unreviewed build fix.


Modified: trunk/Tools/TestWebKitAPI/CMakeLists.txt (219492 => 219493)

--- trunk/Tools/TestWebKitAPI/CMakeLists.txt	2017-07-14 02:56:11 UTC (rev 219492)
+++ trunk/Tools/TestWebKitAPI/CMakeLists.txt	2017-07-14 03:09:54 UTC (rev 219493)
@@ -23,7 +23,7 @@
 gtest
 )
 list(APPEND TestWebKitAPI_LIBRARIES
-WebKit
+WebKit2
 )
 else ()
 list(APPEND TestWebKitAPI_LIBRARIES






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

[webkit-changes] [219492] trunk/Tools

2017-07-13 Thread matthew_hanson

Title: [219492] trunk/Tools








Revision 219492
Author matthew_han...@apple.com
Date 2017-07-13 19:56:11 -0700 (Thu, 13 Jul 2017)


Log Message
Use the old WebKit/WebKit2 targets for CMake builds.

Unreviewed build fix.

We can update the target names to match the Framework names in a future patch.
This is a partial revert of r219489.

* TestWebKitAPI/CMakeLists.txt:
WebKitLegacy => WebKit
WebKit => WebKit2

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/TestWebKitAPI/CMakeLists.txt




Diff

Modified: trunk/Tools/ChangeLog (219491 => 219492)

--- trunk/Tools/ChangeLog	2017-07-14 02:53:24 UTC (rev 219491)
+++ trunk/Tools/ChangeLog	2017-07-14 02:56:11 UTC (rev 219492)
@@ -1,5 +1,18 @@
 2017-07-13  Matthew Hanson  
 
+Use the old WebKit/WebKit2 targets for CMake builds.
+
+Unreviewed build fix.
+
+We can update the target names to match the Framework names in a future patch.
+This is a partial revert of r219489.
+
+* TestWebKitAPI/CMakeLists.txt:
+WebKitLegacy => WebKit
+WebKit => WebKit2
+
+2017-07-13  Matthew Hanson  
+
 Fix TestWebKit API.
 https://bugs.webkit.org/show_bug.cgi?id=174164
 rdar://problem/33137595


Modified: trunk/Tools/TestWebKitAPI/CMakeLists.txt (219491 => 219492)

--- trunk/Tools/TestWebKitAPI/CMakeLists.txt	2017-07-14 02:53:24 UTC (rev 219491)
+++ trunk/Tools/TestWebKitAPI/CMakeLists.txt	2017-07-14 02:56:11 UTC (rev 219492)
@@ -19,15 +19,15 @@
 _javascript_Core
 TestWebKitAPIBase
 WTF
-WebKit
+WebKit2
 gtest
 )
 list(APPEND TestWebKitAPI_LIBRARIES
-WebKitLegacy
+WebKit
 )
 else ()
 list(APPEND TestWebKitAPI_LIBRARIES
-WebKitLegacy${DEBUG_SUFFIX}
+WebKit${DEBUG_SUFFIX}
 )
 endif ()
 
@@ -205,9 +205,9 @@
 ${TESTWEBKITAPI_DIR}/TestsController.cpp
 )
 
-target_link_libraries(TestWebKitAPIBase _javascript_Core WTF WebKit gtest)
+target_link_libraries(TestWebKitAPIBase _javascript_Core WTF WebKit2 gtest)
 
-add_dependencies(TestWebKitAPIBase WebKit ${ForwardingHeadersForTestWebKitAPI_NAME} ${ForwardingNetworkHeadersForTestWebKitAPI_NAME})
+add_dependencies(TestWebKitAPIBase WebKit2 ${ForwardingHeadersForTestWebKitAPI_NAME} ${ForwardingNetworkHeadersForTestWebKitAPI_NAME})
 
 foreach (testName ${test_webkit2_api_BINARIES})
 get_filename_component(testBaseName ${testName} NAME)






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

[webkit-changes] [219489] trunk/Tools

2017-07-13 Thread matthew_hanson

Title: [219489] trunk/Tools








Revision 219489
Author matthew_han...@apple.com
Date 2017-07-13 19:29:31 -0700 (Thu, 13 Jul 2017)


Log Message
Fix TestWebKit API.
https://bugs.webkit.org/show_bug.cgi?id=174164
rdar://problem/33137595

Reviewed by Dan Bernstein.

* TestWebKitAPI/CMakeLists.txt:
* TestWebKitAPI/Configurations/FeatureDefines.xcconfig:
* TestWebKitAPI/PlatformGTK.cmake:

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/TestWebKitAPI/CMakeLists.txt
trunk/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig
trunk/Tools/TestWebKitAPI/PlatformGTK.cmake




Diff

Modified: trunk/Tools/ChangeLog (219488 => 219489)

--- trunk/Tools/ChangeLog	2017-07-14 02:29:28 UTC (rev 219488)
+++ trunk/Tools/ChangeLog	2017-07-14 02:29:31 UTC (rev 219489)
@@ -1,5 +1,17 @@
 2017-07-13  Matthew Hanson  
 
+Fix TestWebKit API.
+https://bugs.webkit.org/show_bug.cgi?id=174164
+rdar://problem/33137595
+
+Reviewed by Dan Bernstein.
+
+* TestWebKitAPI/CMakeLists.txt:
+* TestWebKitAPI/Configurations/FeatureDefines.xcconfig:
+* TestWebKitAPI/PlatformGTK.cmake:
+
+2017-07-13  Matthew Hanson  
+
 Update tools and configurations after renaming Source/WebKit2 to Source/WebKit.
 https://bugs.webkit.org/show_bug.cgi?id=174164
 rdar://problem/33137595


Modified: trunk/Tools/TestWebKitAPI/CMakeLists.txt (219488 => 219489)

--- trunk/Tools/TestWebKitAPI/CMakeLists.txt	2017-07-14 02:29:28 UTC (rev 219488)
+++ trunk/Tools/TestWebKitAPI/CMakeLists.txt	2017-07-14 02:29:31 UTC (rev 219489)
@@ -19,15 +19,15 @@
 _javascript_Core
 TestWebKitAPIBase
 WTF
-WebKit2
+WebKit
 gtest
 )
 list(APPEND TestWebKitAPI_LIBRARIES
-WebKit2
+WebKitLegacy
 )
 else ()
 list(APPEND TestWebKitAPI_LIBRARIES
-WebKit${DEBUG_SUFFIX}
+WebKitLegacy${DEBUG_SUFFIX}
 )
 endif ()
 
@@ -119,30 +119,30 @@
 ${TESTWEBKITAPI_DIR}/InjectedBundleController.cpp
 ${TESTWEBKITAPI_DIR}/InjectedBundleMain.cpp
 ${TESTWEBKITAPI_DIR}/PlatformUtilities.cpp
-${TESTWEBKITAPI_DIR}/Tests/WebKit2/CanHandleRequest_Bundle.cpp
-${TESTWEBKITAPI_DIR}/Tests/WebKit2/DidAssociateFormControls_Bundle.cpp
-${TESTWEBKITAPI_DIR}/Tests/WebKit2/DOMWindowExtensionBasic_Bundle.cpp
-${TESTWEBKITAPI_DIR}/Tests/WebKit2/DOMWindowExtensionNoCache_Bundle.cpp
-${TESTWEBKITAPI_DIR}/Tests/WebKit2/DocumentStartUserScriptAlertCrash_Bundle.cpp
-${TESTWEBKITAPI_DIR}/Tests/WebKit2/GetInjectedBundleInitializationUserDataCallback_Bundle.cpp
-${TESTWEBKITAPI_DIR}/Tests/WebKit2/HitTestResultNodeHandle_Bundle.cpp
-${TESTWEBKITAPI_DIR}/Tests/WebKit2/InjectedBundleBasic_Bundle.cpp
-${TESTWEBKITAPI_DIR}/Tests/WebKit2/InjectedBundleFrameHitTest_Bundle.cpp
-${TESTWEBKITAPI_DIR}/Tests/WebKit2/InjectedBundleInitializationUserDataCallbackWins_Bundle.cpp
-${TESTWEBKITAPI_DIR}/Tests/WebKit2/LoadCanceledNoServerRedirectCallback_Bundle.cpp
-${TESTWEBKITAPI_DIR}/Tests/WebKit2/MouseMoveAfterCrash_Bundle.cpp
-${TESTWEBKITAPI_DIR}/Tests/WebKit2/NewFirstVisuallyNonEmptyLayoutFails_Bundle.cpp
-${TESTWEBKITAPI_DIR}/Tests/WebKit2/NewFirstVisuallyNonEmptyLayoutForImages_Bundle.cpp
-${TESTWEBKITAPI_DIR}/Tests/WebKit2/NewFirstVisuallyNonEmptyLayoutFrames_Bundle.cpp
-${TESTWEBKITAPI_DIR}/Tests/WebKit2/NewFirstVisuallyNonEmptyLayout_Bundle.cpp
-${TESTWEBKITAPI_DIR}/Tests/WebKit2/ParentFrame_Bundle.cpp
-${TESTWEBKITAPI_DIR}/Tests/WebKit2/ProvisionalURLAfterWillSendRequestCallback_Bundle.cpp
-${TESTWEBKITAPI_DIR}/Tests/WebKit2/ResponsivenessTimerDoesntFireEarly_Bundle.cpp
-${TESTWEBKITAPI_DIR}/Tests/WebKit2/ShouldGoToBackForwardListItem_Bundle.cpp
-${TESTWEBKITAPI_DIR}/Tests/WebKit2/TextFieldDidBeginAndEndEditing_Bundle.cpp
-${TESTWEBKITAPI_DIR}/Tests/WebKit2/UserMessage_Bundle.cpp
-${TESTWEBKITAPI_DIR}/Tests/WebKit2/WillLoad_Bundle.cpp
-${TESTWEBKITAPI_DIR}/Tests/WebKit2/WillSendSubmitEvent_Bundle.cpp
+${TESTWEBKITAPI_DIR}/Tests/WebKit/CanHandleRequest_Bundle.cpp
+${TESTWEBKITAPI_DIR}/Tests/WebKit/DidAssociateFormControls_Bundle.cpp
+${TESTWEBKITAPI_DIR}/Tests/WebKit/DOMWindowExtensionBasic_Bundle.cpp
+${TESTWEBKITAPI_DIR}/Tests/WebKit/DOMWindowExtensionNoCache_Bundle.cpp
+${TESTWEBKITAPI_DIR}/Tests/WebKit/DocumentStartUserScriptAlertCrash_Bundle.cpp
+${TESTWEBKITAPI_DIR}/Tests/WebKit/GetInjectedBundleInitializationUserDataCallback_Bundle.cpp
+${TESTWEBKITAPI_DIR}/Tests/WebKit/HitTestResultNodeHandle_Bundle.cpp
+${TESTWEBKITAPI_DIR}/Tests/WebKit/InjectedBundleBasic_Bundle.cpp
+${TESTWEBKITAPI_DIR}/Tests/WebKit/InjectedBundleFrameHitTest_Bundle.cpp
+

[webkit-changes] [219488] trunk

2017-07-13 Thread matthew_hanson

Title: [219488] trunk








Revision 219488
Author matthew_han...@apple.com
Date 2017-07-13 19:29:28 -0700 (Thu, 13 Jul 2017)


Log Message
Fix the cMake builds (GTK and WPE.)
https://bugs.webkit.org/show_bug.cgi?id=174164
rdar://problem/33137595

Reviewed by Dan Bernstein.

.:

* Source/CMakeLists.txt:
* Source/cmake/OptionsGTK.cmake:
* Source/cmake/OptionsJSCOnly.cmake:
* Source/cmake/OptionsMac.cmake:
* Source/cmake/OptionsWPE.cmake:
* Source/cmake/WebKitFS.cmake:
* Source/cmake/WebKitPackaging.cmake:

Source/WebCore/platform/gtk/po:

* POTFILES.in:

Source/WebKit:

* Scripts/generate-forwarding-headers.pl:
(collectFrameworkHeaderPaths):
(createForwardingHeadersForFramework):

Modified Paths

trunk/ChangeLog
trunk/Source/CMakeLists.txt
trunk/Source/WebCore/platform/gtk/po/ChangeLog
trunk/Source/WebCore/platform/gtk/po/POTFILES.in
trunk/Source/WebKit/ChangeLog
trunk/Source/WebKit/Scripts/generate-forwarding-headers.pl
trunk/Source/cmake/OptionsGTK.cmake
trunk/Source/cmake/OptionsJSCOnly.cmake
trunk/Source/cmake/OptionsMac.cmake
trunk/Source/cmake/OptionsWPE.cmake
trunk/Source/cmake/WebKitFS.cmake
trunk/Source/cmake/WebKitPackaging.cmake




Diff

Modified: trunk/ChangeLog (219487 => 219488)

--- trunk/ChangeLog	2017-07-14 02:29:25 UTC (rev 219487)
+++ trunk/ChangeLog	2017-07-14 02:29:28 UTC (rev 219488)
@@ -1,5 +1,21 @@
 2017-07-13  Matthew Hanson  
 
+Fix the cMake builds (GTK and WPE.)
+https://bugs.webkit.org/show_bug.cgi?id=174164
+rdar://problem/33137595
+
+Reviewed by Dan Bernstein.
+
+* Source/CMakeLists.txt:
+* Source/cmake/OptionsGTK.cmake:
+* Source/cmake/OptionsJSCOnly.cmake:
+* Source/cmake/OptionsMac.cmake:
+* Source/cmake/OptionsWPE.cmake:
+* Source/cmake/WebKitFS.cmake:
+* Source/cmake/WebKitPackaging.cmake:
+
+2017-07-13  Matthew Hanson  
+
 Rename WebKit2.xcodeproj to WebKit.xcodeproj.
 https://bugs.webkit.org/show_bug.cgi?id=174164
 rdar://problem/33137595


Modified: trunk/Source/CMakeLists.txt (219487 => 219488)

--- trunk/Source/CMakeLists.txt	2017-07-14 02:29:25 UTC (rev 219487)
+++ trunk/Source/CMakeLists.txt	2017-07-14 02:29:28 UTC (rev 219488)
@@ -30,14 +30,14 @@
 add_subdirectory(WebCore)
 endif ()
 
+if (ENABLE_WEBKIT_LEGACY)
+add_subdirectory(WebKitLegacy)
+endif ()
+
 if (ENABLE_WEBKIT)
 add_subdirectory(WebKit)
 endif ()
 
-if (ENABLE_WEBKIT2)
-add_subdirectory(WebKit2)
-endif ()
-
 WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
 
 # -
@@ -56,10 +56,12 @@
 WEBKIT_SET_EXTRA_COMPILER_FLAGS(WebCoreDerivedSources ${ADDITIONAL_COMPILER_FLAGS})
 endif ()
 
-if (ENABLE_WEBKIT)
+if (ENABLE_WEBKIT_LEGACY)
+# FIXME: Rename this target to WebKitLegacy.
 WEBKIT_SET_EXTRA_COMPILER_FLAGS(WebKit ${ADDITIONAL_COMPILER_FLAGS})
 endif ()
 
-if (ENABLE_WEBKIT2)
+if (ENABLE_WEBKIT)
+# FIXME: Rename this target to WebKit.
 WEBKIT_SET_EXTRA_COMPILER_FLAGS(WebKit2 ${ADDITIONAL_COMPILER_FLAGS})
 endif ()


Modified: trunk/Source/WebCore/platform/gtk/po/ChangeLog (219487 => 219488)

--- trunk/Source/WebCore/platform/gtk/po/ChangeLog	2017-07-14 02:29:25 UTC (rev 219487)
+++ trunk/Source/WebCore/platform/gtk/po/ChangeLog	2017-07-14 02:29:28 UTC (rev 219488)
@@ -1,3 +1,13 @@
+2017-07-13  Matthew Hanson  
+
+Fix the cMake builds (GTK and WPE.)
+https://bugs.webkit.org/show_bug.cgi?id=174164
+rdar://problem/33137595
+
+Reviewed by Dan Bernstein.
+
+* POTFILES.in:
+
 2017-06-25  Yuri Chornoivan  
 
 [GTK] [l10n] Updated Ukrainian translation of WebKitGTK+


Modified: trunk/Source/WebCore/platform/gtk/po/POTFILES.in (219487 => 219488)

--- trunk/Source/WebCore/platform/gtk/po/POTFILES.in	2017-07-14 02:29:25 UTC (rev 219487)
+++ trunk/Source/WebCore/platform/gtk/po/POTFILES.in	2017-07-14 02:29:28 UTC (rev 219488)
@@ -2,40 +2,40 @@
 LocalizedStringsGtk.cpp
 ../LocalizedStrings.cpp
 ../network/soup/NetworkStorageSessionSoup.cpp
-../../../WebKit2/Shared/API/glib/WebKitHitTestResult.cpp
-../../../WebKit2/Shared/API/glib/WebKitURIRequest.cpp
-../../../WebKit2/Shared/API/glib/WebKitURIResponse.cpp
-../../../WebKit2/Shared/WebErrors.cpp
-../../../WebKit2/Shared/glib/WebErrorsGlib.cpp
-../../../WebKit2/Shared/gtk/WebErrorsGtk.cpp
-../../../WebKit2/Shared/soup/WebErrorsSoup.cpp
-../../../WebKit2/UIProcess/API/glib/WebKitAutomationSession.cpp
-../../../WebKit2/UIProcess/API/glib/WebKitDownload.cpp
-../../../WebKit2/UIProcess/API/glib/WebKitEditorState.cpp
-../../../WebKit2/UIProcess/API/glib/WebKitFaviconDatabase.cpp
-../../../WebKit2/UIProcess/API/glib/WebKitFileChooserRequest.cpp
-../../../WebKit2/UIProcess/API/glib/WebKitFindController.cpp
-../../../WebKit2/UIProcess/API/glib/WebKitNavigationPolicyDecision.cpp

[webkit-changes] [219485] trunk/Source/WebKitLegacy

2017-07-13 Thread matthew_hanson

Title: [219485] trunk/Source/WebKitLegacy








Revision 219485
Author matthew_han...@apple.com
Date 2017-07-13 19:29:17 -0700 (Thu, 13 Jul 2017)


Log Message
Update the Visual Studio project name from WebKit to WebKitLegacy.
https://bugs.webkit.org/show_bug.cgi?id=174162
rdar://problem/33137594

Reviewed by Dan Bernstein.

Rename WebKit to WebKitLegacy.

* WebKitLegacy.vcxproj/WebKitLegacy.proj: Renamed from Source/WebKitLegacy/WebKit.vcxproj/WebKit.proj.

Modified Paths

trunk/Source/WebKitLegacy/ChangeLog


Added Paths

trunk/Source/WebKitLegacy/WebKitLegacy.vcxproj/
trunk/Source/WebKitLegacy/WebKitLegacy.vcxproj/WebKitLegacy.proj


Removed Paths

trunk/Source/WebKitLegacy/WebKit.vcxproj/WebKit.proj




Diff

Modified: trunk/Source/WebKitLegacy/ChangeLog (219484 => 219485)

--- trunk/Source/WebKitLegacy/ChangeLog	2017-07-14 02:29:15 UTC (rev 219484)
+++ trunk/Source/WebKitLegacy/ChangeLog	2017-07-14 02:29:17 UTC (rev 219485)
@@ -1,5 +1,17 @@
 2017-07-05  Matthew Hanson  
 
+Update the Visual Studio project name from WebKit to WebKitLegacy.
+https://bugs.webkit.org/show_bug.cgi?id=174162
+rdar://problem/33137594
+
+Reviewed by Dan Bernstein.
+
+Rename WebKit to WebKitLegacy.
+
+* WebKitLegacy.vcxproj/WebKitLegacy.proj: Renamed from Source/WebKitLegacy/WebKit.vcxproj/WebKit.proj.
+
+2017-07-05  Matthew Hanson  
+
 Update the Xcode project name from WebKit to WebKitLegacy.
 https://bugs.webkit.org/show_bug.cgi?id=174162
 rdar://problem/33137594


Deleted: trunk/Source/WebKitLegacy/WebKit.vcxproj/WebKit.proj (219484 => 219485)

--- trunk/Source/WebKitLegacy/WebKit.vcxproj/WebKit.proj	2017-07-14 02:29:15 UTC (rev 219484)
+++ trunk/Source/WebKitLegacy/WebKit.vcxproj/WebKit.proj	2017-07-14 02:29:17 UTC (rev 219485)
@@ -1,128 +0,0 @@
-
-
-
-  
-  
-	Release
-
-
-  
-  
-	Debug
-_debug
--DDEBUG_SUFFIX=_debug
-  
-
-  
-  
-1
-$(SRCROOT)\AppleInternal
-$(DSTROOT)\AppleInternal
-$(AppleInternal)\lib32
-$(AppleInternal)\lib64
-$(AppleInternal)\bin32
-$(AppleInternal)\bin64
-$(AppleInternal)\public32\sym
-$(AppleInternal)\public64\sym
-Program Files (x86)\Common Files\Apple\Apple Application Support
-Program Files\Common Files\Apple\Apple Application Support
-$(OBJROOT)\$(CONFIG)  
-$(DSTROOT)
-	cmake $(SRCROOT) -DPORT=AppleWin $(DebugSuffixDefinition) -DWEBKIT_LIBRARIES_DIR=$(WebKit_Libraries.Replace('\','/')) -DCMAKE_MODULE_PATH=$(SRCROOT.Replace('\','/'))/AppleInternal/tools/cmake -DCMAKE_BINARY_DIR=$(OBJROOT.Replace('\','/'))/$(CONFIG) -DCMAKE_BUILD_TYPE=$(CONFIGURATION) -DWEBKIT_DIR=$(SRCROOT.Replace('\','/'))
-  
- 
-  
-  
-
-
-
-
-
-
-
-  
-
-
-
-
-
-
-
-  
-
-  
-  
-
-
-	
-	
-	
-	
-  
-
-  
-
-
-
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-
-
-
-
-
-
-
-
-
-
-
-  
-
-
-


Copied: trunk/Source/WebKitLegacy/WebKitLegacy.vcxproj/WebKitLegacy.proj (from rev 219484, trunk/Source/WebKitLegacy/WebKit.vcxproj/WebKit.proj) (0 => 219485)

--- trunk/Source/WebKitLegacy/WebKitLegacy.vcxproj/WebKitLegacy.proj	(rev 0)
+++ trunk/Source/WebKitLegacy/WebKitLegacy.vcxproj/WebKitLegacy.proj	2017-07-14 02:29:17 UTC (rev 219485)
@@ -0,0 +1,128 @@
+
+
+
+  
+  
+	Release
+
+
+  
+  
+	Debug
+_debug
+-DDEBUG_SUFFIX=_debug
+  
+
+  
+  
+1
+$(SRCROOT)\AppleInternal
+$(DSTROOT)\AppleInternal
+$(AppleInternal)\lib32
+$(AppleInternal)\lib64
+$(AppleInternal)\bin32
+$(AppleInternal)\bin64
+$(AppleInternal)\public32\sym
+$(AppleInternal)\public64\sym
+Program Files (x86)\Common Files\Apple\Apple Application Support
+Program Files\Common Files\Apple\Apple Application Support
+$(OBJROOT)\$(CONFIG)  
+$(DSTROOT)
+	cmake $(SRCROOT) -DPORT=AppleWin $(DebugSuffixDefinition) -DWEBKIT_LIBRARIES_DIR=$(WebKit_Libraries.Replace('\','/')) -DCMAKE_MODULE_PATH=$(SRCROOT.Replace('\','/'))/AppleInternal/tools/cmake -DCMAKE_BINARY_DIR=$(OBJROOT.Replace('\','/'))/$(CONFIG) -DCMAKE_BUILD_TYPE=$(CONFIGURATION) -DWEBKIT_DIR=$(SRCROOT.Replace('\','/'))
+  
+ 
+  
+  
+
+
+
+
+
+
+
+  
+
+
+
+
+
+
+
+  
+
+  
+  
+
+
+	
+	
+	
+	
+  
+
+  
+
+
+
+
+
+  
+
+
+  
+
+
+  
+
+
+  
+
+
+  
+
+
+  
+
+
+  
+
+
+  
+
+
+  
+
+
+  
+
+
+  
+
+
+  
+
+
+  
+
+
+  
+
+
+

[webkit-changes] [219486] trunk

2017-07-13 Thread matthew_hanson

Title: [219486] trunk








Revision 219486
Author matthew_han...@apple.com
Date 2017-07-13 19:29:22 -0700 (Thu, 13 Jul 2017)


Log Message
Update tools and configurations after renaming Source/WebKit2 to Source/WebKit.
https://bugs.webkit.org/show_bug.cgi?id=174164
rdar://problem/33137595

Reviewed by Dan Bernstein.

.:

* Source/Makefile:
* Source/PlatformGTK.cmake:
* Source/cmake/OptionsGTK.cmake:
* Source/cmake/WebKitFS.cmake:
* Source/cmake/WebKitPackaging.cmake:
* WebKit.xcworkspace/contents.xcworkspacedata:
* WebKit.xcworkspace/xcshareddata/xcschemes/All Source.xcscheme:

Source/WebKit:

* PlatformGTK.cmake:
* Shared/API/c/wpe/WebKit.h:

Tools:

* BuildSlaveSupport/build.webkit.org-config/wkbuild_unittest.py:
(ShouldBuildTest):
* DumpRenderTree/mac/Configurations/Base.xcconfig:
* Scripts/build-webkit:
* Scripts/do-file-rename:
* Scripts/do-webcore-rename:
* Scripts/update-webkit-localizable-strings:
* Scripts/webkitpy/common/config/watchlist:
* Scripts/webkitpy/style/checker.py:
* Scripts/webkitpy/style/checkers/featuredefines.py:
* gtk/make-dist.py:
(ensure_version_if_possible):
* gtk/manifest.txt.in:

Modified Paths

trunk/ChangeLog
trunk/Source/Makefile
trunk/Source/PlatformGTK.cmake
trunk/Source/WebKit/ChangeLog
trunk/Source/WebKit/PlatformGTK.cmake
trunk/Source/WebKit/Shared/API/c/wpe/WebKit.h
trunk/Source/cmake/OptionsGTK.cmake
trunk/Source/cmake/WebKitFS.cmake
trunk/Source/cmake/WebKitPackaging.cmake
trunk/Tools/BuildSlaveSupport/build.webkit.org-config/wkbuild_unittest.py
trunk/Tools/ChangeLog
trunk/Tools/DumpRenderTree/mac/Configurations/Base.xcconfig
trunk/Tools/Scripts/build-webkit
trunk/Tools/Scripts/do-file-rename
trunk/Tools/Scripts/do-webcore-rename
trunk/Tools/Scripts/update-webkit-localizable-strings
trunk/Tools/Scripts/webkitpy/common/config/watchlist
trunk/Tools/Scripts/webkitpy/style/checker.py
trunk/Tools/Scripts/webkitpy/style/checkers/featuredefines.py
trunk/Tools/gtk/make-dist.py
trunk/Tools/gtk/manifest.txt.in
trunk/WebKit.xcworkspace/contents.xcworkspacedata
trunk/WebKit.xcworkspace/xcshareddata/xcschemes/All Source.xcscheme




Diff

Modified: trunk/ChangeLog (219485 => 219486)

--- trunk/ChangeLog	2017-07-14 02:29:17 UTC (rev 219485)
+++ trunk/ChangeLog	2017-07-14 02:29:22 UTC (rev 219486)
@@ -1,3 +1,19 @@
+2017-07-13  Matthew Hanson  
+
+Update tools and configurations after renaming Source/WebKit2 to Source/WebKit.
+https://bugs.webkit.org/show_bug.cgi?id=174164
+rdar://problem/33137595
+
+Reviewed by Dan Bernstein.
+
+* Source/Makefile:
+* Source/PlatformGTK.cmake:
+* Source/cmake/OptionsGTK.cmake:
+* Source/cmake/WebKitFS.cmake:
+* Source/cmake/WebKitPackaging.cmake:
+* WebKit.xcworkspace/contents.xcworkspacedata:
+* WebKit.xcworkspace/xcshareddata/xcschemes/All Source.xcscheme:
+
 2017-07-05  Matthew Hanson  
 
 Update the Xcode project name from WebKit to WebKitLegacy.


Modified: trunk/Source/Makefile (219485 => 219486)

--- trunk/Source/Makefile	2017-07-14 02:29:17 UTC (rev 219485)
+++ trunk/Source/Makefile	2017-07-14 02:29:22 UTC (rev 219486)
@@ -1,8 +1,8 @@
-MODULES = bmalloc WTF _javascript_Core ThirdParty/ANGLE ThirdParty/libwebrtc WebCore WebInspectorUI WebKitLegacy WebKit2
+MODULES = bmalloc WTF _javascript_Core ThirdParty/ANGLE ThirdParty/libwebrtc WebCore WebInspectorUI WebKitLegacy WebKit
 
 ifneq (,$(SDKROOT))
 	ifeq (,$(findstring macosx,$(SDKROOT)))
-		MODULES = bmalloc WTF _javascript_Core ThirdParty/ANGLE ThirdParty/libwebrtc WebCore WebKitLegacy WebKit2
+		MODULES = bmalloc WTF _javascript_Core ThirdParty/ANGLE ThirdParty/libwebrtc WebCore WebKitLegacy WebKit
 	endif
 endif
 


Modified: trunk/Source/PlatformGTK.cmake (219485 => 219486)

--- trunk/Source/PlatformGTK.cmake	2017-07-14 02:29:17 UTC (rev 219485)
+++ trunk/Source/PlatformGTK.cmake	2017-07-14 02:29:22 UTC (rev 219486)
@@ -7,8 +7,8 @@
 
 list(APPEND DocumentationDependencies
 WebKit2
-"${CMAKE_SOURCE_DIR}/Source/WebKit2/UIProcess/API/gtk/docs/webkit2gtk-docs.sgml"
-"${CMAKE_SOURCE_DIR}/Source/WebKit2/UIProcess/API/gtk/docs/webkit2gtk-${WEBKITGTK_API_VERSION}-sections.txt"
+"${CMAKE_SOURCE_DIR}/Source/WebKit/UIProcess/API/gtk/docs/webkit2gtk-docs.sgml"
+"${CMAKE_SOURCE_DIR}/Source/WebKit/UIProcess/API/gtk/docs/webkit2gtk-${WEBKITGTK_API_VERSION}-sections.txt"
 )
 
 if (ENABLE_GTKDOC)


Modified: trunk/Source/WebKit/ChangeLog (219485 => 219486)

--- trunk/Source/WebKit/ChangeLog	2017-07-14 02:29:17 UTC (rev 219485)
+++ trunk/Source/WebKit/ChangeLog	2017-07-14 02:29:22 UTC (rev 219486)
@@ -1,3 +1,14 @@
+2017-07-13  Matthew Hanson  
+
+Update tools and configurations after renaming Source/WebKit2 to Source/WebKit.
+https://bugs.webkit.org/show_bug.cgi?id=174164
+rdar://problem/33137595
+
+Reviewed by Dan Bernstein.
+
+* PlatformGTK.cmake:
+*

[webkit-changes] [219483] trunk

2017-07-13 Thread matthew_hanson

Title: [219483] trunk








Revision 219483
Author matthew_han...@apple.com
Date 2017-07-13 19:29:11 -0700 (Thu, 13 Jul 2017)


Log Message
Update tools and configurations after renaming Source/WebKit to Source/WebKitLegacy.
https://bugs.webkit.org/show_bug.cgi?id=174162
rdar://problem/33137594

Reviewed by Dan Bernstein.

.:

Mass rename of Source/WebKit to Source/WebKitLegacy in OpenSource cmake files
and Xcode project files.

* Source/cmake/OptionsGTK.cmake:
* Source/cmake/WebKitFS.cmake:
* WebKit.xcworkspace/contents.xcworkspacedata:
* WebKit.xcworkspace/xcshareddata/xcschemes/All Source.xcscheme:

Tools:

Mass rename of Source/WebKit to Source/WebKitLegacy in OpenSource tooling.

* BuildSlaveSupport/build.webkit.org-config/wkbuild_unittest.py:
* DumpRenderTree/mac/InternalHeaders/WebKit/WebTypesInternal.h:
* EWSTools/configure-clang-linux.sh:
* Scripts/build-webkit:
* Scripts/do-file-rename:
* Scripts/do-webcore-rename:
* Scripts/update-webkit-localizable-strings:
* Scripts/webkitpy/common/checkout/checkout_unittest.py:
* Scripts/webkitpy/style/checkers/changelog_unittest.py:
* Scripts/webkitpy/style/checkers/featuredefines.py:
* gtk/manifest.txt.in:

Modified Paths

trunk/ChangeLog
trunk/Source/Makefile
trunk/Source/cmake/OptionsGTK.cmake
trunk/Source/cmake/WebKitFS.cmake
trunk/Tools/BuildSlaveSupport/build.webkit.org-config/wkbuild_unittest.py
trunk/Tools/ChangeLog
trunk/Tools/DumpRenderTree/mac/InternalHeaders/WebKit/WebTypesInternal.h
trunk/Tools/EWSTools/configure-clang-linux.sh
trunk/Tools/Scripts/build-webkit
trunk/Tools/Scripts/do-file-rename
trunk/Tools/Scripts/do-webcore-rename
trunk/Tools/Scripts/update-webkit-localizable-strings
trunk/Tools/Scripts/webkitpy/common/checkout/checkout_unittest.py
trunk/Tools/Scripts/webkitpy/style/checkers/changelog_unittest.py
trunk/Tools/Scripts/webkitpy/style/checkers/featuredefines.py
trunk/Tools/gtk/manifest.txt.in
trunk/WebKit.xcworkspace/contents.xcworkspacedata
trunk/WebKit.xcworkspace/xcshareddata/xcschemes/All Source.xcscheme




Diff

Modified: trunk/ChangeLog (219482 => 219483)

--- trunk/ChangeLog	2017-07-14 02:12:32 UTC (rev 219482)
+++ trunk/ChangeLog	2017-07-14 02:29:11 UTC (rev 219483)
@@ -1,3 +1,19 @@
+2017-07-05  Matthew Hanson  
+
+Update tools and configurations after renaming Source/WebKit to Source/WebKitLegacy.
+https://bugs.webkit.org/show_bug.cgi?id=174162
+rdar://problem/33137594
+
+Reviewed by Dan Bernstein.
+
+Mass rename of Source/WebKit to Source/WebKitLegacy in OpenSource cmake files
+and Xcode project files.
+
+* Source/cmake/OptionsGTK.cmake:
+* Source/cmake/WebKitFS.cmake:
+* WebKit.xcworkspace/contents.xcworkspacedata:
+* WebKit.xcworkspace/xcshareddata/xcschemes/All Source.xcscheme:
+
 2017-07-13  Michael Catanzaro  
 
 Fix compiler warnings when building with GCC 7


Modified: trunk/Source/Makefile (219482 => 219483)

--- trunk/Source/Makefile	2017-07-14 02:12:32 UTC (rev 219482)
+++ trunk/Source/Makefile	2017-07-14 02:29:11 UTC (rev 219483)
@@ -1,8 +1,8 @@
-MODULES = bmalloc WTF _javascript_Core ThirdParty/ANGLE ThirdParty/libwebrtc WebCore WebInspectorUI WebKit WebKit2
+MODULES = bmalloc WTF _javascript_Core ThirdParty/ANGLE ThirdParty/libwebrtc WebCore WebInspectorUI WebKitLegacy WebKit2
 
 ifneq (,$(SDKROOT))
 	ifeq (,$(findstring macosx,$(SDKROOT)))
-		MODULES = bmalloc WTF _javascript_Core ThirdParty/ANGLE ThirdParty/libwebrtc WebCore WebKit WebKit2
+		MODULES = bmalloc WTF _javascript_Core ThirdParty/ANGLE ThirdParty/libwebrtc WebCore WebKitLegacy WebKit2
 	endif
 endif
 


Modified: trunk/Source/cmake/OptionsGTK.cmake (219482 => 219483)

--- trunk/Source/cmake/OptionsGTK.cmake	2017-07-14 02:12:32 UTC (rev 219482)
+++ trunk/Source/cmake/OptionsGTK.cmake	2017-07-14 02:29:11 UTC (rev 219483)
@@ -439,7 +439,7 @@
 set(FORWARDING_HEADERS_WEBKIT2GTK_DIR ${FORWARDING_HEADERS_DIR}/webkit2gtk)
 set(FORWARDING_HEADERS_WEBKIT2GTK_EXTENSION_DIR ${FORWARDING_HEADERS_DIR}/webkit2gtk-webextension)
 
-set(WebKit_PKGCONFIG_FILE ${CMAKE_BINARY_DIR}/Source/WebKit/gtk/webkitgtk-${WEBKITGTK_API_VERSION}.pc)
+set(WebKit_PKGCONFIG_FILE ${CMAKE_BINARY_DIR}/Source/WebKitLegacy/gtk/webkitgtk-${WEBKITGTK_API_VERSION}.pc)
 set(WebKit2_PKGCONFIG_FILE ${CMAKE_BINARY_DIR}/Source/WebKit2/webkit2gtk-${WEBKITGTK_API_VERSION}.pc)
 set(WebKit2WebExtension_PKGCONFIG_FILE ${CMAKE_BINARY_DIR}/Source/WebKit2/webkit2gtk-web-extension-${WEBKITGTK_API_VERSION}.pc)
 


Modified: trunk/Source/cmake/WebKitFS.cmake (219482 => 219483)

--- trunk/Source/cmake/WebKitFS.cmake	2017-07-14 02:12:32 UTC (rev 219482)
+++ trunk/Source/cmake/WebKitFS.cmake	2017-07-14 02:29:11 UTC (rev 219483)
@@ -14,7 +14,7 @@
 set(PAL_DIR "${CMAKE_SOURCE_DIR}/Source/WebCore/PAL")
 endif ()
 if (NOT WEBKIT_DIR)
-set(WEBKIT_DIR "${CMAKE_SOURCE_DIR}/Source/WebKit")
+set(WEBKIT_DIR "${CMAKE_SOURCE_DIR}/Source/WebKitLegacy")
 endif ()
 if (NOT

[webkit-changes] [219482] trunk/Source

2017-07-13 Thread matthew_hanson

Title: [219482] trunk/Source








Revision 219482
Author matthew_han...@apple.com
Date 2017-07-13 19:12:32 -0700 (Thu, 13 Jul 2017)


Log Message
Rename Source/WebKit2 to Source/WebKit.

Added Paths

trunk/Source/WebKit/


Removed Paths

trunk/Source/WebKit2/




Diff
Index: trunk/Source/WebKit
===
--- trunk/Source/WebKit2	2017-07-14 02:11:40 UTC (rev 219481)
+++ trunk/Source/WebKit	2017-07-14 02:12:32 UTC (rev 219482)

Property changes: trunk/Source/WebKit



Added: svn:mergeinfo
+/trunk/Source/WebKit2:53455
\ No newline at end of property




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

[webkit-changes] [219481] trunk/Source

2017-07-13 Thread matthew_hanson

Title: [219481] trunk/Source








Revision 219481
Author matthew_han...@apple.com
Date 2017-07-13 19:11:40 -0700 (Thu, 13 Jul 2017)


Log Message
Rename Source/WebKit to Source/WebKitLegacy.

Added Paths

trunk/Source/WebKitLegacy/


Removed Paths

trunk/Source/WebKit/




Diff




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

[webkit-changes] [219077] branches/safari-604.1.28-branch/Source

2017-07-03 Thread matthew_hanson

Title: [219077] branches/safari-604.1.28-branch/Source








Revision 219077
Author matthew_han...@apple.com
Date 2017-07-03 10:22:11 -0700 (Mon, 03 Jul 2017)


Log Message
Versioning.

Modified Paths

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




Diff

Modified: branches/safari-604.1.28-branch/Source/_javascript_Core/Configurations/Version.xcconfig (219076 => 219077)

--- branches/safari-604.1.28-branch/Source/_javascript_Core/Configurations/Version.xcconfig	2017-07-03 17:20:25 UTC (rev 219076)
+++ branches/safari-604.1.28-branch/Source/_javascript_Core/Configurations/Version.xcconfig	2017-07-03 17:22:11 UTC (rev 219077)
@@ -24,7 +24,7 @@
 MAJOR_VERSION = 604;
 MINOR_VERSION = 1;
 TINY_VERSION = 28;
-MICRO_VERSION = 1;
+MICRO_VERSION = 2;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION);
 


Modified: branches/safari-604.1.28-branch/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig (219076 => 219077)

--- branches/safari-604.1.28-branch/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig	2017-07-03 17:20:25 UTC (rev 219076)
+++ branches/safari-604.1.28-branch/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig	2017-07-03 17:22:11 UTC (rev 219077)
@@ -24,7 +24,7 @@
 MAJOR_VERSION = 604;
 MINOR_VERSION = 1;
 TINY_VERSION = 28;
-MICRO_VERSION = 1;
+MICRO_VERSION = 2;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION);
 


Modified: branches/safari-604.1.28-branch/Source/WebCore/Configurations/Version.xcconfig (219076 => 219077)

--- branches/safari-604.1.28-branch/Source/WebCore/Configurations/Version.xcconfig	2017-07-03 17:20:25 UTC (rev 219076)
+++ branches/safari-604.1.28-branch/Source/WebCore/Configurations/Version.xcconfig	2017-07-03 17:22:11 UTC (rev 219077)
@@ -24,7 +24,7 @@
 MAJOR_VERSION = 604;
 MINOR_VERSION = 1;
 TINY_VERSION = 28;
-MICRO_VERSION = 1;
+MICRO_VERSION = 2;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION);
 


Modified: branches/safari-604.1.28-branch/Source/WebCore/PAL/Configurations/Version.xcconfig (219076 => 219077)

--- branches/safari-604.1.28-branch/Source/WebCore/PAL/Configurations/Version.xcconfig	2017-07-03 17:20:25 UTC (rev 219076)
+++ branches/safari-604.1.28-branch/Source/WebCore/PAL/Configurations/Version.xcconfig	2017-07-03 17:22:11 UTC (rev 219077)
@@ -24,7 +24,7 @@
 MAJOR_VERSION = 604;
 MINOR_VERSION = 1;
 TINY_VERSION = 28;
-MICRO_VERSION = 1;
+MICRO_VERSION = 2;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION);
 


Modified: branches/safari-604.1.28-branch/Source/WebInspectorUI/Configurations/Version.xcconfig (219076 => 219077)

--- branches/safari-604.1.28-branch/Source/WebInspectorUI/Configurations/Version.xcconfig	2017-07-03 17:20:25 UTC (rev 219076)
+++ branches/safari-604.1.28-branch/Source/WebInspectorUI/Configurations/Version.xcconfig	2017-07-03 17:22:11 UTC (rev 219077)
@@ -1,7 +1,7 @@
 MAJOR_VERSION = 604;
 MINOR_VERSION = 1;
 TINY_VERSION = 28;
-MICRO_VERSION = 1;
+MICRO_VERSION = 2;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION);
 


Modified: branches/safari-604.1.28-branch/Source/WebKit/mac/Configurations/Version.xcconfig (219076 => 219077)

--- branches/safari-604.1.28-branch/Source/WebKit/mac/Configurations/Version.xcconfig	2017-07-03 17:20:25 UTC (rev 219076)
+++ branches/safari-604.1.28-branch/Source/WebKit/mac/Configurations/Version.xcconfig	2017-07-03 17:22:11 UTC (rev 219077)
@@ -24,7 +24,7 @@
 MAJOR_VERSION = 604;
 MINOR_VERSION = 1;
 TINY_VERSION = 28;
-MICRO_VERSION = 1;
+MICRO_VERSION = 2;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION);
 


Modified: branches/safari-604.1.28-branch/Source/WebKit2/Configurations/Version.xcconfig (219076 => 219077)

--- branches/safari-604.1.28-branch/Source/WebKit2/Configurations/Version.xcconfig	2017-07-03 17:20:25 UTC (rev 219076)
+++ branches/safari-604.1.28-branch/Source/WebKit2/Configurations/Version.xcconfig	2017-07-03 17:22:11 UTC (rev 219077)
@@ -24,7 +24,7 @@
 MAJOR_VERSION = 604;
 MINOR_VERSION = 1;
 TINY_VERSION = 28;
-MICRO_VERSION = 1;
+MICRO_VERSION = 2;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION);
 






___

[webkit-changes] [218981] tags/Safari-604.1.28.1/

2017-06-29 Thread matthew_hanson

Title: [218981] tags/Safari-604.1.28.1/








Revision 218981
Author matthew_han...@apple.com
Date 2017-06-29 19:04:16 -0700 (Thu, 29 Jun 2017)


Log Message
New Tag.

Added Paths

tags/Safari-604.1.28.1/




Diff




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

[webkit-changes] [218980] tags/Safari-604.1.28.1/

2017-06-29 Thread matthew_hanson

Title: [218980] tags/Safari-604.1.28.1/








Revision 218980
Author matthew_han...@apple.com
Date 2017-06-29 19:03:28 -0700 (Thu, 29 Jun 2017)


Log Message
Delete Tag.

Removed Paths

tags/Safari-604.1.28.1/




Diff




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

[webkit-changes] [218707] tags/Safari-604.1.27/Source/JavaScriptCore

2017-06-22 Thread matthew_hanson

Title: [218707] tags/Safari-604.1.27/Source/_javascript_Core








Revision 218707
Author matthew_han...@apple.com
Date 2017-06-22 11:32:18 -0700 (Thu, 22 Jun 2017)


Log Message
Revert r217530. rdar://problem/32855563

Modified Paths

tags/Safari-604.1.27/Source/_javascript_Core/ChangeLog
tags/Safari-604.1.27/Source/_javascript_Core/builtins/GlobalOperations.js




Diff

Modified: tags/Safari-604.1.27/Source/_javascript_Core/ChangeLog (218706 => 218707)

--- tags/Safari-604.1.27/Source/_javascript_Core/ChangeLog	2017-06-22 18:05:25 UTC (rev 218706)
+++ tags/Safari-604.1.27/Source/_javascript_Core/ChangeLog	2017-06-22 18:32:18 UTC (rev 218707)
@@ -1,3 +1,7 @@
+2017-06-22  Matthew Hanson  
+
+Revert r217530. rdar://problem/32855563
+
 2017-06-20  Myles C. Maxfield  
 
 Disable font variations on macOS Sierra and iOS 10


Modified: tags/Safari-604.1.27/Source/_javascript_Core/builtins/GlobalOperations.js (218706 => 218707)

--- tags/Safari-604.1.27/Source/_javascript_Core/builtins/GlobalOperations.js	2017-06-22 18:05:25 UTC (rev 218706)
+++ tags/Safari-604.1.27/Source/_javascript_Core/builtins/GlobalOperations.js	2017-06-22 18:32:18 UTC (rev 218707)
@@ -30,7 +30,7 @@
 {
 "use strict";
 
-var numberValue = +target;
+var numberValue = @Number(target);
 
 // isNaN(numberValue)
 if (numberValue !== numberValue)
@@ -45,7 +45,7 @@
 
 var length = @toInteger(target);
 // originally Math.min(Math.max(length, 0), maxSafeInteger));
-return +(length > 0 ? (length < @MAX_SAFE_INTEGER ? length : @MAX_SAFE_INTEGER) : 0);
+return length > 0 ? (length < @MAX_SAFE_INTEGER ? length : @MAX_SAFE_INTEGER) : 0;
 }
 
 @globalPrivate






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

[webkit-changes] [218661] tags/Safari-604.1.27/Source/WebKit2

2017-06-21 Thread matthew_hanson

Title: [218661] tags/Safari-604.1.27/Source/WebKit2








Revision 218661
Author matthew_han...@apple.com
Date 2017-06-21 15:55:34 -0700 (Wed, 21 Jun 2017)


Log Message
Cherry-pick r218656. rdar://problem/32905541

Modified Paths

tags/Safari-604.1.27/Source/WebKit2/ChangeLog
tags/Safari-604.1.27/Source/WebKit2/UIProcess/ios/WKActionSheetAssistant.mm




Diff

Modified: tags/Safari-604.1.27/Source/WebKit2/ChangeLog (218660 => 218661)

--- tags/Safari-604.1.27/Source/WebKit2/ChangeLog	2017-06-21 22:53:14 UTC (rev 218660)
+++ tags/Safari-604.1.27/Source/WebKit2/ChangeLog	2017-06-21 22:55:34 UTC (rev 218661)
@@ -1,3 +1,25 @@
+2017-06-21  Matthew Hanson  
+
+Cherry-pick r218656. rdar://problem/32905541
+
+2017-06-21  Tim Horton  
+
+REGRESSION (r218606): 3D Touch action menu for links is missing items
+https://bugs.webkit.org/show_bug.cgi?id=173669
+
+
+Reviewed by Wenson Hsieh.
+
+* UIProcess/ios/WKActionSheetAssistant.mm:
+(-[WKActionSheetAssistant defaultActionsForLinkSheet:]):
+defaultActionsForLinkSheet is used outside the usual action sheet flow,
+by 3D Touch code. Therefore, we're not guaranteed to have a _positionInformation.
+We don't need one, though -- we can get the URL from the passed-in
+_WKActivatedElementInfo, exactly like defaultActionsForImageSheet already did.
+
+(-[WKActionSheetAssistant defaultActionsForImageSheet:]):
+Remove the delegate null check, which isn't used after r218606.
+
 2017-06-21  Miguel Gomez  
 
 [GTK][WAYLAND] Create WaylandCompositorDisplay unconditionally when initializing the WebProcess


Modified: tags/Safari-604.1.27/Source/WebKit2/UIProcess/ios/WKActionSheetAssistant.mm (218660 => 218661)

--- tags/Safari-604.1.27/Source/WebKit2/UIProcess/ios/WKActionSheetAssistant.mm	2017-06-21 22:53:14 UTC (rev 218660)
+++ tags/Safari-604.1.27/Source/WebKit2/UIProcess/ios/WKActionSheetAssistant.mm	2017-06-21 22:55:34 UTC (rev 218661)
@@ -441,14 +441,7 @@
 
 - (RetainPtr)defaultActionsForLinkSheet:(_WKActivatedElementInfo *)elementInfo
 {
-auto delegate = _delegate.get();
-if (!delegate)
-return nil;
-
-if (!_positionInformation)
-return nil;
-
-NSURL *targetURL = [NSURL URLWithString:_positionInformation->url];
+NSURL *targetURL = [elementInfo URL];
 if (!targetURL)
 return nil;
 
@@ -469,10 +462,6 @@
 
 - (RetainPtr)defaultActionsForImageSheet:(_WKActivatedElementInfo *)elementInfo
 {
-auto delegate = _delegate.get();
-if (!delegate)
-return nil;
-
 NSURL *targetURL = [elementInfo URL];
 
 auto defaultActions = adoptNS([[NSMutableArray alloc] init]);






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

[webkit-changes] [218363] tags/Safari-603.3.5/

2017-06-15 Thread matthew_hanson

Title: [218363] tags/Safari-603.3.5/








Revision 218363
Author matthew_han...@apple.com
Date 2017-06-15 15:24:29 -0700 (Thu, 15 Jun 2017)


Log Message
Tag Safari-603.3.5.

Added Paths

tags/Safari-603.3.5/




Diff




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

[webkit-changes] [218362] tags/Safari-604.1.25.3.2/

2017-06-15 Thread matthew_hanson

Title: [218362] tags/Safari-604.1.25.3.2/








Revision 218362
Author matthew_han...@apple.com
Date 2017-06-15 15:23:26 -0700 (Thu, 15 Jun 2017)


Log Message
Tag Safari-604.1.25.3.2.

Added Paths

tags/Safari-604.1.25.3.2/




Diff




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

[webkit-changes] [218361] tags/Safari-604.1.25.4.2/

2017-06-15 Thread matthew_hanson

Title: [218361] tags/Safari-604.1.25.4.2/








Revision 218361
Author matthew_han...@apple.com
Date 2017-06-15 15:20:20 -0700 (Thu, 15 Jun 2017)


Log Message
Tag Safari-604.1.25.4.2.

Added Paths

tags/Safari-604.1.25.4.2/




Diff




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

[webkit-changes] [218354] branches/safari-604.1.25.4-branch/Source/WebCore/page/Settings.in

2017-06-15 Thread matthew_hanson

Title: [218354] branches/safari-604.1.25.4-branch/Source/WebCore/page/Settings.in








Revision 218354
Author matthew_han...@apple.com
Date 2017-06-15 13:25:01 -0700 (Thu, 15 Jun 2017)


Log Message
Follow-up fix for rdar://problem/32621736

Modified Paths

branches/safari-604.1.25.4-branch/Source/WebCore/page/Settings.in




Diff

Modified: branches/safari-604.1.25.4-branch/Source/WebCore/page/Settings.in (218353 => 218354)

--- branches/safari-604.1.25.4-branch/Source/WebCore/page/Settings.in	2017-06-15 20:22:25 UTC (rev 218353)
+++ branches/safari-604.1.25.4-branch/Source/WebCore/page/Settings.in	2017-06-15 20:25:01 UTC (rev 218354)
@@ -292,11 +292,7 @@
 
 langAttributeAwareFormControlUIEnabled initial=false
 
-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED <= 101300) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED <= 11)
 subresourceIntegrityEnabled initial=false
-#else
-subresourceIntegrityEnabled initial=true
-#endif
 
 constantPropertiesEnabled initial=false
 






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

[webkit-changes] [218353] branches/safari-604.1.25.3-branch/Source/WebCore/page/Settings.in

2017-06-15 Thread matthew_hanson

Title: [218353] branches/safari-604.1.25.3-branch/Source/WebCore/page/Settings.in








Revision 218353
Author matthew_han...@apple.com
Date 2017-06-15 13:22:25 -0700 (Thu, 15 Jun 2017)


Log Message
Follow-up fix for rdar://problem/32621736

Modified Paths

branches/safari-604.1.25.3-branch/Source/WebCore/page/Settings.in




Diff

Modified: branches/safari-604.1.25.3-branch/Source/WebCore/page/Settings.in (218352 => 218353)

--- branches/safari-604.1.25.3-branch/Source/WebCore/page/Settings.in	2017-06-15 20:15:23 UTC (rev 218352)
+++ branches/safari-604.1.25.3-branch/Source/WebCore/page/Settings.in	2017-06-15 20:22:25 UTC (rev 218353)
@@ -292,11 +292,7 @@
 
 langAttributeAwareFormControlUIEnabled initial=false
 
-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED <= 101300) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED <= 11)
 subresourceIntegrityEnabled initial=false
-#else
-subresourceIntegrityEnabled initial=true
-#endif
 
 constantPropertiesEnabled initial=false
 






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

1 2 3 4 5 6 7 8 9 10 >

1 - 100 of 2561 matches

Mail list logo