[webkit-changes] [191108] releases/WebKitGTK/webkit-2.10

2015-10-15 Thread carlosgc
Title: [191108] releases/WebKitGTK/webkit-2.10








Revision 191108
Author carlo...@webkit.org
Date 2015-10-15 03:19:04 -0700 (Thu, 15 Oct 2015)


Log Message
Unreviewed. Update OptionsGTK.cmake and NEWS for 2.10.2 release.

.:

* Source/cmake/OptionsGTK.cmake: Bump version numbers.

Source/WebKit2:

* gtk/NEWS: Add release notes for 2.10.2

Modified Paths

releases/WebKitGTK/webkit-2.10/ChangeLog
releases/WebKitGTK/webkit-2.10/Source/WebKit2/ChangeLog
releases/WebKitGTK/webkit-2.10/Source/WebKit2/gtk/NEWS
releases/WebKitGTK/webkit-2.10/Source/cmake/OptionsGTK.cmake




Diff

Modified: releases/WebKitGTK/webkit-2.10/ChangeLog (191107 => 191108)

--- releases/WebKitGTK/webkit-2.10/ChangeLog	2015-10-15 09:17:29 UTC (rev 191107)
+++ releases/WebKitGTK/webkit-2.10/ChangeLog	2015-10-15 10:19:04 UTC (rev 191108)
@@ -1,3 +1,9 @@
+2015-10-15  Carlos Garcia Campos  
+
+Unreviewed. Update OptionsGTK.cmake and NEWS for 2.10.2 release.
+
+* Source/cmake/OptionsGTK.cmake: Bump version numbers.
+
 2015-10-14  Tomas Popela  
 
 [GTK][EFL] Fix build with cmake 3.4


Modified: releases/WebKitGTK/webkit-2.10/Source/WebKit2/ChangeLog (191107 => 191108)

--- releases/WebKitGTK/webkit-2.10/Source/WebKit2/ChangeLog	2015-10-15 09:17:29 UTC (rev 191107)
+++ releases/WebKitGTK/webkit-2.10/Source/WebKit2/ChangeLog	2015-10-15 10:19:04 UTC (rev 191108)
@@ -1,5 +1,11 @@
 2015-10-15  Carlos Garcia Campos  
 
+Unreviewed. Update OptionsGTK.cmake and NEWS for 2.10.2 release.
+
+* gtk/NEWS: Add release notes for 2.10.2
+
+2015-10-15  Carlos Garcia Campos  
+
 Unreviewed. Fix wrong #ifdef added in r190615.
 
 This disabled accelerated compositing unconditionally.


Modified: releases/WebKitGTK/webkit-2.10/Source/WebKit2/gtk/NEWS (191107 => 191108)

--- releases/WebKitGTK/webkit-2.10/Source/WebKit2/gtk/NEWS	2015-10-15 09:17:29 UTC (rev 191107)
+++ releases/WebKitGTK/webkit-2.10/Source/WebKit2/gtk/NEWS	2015-10-15 10:19:04 UTC (rev 191108)
@@ -1,4 +1,13 @@
 =
+WebKitGTK+ 2.10.2
+=
+
+What's new in WebKitGTK+ 2.10.2?
+
+  - Fix a regression introduced in 2.10.1 that disabled accelerated compositing.
+  - Fix build with cmake 3.4.
+
+=
 WebKitGTK+ 2.10.1
 =
 


Modified: releases/WebKitGTK/webkit-2.10/Source/cmake/OptionsGTK.cmake (191107 => 191108)

--- releases/WebKitGTK/webkit-2.10/Source/cmake/OptionsGTK.cmake	2015-10-15 09:17:29 UTC (rev 191107)
+++ releases/WebKitGTK/webkit-2.10/Source/cmake/OptionsGTK.cmake	2015-10-15 10:19:04 UTC (rev 191108)
@@ -2,7 +2,7 @@
 
 set(PROJECT_VERSION_MAJOR 2)
 set(PROJECT_VERSION_MINOR 10)
-set(PROJECT_VERSION_MICRO 1)
+set(PROJECT_VERSION_MICRO 2)
 set(PROJECT_VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_MICRO})
 set(WEBKITGTK_API_VERSION 4.0)
 
@@ -15,8 +15,8 @@
 
 # Libtool library version, not to be confused with API version.
 # See http://www.gnu.org/software/libtool/manual/html_node/Libtool-versioning.html
-CALCULATE_LIBRARY_VERSIONS_FROM_LIBTOOL_TRIPLE(WEBKIT2 48 4 11)
-CALCULATE_LIBRARY_VERSIONS_FROM_LIBTOOL_TRIPLE(_javascript_CORE 20 9 2)
+CALCULATE_LIBRARY_VERSIONS_FROM_LIBTOOL_TRIPLE(WEBKIT2 48 5 11)
+CALCULATE_LIBRARY_VERSIONS_FROM_LIBTOOL_TRIPLE(_javascript_CORE 20 10 2)
 
 # These are shared variables, but we special case their definition so that we can use the
 # CMAKE_INSTALL_* variables that are populated by the GNUInstallDirs macro.






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


[webkit-changes] [191109] releases/WebKitGTK/webkit-2.10.2/

2015-10-15 Thread carlosgc
Title: [191109] releases/WebKitGTK/webkit-2.10.2/








Revision 191109
Author carlo...@webkit.org
Date 2015-10-15 03:19:39 -0700 (Thu, 15 Oct 2015)


Log Message
WebKitGTK+ 2.10.2

Added Paths

releases/WebKitGTK/webkit-2.10.2/




Diff

Property changes: releases/WebKitGTK/webkit-2.10.2



Added: svn:ignore
depcomp
compile
config.guess
GNUmakefile.in
config.sub
ltmain.sh
aconfig.h.in
autom4te.cache
missing
aclocal.m4
install-sh
autotoolsconfig.h.in
INSTALL
README
gtk-doc.make
out
Makefile.chromium
WebKitSupportLibrary.zip
WebKitBuild

Added: svn:mergeinfo




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


[webkit-changes] [191099] branches/safari-601.1.46-branch

2015-10-15 Thread matthew_hanson
Title: [191099] branches/safari-601.1.46-branch








Revision 191099
Author matthew_han...@apple.com
Date 2015-10-15 00:32:10 -0700 (Thu, 15 Oct 2015)


Log Message
Merge r191077. rdar://problem/22993325

Modified Paths

branches/safari-601.1.46-branch/LayoutTests/ChangeLog
branches/safari-601.1.46-branch/Source/WebCore/ChangeLog
branches/safari-601.1.46-branch/Source/WebCore/xml/XMLHttpRequest.cpp
branches/safari-601.1.46-branch/Source/WebCore/xml/XMLHttpRequest.h


Added Paths

branches/safari-601.1.46-branch/LayoutTests/http/tests/contentextensions/async-xhr-onerror-expected.txt
branches/safari-601.1.46-branch/LayoutTests/http/tests/contentextensions/async-xhr-onerror.html
branches/safari-601.1.46-branch/LayoutTests/http/tests/contentextensions/async-xhr-onerror.html.json




Diff

Modified: branches/safari-601.1.46-branch/LayoutTests/ChangeLog (191098 => 191099)

--- branches/safari-601.1.46-branch/LayoutTests/ChangeLog	2015-10-15 07:28:34 UTC (rev 191098)
+++ branches/safari-601.1.46-branch/LayoutTests/ChangeLog	2015-10-15 07:32:10 UTC (rev 191099)
@@ -1,3 +1,18 @@
+2015-10-15  Matthew Hanson  
+
+Merge r191077. rdar://problem/22993325
+
+2015-10-14  Alex Christensen  
+
+[Content Extensions] Make blocked async XHR call onerror
+https://bugs.webkit.org/show_bug.cgi?id=146706
+
+Reviewed by Brady Eidson.
+
+* http/tests/contentextensions/async-xhr-onerror-expected.txt: Added.
+* http/tests/contentextensions/async-xhr-onerror.html: Added.
+* http/tests/contentextensions/async-xhr-onerror.html.json: Added.
+
 2015-10-14  Matthew Hanson  
 
 Merge r190570. rdar://problem/23075838


Added: branches/safari-601.1.46-branch/LayoutTests/http/tests/contentextensions/async-xhr-onerror-expected.txt (0 => 191099)

--- branches/safari-601.1.46-branch/LayoutTests/http/tests/contentextensions/async-xhr-onerror-expected.txt	(rev 0)
+++ branches/safari-601.1.46-branch/LayoutTests/http/tests/contentextensions/async-xhr-onerror-expected.txt	2015-10-15 07:32:10 UTC (rev 191099)
@@ -0,0 +1,11 @@
+CONSOLE MESSAGE: line 30: Content blocker prevented frame displaying http://127.0.0.1:8000/contentextensions/async-xhr-onerror.html from loading a resource from http://127.0.0.1:8000/contentextensions/resources/url-blocking-test.js
+CONSOLE MESSAGE: line 30: Content blocker prevented frame displaying http://127.0.0.1:8000/contentextensions/async-xhr-onerror.html from loading a resource from http://127.0.0.1:8000/contentextensions/resources/url-blocking-test.js
+Asynchronous onreadystatechange status: 0, readyState:1, responseText: 
+Finished runTest. Waiting for callbacks
+Asynchronous onreadystatechange status: 0, readyState:1, responseText: 
+Finished runTest. Waiting for callbacks
+Asynchronous onreadystatechange status: 0, readyState:4, responseText: 
+onerror was called.
+Asynchronous onreadystatechange status: 0, readyState:4, responseText: 
+onerror was called.
+


Added: branches/safari-601.1.46-branch/LayoutTests/http/tests/contentextensions/async-xhr-onerror.html (0 => 191099)

--- branches/safari-601.1.46-branch/LayoutTests/http/tests/contentextensions/async-xhr-onerror.html	(rev 0)
+++ branches/safari-601.1.46-branch/LayoutTests/http/tests/contentextensions/async-xhr-onerror.html	2015-10-15 07:32:10 UTC (rev 191099)
@@ -0,0 +1,46 @@
+
+
+if (window.testRunner) {
+testRunner.dumpAsText();
+testRunner.waitUntilDone();
+}
+
+function log(text) {
+document.body.appendChild(document.createTextNode(text));
+document.body.appendChild(document.createElement("br"));
+}
+
+function runTest(shouldAbort) {
+var xhr = new XMLHttpRequest();
+xhr._onreadystatechange_ = function() {
+log("Asynchronous onreadystatechange status: " + xhr.status + ", readyState:" + xhr.readyState + ", responseText: " + xhr.responseText);
+}
+xhr._ontimeout_ = function () {
+log("timeout - this should not be called.");
+};
+xhr._onerror_ = function () {
+log("onerror was called.");
+if (shouldAbort) // The second time this is called.
+testRunner.notifyDone();
+};
+
+xhr.open("GET", "resources/url-blocking-test.js", true);
+xhr.timeout = 1; // 1 ms should be too late if it is blocked.
+try {
+xhr.send();
+} catch (error) {
+log("Asynchronous error: " + error);
+}
+if (shouldAbort)
+xhr.abort(); // This should not crash, obviously.
+log("Finished runTest.  Waiting for callbacks");
+}
+
+function runTests() {
+runTest(false);
+runTest(true);
+}
+
+
+
+


Added: branches/safari-601.1.46-branch/LayoutTests/http/tests/contentextensions/async-xhr-onerror.html.json (0 => 191099)

--- branches/safari-601.1.46-branch/LayoutTests/http/tests/contentextensions/async-xhr-onerror.html.json	   

[webkit-changes] [191103] trunk

2015-10-15 Thread carlosgc
Title: [191103] trunk








Revision 191103
Author carlo...@webkit.org
Date 2015-10-15 01:18:58 -0700 (Thu, 15 Oct 2015)


Log Message
[GTK] Test WebKit2.RestoreSessionStateContainingFormData fails
https://bugs.webkit.org/show_bug.cgi?id=84960

Reviewed by Žan Doberšek.

Source/WebKit2:

Add a cross-platform implementation to LegacySessionStateCodingNone
using the new SessionState, so that non mac ports can make unit
tests that use the legacy session state coding pass.

* UIProcess/LegacySessionStateCodingNone.cpp:
(WebKit::encodeLegacySessionState):
(WebKit::decodeLegacySessionState):
(WebKit::encodeLegacySessionHistoryEntryData): Deleted.
(WebKit::decodeLegacySessionHistoryEntryData): Deleted.

Tools:

* Scripts/run-gtk-tests:
(TestRunner): Unskip tests using SessionState.
* TestWebKitAPI/PlatformGTK.cmake: Add
WKPageCopySessionStateWithFiltering test.

Modified Paths

trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/LegacySessionStateCodingNone.cpp
trunk/Tools/ChangeLog
trunk/Tools/Scripts/run-gtk-tests
trunk/Tools/TestWebKitAPI/PlatformGTK.cmake




Diff

Modified: trunk/Source/WebKit2/ChangeLog (191102 => 191103)

--- trunk/Source/WebKit2/ChangeLog	2015-10-15 08:16:53 UTC (rev 191102)
+++ trunk/Source/WebKit2/ChangeLog	2015-10-15 08:18:58 UTC (rev 191103)
@@ -1,5 +1,22 @@
 2015-10-15  Carlos Garcia Campos  
 
+[GTK] Test WebKit2.RestoreSessionStateContainingFormData fails
+https://bugs.webkit.org/show_bug.cgi?id=84960
+
+Reviewed by Žan Doberšek.
+
+Add a cross-platform implementation to LegacySessionStateCodingNone
+using the new SessionState, so that non mac ports can make unit
+tests that use the legacy session state coding pass.
+
+* UIProcess/LegacySessionStateCodingNone.cpp:
+(WebKit::encodeLegacySessionState):
+(WebKit::decodeLegacySessionState):
+(WebKit::encodeLegacySessionHistoryEntryData): Deleted.
+(WebKit::decodeLegacySessionHistoryEntryData): Deleted.
+
+2015-10-15  Carlos Garcia Campos  
+
 Unreviewed. Fix wrong #ifdef added in r190615.
 
 This disabled accelerated compositing unconditionally.


Modified: trunk/Source/WebKit2/UIProcess/LegacySessionStateCodingNone.cpp (191102 => 191103)

--- trunk/Source/WebKit2/UIProcess/LegacySessionStateCodingNone.cpp	2015-10-15 08:16:53 UTC (rev 191102)
+++ trunk/Source/WebKit2/UIProcess/LegacySessionStateCodingNone.cpp	2015-10-15 08:18:58 UTC (rev 191103)
@@ -27,33 +27,32 @@
 #include "LegacySessionStateCoding.h"
 
 #include "APIData.h"
+#include "ArgumentDecoder.h"
+#include "ArgumentEncoder.h"
 #include "SessionState.h"
-#include 
+#include "WebCoreArgumentCoders.h"
 
 namespace WebKit {
 
-RefPtr encodeLegacySessionState(const SessionState&)
+RefPtr encodeLegacySessionState(const SessionState& sessionState)
 {
-notImplemented();
-return API::Data::create(nullptr, 0);
+IPC::ArgumentEncoder encoder;
+encoder << sessionState.backForwardListState;
+encoder << sessionState.renderTreeSize;
+encoder << sessionState.provisionalURL;
+return API::Data::create(encoder.buffer(), encoder.bufferSize());
 }
 
-RefPtr encodeLegacySessionHistoryEntryData(const FrameState&)
+bool decodeLegacySessionState(const uint8_t* data, size_t dataSize, SessionState& sessionState)
 {
-notImplemented();
-return API::Data::create(nullptr, 0);
+IPC::ArgumentDecoder decoder(data, dataSize);
+if (!decoder.decode(sessionState.backForwardListState))
+return false;
+if (!decoder.decode(sessionState.renderTreeSize))
+return false;
+if (!decoder.decode(sessionState.provisionalURL))
+return false;
+return true;
 }
 
-bool decodeLegacySessionState(const uint8_t*, size_t, SessionState&)
-{
-notImplemented();
-return false;
-}
-
-bool decodeLegacySessionHistoryEntryData(const uint8_t*, size_t, FrameState&)
-{
-notImplemented();
-return false;
-}
-
 } // namespace WebKit


Modified: trunk/Tools/ChangeLog (191102 => 191103)

--- trunk/Tools/ChangeLog	2015-10-15 08:16:53 UTC (rev 191102)
+++ trunk/Tools/ChangeLog	2015-10-15 08:18:58 UTC (rev 191103)
@@ -1,3 +1,15 @@
+2015-10-15  Carlos Garcia Campos  
+
+[GTK] Test WebKit2.RestoreSessionStateContainingFormData fails
+https://bugs.webkit.org/show_bug.cgi?id=84960
+
+Reviewed by Žan Doberšek.
+
+* Scripts/run-gtk-tests:
+(TestRunner): Unskip tests using SessionState.
+* TestWebKitAPI/PlatformGTK.cmake: Add
+WKPageCopySessionStateWithFiltering test.
+
 2015-10-14  Carlos Garcia Campos  
 
 [GTK] Missing return value on TestWebExtensions.cpp:193


Modified: trunk/Tools/Scripts/run-gtk-tests (191102 => 191103)

--- trunk/Tools/Scripts/run-gtk-tests	2015-10-15 08:16:53 UTC (rev 191102)
+++ trunk/Tools/Scripts/run-gtk-tests	2015-10-15 08:18:58 UTC (rev 191103)
@@ -68,10 +68,8 @@
 

[webkit-changes] [191106] releases/WebKitGTK/webkit-2.10/Tools

2015-10-15 Thread carlosgc
Title: [191106] releases/WebKitGTK/webkit-2.10/Tools








Revision 191106
Author carlo...@webkit.org
Date 2015-10-15 02:15:46 -0700 (Thu, 15 Oct 2015)


Log Message
Merge r191100 - [GTK] Missing return value on TestWebExtensions.cpp:193
https://bugs.webkit.org/show_bug.cgi?id=149755

Unreviewed. Add missing return value.

* TestWebKitAPI/Tests/WebKit2Gtk/TestWebExtensions.cpp:
(permissionRequestCallback):

Modified Paths

releases/WebKitGTK/webkit-2.10/Tools/ChangeLog
releases/WebKitGTK/webkit-2.10/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebExtensions.cpp




Diff

Modified: releases/WebKitGTK/webkit-2.10/Tools/ChangeLog (191105 => 191106)

--- releases/WebKitGTK/webkit-2.10/Tools/ChangeLog	2015-10-15 09:14:53 UTC (rev 191105)
+++ releases/WebKitGTK/webkit-2.10/Tools/ChangeLog	2015-10-15 09:15:46 UTC (rev 191106)
@@ -1,3 +1,13 @@
+2015-10-14  Carlos Garcia Campos  
+
+[GTK] Missing return value on TestWebExtensions.cpp:193
+https://bugs.webkit.org/show_bug.cgi?id=149755
+
+Unreviewed. Add missing return value.
+
+* TestWebKitAPI/Tests/WebKit2Gtk/TestWebExtensions.cpp:
+(permissionRequestCallback):
+
 2015-10-13  Sergio Villar Senin  
 
 [GTK] Fix build for ENABLE_TOUCH_EVENTS=OFF


Modified: releases/WebKitGTK/webkit-2.10/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebExtensions.cpp (191105 => 191106)

--- releases/WebKitGTK/webkit-2.10/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebExtensions.cpp	2015-10-15 09:14:53 UTC (rev 191105)
+++ releases/WebKitGTK/webkit-2.10/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebExtensions.cpp	2015-10-15 09:15:46 UTC (rev 191106)
@@ -190,6 +190,8 @@
 g_assert(webkit_install_missing_media_plugins_permission_request_get_description(missingPluginsRequest));
 webkit_permission_request_deny(request);
 test->quitMainLoop();
+
+return TRUE;
 }
 
 static void testInstallMissingPluginsPermissionRequest(WebViewTest* test, gconstpointer)






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


[webkit-changes] [191098] branches/safari-601-branch

2015-10-15 Thread matthew_hanson
Title: [191098] branches/safari-601-branch








Revision 191098
Author matthew_han...@apple.com
Date 2015-10-15 00:28:34 -0700 (Thu, 15 Oct 2015)


Log Message
Merge r191077. rdar://problem/22993325

Modified Paths

branches/safari-601-branch/LayoutTests/ChangeLog
branches/safari-601-branch/Source/WebCore/ChangeLog
branches/safari-601-branch/Source/WebCore/xml/XMLHttpRequest.cpp
branches/safari-601-branch/Source/WebCore/xml/XMLHttpRequest.h


Added Paths

branches/safari-601-branch/LayoutTests/http/tests/contentextensions/async-xhr-onerror-expected.txt
branches/safari-601-branch/LayoutTests/http/tests/contentextensions/async-xhr-onerror.html
branches/safari-601-branch/LayoutTests/http/tests/contentextensions/async-xhr-onerror.html.json




Diff

Modified: branches/safari-601-branch/LayoutTests/ChangeLog (191097 => 191098)

--- branches/safari-601-branch/LayoutTests/ChangeLog	2015-10-15 06:46:44 UTC (rev 191097)
+++ branches/safari-601-branch/LayoutTests/ChangeLog	2015-10-15 07:28:34 UTC (rev 191098)
@@ -1,3 +1,18 @@
+2015-10-14  Matthew Hanson  
+
+Merge r191077. rdar://problem/22993325
+
+2015-10-14  Alex Christensen  
+
+[Content Extensions] Make blocked async XHR call onerror
+https://bugs.webkit.org/show_bug.cgi?id=146706
+
+Reviewed by Brady Eidson.
+
+* http/tests/contentextensions/async-xhr-onerror-expected.txt: Added.
+* http/tests/contentextensions/async-xhr-onerror.html: Added.
+* http/tests/contentextensions/async-xhr-onerror.html.json: Added.
+
 2015-10-13  Matthew Hanson  
 
 Merge r190570. rdar://problem/23075530


Added: branches/safari-601-branch/LayoutTests/http/tests/contentextensions/async-xhr-onerror-expected.txt (0 => 191098)

--- branches/safari-601-branch/LayoutTests/http/tests/contentextensions/async-xhr-onerror-expected.txt	(rev 0)
+++ branches/safari-601-branch/LayoutTests/http/tests/contentextensions/async-xhr-onerror-expected.txt	2015-10-15 07:28:34 UTC (rev 191098)
@@ -0,0 +1,11 @@
+CONSOLE MESSAGE: line 30: Content blocker prevented frame displaying http://127.0.0.1:8000/contentextensions/async-xhr-onerror.html from loading a resource from http://127.0.0.1:8000/contentextensions/resources/url-blocking-test.js
+CONSOLE MESSAGE: line 30: Content blocker prevented frame displaying http://127.0.0.1:8000/contentextensions/async-xhr-onerror.html from loading a resource from http://127.0.0.1:8000/contentextensions/resources/url-blocking-test.js
+Asynchronous onreadystatechange status: 0, readyState:1, responseText: 
+Finished runTest. Waiting for callbacks
+Asynchronous onreadystatechange status: 0, readyState:1, responseText: 
+Finished runTest. Waiting for callbacks
+Asynchronous onreadystatechange status: 0, readyState:4, responseText: 
+onerror was called.
+Asynchronous onreadystatechange status: 0, readyState:4, responseText: 
+onerror was called.
+


Added: branches/safari-601-branch/LayoutTests/http/tests/contentextensions/async-xhr-onerror.html (0 => 191098)

--- branches/safari-601-branch/LayoutTests/http/tests/contentextensions/async-xhr-onerror.html	(rev 0)
+++ branches/safari-601-branch/LayoutTests/http/tests/contentextensions/async-xhr-onerror.html	2015-10-15 07:28:34 UTC (rev 191098)
@@ -0,0 +1,46 @@
+
+
+if (window.testRunner) {
+testRunner.dumpAsText();
+testRunner.waitUntilDone();
+}
+
+function log(text) {
+document.body.appendChild(document.createTextNode(text));
+document.body.appendChild(document.createElement("br"));
+}
+
+function runTest(shouldAbort) {
+var xhr = new XMLHttpRequest();
+xhr._onreadystatechange_ = function() {
+log("Asynchronous onreadystatechange status: " + xhr.status + ", readyState:" + xhr.readyState + ", responseText: " + xhr.responseText);
+}
+xhr._ontimeout_ = function () {
+log("timeout - this should not be called.");
+};
+xhr._onerror_ = function () {
+log("onerror was called.");
+if (shouldAbort) // The second time this is called.
+testRunner.notifyDone();
+};
+
+xhr.open("GET", "resources/url-blocking-test.js", true);
+xhr.timeout = 1; // 1 ms should be too late if it is blocked.
+try {
+xhr.send();
+} catch (error) {
+log("Asynchronous error: " + error);
+}
+if (shouldAbort)
+xhr.abort(); // This should not crash, obviously.
+log("Finished runTest.  Waiting for callbacks");
+}
+
+function runTests() {
+runTest(false);
+runTest(true);
+}
+
+
+
+


Added: branches/safari-601-branch/LayoutTests/http/tests/contentextensions/async-xhr-onerror.html.json (0 => 191098)

--- branches/safari-601-branch/LayoutTests/http/tests/contentextensions/async-xhr-onerror.html.json	(rev 0)
+++ 

[webkit-changes] [191101] trunk/LayoutTests

2015-10-15 Thread carlosgc
Title: [191101] trunk/LayoutTests








Revision 191101
Author carlo...@webkit.org
Date 2015-10-15 00:53:16 -0700 (Thu, 15 Oct 2015)


Log Message
Unreviewed GTK+ gardening. Unskip several tests that are passing now.

* platform/gtk/TestExpectations:

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/LayoutTests/platform/gtk/TestExpectations




Diff

Modified: trunk/LayoutTests/ChangeLog (191100 => 191101)

--- trunk/LayoutTests/ChangeLog	2015-10-15 07:51:17 UTC (rev 191100)
+++ trunk/LayoutTests/ChangeLog	2015-10-15 07:53:16 UTC (rev 191101)
@@ -1,3 +1,9 @@
+2015-10-15  Carlos Garcia Campos  
+
+Unreviewed GTK+ gardening. Unskip several tests that are passing now.
+
+* platform/gtk/TestExpectations:
+
 2015-10-14  Alexey Proskuryakov  
 
 [Win] Layout Test http/tests/multipart/multipart-replace-non-html-content.php has extra whitespace


Modified: trunk/LayoutTests/platform/gtk/TestExpectations (191100 => 191101)

--- trunk/LayoutTests/platform/gtk/TestExpectations	2015-10-15 07:51:17 UTC (rev 191100)
+++ trunk/LayoutTests/platform/gtk/TestExpectations	2015-10-15 07:53:16 UTC (rev 191101)
@@ -600,8 +600,6 @@
 webkit.org/b/146720 http/tests/media/hls/video-controller-getStartDate.html [ Failure ]
 webkit.org/b/146720 media/accessiblity-describes-video.html [ Failure ]
 
-webkit.org/b/146721 fast/forms/auto-fill-button/input-readonly-auto-fill-button.html [ ImageOnlyFailure ]
-
 webkit.org/b/146724 fast/text/word-break-keep-all.html [ ImageOnlyFailure ]
 
 # This tests fail since the upgrade of GTK to 3.16 and Cairo to 1.14 on the JHBuild
@@ -1290,13 +1288,11 @@
 webkit.org/b/122571 inspector/page/frameScheduledNavigation.html [ Timeout Pass Crash ]
 webkit.org/b/122571 inspector/page/setEmulatedMedia.html [ Timeout Pass ]
 webkit.org/b/122571 inspector/css/getSupportedCSSProperties.html [ Timeout Pass ]
-webkit.org/b/122571 inspector/unit-tests/test-harness-trivially-works.html [ Timeout Crash ]
+webkit.org/b/122571 [ Debug ] inspector/unit-tests/test-harness-trivially-works.html [ Timeout Crash ]
 
 
 Bug(GTK) plugins/reloadplugins-and-pages.html [ Timeout ]
 
-Bug(GTK) fast/forms/select/menulist-popup-crash.html [ Timeout ]
-
 Bug(GTK) fast/forms/select/optgroup-clicking.html [ Timeout ]
 
 Bug(GTK) fast/media/media-query-list-04.html [ Timeout ]
@@ -1381,7 +1377,6 @@
 webkit.org/b/109469 fast/events/mouse-cursor-image-set.html [ Crash Timeout ]
 
 webkit.org/b/144865 fast/animation/request-animation-frame-throttle-subframe.html [ Timeout ]
-webkit.org/b/144865 fast/animation/request-animation-frame-throttle-subframe-display-none.html [ Timeout ]
 webkit.org/b/145053 http/tests/xmlhttprequest/origin-exact-matching.html [ Timeout Pass ]
 
 webkit.org/b/145168 media/track/track-cue-inline-assertion-crash.html [ Timeout Pass ]
@@ -1889,7 +1884,6 @@
 
 webkit.org/b/111606 fast/borders/border-fit.html [ Failure ]
 webkit.org/b/111606 fast/borders/border-fit-2.html [ Failure ]
-webkit.org/b/111606 fast/repaint/border-fit-lines.html [ Failure ]
 
 webkit.org/b/112228 svg/custom/resources-css-scaled.html [ ImageOnlyFailure ]
 
@@ -1934,8 +1928,6 @@
 # May take too long on the bots.
 Bug(GTK) mathml/very-large-stretchy-operators.html [ Pass Timeout ]
 
-webkit.org/b/119841 fast/sub-pixel/sub-pixel-composited-layers.html [ ImageOnlyFailure ]
-
 webkit.org/b/120105 http/tests/navigation/post-frames-goback1-uncached.html [ Failure ]
 
 webkit.org/b/120596 css3/background/background-repeat-space-border.html [ ImageOnlyFailure ]
@@ -2188,8 +2180,6 @@
 
 webkit.org/b/117756 media/track/media-element-enqueue-event-crash.html [ Timeout Pass Crash ]
 
-webkit.org/b/132046 svg/css/svg-resource-fragment-identifier-img-src.html  [ ImageOnlyFailure ]
-
 webkit.org/b/132054 js/dom/global-constructors-attributes.html  [ Failure ]
 
 webkit.org/b/132056 webaudio/codec-tests/mp3/128kbps-44khz.html  [ Failure ]
@@ -2204,10 +2194,6 @@
 webkit.org/b/132126 animations/animation-iteration-event-destroy-renderer.html [ Timeout Pass Crash ]
 webkit.org/b/132126 animations/animation-direction-normal.html [ Failure Pass ]
 webkit.org/b/132126 animations/animation-direction-reverse.html [ Crash Failure Pass ]
-webkit.org/b/132126 animations/play-state-paused.html [ Failure ]
-webkit.org/b/132126 animations/play-state-suspend.html [ Failure ]
-webkit.org/b/132126 animations/suspend-resume-animation.html [ Failure ]
-webkit.org/b/132126 animations/transform-non-accelerated.html [ Failure ]
 webkit.org/b/132126 animations/body-removal-crash.html [ Crash Pass ]
 webkit.org/b/132126 media/track/track-cues-cuechange.html [ Timeout Pass ]
 webkit.org/b/132126 media/track/track-cues-enter-exit.html [ Timeout Pass ]
@@ -2291,11 +2277,6 @@
 
 webkit.org/b/136255 fast/block/float/overhanging-tall-block.html [ Failure ]
 
-webkit.org/b/136257 fast/forms/input-placeholder-visibility-1.html [ Failure ]
-webkit.org/b/136257 fast/forms/input-placeholder-visibility-3.html [ Failure ]

[webkit-changes] [191090] branches/safari-601.1.46-branch/Source/WebCore

2015-10-15 Thread matthew_hanson
Title: [191090] branches/safari-601.1.46-branch/Source/WebCore








Revision 191090
Author matthew_han...@apple.com
Date 2015-10-14 23:46:24 -0700 (Wed, 14 Oct 2015)


Log Message
Merge r188531. rdar://problem/22707497

Modified Paths

branches/safari-601.1.46-branch/Source/WebCore/ChangeLog
branches/safari-601.1.46-branch/Source/WebCore/loader/SubresourceLoader.cpp




Diff

Modified: branches/safari-601.1.46-branch/Source/WebCore/ChangeLog (191089 => 191090)

--- branches/safari-601.1.46-branch/Source/WebCore/ChangeLog	2015-10-15 06:46:22 UTC (rev 191089)
+++ branches/safari-601.1.46-branch/Source/WebCore/ChangeLog	2015-10-15 06:46:24 UTC (rev 191090)
@@ -1,5 +1,22 @@
 2015-10-14  Matthew Hanson  
 
+Merge r188531. rdar://problem/22707497
+
+2015-08-17  Andy Estes  
+
+REGRESSION (r188486): Crash in SubresourceLoader::didReceiveResponse() when TemporaryChange goes out of scope
+https://bugs.webkit.org/show_bug.cgi?id=148082
+
+Reviewed by Alexey Proskuryakov.
+
+Covered by existing tests run under ASan or Guard Malloc.
+
+* loader/SubresourceLoader.cpp:
+(WebCore::SubresourceLoader::didReceiveResponse): Ensure that callingDidReceiveResponse is destroyed while the
+SubresourceLoader is still alive by declaring it after protect.
+
+2015-10-14  Matthew Hanson  
+
 Merge r188486. rdar://problem/22707497
 
 2015-08-13  Andy Estes  


Modified: branches/safari-601.1.46-branch/Source/WebCore/loader/SubresourceLoader.cpp (191089 => 191090)

--- branches/safari-601.1.46-branch/Source/WebCore/loader/SubresourceLoader.cpp	2015-10-15 06:46:22 UTC (rev 191089)
+++ branches/safari-601.1.46-branch/Source/WebCore/loader/SubresourceLoader.cpp	2015-10-15 06:46:24 UTC (rev 191090)
@@ -203,12 +203,12 @@
 ASSERT(!response.isNull());
 ASSERT(m_state == Initialized);
 
-TemporaryChange callingDidReceiveResponse(m_callingDidReceiveResponse, true);
-
 // Reference the object in this method since the additional processing can do
 // anything including removing the last reference to this object; one example of this is 3266216.
 Ref protect(*this);
 
+TemporaryChange callingDidReceiveResponse(m_callingDidReceiveResponse, true);
+
 if (shouldIncludeCertificateInfo())
 response.includeCertificateInfo();
 






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


[webkit-changes] [191089] branches/safari-601.1.46-branch

2015-10-15 Thread matthew_hanson
Title: [191089] branches/safari-601.1.46-branch








Revision 191089
Author matthew_han...@apple.com
Date 2015-10-14 23:46:22 -0700 (Wed, 14 Oct 2015)


Log Message
Merge r188486. rdar://problem/22707497

Modified Paths

branches/safari-601.1.46-branch/Source/WebCore/ChangeLog
branches/safari-601.1.46-branch/Source/WebCore/dom/Document.cpp
branches/safari-601.1.46-branch/Source/WebCore/loader/DocumentLoader.cpp
branches/safari-601.1.46-branch/Source/WebCore/loader/DocumentLoader.h
branches/safari-601.1.46-branch/Source/WebCore/loader/SubresourceLoader.cpp
branches/safari-601.1.46-branch/Source/WebCore/loader/SubresourceLoader.h
branches/safari-601.1.46-branch/Source/WebCore/loader/appcache/ApplicationCacheHost.cpp
branches/safari-601.1.46-branch/Source/WebCore/loader/mac/DocumentLoaderMac.cpp
branches/safari-601.1.46-branch/Source/WebKit/mac/ChangeLog
branches/safari-601.1.46-branch/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm
branches/safari-601.1.46-branch/Source/WebKit/win/ChangeLog
branches/safari-601.1.46-branch/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp
branches/safari-601.1.46-branch/Source/WebKit2/ChangeLog
branches/safari-601.1.46-branch/Source/WebKit2/WebProcess/Network/WebResourceLoader.cpp
branches/safari-601.1.46-branch/Source/WebKit2/WebProcess/WebPage/WebFrame.cpp
branches/safari-601.1.46-branch/Tools/ChangeLog
branches/safari-601.1.46-branch/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/Download.mm




Diff

Modified: branches/safari-601.1.46-branch/Source/WebCore/ChangeLog (191088 => 191089)

--- branches/safari-601.1.46-branch/Source/WebCore/ChangeLog	2015-10-15 06:46:15 UTC (rev 191088)
+++ branches/safari-601.1.46-branch/Source/WebCore/ChangeLog	2015-10-15 06:46:22 UTC (rev 191089)
@@ -1,5 +1,36 @@
 2015-10-14  Matthew Hanson  
 
+Merge r188486. rdar://problem/22707497
+
+2015-08-13  Andy Estes  
+
+[Cocoa] Downloads do not start if policy decision is made asynchronously
+https://bugs.webkit.org/show_bug.cgi?id=147985
+
+Reviewed by Brady Eidson.
+
+It's only possible to convert a NSURLConnection to a download while the connection delegate's
+-connection:didReceiveResponse: is being called. However, WebKit clients can decide content policy
+asynchronously. If a client chooses to download a response asynchronously, we can no longer convert the
+connection to a download, so we should start a new download instead.
+
+New API test: _WKDownload.AsynchronousDownloadPolicy
+
+* dom/Document.cpp: Updated to include SubresourceLoader.h.
+* loader/DocumentLoader.cpp:
+(WebCore::DocumentLoader::mainResourceLoader): Updated to return a SubresourceLoader.
+(WebCore::DocumentLoader::continueAfterContentPolicy): Cast mainResourceLoader() to a ResourceLoader since
+didFail() is private in SubresourceLoader.
+* loader/DocumentLoader.h:
+* loader/SubresourceLoader.cpp:
+(WebCore::SubresourceLoader::SubresourceLoader): Initialized m_callingDidReceiveResponse to false.
+(WebCore::SubresourceLoader::didReceiveResponse): Used TemporaryChange<> to set m_callingDidReceiveResponse to true.
+* loader/SubresourceLoader.h:
+* loader/appcache/ApplicationCacheHost.cpp: Updated to include SubresourceLoader.h.
+* loader/mac/DocumentLoaderMac.cpp: Ditto.
+
+2015-10-14  Matthew Hanson  
+
 Merge r188416. rdar://problem/22803749
 
 2015-08-13  Jer Noble  


Modified: branches/safari-601.1.46-branch/Source/WebCore/dom/Document.cpp (191088 => 191089)

--- branches/safari-601.1.46-branch/Source/WebCore/dom/Document.cpp	2015-10-15 06:46:15 UTC (rev 191088)
+++ branches/safari-601.1.46-branch/Source/WebCore/dom/Document.cpp	2015-10-15 06:46:22 UTC (rev 191089)
@@ -124,7 +124,6 @@
 #include "RenderView.h"
 #include "RenderWidget.h"
 #include "ResourceLoadScheduler.h"
-#include "ResourceLoader.h"
 #include "RuntimeEnabledFeatures.h"
 #include "SVGDocumentExtensions.h"
 #include "SVGElement.h"
@@ -147,6 +146,7 @@
 #include "StyleResolver.h"
 #include "StyleSheetContents.h"
 #include "StyleSheetList.h"
+#include "SubresourceLoader.h"
 #include "TextNodeTraversal.h"
 #include "TextResourceDecoder.h"
 #include "TransformSource.h"


Modified: branches/safari-601.1.46-branch/Source/WebCore/loader/DocumentLoader.cpp (191088 => 191089)

--- branches/safari-601.1.46-branch/Source/WebCore/loader/DocumentLoader.cpp	2015-10-15 06:46:15 UTC (rev 191088)
+++ branches/safari-601.1.46-branch/Source/WebCore/loader/DocumentLoader.cpp	2015-10-15 06:46:22 UTC (rev 191089)
@@ -154,7 +154,7 @@
 return _frame->loader();
 }
 
-ResourceLoader* DocumentLoader::mainResourceLoader() const
+SubresourceLoader* DocumentLoader::mainResourceLoader() const
 {
 return m_mainResource 

[webkit-changes] [191094] branches/safari-601.1.46-branch/Source/WebCore

2015-10-15 Thread matthew_hanson
Title: [191094] branches/safari-601.1.46-branch/Source/WebCore








Revision 191094
Author matthew_han...@apple.com
Date 2015-10-14 23:46:35 -0700 (Wed, 14 Oct 2015)


Log Message
Merge r190382. rdar://problem/22934241

Modified Paths

branches/safari-601.1.46-branch/Source/WebCore/ChangeLog
branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp




Diff

Modified: branches/safari-601.1.46-branch/Source/WebCore/ChangeLog (191093 => 191094)

--- branches/safari-601.1.46-branch/Source/WebCore/ChangeLog	2015-10-15 06:46:33 UTC (rev 191093)
+++ branches/safari-601.1.46-branch/Source/WebCore/ChangeLog	2015-10-15 06:46:35 UTC (rev 191094)
@@ -1,5 +1,27 @@
 2015-10-14  Matthew Hanson  
 
+Merge r190382. rdar://problem/22934241
+
+2015-09-30  Dean Jackson  
+
+GraphicsContext3D::mappedSymbolName should initialize count variable
+https://bugs.webkit.org/show_bug.cgi?id=149692
+
+
+Reviewed by Simon Fraser.
+
+While debugging another WebGL issue, I noticed that some
+OpenGL renderers can get into a state where they
+drop resources (e.g. a GPU reset). If we don't detect that
+in time, we might try to ask for the currently attached
+resources and our in-parameter will not be set. In this
+case, initialize it to zero so that we don't do silly things.
+
+* platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp:
+(WebCore::GraphicsContext3D::mappedSymbolName): Initialize count to 0.
+
+2015-10-14  Matthew Hanson  
+
 Merge r190339. rdar://problem/23075839
 
 2015-09-29  Jon Honeycutt  


Modified: branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp (191093 => 191094)

--- branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp	2015-10-15 06:46:33 UTC (rev 191093)
+++ branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp	2015-10-15 06:46:35 UTC (rev 191094)
@@ -858,7 +858,7 @@
 
 String GraphicsContext3D::mappedSymbolName(Platform3DObject program, ANGLEShaderSymbolType symbolType, const String& name)
 {
-GC3Dsizei count;
+GC3Dsizei count = 0;
 Platform3DObject shaders[2] = { };
 getAttachedShaders(program, 2, , shaders);
 






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


[webkit-changes] [191093] branches/safari-601.1.46-branch

2015-10-15 Thread matthew_hanson
Title: [191093] branches/safari-601.1.46-branch








Revision 191093
Author matthew_han...@apple.com
Date 2015-10-14 23:46:33 -0700 (Wed, 14 Oct 2015)


Log Message
Merge r190339. rdar://problem/23075839

Modified Paths

branches/safari-601.1.46-branch/LayoutTests/ChangeLog
branches/safari-601.1.46-branch/Source/WebCore/ChangeLog
branches/safari-601.1.46-branch/Source/WebCore/xml/XSLStyleSheet.h
branches/safari-601.1.46-branch/Source/WebCore/xml/XSLStyleSheetLibxslt.cpp


Added Paths

branches/safari-601.1.46-branch/LayoutTests/svg/custom/invalid-xslt-crash-expected.txt
branches/safari-601.1.46-branch/LayoutTests/svg/custom/invalid-xslt-crash.svg




Diff

Modified: branches/safari-601.1.46-branch/LayoutTests/ChangeLog (191092 => 191093)

--- branches/safari-601.1.46-branch/LayoutTests/ChangeLog	2015-10-15 06:46:30 UTC (rev 191092)
+++ branches/safari-601.1.46-branch/LayoutTests/ChangeLog	2015-10-15 06:46:33 UTC (rev 191093)
@@ -1,5 +1,22 @@
 2015-10-14  Matthew Hanson  
 
+Merge r190339. rdar://problem/23075839
+
+2015-09-29  Jon Honeycutt  
+
+Avoid reparsing an XSLT stylesheet after the first failure.
+https://bugs.webkit.org/show_bug.cgi?id=149188
+
+
+Reviewed by Dave Hyatt.
+
+Patch by Jiewen Tan, jiewen_...@apple.com.
+
+* svg/custom/invalid-xslt-crash-expected.txt: Added.
+* svg/custom/invalid-xslt-crash.svg: Added.
+
+2015-10-14  Matthew Hanson  
+
 Merge r188390. rdar://problem/22803749
 
 2015-08-13  Eric Carlson  


Added: branches/safari-601.1.46-branch/LayoutTests/svg/custom/invalid-xslt-crash-expected.txt (0 => 191093)

--- branches/safari-601.1.46-branch/LayoutTests/svg/custom/invalid-xslt-crash-expected.txt	(rev 0)
+++ branches/safari-601.1.46-branch/LayoutTests/svg/custom/invalid-xslt-crash-expected.txt	2015-10-15 06:46:33 UTC (rev 191093)
@@ -0,0 +1,2 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600


Added: branches/safari-601.1.46-branch/LayoutTests/svg/custom/invalid-xslt-crash.svg (0 => 191093)

--- branches/safari-601.1.46-branch/LayoutTests/svg/custom/invalid-xslt-crash.svg	(rev 0)
+++ branches/safari-601.1.46-branch/LayoutTests/svg/custom/invalid-xslt-crash.svg	2015-10-15 06:46:33 UTC (rev 191093)
@@ -0,0 +1,7 @@
+
+  
+  lime
+


Modified: branches/safari-601.1.46-branch/Source/WebCore/ChangeLog (191092 => 191093)

--- branches/safari-601.1.46-branch/Source/WebCore/ChangeLog	2015-10-15 06:46:30 UTC (rev 191092)
+++ branches/safari-601.1.46-branch/Source/WebCore/ChangeLog	2015-10-15 06:46:33 UTC (rev 191093)
@@ -1,5 +1,30 @@
 2015-10-14  Matthew Hanson  
 
+Merge r190339. rdar://problem/23075839
+
+2015-09-29  Jon Honeycutt  
+
+Avoid reparsing an XSLT stylesheet after the first failure.
+https://bugs.webkit.org/show_bug.cgi?id=149188
+
+
+Reviewed by Dave Hyatt.
+
+Patch by Jiewen Tan, jiewen_...@apple.com.
+
+Test: svg/custom/invalid-xslt-crash.svg
+
+* xml/XSLStyleSheet.h:
+Add a new member variable m_compilationFailed that tracks whether
+compilation has failed. Default value is false.
+
+* xml/XSLStyleSheetLibxslt.cpp:
+(WebCore::XSLStyleSheet::compileStyleSheet):
+Return early if the compilation has failed before. After compiling the
+style sheet, if we failed, set m_compilationFailed to true.
+
+2015-10-14  Matthew Hanson  
+
 Merge r190097. rdar://problem/23075843
 
 2015-09-21  Ryosuke Niwa  


Modified: branches/safari-601.1.46-branch/Source/WebCore/xml/XSLStyleSheet.h (191092 => 191093)

--- branches/safari-601.1.46-branch/Source/WebCore/xml/XSLStyleSheet.h	2015-10-15 06:46:30 UTC (rev 191092)
+++ branches/safari-601.1.46-branch/Source/WebCore/xml/XSLStyleSheet.h	2015-10-15 06:46:33 UTC (rev 191093)
@@ -116,7 +116,8 @@
 
 xmlDocPtr m_stylesheetDoc;
 bool m_stylesheetDocTaken;
-
+bool m_compilationFailed = false;
+
 XSLStyleSheet* m_parentStyleSheet;
 };
 


Modified: branches/safari-601.1.46-branch/Source/WebCore/xml/XSLStyleSheetLibxslt.cpp (191092 => 191093)

--- branches/safari-601.1.46-branch/Source/WebCore/xml/XSLStyleSheetLibxslt.cpp	2015-10-15 06:46:30 UTC (rev 191092)
+++ branches/safari-601.1.46-branch/Source/WebCore/xml/XSLStyleSheetLibxslt.cpp	2015-10-15 06:46:33 UTC (rev 191093)
@@ -245,12 +245,19 @@
 if (m_embedded)
 return xsltLoadStylesheetPI(document());
 
+// Certain libxslt versions are corrupting the xmlDoc on compilation
+// failures - hence attempting to recompile after a failure is unsafe.
+if (m_compilationFailed)
+return 0;
+
 // xsltParseStylesheetDoc 

[webkit-changes] [191087] branches/safari-601.1.46-branch

2015-10-15 Thread matthew_hanson
Title: [191087] branches/safari-601.1.46-branch








Revision 191087
Author matthew_han...@apple.com
Date 2015-10-14 23:46:12 -0700 (Wed, 14 Oct 2015)


Log Message
Merge r188390. rdar://problem/22803749

Modified Paths

branches/safari-601.1.46-branch/LayoutTests/ChangeLog
branches/safari-601.1.46-branch/LayoutTests/media/event-attributes-expected.txt
branches/safari-601.1.46-branch/LayoutTests/media/event-attributes.html
branches/safari-601.1.46-branch/LayoutTests/platform/efl/TestExpectations
branches/safari-601.1.46-branch/LayoutTests/platform/gtk/TestExpectations
branches/safari-601.1.46-branch/LayoutTests/platform/mac/TestExpectations
branches/safari-601.1.46-branch/LayoutTests/platform/win/TestExpectations
branches/safari-601.1.46-branch/Source/WebCore/ChangeLog
branches/safari-601.1.46-branch/Source/WebCore/html/HTMLMediaElement.cpp
branches/safari-601.1.46-branch/Source/WebCore/html/HTMLMediaElement.h
branches/safari-601.1.46-branch/Source/WebCore/html/HTMLMediaElementEnums.h
branches/safari-601.1.46-branch/Source/WebCore/platform/GenericTaskQueue.h
branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp
branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm


Added Paths

branches/safari-601.1.46-branch/LayoutTests/media/video-seek-to-current-time-expected.txt
branches/safari-601.1.46-branch/LayoutTests/media/video-seek-to-current-time.html




Diff

Modified: branches/safari-601.1.46-branch/LayoutTests/ChangeLog (191086 => 191087)

--- branches/safari-601.1.46-branch/LayoutTests/ChangeLog	2015-10-15 05:30:43 UTC (rev 191086)
+++ branches/safari-601.1.46-branch/LayoutTests/ChangeLog	2015-10-15 06:46:12 UTC (rev 191087)
@@ -1,3 +1,25 @@
+2015-10-14  Matthew Hanson  
+
+Merge r188390. rdar://problem/22803749
+
+2015-08-13  Eric Carlson  
+
+Don't short circuit seeking
+https://bugs.webkit.org/show_bug.cgi?id=147892
+
+Reviewed by Jer Noble.
+
+* media/event-attributes-expected.txt: Update for test change.
+* media/event-attributes.html: There is no reason to expect that a 'timeupdate' will have
+  been sent before 'canplaythrough'.
+* media/video-seek-to-current-time-expected.txt: Added.
+* media/video-seek-to-current-time.html: Added.
+* platform/efl/TestExpectations: Skip new test.
+* platform/gtk/TestExpectations: Ditto.
+* platform/mac/TestExpectations: Mark the new test as sometimes failing because of
+  webkit.org/b/147944.
+* platform/win/TestExpectations: Skip new test.
+
 2015-10-09  Babak Shafiei  
 
 Roll out r190434.


Modified: branches/safari-601.1.46-branch/LayoutTests/media/event-attributes-expected.txt (191086 => 191087)

--- branches/safari-601.1.46-branch/LayoutTests/media/event-attributes-expected.txt	2015-10-15 05:30:43 UTC (rev 191086)
+++ branches/safari-601.1.46-branch/LayoutTests/media/event-attributes-expected.txt	2015-10-15 06:46:12 UTC (rev 191087)
@@ -5,7 +5,6 @@
 EVENT(loadeddata)
 EVENT(canplay)
 EVENT(canplaythrough)
-EXPECTED (progressEventCount >= '1') OK
 
 *** starting playback
 RUN(video.play())


Modified: branches/safari-601.1.46-branch/LayoutTests/media/event-attributes.html (191086 => 191087)

--- branches/safari-601.1.46-branch/LayoutTests/media/event-attributes.html	2015-10-15 05:30:43 UTC (rev 191086)
+++ branches/safari-601.1.46-branch/LayoutTests/media/event-attributes.html	2015-10-15 06:46:12 UTC (rev 191087)
@@ -18,7 +18,6 @@
 switch (event.type)
 {
 case "canplaythrough":
-testExpected('progressEventCount', 1, '>=');
 consoleWrite("*** starting playback");
 run("video.play()"); 
 break;


Added: branches/safari-601.1.46-branch/LayoutTests/media/video-seek-to-current-time-expected.txt (0 => 191087)

--- branches/safari-601.1.46-branch/LayoutTests/media/video-seek-to-current-time-expected.txt	(rev 0)
+++ branches/safari-601.1.46-branch/LayoutTests/media/video-seek-to-current-time-expected.txt	2015-10-15 06:46:12 UTC (rev 191087)
@@ -0,0 +1,20 @@
+
+Test that setting currentTime immediately after fastSeek() works correctly.
+
+EVENT(canplaythrough)
+
+Seek to a specific time:
+RUN(video.currentTime = 2.5)
+EVENT(seeked)
+EXPECTED (video.currentTime == '2.5') OK
+
+Set currentTime shortly after calling fastSeek():
+RUN(video.fastSeek(4.6))
+RUN(setTimeout(function() { video.currentTime = 2.5; }, 10))
+
+EVENT(seeked)
+EVENT(seeked)
+EXPECTED (video.currentTime == '2.5') OK
+
+END OF TEST
+


Added: branches/safari-601.1.46-branch/LayoutTests/media/video-seek-to-current-time.html (0 => 191087)

--- 

[webkit-changes] [191096] branches/safari-601.1.46-branch/Source/WebKit2

2015-10-15 Thread matthew_hanson
Title: [191096] branches/safari-601.1.46-branch/Source/WebKit2








Revision 191096
Author matthew_han...@apple.com
Date 2015-10-14 23:46:40 -0700 (Wed, 14 Oct 2015)


Log Message
Merge r190992. rdar://problem/22823232

Modified Paths

branches/safari-601.1.46-branch/Source/WebKit2/ChangeLog
branches/safari-601.1.46-branch/Source/WebKit2/WebProcess/ios/WebVideoFullscreenManager.mm




Diff

Modified: branches/safari-601.1.46-branch/Source/WebKit2/ChangeLog (191095 => 191096)

--- branches/safari-601.1.46-branch/Source/WebKit2/ChangeLog	2015-10-15 06:46:38 UTC (rev 191095)
+++ branches/safari-601.1.46-branch/Source/WebKit2/ChangeLog	2015-10-15 06:46:40 UTC (rev 191096)
@@ -1,5 +1,23 @@
 2015-10-14  Matthew Hanson  
 
+Merge r190992. rdar://problem/22823232
+
+2015-10-13  Brent Fulgham  
+
+[iOS] Avoid crash due to invalid screen bounds
+https://bugs.webkit.org/show_bug.cgi?id=150048
+
+
+Reviewed by Jer Noble.
+
+Check for an invalid bounds, and reset it to a known state before
+attempting to use it.
+
+* WebProcess/ios/WebVideoFullscreenManager.mm:
+(WebKit::WebVideoFullscreenManager::setVideoLayerFrameFenced):
+
+2015-10-14  Matthew Hanson  
+
 Merge r188486. rdar://problem/22707497
 
 2015-08-13  Andy Estes  


Modified: branches/safari-601.1.46-branch/Source/WebKit2/WebProcess/ios/WebVideoFullscreenManager.mm (191095 => 191096)

--- branches/safari-601.1.46-branch/Source/WebKit2/WebProcess/ios/WebVideoFullscreenManager.mm	2015-10-15 06:46:38 UTC (rev 191095)
+++ branches/safari-601.1.46-branch/Source/WebKit2/WebProcess/ios/WebVideoFullscreenManager.mm	2015-10-15 06:46:40 UTC (rev 191096)
@@ -540,6 +540,11 @@
 RefPtr interface;
 std::tie(model, interface) = ensureModelAndInterface(contextId);
 
+if (std::isnan(bounds.x()) || std::isnan(bounds.y()) || std::isnan(bounds.width()) || std::isnan(bounds.height())) {
+FloatRect clientRect = clientRectForElement(model->videoElement());
+bounds = FloatRect(0, 0, clientRect.width(), clientRect.height());
+}
+
 [CATransaction begin];
 [CATransaction setAnimationDuration:0];
 if (interface->layerHostingContext())






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


[webkit-changes] [191097] branches/safari-601.1.46-branch

2015-10-15 Thread matthew_hanson
Title: [191097] branches/safari-601.1.46-branch








Revision 191097
Author matthew_han...@apple.com
Date 2015-10-14 23:46:44 -0700 (Wed, 14 Oct 2015)


Log Message
Merge r191008. rdar://problem/23110743

Modified Paths

branches/safari-601.1.46-branch/ChangeLog
branches/safari-601.1.46-branch/Source/WebCore/ChangeLog
branches/safari-601.1.46-branch/Source/WebCore/page/DOMWindow.cpp
branches/safari-601.1.46-branch/Source/WebCore/page/DOMWindow.h


Added Paths

branches/safari-601.1.46-branch/ManualTests/deviceorientation-child-frame.html
branches/safari-601.1.46-branch/ManualTests/deviceorientation-main-frame-only.html




Diff

Modified: branches/safari-601.1.46-branch/ChangeLog (191096 => 191097)

--- branches/safari-601.1.46-branch/ChangeLog	2015-10-15 06:46:40 UTC (rev 191096)
+++ branches/safari-601.1.46-branch/ChangeLog	2015-10-15 06:46:44 UTC (rev 191097)
@@ -1,3 +1,21 @@
+2015-10-14  Matthew Hanson  
+
+Merge r191008. rdar://problem/23110743
+
+2015-10-13  Dean Jackson  
+
+Device motion and orientation should only be visible from the main frame's security origin
+https://bugs.webkit.org/show_bug.cgi?id=150072
+
+
+Reviewed by Brent Fulgham.
+
+Add a manual test for cross-origin device orientation events, while
+we're waiting on the mock client to be supported everywhere.
+
+* ManualTests/deviceorientation-child-frame.html: Added.
+* ManualTests/deviceorientation-main-frame-only.html: Added.
+
 2015-10-02  Babak Shafiei  
 
 Merge r188405.


Added: branches/safari-601.1.46-branch/ManualTests/deviceorientation-child-frame.html (0 => 191097)

--- branches/safari-601.1.46-branch/ManualTests/deviceorientation-child-frame.html	(rev 0)
+++ branches/safari-601.1.46-branch/ManualTests/deviceorientation-child-frame.html	2015-10-15 06:46:44 UTC (rev 191097)
@@ -0,0 +1,23 @@
+
+
+
+var results = null;
+
+function run() {
+results = document.getElementById("results");
+window.addEventListener("deviceorientation", handleDeviceOrientation, false);
+}
+
+function handleDeviceOrientation(event) {
+results.textContent = "ERROR: Saw event in child frame.";
+window.removeEventListener("deviceorientation", handleDeviceOrientation);
+}
+
+window.addEventListener("load", run, false);
+
+
+
+We should not see an event in here.
+Child frame has not seen event - this is ok.
+
+


Added: branches/safari-601.1.46-branch/ManualTests/deviceorientation-main-frame-only.html (0 => 191097)

--- branches/safari-601.1.46-branch/ManualTests/deviceorientation-main-frame-only.html	(rev 0)
+++ branches/safari-601.1.46-branch/ManualTests/deviceorientation-main-frame-only.html	2015-10-15 06:46:44 UTC (rev 191097)
@@ -0,0 +1,26 @@
+
+
+
+var results = null;
+
+function run() {
+results = document.getElementById("results");
+window.addEventListener("deviceorientation", handleDeviceOrientation, false);
+}
+
+function handleDeviceOrientation(event) {
+results.textContent = "Saw event in the main frame - this is ok";
+window.removeEventListener("deviceorientation", handleDeviceOrientation);
+}
+
+window.addEventListener("load", run, false);
+
+
+
+This tests that deviceorientation events are not dispatched in different origin iframes.
+REMEMBER TO CHANGE THE SRC OF THE IFRAME TO BE CROSS-ORIGIN
+We should be able to detect the event in the main page, but not in the frame.
+Main page has not seen event.
+
+


Modified: branches/safari-601.1.46-branch/Source/WebCore/ChangeLog (191096 => 191097)

--- branches/safari-601.1.46-branch/Source/WebCore/ChangeLog	2015-10-15 06:46:40 UTC (rev 191096)
+++ branches/safari-601.1.46-branch/Source/WebCore/ChangeLog	2015-10-15 06:46:44 UTC (rev 191097)
@@ -1,5 +1,30 @@
 2015-10-14  Matthew Hanson  
 
+Merge r191008. rdar://problem/23110743
+
+2015-10-13  Dean Jackson  
+
+Device motion and orientation should only be visible from the main frame's security origin
+https://bugs.webkit.org/show_bug.cgi?id=150072
+
+
+Reviewed by Brent Fulgham.
+
+There are reports that gyroscope and accelerometer information can
+be used to detect keyboard entry. One initial step to reduce the
+risk is to forbid device motion and orientation events from
+being fired in frames that are a different security origin from the main page.
+
+Manual test: deviceorientation-main-frame-only.html
+
+* page/DOMWindow.cpp:
+(WebCore::DOMWindow::isSameSecurityOriginAsMainFrame): New helper function.
+(WebCore::DOMWindow::addEventListener): Check if we are the main frame, 

[webkit-changes] [191091] branches/safari-601.1.46-branch/Source/WebCore

2015-10-15 Thread matthew_hanson
Title: [191091] branches/safari-601.1.46-branch/Source/WebCore








Revision 191091
Author matthew_han...@apple.com
Date 2015-10-14 23:46:27 -0700 (Wed, 14 Oct 2015)


Log Message
Merge r190007. rdar://problem/23075843

Modified Paths

branches/safari-601.1.46-branch/Source/WebCore/ChangeLog
branches/safari-601.1.46-branch/Source/WebCore/dom/DocumentOrderedMap.cpp
branches/safari-601.1.46-branch/Source/WebCore/dom/DocumentOrderedMap.h
branches/safari-601.1.46-branch/Source/WebCore/dom/Element.cpp




Diff

Modified: branches/safari-601.1.46-branch/Source/WebCore/ChangeLog (191090 => 191091)

--- branches/safari-601.1.46-branch/Source/WebCore/ChangeLog	2015-10-15 06:46:24 UTC (rev 191090)
+++ branches/safari-601.1.46-branch/Source/WebCore/ChangeLog	2015-10-15 06:46:27 UTC (rev 191091)
@@ -1,5 +1,33 @@
 2015-10-14  Matthew Hanson  
 
+Merge r190007. rdar://problem/23075843
+
+2015-09-18  Ryosuke Niwa  
+
+REGRESSION(r150187): updateIdForTreeScope may not be called inside shadow trees
+https://bugs.webkit.org/show_bug.cgi?id=149364
+
+Reviewed by Antti Koivisto.
+
+Since the tree scope is set to that of Document's inside removeBetween when a node is removed from a shadow tree,
+oldScope != () was already true inside Element::removedFrom. This can introduce an inconsistency in
+DocumentOrderedMap which could result in a crash. Fixed the bug by checking it against document(), which is the
+behavior we had prior to r150187.
+
+Also added a consistency check in DocumentOrderedMap to catch bugs like this.
+
+No new tests. New assertions fail in existing tests without this fix.
+
+* dom/DocumentOrderedMap.cpp:
+(WebCore::DocumentOrderedMap::add):
+(WebCore::DocumentOrderedMap::remove):
+(WebCore::DocumentOrderedMap::get):
+* dom/DocumentOrderedMap.h:
+* dom/Element.cpp:
+(WebCore::Element::removedFrom):
+
+2015-10-14  Matthew Hanson  
+
 Merge r188531. rdar://problem/22707497
 
 2015-08-17  Andy Estes  


Modified: branches/safari-601.1.46-branch/Source/WebCore/dom/DocumentOrderedMap.cpp (191090 => 191091)

--- branches/safari-601.1.46-branch/Source/WebCore/dom/DocumentOrderedMap.cpp	2015-10-15 06:46:24 UTC (rev 191090)
+++ branches/safari-601.1.46-branch/Source/WebCore/dom/DocumentOrderedMap.cpp	2015-10-15 06:46:27 UTC (rev 191091)
@@ -51,13 +51,20 @@
 UNUSED_PARAM(treeScope);
 ASSERT_WITH_SECURITY_IMPLICATION(element.isInTreeScope());
 ASSERT_WITH_SECURITY_IMPLICATION(treeScope.rootNode().containsIncludingShadowDOM());
+
 if (!element.isInTreeScope())
 return;
 Map::AddResult addResult = m_map.add(, MapEntry());
+MapEntry& entry = addResult.iterator->value;
+
+#ifndef NDEBUG
+ASSERT_WITH_SECURITY_IMPLICATION(!entry.registeredElements.contains());
+entry.registeredElements.add();
+#endif
+
 if (addResult.isNewEntry)
 return;
 
-MapEntry& entry = addResult.iterator->value;
 ASSERT_WITH_SECURITY_IMPLICATION(entry.count);
 entry.element = nullptr;
 entry.count++;
@@ -68,11 +75,13 @@
 {
 m_map.checkConsistency();
 auto it = m_map.find();
+
 ASSERT_WITH_SECURITY_IMPLICATION(it != m_map.end());
 if (it == m_map.end())
 return;
+
 MapEntry& entry = it->value;
-
+ASSERT_WITH_SECURITY_IMPLICATION(entry.registeredElements.remove());
 ASSERT_WITH_SECURITY_IMPLICATION(entry.count);
 if (entry.count == 1) {
 ASSERT_WITH_SECURITY_IMPLICATION(!entry.element || entry.element == );
@@ -99,6 +108,7 @@
 if (entry.element) {
 ASSERT_WITH_SECURITY_IMPLICATION(entry.element->isInTreeScope());
 ASSERT_WITH_SECURITY_IMPLICATION(>treeScope() == );
+ASSERT_WITH_SECURITY_IMPLICATION(entry.registeredElements.contains(entry.element));
 return entry.element;
 }
 
@@ -109,6 +119,7 @@
 entry.element = 
 ASSERT_WITH_SECURITY_IMPLICATION(element.isInTreeScope());
 ASSERT_WITH_SECURITY_IMPLICATION(() == );
+ASSERT_WITH_SECURITY_IMPLICATION(entry.registeredElements.contains(entry.element));
 return 
 }
 ASSERT_NOT_REACHED();


Modified: branches/safari-601.1.46-branch/Source/WebCore/dom/DocumentOrderedMap.h (191090 => 191091)

--- branches/safari-601.1.46-branch/Source/WebCore/dom/DocumentOrderedMap.h	2015-10-15 06:46:24 UTC (rev 191090)
+++ branches/safari-601.1.46-branch/Source/WebCore/dom/DocumentOrderedMap.h	2015-10-15 06:46:27 UTC (rev 191091)
@@ -33,6 +33,7 @@
 
 #include 
 #include 
+#include 
 #include 
 #include 
 
@@ -84,6 +85,9 @@
 Element* element;
 unsigned count;
 Vector orderedList;
+#ifndef NDEBUG
+HashSet registeredElements;
+#endif
 };
 
 typedef HashMap Map;


Modified: 

[webkit-changes] [191088] branches/safari-601.1.46-branch/Source/WebCore

2015-10-15 Thread matthew_hanson
Title: [191088] branches/safari-601.1.46-branch/Source/WebCore








Revision 191088
Author matthew_han...@apple.com
Date 2015-10-14 23:46:15 -0700 (Wed, 14 Oct 2015)


Log Message
Merge r188416. rdar://problem/22803749

Modified Paths

branches/safari-601.1.46-branch/Source/WebCore/ChangeLog
branches/safari-601.1.46-branch/Source/WebCore/html/HTMLMediaElement.cpp
branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm




Diff

Modified: branches/safari-601.1.46-branch/Source/WebCore/ChangeLog (191087 => 191088)

--- branches/safari-601.1.46-branch/Source/WebCore/ChangeLog	2015-10-15 06:46:12 UTC (rev 191087)
+++ branches/safari-601.1.46-branch/Source/WebCore/ChangeLog	2015-10-15 06:46:15 UTC (rev 191088)
@@ -1,5 +1,31 @@
 2015-10-14  Matthew Hanson  
 
+Merge r188416. rdar://problem/22803749
+
+2015-08-13  Jer Noble  
+
+Don't short circuit seeking
+https://bugs.webkit.org/show_bug.cgi?id=147892
+
+Reviewed by Eric Carlson.
+
+When two seekWithTolerance() requests come in before the first is acted upon in seekTask(),
+the second will result in a "no seek required" conditional, because the new "currentTime" is
+assumed to be the destination time of the first seek.
+
+When cancelling a pending seek, first replace the "now" value with the "now" value from the
+replaced seek, thus preserving the original currentTime across all replacement seeks.
+
+Drive-by fix: some added logging causes occasional crashes, due to the underlying object being
+accessed having been deleted.
+
+* html/HTMLMediaElement.cpp:
+(WebCore::HTMLMediaElement::seekWithTolerance):
+* platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
+(WebCore::MediaPlayerPrivateAVFoundationObjC::seekToTime):
+
+2015-10-14  Matthew Hanson  
+
 Merge r188390. rdar://problem/22803749
 
 2015-08-13  Eric Carlson  


Modified: branches/safari-601.1.46-branch/Source/WebCore/html/HTMLMediaElement.cpp (191087 => 191088)

--- branches/safari-601.1.46-branch/Source/WebCore/html/HTMLMediaElement.cpp	2015-10-15 06:46:12 UTC (rev 191087)
+++ branches/safari-601.1.46-branch/Source/WebCore/html/HTMLMediaElement.cpp	2015-10-15 06:46:15 UTC (rev 191088)
@@ -2442,7 +2442,10 @@
 if (m_seekTaskQueue.hasPendingTasks()) {
 LOG(Media, "HTMLMediaElement::seekWithTolerance(%p) - cancelling pending seeks", this);
 m_seekTaskQueue.cancelAllTasks();
-m_pendingSeek = nullptr;
+if (m_pendingSeek) {
+now = m_pendingSeek->now;
+m_pendingSeek = nullptr;
+}
 m_pendingSeekType = NoSeek;
 }
 


Modified: branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm (191087 => 191088)

--- branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm	2015-10-15 06:46:12 UTC (rev 191087)
+++ branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm	2015-10-15 06:46:15 UTC (rev 191088)
@@ -1308,11 +1308,8 @@
 LOG(Media, "MediaPlayerPrivateAVFoundationObjC::seekToTime(%p) - calling seekToTime", this);
 
 [m_avPlayerItem.get() seekToTime:cmTime toleranceBefore:cmBefore toleranceAfter:cmAfter completionHandler:^(BOOL finished) {
-double currentTime = CMTimeGetSeconds([m_avPlayerItem currentTime]);
-callOnMainThread([weakThis, finished, currentTime] {
-UNUSED_PARAM(currentTime);
+callOnMainThread([weakThis, finished] {
 auto _this = weakThis.get();
-LOG(Media, "MediaPlayerPrivateAVFoundationObjC::seekToTime(%p) - completion handler called, currentTime = %f", _this, currentTime);
 if (!_this)
 return;
 






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


[webkit-changes] [191092] branches/safari-601.1.46-branch/Source/WebCore

2015-10-15 Thread matthew_hanson
Title: [191092] branches/safari-601.1.46-branch/Source/WebCore








Revision 191092
Author matthew_han...@apple.com
Date 2015-10-14 23:46:30 -0700 (Wed, 14 Oct 2015)


Log Message
Merge r190097. rdar://problem/23075843

Modified Paths

branches/safari-601.1.46-branch/Source/WebCore/ChangeLog
branches/safari-601.1.46-branch/Source/WebCore/dom/DocumentOrderedMap.cpp
branches/safari-601.1.46-branch/Source/WebCore/dom/DocumentOrderedMap.h




Diff

Modified: branches/safari-601.1.46-branch/Source/WebCore/ChangeLog (191091 => 191092)

--- branches/safari-601.1.46-branch/Source/WebCore/ChangeLog	2015-10-15 06:46:27 UTC (rev 191091)
+++ branches/safari-601.1.46-branch/Source/WebCore/ChangeLog	2015-10-15 06:46:30 UTC (rev 191092)
@@ -1,5 +1,16 @@
 2015-10-14  Matthew Hanson  
 
+Merge r190097. rdar://problem/23075843
+
+2015-09-21  Ryosuke Niwa  
+
+Fix release builds with security assertion after r190007.
+
+* dom/DocumentOrderedMap.cpp:
+* dom/DocumentOrderedMap.h:
+
+2015-10-14  Matthew Hanson  
+
 Merge r190007. rdar://problem/23075843
 
 2015-09-18  Ryosuke Niwa  


Modified: branches/safari-601.1.46-branch/Source/WebCore/dom/DocumentOrderedMap.cpp (191091 => 191092)

--- branches/safari-601.1.46-branch/Source/WebCore/dom/DocumentOrderedMap.cpp	2015-10-15 06:46:27 UTC (rev 191091)
+++ branches/safari-601.1.46-branch/Source/WebCore/dom/DocumentOrderedMap.cpp	2015-10-15 06:46:30 UTC (rev 191092)
@@ -57,7 +57,7 @@
 Map::AddResult addResult = m_map.add(, MapEntry());
 MapEntry& entry = addResult.iterator->value;
 
-#ifndef NDEBUG
+#if !ASSERT_DISABLED || ENABLE(SECURITY_ASSERTIONS)
 ASSERT_WITH_SECURITY_IMPLICATION(!entry.registeredElements.contains());
 entry.registeredElements.add();
 #endif


Modified: branches/safari-601.1.46-branch/Source/WebCore/dom/DocumentOrderedMap.h (191091 => 191092)

--- branches/safari-601.1.46-branch/Source/WebCore/dom/DocumentOrderedMap.h	2015-10-15 06:46:27 UTC (rev 191091)
+++ branches/safari-601.1.46-branch/Source/WebCore/dom/DocumentOrderedMap.h	2015-10-15 06:46:30 UTC (rev 191092)
@@ -85,7 +85,7 @@
 Element* element;
 unsigned count;
 Vector orderedList;
-#ifndef NDEBUG
+#if !ASSERT_DISABLED || ENABLE(SECURITY_ASSERTIONS)
 HashSet registeredElements;
 #endif
 };






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


[webkit-changes] [191095] branches/safari-601.1.46-branch

2015-10-15 Thread matthew_hanson
Title: [191095] branches/safari-601.1.46-branch








Revision 191095
Author matthew_han...@apple.com
Date 2015-10-14 23:46:38 -0700 (Wed, 14 Oct 2015)


Log Message
Merge r190570. rdar://problem/23075838

Modified Paths

branches/safari-601.1.46-branch/LayoutTests/ChangeLog
branches/safari-601.1.46-branch/Source/WebCore/ChangeLog
branches/safari-601.1.46-branch/Source/WebCore/rendering/RenderQuote.cpp


Added Paths

branches/safari-601.1.46-branch/LayoutTests/fast/inline/quotation-text-changes-dynamically-expected.txt
branches/safari-601.1.46-branch/LayoutTests/fast/inline/quotation-text-changes-dynamically.html




Diff

Modified: branches/safari-601.1.46-branch/LayoutTests/ChangeLog (191094 => 191095)

--- branches/safari-601.1.46-branch/LayoutTests/ChangeLog	2015-10-15 06:46:35 UTC (rev 191094)
+++ branches/safari-601.1.46-branch/LayoutTests/ChangeLog	2015-10-15 06:46:38 UTC (rev 191095)
@@ -1,5 +1,23 @@
 2015-10-14  Matthew Hanson  
 
+Merge r190570. rdar://problem/23075838
+
+2015-10-05  Zalan Bujtas  
+
+Mark the line dirty when RenderQuote's text changes.
+https://bugs.webkit.org/show_bug.cgi?id=149784
+rdar://problem/22558169
+
+Reviewed by Antti Koivisto.
+
+When quotation mark changes ( " -> ' or empty string), we
+need to mark the line dirty to ensure its content gets laid out properly.
+
+* fast/inline/quotation-text-changes-dynamically-expected.txt: Added.
+* fast/inline/quotation-text-changes-dynamically.html: Added.
+
+2015-10-14  Matthew Hanson  
+
 Merge r190339. rdar://problem/23075839
 
 2015-09-29  Jon Honeycutt  


Added: branches/safari-601.1.46-branch/LayoutTests/fast/inline/quotation-text-changes-dynamically-expected.txt (0 => 191095)

--- branches/safari-601.1.46-branch/LayoutTests/fast/inline/quotation-text-changes-dynamically-expected.txt	(rev 0)
+++ branches/safari-601.1.46-branch/LayoutTests/fast/inline/quotation-text-changes-dynamically-expected.txt	2015-10-15 06:46:38 UTC (rev 191095)
@@ -0,0 +1 @@
+PASS if no crash or assert in debug


Added: branches/safari-601.1.46-branch/LayoutTests/fast/inline/quotation-text-changes-dynamically.html (0 => 191095)

--- branches/safari-601.1.46-branch/LayoutTests/fast/inline/quotation-text-changes-dynamically.html	(rev 0)
+++ branches/safari-601.1.46-branch/LayoutTests/fast/inline/quotation-text-changes-dynamically.html	2015-10-15 06:46:38 UTC (rev 191095)
@@ -0,0 +1,23 @@
+
+if (window.testRunner)
+testRunner.dumpAsText();
+
+
+
+q:before { 
+  position: fixed;
+  -webkit-animation-name: name1;
+  -webkit-animation-duration: 1s;
+} 
+
+@-webkit-keyframes name1 {
+  from {
+column-width: 10px;
+  }
+  to {
+column-width: 20px;
+  }
+}
+
+
+PASS if no crash or assert in debug
\ No newline at end of file


Modified: branches/safari-601.1.46-branch/Source/WebCore/ChangeLog (191094 => 191095)

--- branches/safari-601.1.46-branch/Source/WebCore/ChangeLog	2015-10-15 06:46:35 UTC (rev 191094)
+++ branches/safari-601.1.46-branch/Source/WebCore/ChangeLog	2015-10-15 06:46:38 UTC (rev 191095)
@@ -1,5 +1,27 @@
 2015-10-14  Matthew Hanson  
 
+Merge r190570. rdar://problem/23075838
+
+2015-10-05  Zalan Bujtas  
+
+Mark the line dirty when RenderQuote's text changes.
+https://bugs.webkit.org/show_bug.cgi?id=149784
+rdar://problem/22558169
+
+Reviewed by Antti Koivisto.
+
+When quotation mark changes ( " -> ' or empty string), we
+need to mark the line dirty to ensure its content gets laid out properly.
+
+Test: fast/inline/quotation-text-changes-dynamically.html
+
+* rendering/RenderQuote.cpp:
+(WebCore::quoteTextRenderer):
+(WebCore::RenderQuote::updateText):
+(WebCore::fragmentChild): Deleted.
+
+2015-10-14  Matthew Hanson  
+
 Merge r190382. rdar://problem/22934241
 
 2015-09-30  Dean Jackson  


Modified: branches/safari-601.1.46-branch/Source/WebCore/rendering/RenderQuote.cpp (191094 => 191095)

--- branches/safari-601.1.46-branch/Source/WebCore/rendering/RenderQuote.cpp	2015-10-15 06:46:35 UTC (rev 191094)
+++ branches/safari-601.1.46-branch/Source/WebCore/rendering/RenderQuote.cpp	2015-10-15 06:46:38 UTC (rev 191095)
@@ -330,7 +330,7 @@
 return apostropheString;
 }
 
-static RenderTextFragment* fragmentChild(RenderObject* lastChild)
+static RenderTextFragment* quoteTextRenderer(RenderObject* lastChild)
 {
 if (!lastChild)
 return nullptr;
@@ -349,8 +349,9 @@
 m_text = text;
 // Start from the end of the child list because, if we've had a first-letter
 // renderer inserted then the remaining text will be 

[webkit-changes] [191107] releases/WebKitGTK/webkit-2.10/Source/WebKit2

2015-10-15 Thread carlosgc
Title: [191107] releases/WebKitGTK/webkit-2.10/Source/WebKit2








Revision 191107
Author carlo...@webkit.org
Date 2015-10-15 02:17:29 -0700 (Thu, 15 Oct 2015)


Log Message
Merge r191102 - Unreviewed. Fix wrong #ifdef added in r190615.

This disabled accelerated compositing unconditionally.

* UIProcess/gtk/WebPreferencesGtk.cpp:
(WebKit::WebPreferences::platformInitializeStore):

Modified Paths

releases/WebKitGTK/webkit-2.10/Source/WebKit2/ChangeLog
releases/WebKitGTK/webkit-2.10/Source/WebKit2/UIProcess/gtk/WebPreferencesGtk.cpp




Diff

Modified: releases/WebKitGTK/webkit-2.10/Source/WebKit2/ChangeLog (191106 => 191107)

--- releases/WebKitGTK/webkit-2.10/Source/WebKit2/ChangeLog	2015-10-15 09:15:46 UTC (rev 191106)
+++ releases/WebKitGTK/webkit-2.10/Source/WebKit2/ChangeLog	2015-10-15 09:17:29 UTC (rev 191107)
@@ -1,3 +1,12 @@
+2015-10-15  Carlos Garcia Campos  
+
+Unreviewed. Fix wrong #ifdef added in r190615.
+
+This disabled accelerated compositing unconditionally.
+
+* UIProcess/gtk/WebPreferencesGtk.cpp:
+(WebKit::WebPreferences::platformInitializeStore):
+
 2015-10-14  Carlos Garcia Campos  
 
 Unreviewed. Update OptionsGTK.cmake and NEWS for 2.10.1 release.


Modified: releases/WebKitGTK/webkit-2.10/Source/WebKit2/UIProcess/gtk/WebPreferencesGtk.cpp (191106 => 191107)

--- releases/WebKitGTK/webkit-2.10/Source/WebKit2/UIProcess/gtk/WebPreferencesGtk.cpp	2015-10-15 09:15:46 UTC (rev 191106)
+++ releases/WebKitGTK/webkit-2.10/Source/WebKit2/UIProcess/gtk/WebPreferencesGtk.cpp	2015-10-15 09:17:29 UTC (rev 191107)
@@ -43,7 +43,7 @@
 setPluginsEnabled(false);
 }
 #endif
-#if !ENABLE(OPEN_GL)
+#if !ENABLE(OPENGL)
 setAcceleratedCompositingEnabled(false);
 #endif
 }






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


[webkit-changes] [191102] trunk/Source/WebKit2

2015-10-15 Thread carlosgc
Title: [191102] trunk/Source/WebKit2








Revision 191102
Author carlo...@webkit.org
Date 2015-10-15 01:16:53 -0700 (Thu, 15 Oct 2015)


Log Message
Unreviewed. Fix wrong #ifdef added in r190615.

This disabled accelerated compositing unconditionally.

* UIProcess/gtk/WebPreferencesGtk.cpp:
(WebKit::WebPreferences::platformInitializeStore):

Modified Paths

trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/gtk/WebPreferencesGtk.cpp




Diff

Modified: trunk/Source/WebKit2/ChangeLog (191101 => 191102)

--- trunk/Source/WebKit2/ChangeLog	2015-10-15 07:53:16 UTC (rev 191101)
+++ trunk/Source/WebKit2/ChangeLog	2015-10-15 08:16:53 UTC (rev 191102)
@@ -1,3 +1,12 @@
+2015-10-15  Carlos Garcia Campos  
+
+Unreviewed. Fix wrong #ifdef added in r190615.
+
+This disabled accelerated compositing unconditionally.
+
+* UIProcess/gtk/WebPreferencesGtk.cpp:
+(WebKit::WebPreferences::platformInitializeStore):
+
 2015-10-14  Zhuo Li  
 
 Augment ’s recent search history with the time each entry was added,


Modified: trunk/Source/WebKit2/UIProcess/gtk/WebPreferencesGtk.cpp (191101 => 191102)

--- trunk/Source/WebKit2/UIProcess/gtk/WebPreferencesGtk.cpp	2015-10-15 07:53:16 UTC (rev 191101)
+++ trunk/Source/WebKit2/UIProcess/gtk/WebPreferencesGtk.cpp	2015-10-15 08:16:53 UTC (rev 191102)
@@ -43,7 +43,7 @@
 setPluginsEnabled(false);
 }
 #endif
-#if !ENABLE(OPEN_GL)
+#if !ENABLE(OPENGL)
 setAcceleratedCompositingEnabled(false);
 #endif
 }






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


[webkit-changes] [191105] releases/WebKitGTK/webkit-2.10

2015-10-15 Thread carlosgc
Title: [191105] releases/WebKitGTK/webkit-2.10








Revision 191105
Author carlo...@webkit.org
Date 2015-10-15 02:14:53 -0700 (Thu, 15 Oct 2015)


Log Message
Merge r191066 - Postpone mutation events before invoke Editor::Command command(Document*, const String&, bool).
https://bugs.webkit.org/show_bug.cgi?id=149299


Patch by Jiewen Tan  on 2015-10-14
Reviewed by Andreas Kling.

Source/WebCore:

Test: editing/inserting/insert-with-mutation-event.html

This is a merge of a part of Blink r166294:
https://codereview.chromium.org/141103006

* dom/Document.cpp:
(WebCore::Document::execCommand):

LayoutTests:

* editing/inserting/insert-with-mutation-event-expected.txt: Added.
* editing/inserting/insert-with-mutation-event.html: Added.

Modified Paths

releases/WebKitGTK/webkit-2.10/LayoutTests/ChangeLog
releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog
releases/WebKitGTK/webkit-2.10/Source/WebCore/dom/Document.cpp


Added Paths

releases/WebKitGTK/webkit-2.10/LayoutTests/editing/inserting/insert-with-mutation-event-expected.txt
releases/WebKitGTK/webkit-2.10/LayoutTests/editing/inserting/insert-with-mutation-event.html




Diff

Modified: releases/WebKitGTK/webkit-2.10/LayoutTests/ChangeLog (191104 => 191105)

--- releases/WebKitGTK/webkit-2.10/LayoutTests/ChangeLog	2015-10-15 08:48:01 UTC (rev 191104)
+++ releases/WebKitGTK/webkit-2.10/LayoutTests/ChangeLog	2015-10-15 09:14:53 UTC (rev 191105)
@@ -1,3 +1,14 @@
+2015-10-14  Jiewen Tan  
+
+Postpone mutation events before invoke Editor::Command command(Document*, const String&, bool).
+https://bugs.webkit.org/show_bug.cgi?id=149299
+
+
+Reviewed by Andreas Kling.
+
+* editing/inserting/insert-with-mutation-event-expected.txt: Added.
+* editing/inserting/insert-with-mutation-event.html: Added.
+
 2015-10-12  Simon Fraser  
 
 Clip-path transitions sometimes trigger endless animation timers


Added: releases/WebKitGTK/webkit-2.10/LayoutTests/editing/inserting/insert-with-mutation-event-expected.txt (0 => 191105)

--- releases/WebKitGTK/webkit-2.10/LayoutTests/editing/inserting/insert-with-mutation-event-expected.txt	(rev 0)
+++ releases/WebKitGTK/webkit-2.10/LayoutTests/editing/inserting/insert-with-mutation-event-expected.txt	2015-10-15 09:14:53 UTC (rev 191105)
@@ -0,0 +1 @@
+PASS; NOT CRASHED


Added: releases/WebKitGTK/webkit-2.10/LayoutTests/editing/inserting/insert-with-mutation-event.html (0 => 191105)

--- releases/WebKitGTK/webkit-2.10/LayoutTests/editing/inserting/insert-with-mutation-event.html	(rev 0)
+++ releases/WebKitGTK/webkit-2.10/LayoutTests/editing/inserting/insert-with-mutation-event.html	2015-10-15 09:14:53 UTC (rev 191105)
@@ -0,0 +1,22 @@
+
+
+
+foo
+bar
+
+
+
+if (window.testRunner)
+testRunner.dumpAsText();
+function $(id) { return document.getElementById(id); }
+window.getSelection().collapse($('test'), 0);
+document.execCommand('Delete');
+var sample = $('sample');
+sample.addEventListener('DOMSubtreeModified', function () {
+// Move nodes being processed by 'InsertText' to another document.
+var anotherDoc = document.implementation.createDocument('', null);
+anotherDoc.adoptNode(sample);
+});
+document.execCommand('InsertText', false, 'ab123cd');
+document.body.textContent = 'PASS; NOT CRASHED';
+


Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog (191104 => 191105)

--- releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog	2015-10-15 08:48:01 UTC (rev 191104)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog	2015-10-15 09:14:53 UTC (rev 191105)
@@ -1,3 +1,19 @@
+2015-10-14  Jiewen Tan  
+
+Postpone mutation events before invoke Editor::Command command(Document*, const String&, bool).
+https://bugs.webkit.org/show_bug.cgi?id=149299
+
+
+Reviewed by Andreas Kling.
+
+Test: editing/inserting/insert-with-mutation-event.html
+
+This is a merge of a part of Blink r166294:
+https://codereview.chromium.org/141103006
+
+* dom/Document.cpp:
+(WebCore::Document::execCommand):
+
 2015-10-13  Chris Dumez  
 
 Avoid useless copies in range-loops that are using 'auto'


Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/dom/Document.cpp (191104 => 191105)

--- releases/WebKitGTK/webkit-2.10/Source/WebCore/dom/Document.cpp	2015-10-15 08:48:01 UTC (rev 191104)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/dom/Document.cpp	2015-10-15 09:14:53 UTC (rev 191105)
@@ -4638,6 +4638,7 @@
 
 bool Document::execCommand(const String& commandName, bool userInterface, const String& value)
 {
+EventQueueScope eventQueueScope;
 return command(this, commandName, userInterface).execute(value);
 }
 






___
webkit-changes mailing list
webkit-changes@lists.webkit.org

[webkit-changes] [191100] trunk/Tools

2015-10-15 Thread carlosgc
Title: [191100] trunk/Tools








Revision 191100
Author carlo...@webkit.org
Date 2015-10-15 00:51:17 -0700 (Thu, 15 Oct 2015)


Log Message
[GTK] Missing return value on TestWebExtensions.cpp:193
https://bugs.webkit.org/show_bug.cgi?id=149755

Unreviewed. Add missing return value.

* TestWebKitAPI/Tests/WebKit2Gtk/TestWebExtensions.cpp:
(permissionRequestCallback):

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebExtensions.cpp




Diff

Modified: trunk/Tools/ChangeLog (191099 => 191100)

--- trunk/Tools/ChangeLog	2015-10-15 07:32:10 UTC (rev 191099)
+++ trunk/Tools/ChangeLog	2015-10-15 07:51:17 UTC (rev 191100)
@@ -1,3 +1,13 @@
+2015-10-14  Carlos Garcia Campos  
+
+[GTK] Missing return value on TestWebExtensions.cpp:193
+https://bugs.webkit.org/show_bug.cgi?id=149755
+
+Unreviewed. Add missing return value.
+
+* TestWebKitAPI/Tests/WebKit2Gtk/TestWebExtensions.cpp:
+(permissionRequestCallback):
+
 2015-10-14  Andy Estes  
 
 [iOS] build-dumprendertree does not build ImageDiff


Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebExtensions.cpp (191099 => 191100)

--- trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebExtensions.cpp	2015-10-15 07:32:10 UTC (rev 191099)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebExtensions.cpp	2015-10-15 07:51:17 UTC (rev 191100)
@@ -190,6 +190,8 @@
 g_assert(webkit_install_missing_media_plugins_permission_request_get_description(missingPluginsRequest));
 webkit_permission_request_deny(request);
 test->quitMainLoop();
+
+return TRUE;
 }
 
 static void testInstallMissingPluginsPermissionRequest(WebViewTest* test, gconstpointer)






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


[webkit-changes] [191104] releases/WebKitGTK/webkit-2.10

2015-10-15 Thread carlosgc
Title: [191104] releases/WebKitGTK/webkit-2.10








Revision 191104
Author carlo...@webkit.org
Date 2015-10-15 01:48:01 -0700 (Thu, 15 Oct 2015)


Log Message
Merge r191042 - [GTK][EFL] Fix build with cmake 3.4
https://bugs.webkit.org/show_bug.cgi?id=150117

Explicitely include the CheckIncludeFiles module before using
the CHECK_INCLUDE_FILES command.

Patch by Tomas Popela  on 2015-10-14
Reviewed by Žan Doberšek.

* Source/cmake/FindOpenGL.cmake:
* Source/cmake/FindWebP.cmake:
* Source/cmake/OptionsEfl.cmake:

Modified Paths

releases/WebKitGTK/webkit-2.10/ChangeLog
releases/WebKitGTK/webkit-2.10/Source/cmake/FindOpenGL.cmake
releases/WebKitGTK/webkit-2.10/Source/cmake/FindWebP.cmake
releases/WebKitGTK/webkit-2.10/Source/cmake/OptionsEfl.cmake




Diff

Modified: releases/WebKitGTK/webkit-2.10/ChangeLog (191103 => 191104)

--- releases/WebKitGTK/webkit-2.10/ChangeLog	2015-10-15 08:18:58 UTC (rev 191103)
+++ releases/WebKitGTK/webkit-2.10/ChangeLog	2015-10-15 08:48:01 UTC (rev 191104)
@@ -1,3 +1,17 @@
+2015-10-14  Tomas Popela  
+
+[GTK][EFL] Fix build with cmake 3.4
+https://bugs.webkit.org/show_bug.cgi?id=150117
+
+Explicitely include the CheckIncludeFiles module before using
+the CHECK_INCLUDE_FILES command.
+
+Reviewed by Žan Doberšek.
+
+* Source/cmake/FindOpenGL.cmake:
+* Source/cmake/FindWebP.cmake:
+* Source/cmake/OptionsEfl.cmake:
+
 2015-10-14  Carlos Garcia Campos  
 
 Unreviewed. Update OptionsGTK.cmake and NEWS for 2.10.1 release.


Modified: releases/WebKitGTK/webkit-2.10/Source/cmake/FindOpenGL.cmake (191103 => 191104)

--- releases/WebKitGTK/webkit-2.10/Source/cmake/FindOpenGL.cmake	2015-10-15 08:18:58 UTC (rev 191103)
+++ releases/WebKitGTK/webkit-2.10/Source/cmake/FindOpenGL.cmake	2015-10-15 08:48:01 UTC (rev 191104)
@@ -59,6 +59,7 @@
 include(CMakePushCheckState)
 CMAKE_PUSH_CHECK_STATE()
 set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${OPENGL_INCLUDE_DIRS})
+include(CheckIncludeFiles)
 check_include_files("GL/glx.h" GLX_FOUND)
 CMAKE_POP_CHECK_STATE()
 endif ()


Modified: releases/WebKitGTK/webkit-2.10/Source/cmake/FindWebP.cmake (191103 => 191104)

--- releases/WebKitGTK/webkit-2.10/Source/cmake/FindWebP.cmake	2015-10-15 08:18:58 UTC (rev 191103)
+++ releases/WebKitGTK/webkit-2.10/Source/cmake/FindWebP.cmake	2015-10-15 08:48:01 UTC (rev 191104)
@@ -35,6 +35,7 @@
 if (NOT(WEBP_FOUND))
 # Older installations of libwebp do not install a pkgconfig file, so we fall
 # back to a manual search for a libwebp header file.
+include(CheckIncludeFiles)
 check_include_files("webp/decode.h" WEBP_FOUND_HEADER)
 if (WEBP_FOUND_HEADER)
 set(WEBP_LIBRARIES "-lwebp")


Modified: releases/WebKitGTK/webkit-2.10/Source/cmake/OptionsEfl.cmake (191103 => 191104)

--- releases/WebKitGTK/webkit-2.10/Source/cmake/OptionsEfl.cmake	2015-10-15 08:18:58 UTC (rev 191103)
+++ releases/WebKitGTK/webkit-2.10/Source/cmake/OptionsEfl.cmake	2015-10-15 08:48:01 UTC (rev 191104)
@@ -249,6 +249,7 @@
 find_package(EGL REQUIRED)
 SET_AND_EXPOSE_TO_BUILD(USE_EGL TRUE)
 else ()
+include(CheckIncludeFiles)
 CHECK_INCLUDE_FILES("GL/glx.h" OPENGLX_FOUND)
 SET_AND_EXPOSE_TO_BUILD(USE_GLX TRUE)
 endif ()






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


[webkit-changes] [191113] trunk

2015-10-15 Thread dbates
Title: [191113] trunk








Revision 191113
Author dba...@webkit.org
Date 2015-10-15 09:08:24 -0700 (Thu, 15 Oct 2015)


Log Message
[iOS] DOM click event may not be dispatched when page has :active style and 
https://bugs.webkit.org/show_bug.cgi?id=144451


Reviewed by Simon Fraser.

Source/WebCore:

Fixes an issue where a DOM click event is not dispatched to an element in a subframe on a page
that has a  and defines a CSS :active pseudo-class for the HTML body element.

On iOS we only dispatch a DOM click event if the content does not change as part
of dispatching a DOM mousemove event at the tapped element. In particular, we do not
dispatch a DOM click event if there is a visibility change to some element on the page
as part of dispatching a mousemove event at the tapped element. For a web page
that specifies CSS :active pseudo-class and contains a search field, applying/unapplying
this pseudo-class as part of dispatching a DOM mousemove event may cause the
visibility of the search field cancel button to change; => a DOM click event will not
be dispatched to the tapped element.

Tests: fast/events/can-click-element-on-page-with-active-pseudo-class-and-search-field.html
   fast/forms/search/search-cancel-button-visible-when-input-becomes-disabled.html
   fast/forms/search/search-cancel-button-visible-when-input-becomes-readonly.html
   fast/forms/search/search-cancel-in-formerly-invisible-element.html
   fast/forms/search/search-cancel-toggle-visibility-initially-hidden.html
   fast/forms/search/search-cancel-toggle-visibility-initially-visible.html

* rendering/RenderSearchField.cpp:
(WebCore::RenderSearchField::updateCancelButtonVisibility): Write logic for determining
whether the visibility of the cancel button changed in terms of m_isCancelButtonVisible
instead of querying for the current style data as the latter is overwritten on a full
style recalculation.
(WebCore::RenderSearchField::RenderSearchField): Deleted.
(WebCore::RenderSearchField::visibilityForCancelButton): Deleted.
* rendering/RenderSearchField.h: Define instance variable m_isCancelButtonVisible to
store the visibility state of the cancel button.

LayoutTests:

Add a test to ensure that a DOM click event is dispatched to an element in a subframe on a page
with a search field and that specifies a CSS :active pseudo-class that changes the tap highlight
color.

Additionally, add tests to ensure we update the cancel button visibility whenever the visibility
of the search field changes.

* fast/events/can-click-element-on-page-with-active-pseudo-class-and-search-field-expected.txt: Added.
* fast/events/can-click-element-on-page-with-active-pseudo-class-and-search-field.html: Added.
* fast/forms/search/search-cancel-button-visible-when-input-becomes-disabled-expected.html: Added.
* fast/forms/search/search-cancel-button-visible-when-input-becomes-disabled.html: Added.
* fast/forms/search/search-cancel-button-visible-when-input-becomes-readonly-expected.html: Added.
* fast/forms/search/search-cancel-button-visible-when-input-becomes-readonly.html: Added.
* fast/forms/search/search-cancel-in-formerly-invisible-element-expected.html: Added.
* fast/forms/search/search-cancel-in-formerly-invisible-element.html: Added.
* fast/forms/search/search-cancel-toggle-visibility-initially-hidden-expected.html: Added.
* fast/forms/search/search-cancel-toggle-visibility-initially-hidden.html: Added.
* fast/forms/search/search-cancel-toggle-visibility-initially-visible-expected.html: Added.
* fast/forms/search/search-cancel-toggle-visibility-initially-visible.html: Added.

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/rendering/RenderSearchField.cpp
trunk/Source/WebCore/rendering/RenderSearchField.h


Added Paths

trunk/LayoutTests/fast/events/can-click-element-on-page-with-active-pseudo-class-and-search-field-expected.txt
trunk/LayoutTests/fast/events/can-click-element-on-page-with-active-pseudo-class-and-search-field.html
trunk/LayoutTests/fast/forms/search/search-cancel-button-visible-when-input-becomes-disabled-expected.html
trunk/LayoutTests/fast/forms/search/search-cancel-button-visible-when-input-becomes-disabled.html
trunk/LayoutTests/fast/forms/search/search-cancel-button-visible-when-input-becomes-readonly-expected.html
trunk/LayoutTests/fast/forms/search/search-cancel-button-visible-when-input-becomes-readonly.html
trunk/LayoutTests/fast/forms/search/search-cancel-in-formerly-invisible-element-expected.html
trunk/LayoutTests/fast/forms/search/search-cancel-in-formerly-invisible-element.html
trunk/LayoutTests/fast/forms/search/search-cancel-toggle-visibility-initially-hidden-expected.html
trunk/LayoutTests/fast/forms/search/search-cancel-toggle-visibility-initially-hidden.html
trunk/LayoutTests/fast/forms/search/search-cancel-toggle-visibility-initially-visible-expected.html
trunk/LayoutTests/fast/forms/search/search-cancel-toggle-visibility-initially-visible.html




Diff


[webkit-changes] [191112] trunk/Source/WebCore

2015-10-15 Thread antti
Title: [191112] trunk/Source/WebCore








Revision 191112
Author an...@apple.com
Date 2015-10-15 08:12:39 -0700 (Thu, 15 Oct 2015)


Log Message
Implement iterator for traversing composed ancestors
https://bugs.webkit.org/show_bug.cgi?id=150162

Reviewed by Andreas Kling.

The existing general purpose ComposedTreeIterator can traverse parent chain but not efficiently
(since it builds stack). Add a separate stackless iterator for ancestor chain traversal.

* WebCore.xcodeproj/project.pbxproj:
* dom/ComposedTreeAncestorIterator.h: Added.
(WebCore::ComposedTreeAncestorIterator::operator*):
(WebCore::ComposedTreeAncestorIterator::operator->):
(WebCore::ComposedTreeAncestorIterator::operator==):
(WebCore::ComposedTreeAncestorIterator::operator!=):
(WebCore::ComposedTreeAncestorIterator::operator++):
(WebCore::ComposedTreeAncestorIterator::get):
(WebCore::ComposedTreeAncestorIterator::ComposedTreeAncestorIterator):
(WebCore::ComposedTreeAncestorIterator::traverseParent):
(WebCore::ComposedTreeAncestorAdapter::ComposedTreeAncestorAdapter):
(WebCore::ComposedTreeAncestorAdapter::begin):
(WebCore::ComposedTreeAncestorAdapter::end):
(WebCore::ComposedTreeAncestorAdapter::first):
(WebCore::composedTreeAncestors):
* dom/ComposedTreeIterator.h:
* dom/ContainerNode.h:
(WebCore::Node::highestAncestor):
(WebCore::Node::isTreeScope):
(WebCore::Node::needsNodeRenderingTraversalSlowPath): Deleted.

With NodeRenderingTraversal::parent removed this bit is no longer used.

* dom/Element.cpp:
(WebCore::Element::shadowRoot):
(WebCore::Element::addShadowRoot):
(WebCore::shouldUseNodeRenderingTraversalSlowPath): Deleted.
(WebCore::Element::resetNeedsNodeRenderingTraversalSlowPath): Deleted.
* dom/Element.h:
(WebCore::Element::didAddUserAgentShadowRoot):
(WebCore::Element::alwaysCreateUserAgentShadowRoot):
* dom/Node.cpp:
(WebCore::Node::derefEventTarget):
(WebCore::Node::updateAncestorsForStyleRecalc):
(WebCore::traverseStyleParent): Deleted.
(WebCore::traverseFirstStyleParent): Deleted.

Switch to iterator interface.

* dom/Node.h:
(WebCore::Node::isDocumentFragment):
(WebCore::Node::isShadowRoot):
(WebCore::Node::isNamedFlowContentNode):
(WebCore::Node::hasCustomStyleResolveCallbacks):
(WebCore::Node::setHasCustomStyleResolveCallbacks):
(WebCore::Node::setTreeScope):
(WebCore::Node::setStyleChange):
(WebCore::Node::setNeedsNodeRenderingTraversalSlowPath): Deleted.
* dom/NodeRenderingTraversal.cpp:
(WebCore::NodeRenderingTraversal::traverseParent):
(WebCore::NodeRenderingTraversal::traverseFirstChild):
(WebCore::NodeRenderingTraversal::traverseLastChild):
(WebCore::NodeRenderingTraversal::traversePreviousSibling):
(WebCore::NodeRenderingTraversal::nextInScope):
(WebCore::NodeRenderingTraversal::previousInScope):
(WebCore::NodeRenderingTraversal::parentInScope):
(WebCore::NodeRenderingTraversal::lastChildInScope):
(WebCore::NodeRenderingTraversal::parentSlow): Deleted.
* dom/NodeRenderingTraversal.h:
(WebCore::NodeRenderingTraversal::parent): Deleted.

No longer used.

* html/HTMLSummaryElement.cpp:
* rendering/RenderNamedFlowThread.cpp:
(WebCore::RenderNamedFlowThread::isChildAllowed):

Switch to iterator interface.

* style/RenderTreePosition.cpp:
* style/StyleResolveTree.cpp:
(WebCore::Style::updateTextRendererAfterContentChange):

Switch to iterator interface.

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj
trunk/Source/WebCore/dom/ComposedTreeIterator.h
trunk/Source/WebCore/dom/ContainerNode.h
trunk/Source/WebCore/dom/Element.cpp
trunk/Source/WebCore/dom/Element.h
trunk/Source/WebCore/dom/Node.cpp
trunk/Source/WebCore/dom/Node.h
trunk/Source/WebCore/dom/NodeRenderingTraversal.cpp
trunk/Source/WebCore/dom/NodeRenderingTraversal.h
trunk/Source/WebCore/html/HTMLSummaryElement.cpp
trunk/Source/WebCore/rendering/RenderNamedFlowThread.cpp
trunk/Source/WebCore/style/RenderTreePosition.cpp
trunk/Source/WebCore/style/StyleResolveTree.cpp


Added Paths

trunk/Source/WebCore/dom/ComposedTreeAncestorIterator.h




Diff

Modified: trunk/Source/WebCore/ChangeLog (19 => 191112)

--- trunk/Source/WebCore/ChangeLog	2015-10-15 14:54:52 UTC (rev 19)
+++ trunk/Source/WebCore/ChangeLog	2015-10-15 15:12:39 UTC (rev 191112)
@@ -1,3 +1,88 @@
+2015-10-15  Antti Koivisto  
+
+Implement iterator for traversing composed ancestors
+https://bugs.webkit.org/show_bug.cgi?id=150162
+
+Reviewed by Andreas Kling.
+
+The existing general purpose ComposedTreeIterator can traverse parent chain but not efficiently
+(since it builds stack). Add a separate stackless iterator for ancestor chain traversal.
+
+* WebCore.xcodeproj/project.pbxproj:
+* dom/ComposedTreeAncestorIterator.h: Added.
+(WebCore::ComposedTreeAncestorIterator::operator*):
+(WebCore::ComposedTreeAncestorIterator::operator->):
+(WebCore::ComposedTreeAncestorIterator::operator==):
+

[webkit-changes] [191135] trunk

2015-10-15 Thread commit-queue
Title: [191135] trunk








Revision 191135
Author commit-qu...@webkit.org
Date 2015-10-15 13:50:02 -0700 (Thu, 15 Oct 2015)


Log Message
Web Inspector: _javascript_Core should parse sourceURL and sourceMappingURL directives
https://bugs.webkit.org/show_bug.cgi?id=150096

Patch by Joseph Pecoraro  on 2015-10-15
Reviewed by Geoffrey Garen.

Source/_javascript_Core:

* inspector/ContentSearchUtilities.cpp:
(Inspector::ContentSearchUtilities::scriptCommentPattern): Deleted.
(Inspector::ContentSearchUtilities::findScriptSourceURL): Deleted.
(Inspector::ContentSearchUtilities::findScriptSourceMapURL): Deleted.
* inspector/ContentSearchUtilities.h:
No longer need to search script content.

* inspector/ScriptDebugServer.cpp:
(Inspector::ScriptDebugServer::dispatchDidParseSource):
Carry over the sourceURL and sourceMappingURL from the SourceProvider.

* inspector/agents/InspectorDebuggerAgent.cpp:
(Inspector::InspectorDebuggerAgent::sourceMapURLForScript):
(Inspector::InspectorDebuggerAgent::didParseSource):
No longer do content searching.

* parser/Lexer.cpp:
(JSC::Lexer::setCode):
(JSC::Lexer::skipWhitespace):
(JSC::Lexer::parseCommentDirective):
(JSC::Lexer::parseCommentDirectiveValue):
(JSC::Lexer::consume):
(JSC::Lexer::lex):
* parser/Lexer.h:
(JSC::Lexer::sourceURL):
(JSC::Lexer::sourceMappingURL):
(JSC::Lexer::sourceProvider): Deleted.
Give lexer the ability to detect script comment directives.
This just consumes characters in single line comments and
ultimately sets the sourceURL or sourceMappingURL found.

* parser/Parser.h:
(JSC::Parser::parse):
* parser/SourceProvider.h:
(JSC::SourceProvider::url):
(JSC::SourceProvider::sourceURL):
(JSC::SourceProvider::sourceMappingURL):
(JSC::SourceProvider::setSourceURL):
(JSC::SourceProvider::setSourceMappingURL):
After parsing a script, update the Source Provider with the
value of directives that may have been found in the script.

Source/WebInspectorUI:

* UserInterface/Test/InspectorProtocol.js:
(InspectorProtocol._sendMessage):
(InspectorProtocol.dispatchMessageFromBackend):
This is only used for tests, so avoid console.log
and just dump directly to the system console.

LayoutTests:

* inspector/debugger/sourceURLs-expected.txt: Added.
* inspector/debugger/sourceURLs.html: Added.
sourceURL and sourceMappingURL detection.

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/inspector/ContentSearchUtilities.cpp
trunk/Source/_javascript_Core/inspector/ContentSearchUtilities.h
trunk/Source/_javascript_Core/inspector/ScriptDebugServer.cpp
trunk/Source/_javascript_Core/inspector/agents/InspectorDebuggerAgent.cpp
trunk/Source/_javascript_Core/parser/Lexer.cpp
trunk/Source/_javascript_Core/parser/Lexer.h
trunk/Source/_javascript_Core/parser/Parser.h
trunk/Source/_javascript_Core/parser/SourceProvider.h
trunk/Source/WebInspectorUI/ChangeLog
trunk/Source/WebInspectorUI/UserInterface/Test/InspectorProtocol.js


Added Paths

trunk/LayoutTests/inspector/debugger/sourceURLs-expected.txt
trunk/LayoutTests/inspector/debugger/sourceURLs.html




Diff

Modified: trunk/LayoutTests/ChangeLog (191134 => 191135)

--- trunk/LayoutTests/ChangeLog	2015-10-15 20:34:10 UTC (rev 191134)
+++ trunk/LayoutTests/ChangeLog	2015-10-15 20:50:02 UTC (rev 191135)
@@ -1,3 +1,14 @@
+2015-10-15  Joseph Pecoraro  
+
+Web Inspector: _javascript_Core should parse sourceURL and sourceMappingURL directives
+https://bugs.webkit.org/show_bug.cgi?id=150096
+
+Reviewed by Geoffrey Garen.
+
+* inspector/debugger/sourceURLs-expected.txt: Added.
+* inspector/debugger/sourceURLs.html: Added.
+sourceURL and sourceMappingURL detection.
+
 2015-10-15  Dean Jackson  
 
 CSSKeyframesRule::appendRule is deprecated, but is actually the spec


Added: trunk/LayoutTests/inspector/debugger/sourceURLs-expected.txt (0 => 191135)

--- trunk/LayoutTests/inspector/debugger/sourceURLs-expected.txt	(rev 0)
+++ trunk/LayoutTests/inspector/debugger/sourceURLs-expected.txt	2015-10-15 20:50:02 UTC (rev 191135)
@@ -0,0 +1,26 @@
+Tests for the Debugger.scriptParsed sourceURL and sourceMappingURL comment directive parsing.
+
+
+== Running test suite: Debugger.scriptParsed.sourceURL-directives
+-- Running test case: TestExpressionsForSourceURL
+Found Script with sourceURL 'test1.js'
+Found Script with sourceURL 'test2.js'
+Found Script with sourceURL 'test3.js'
+Found Script with sourceURL 'test4.js'
+Found Script with sourceURL 'test5.js'
+Found Script with sourceURL 'test6.js'
+Found Script with sourceURL 'test7.js'
+Found Script with sourceURL 'test8.js'
+Found Script with sourceURL 'test9.js'
+
+-- Running test case: TestExpressionsForSourceMappingURL
+Found Script with sourceMappingURL 'test1.js'
+Found Script with sourceMappingURL 'test2.js'
+Found Script with sourceMappingURL 'test3.js'
+Found Script with sourceMappingURL 'test4.js'

[webkit-changes] [191146] trunk/Source/WebKit2

2015-10-15 Thread dino
Title: [191146] trunk/Source/WebKit2








Revision 191146
Author d...@apple.com
Date 2015-10-15 16:03:17 -0700 (Thu, 15 Oct 2015)


Log Message
Fix the iOS build. And hopefully not breaking the other builds
at the same time.

* UIProcess/PageClient.h:
* UIProcess/WebContextMenuProxy.cpp:
* UIProcess/WebContextMenuProxy.h:
* UIProcess/ios/PageClientImplIOS.h:
* UIProcess/ios/PageClientImplIOS.mm:
* UIProcess/mac/PageClientImpl.h:
* UIProcess/mac/PageClientImpl.mm:

Modified Paths

trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/PageClient.h
trunk/Source/WebKit2/UIProcess/WebContextMenuProxy.cpp
trunk/Source/WebKit2/UIProcess/WebContextMenuProxy.h
trunk/Source/WebKit2/UIProcess/ios/PageClientImplIOS.h
trunk/Source/WebKit2/UIProcess/ios/PageClientImplIOS.mm
trunk/Source/WebKit2/UIProcess/mac/PageClientImpl.h
trunk/Source/WebKit2/UIProcess/mac/PageClientImpl.mm




Diff

Modified: trunk/Source/WebKit2/ChangeLog (191145 => 191146)

--- trunk/Source/WebKit2/ChangeLog	2015-10-15 23:02:43 UTC (rev 191145)
+++ trunk/Source/WebKit2/ChangeLog	2015-10-15 23:03:17 UTC (rev 191146)
@@ -1,3 +1,16 @@
+2015-10-15  Dean Jackson  
+
+Fix the iOS build. And hopefully not breaking the other builds
+at the same time.
+
+* UIProcess/PageClient.h:
+* UIProcess/WebContextMenuProxy.cpp:
+* UIProcess/WebContextMenuProxy.h:
+* UIProcess/ios/PageClientImplIOS.h:
+* UIProcess/ios/PageClientImplIOS.mm:
+* UIProcess/mac/PageClientImpl.h:
+* UIProcess/mac/PageClientImpl.mm:
+
 2015-10-15  Anders Carlsson  
 
 Use the context inside WebContextMenuProxyMac


Modified: trunk/Source/WebKit2/UIProcess/PageClient.h (191145 => 191146)

--- trunk/Source/WebKit2/UIProcess/PageClient.h	2015-10-15 23:02:43 UTC (rev 191145)
+++ trunk/Source/WebKit2/UIProcess/PageClient.h	2015-10-15 23:03:17 UTC (rev 191146)
@@ -220,7 +220,9 @@
 #endif
 
 virtual RefPtr createPopupMenuProxy(WebPageProxy&) = 0;
+#if ENABLE(CONTEXT_MENUS)
 virtual RefPtr createContextMenuProxy(WebPageProxy&, const ContextMenuContextData&, const UserData&) = 0;
+#endif
 
 #if ENABLE(INPUT_TYPE_COLOR)
 virtual RefPtr createColorPicker(WebPageProxy*, const WebCore::Color& initialColor, const WebCore::IntRect&) = 0;


Modified: trunk/Source/WebKit2/UIProcess/WebContextMenuProxy.cpp (191145 => 191146)

--- trunk/Source/WebKit2/UIProcess/WebContextMenuProxy.cpp	2015-10-15 23:02:43 UTC (rev 191145)
+++ trunk/Source/WebKit2/UIProcess/WebContextMenuProxy.cpp	2015-10-15 23:03:17 UTC (rev 191146)
@@ -26,6 +26,8 @@
 #include "config.h"
 #include "WebContextMenuProxy.h"
 
+#if ENABLE(CONTEXT_MENUS)
+
 namespace WebKit {
 
 WebContextMenuProxy::WebContextMenuProxy(const ContextMenuContextData& context, const UserData& userData)
@@ -39,3 +41,5 @@
 }
 
 } // namespace WebKit
+
+#endif


Modified: trunk/Source/WebKit2/UIProcess/WebContextMenuProxy.h (191145 => 191146)

--- trunk/Source/WebKit2/UIProcess/WebContextMenuProxy.h	2015-10-15 23:02:43 UTC (rev 191145)
+++ trunk/Source/WebKit2/UIProcess/WebContextMenuProxy.h	2015-10-15 23:03:17 UTC (rev 191146)
@@ -26,13 +26,14 @@
 #ifndef WebContextMenuProxy_h
 #define WebContextMenuProxy_h
 
+#if ENABLE(CONTEXT_MENUS)
+
 #include "ContextMenuContextData.h"
 #include "UserData.h"
 #include 
 
 namespace WebKit {
 
-class ContextMenuContextData;
 class WebContextMenuItem;
 
 class WebContextMenuProxy : public RefCounted {
@@ -52,4 +53,6 @@
 
 } // namespace WebKit
 
+#endif
+
 #endif // WebPopupMenuProxy_h


Modified: trunk/Source/WebKit2/UIProcess/ios/PageClientImplIOS.h (191145 => 191146)

--- trunk/Source/WebKit2/UIProcess/ios/PageClientImplIOS.h	2015-10-15 23:02:43 UTC (rev 191145)
+++ trunk/Source/WebKit2/UIProcess/ios/PageClientImplIOS.h	2015-10-15 23:03:17 UTC (rev 191146)
@@ -96,7 +96,9 @@
 virtual void doneWithTouchEvent(const NativeWebTouchEvent&, bool wasEventHandled) override;
 #endif
 virtual RefPtr createPopupMenuProxy(WebPageProxy&) override;
+#if ENABLE(CONTEXT_MENUS)
 virtual RefPtr createContextMenuProxy(WebPageProxy&, const ContextMenuContextData&, const UserData&) override;
+#endif
 virtual void setTextIndicator(Ref, WebCore::TextIndicatorWindowLifetime) override;
 virtual void clearTextIndicator(WebCore::TextIndicatorWindowDismissalAnimation) override;
 virtual void setTextIndicatorAnimationProgress(float) override;


Modified: trunk/Source/WebKit2/UIProcess/ios/PageClientImplIOS.mm (191145 => 191146)

--- trunk/Source/WebKit2/UIProcess/ios/PageClientImplIOS.mm	2015-10-15 23:02:43 UTC (rev 191145)
+++ trunk/Source/WebKit2/UIProcess/ios/PageClientImplIOS.mm	2015-10-15 23:03:17 UTC (rev 191146)
@@ -435,10 +435,12 @@
 return nullptr;
 }
 
+#if ENABLE(CONTEXT_MENUS)
 RefPtr PageClientImpl::createContextMenuProxy(WebPageProxy&, const UserData&)
 {
 return nullptr;
 }
+#endif
 
 void PageClientImpl::setTextIndicator(Ref textIndicator, TextIndicatorWindowLifetime)
 {



[webkit-changes] [191152] trunk/LayoutTests

2015-10-15 Thread commit-queue
Title: [191152] trunk/LayoutTests








Revision 191152
Author commit-qu...@webkit.org
Date 2015-10-15 17:09:38 -0700 (Thu, 15 Oct 2015)


Log Message
Marking another disk-cache test as flaky on mac-wk2
https://bugs.webkit.org/show_bug.cgi?id=149087

Patch by Ryan Haddad  on 2015-10-15
Reviewed by Alexey Proskuryakov.

* platform/mac-wk2/TestExpectations:

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/LayoutTests/platform/mac-wk2/TestExpectations




Diff

Modified: trunk/LayoutTests/ChangeLog (191151 => 191152)

--- trunk/LayoutTests/ChangeLog	2015-10-15 23:54:46 UTC (rev 191151)
+++ trunk/LayoutTests/ChangeLog	2015-10-16 00:09:38 UTC (rev 191152)
@@ -1,3 +1,12 @@
+2015-10-15  Ryan Haddad  
+
+Marking another disk-cache test as flaky on mac-wk2
+https://bugs.webkit.org/show_bug.cgi?id=149087
+
+Reviewed by Alexey Proskuryakov.
+
+* platform/mac-wk2/TestExpectations:
+
 2015-10-15  David Hyatt  
 
 Add support for the CSS 'unset' keyword.


Modified: trunk/LayoutTests/platform/mac-wk2/TestExpectations (191151 => 191152)

--- trunk/LayoutTests/platform/mac-wk2/TestExpectations	2015-10-15 23:54:46 UTC (rev 191151)
+++ trunk/LayoutTests/platform/mac-wk2/TestExpectations	2015-10-16 00:09:38 UTC (rev 191152)
@@ -268,6 +268,7 @@
 webkit.org/b/149087 http/tests/cache/disk-cache/disk-cache-last-modified.html [ Pass Failure Timeout ]
 webkit.org/b/149087 http/tests/cache/disk-cache/disk-cache-vary.html [ Pass Failure Timeout ]
 webkit.org/b/147075 http/tests/cache/disk-cache/disk-cache-disable.html [ Pass Failure Timeout ]
+webkit.org/b/149087 http/tests/cache/disk-cache/disk-cache-vary-no-body.html [ Pass Failure Timeout ]
 
 webkit.org/b/150095 http/tests/xmlhttprequest/xmlhttprequest-overridemimetype-invalidstaterror.html [ Pass Timeout ]
 






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


[webkit-changes] [191145] trunk

2015-10-15 Thread commit-queue
Title: [191145] trunk








Revision 191145
Author commit-qu...@webkit.org
Date 2015-10-15 16:02:43 -0700 (Thu, 15 Oct 2015)


Log Message
Unreviewed, rolling out r191135.
https://bugs.webkit.org/show_bug.cgi?id=150197

This patch causes 50+ LayoutTest crashes related to the
inspector (Requested by ryanhaddad on #webkit).

Reverted changeset:

"Web Inspector: _javascript_Core should parse sourceURL and
sourceMappingURL directives"
https://bugs.webkit.org/show_bug.cgi?id=150096
http://trac.webkit.org/changeset/191135

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/inspector/ContentSearchUtilities.cpp
trunk/Source/_javascript_Core/inspector/ContentSearchUtilities.h
trunk/Source/_javascript_Core/inspector/ScriptDebugServer.cpp
trunk/Source/_javascript_Core/inspector/agents/InspectorDebuggerAgent.cpp
trunk/Source/_javascript_Core/parser/Lexer.cpp
trunk/Source/_javascript_Core/parser/Lexer.h
trunk/Source/_javascript_Core/parser/Parser.h
trunk/Source/_javascript_Core/parser/SourceProvider.h
trunk/Source/WebInspectorUI/ChangeLog
trunk/Source/WebInspectorUI/UserInterface/Test/InspectorProtocol.js


Removed Paths

trunk/LayoutTests/inspector/debugger/sourceURLs-expected.txt
trunk/LayoutTests/inspector/debugger/sourceURLs.html




Diff

Modified: trunk/LayoutTests/ChangeLog (191144 => 191145)

--- trunk/LayoutTests/ChangeLog	2015-10-15 22:51:33 UTC (rev 191144)
+++ trunk/LayoutTests/ChangeLog	2015-10-15 23:02:43 UTC (rev 191145)
@@ -1,3 +1,18 @@
+2015-10-15  Commit Queue  
+
+Unreviewed, rolling out r191135.
+https://bugs.webkit.org/show_bug.cgi?id=150197
+
+This patch causes 50+ LayoutTest crashes related to the
+inspector (Requested by ryanhaddad on #webkit).
+
+Reverted changeset:
+
+"Web Inspector: _javascript_Core should parse sourceURL and
+sourceMappingURL directives"
+https://bugs.webkit.org/show_bug.cgi?id=150096
+http://trac.webkit.org/changeset/191135
+
 2015-10-15  Joseph Pecoraro  
 
 Web Inspector: _javascript_Core should parse sourceURL and sourceMappingURL directives


Deleted: trunk/LayoutTests/inspector/debugger/sourceURLs-expected.txt (191144 => 191145)

--- trunk/LayoutTests/inspector/debugger/sourceURLs-expected.txt	2015-10-15 22:51:33 UTC (rev 191144)
+++ trunk/LayoutTests/inspector/debugger/sourceURLs-expected.txt	2015-10-15 23:02:43 UTC (rev 191145)
@@ -1,26 +0,0 @@
-Tests for the Debugger.scriptParsed sourceURL and sourceMappingURL comment directive parsing.
-
-
-== Running test suite: Debugger.scriptParsed.sourceURL-directives
--- Running test case: TestExpressionsForSourceURL
-Found Script with sourceURL 'test1.js'
-Found Script with sourceURL 'test2.js'
-Found Script with sourceURL 'test3.js'
-Found Script with sourceURL 'test4.js'
-Found Script with sourceURL 'test5.js'
-Found Script with sourceURL 'test6.js'
-Found Script with sourceURL 'test7.js'
-Found Script with sourceURL 'test8.js'
-Found Script with sourceURL 'test9.js'
-
--- Running test case: TestExpressionsForSourceMappingURL
-Found Script with sourceMappingURL 'test1.js'
-Found Script with sourceMappingURL 'test2.js'
-Found Script with sourceMappingURL 'test3.js'
-Found Script with sourceMappingURL 'test4.js'
-Found Script with sourceMappingURL 'test5.js'
-Found Script with sourceMappingURL 'test6.js'
-Found Script with sourceMappingURL 'test7.js'
-Found Script with sourceMappingURL 'test8.js'
-Found Script with sourceMappingURL 'test9.js'
-


Deleted: trunk/LayoutTests/inspector/debugger/sourceURLs.html (191144 => 191145)

--- trunk/LayoutTests/inspector/debugger/sourceURLs.html	2015-10-15 22:51:33 UTC (rev 191144)
+++ trunk/LayoutTests/inspector/debugger/sourceURLs.html	2015-10-15 23:02:43 UTC (rev 191145)
@@ -1,207 +0,0 @@
-
-
-
-
-function test()
-{
-let suite = ProtocolTest.createAsyncSuite("Debugger.scriptParsed.sourceURL-directives");
-
-// Because InspectorTest output causes scripts to be parsed
-// we cannot check sourceURL per evaluation easily. Instead
-// just run a bunch of tests for valid and invalid directives
-// and check that the output only includes the valid results.
-
-let expressions = [];
-let sourceURLExpectations = [];
-let sourceMappingURLExpectations = [];
-
-function addInvalidTestCase(args) {
-let {_expression_} = args;
-expressions.push(_expression_);
-}
-
-function addValidTestCase(args) {
-let {_expression_, expected} = args;
-expressions.push(_expression_);
-sourceURLExpectations.push(expected);
-sourceMappingURLExpectations.push(expected);
-}
-
-suite.addTestCase({
-name: "TestExpressionsForSourceURL",
-test: (resolve, reject) => {
-for (let _expression_ of expressions)
-ProtocolTest.evaluateInPage(_expression_);
-
-

[webkit-changes] [191153] branches/safari-601.1.46-branch/Source/WebCore

2015-10-15 Thread matthew_hanson
Title: [191153] branches/safari-601.1.46-branch/Source/WebCore








Revision 191153
Author matthew_han...@apple.com
Date 2015-10-15 17:13:28 -0700 (Thu, 15 Oct 2015)


Log Message
Rollout r188531. rdar://problem/22707497

Modified Paths

branches/safari-601.1.46-branch/Source/WebCore/ChangeLog
branches/safari-601.1.46-branch/Source/WebCore/loader/SubresourceLoader.cpp




Diff

Modified: branches/safari-601.1.46-branch/Source/WebCore/ChangeLog (191152 => 191153)

--- branches/safari-601.1.46-branch/Source/WebCore/ChangeLog	2015-10-16 00:09:38 UTC (rev 191152)
+++ branches/safari-601.1.46-branch/Source/WebCore/ChangeLog	2015-10-16 00:13:28 UTC (rev 191153)
@@ -1,5 +1,9 @@
 2015-10-15  Matthew Hanson  
 
+Rollout r188531. rdar://problem/22707497
+
+2015-10-15  Matthew Hanson  
+
 Merge r191077. rdar://problem/22993325
 
 2015-10-14  Alex Christensen  


Modified: branches/safari-601.1.46-branch/Source/WebCore/loader/SubresourceLoader.cpp (191152 => 191153)

--- branches/safari-601.1.46-branch/Source/WebCore/loader/SubresourceLoader.cpp	2015-10-16 00:09:38 UTC (rev 191152)
+++ branches/safari-601.1.46-branch/Source/WebCore/loader/SubresourceLoader.cpp	2015-10-16 00:13:28 UTC (rev 191153)
@@ -203,12 +203,12 @@
 ASSERT(!response.isNull());
 ASSERT(m_state == Initialized);
 
+TemporaryChange callingDidReceiveResponse(m_callingDidReceiveResponse, true);
+
 // Reference the object in this method since the additional processing can do
 // anything including removing the last reference to this object; one example of this is 3266216.
 Ref protect(*this);
 
-TemporaryChange callingDidReceiveResponse(m_callingDidReceiveResponse, true);
-
 if (shouldIncludeCertificateInfo())
 response.includeCertificateInfo();
 






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


[webkit-changes] [191162] trunk/Source/JavaScriptCore

2015-10-15 Thread joepeck
Title: [191162] trunk/Source/_javascript_Core








Revision 191162
Author joep...@webkit.org
Date 2015-10-15 19:36:29 -0700 (Thu, 15 Oct 2015)


Log Message
Unreviewed. Build fix after r191160.

* inspector/agents/InspectorHeapAgent.cpp:
(Inspector::InspectorHeapAgent::didGarbageCollect):

Modified Paths

trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/inspector/agents/InspectorHeapAgent.cpp




Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (191161 => 191162)

--- trunk/Source/_javascript_Core/ChangeLog	2015-10-16 02:34:24 UTC (rev 191161)
+++ trunk/Source/_javascript_Core/ChangeLog	2015-10-16 02:36:29 UTC (rev 191162)
@@ -1,5 +1,12 @@
 2015-10-15  Joseph Pecoraro  
 
+Unreviewed. Build fix after r191160.
+
+* inspector/agents/InspectorHeapAgent.cpp:
+(Inspector::InspectorHeapAgent::didGarbageCollect):
+
+2015-10-15  Joseph Pecoraro  
+
 Unreviewed. Revert part of r191159 which caused ASSERTs.
 
 A review comment suggested using WeakPtr. It is not suitable


Modified: trunk/Source/_javascript_Core/inspector/agents/InspectorHeapAgent.cpp (191161 => 191162)

--- trunk/Source/_javascript_Core/inspector/agents/InspectorHeapAgent.cpp	2015-10-16 02:34:24 UTC (rev 191161)
+++ trunk/Source/_javascript_Core/inspector/agents/InspectorHeapAgent.cpp	2015-10-16 02:36:29 UTC (rev 191162)
@@ -130,7 +130,7 @@
 .setEndTime(endTime)
 .release();
 
-weakThis->m_frontendDispatcher->garbageCollected(WTF::move(collection));
+m_frontendDispatcher->garbageCollected(WTF::move(collection));
 });
 
 m_gcStartTime = NAN;






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


[webkit-changes] [191148] trunk/Source

2015-10-15 Thread mmaxfield
Title: [191148] trunk/Source








Revision 191148
Author mmaxfi...@apple.com
Date 2015-10-15 16:20:07 -0700 (Thu, 15 Oct 2015)


Log Message
Migrate to CGContextSetBaseCTM() and CGContextResetClip() from WKSI
https://bugs.webkit.org/show_bug.cgi?id=150155

Reviewed by Tim Horton.

Source/WebCore:

No new tests because there is no behavior change.

* platform/graphics/cg/GraphicsContextCG.cpp:
(WebCore::GraphicsContext::drawPattern):
(WebCore::GraphicsContext::platformApplyDeviceScaleFactor):
* platform/graphics/cg/ImageBufferCG.cpp:
(WebCore::ImageBuffer::putByteArray):
* platform/ios/WebCoreSystemInterfaceIOS.mm:
* platform/mac/WebCoreSystemInterface.h:
* platform/mac/WebCoreSystemInterface.mm:

Source/WebKit/mac:

* WebCoreSupport/WebSystemInterface.mm:
(InitWebCoreSystemInterface): Deleted.
* WebView/WebView.mm:
(-[WebView _setBaseCTM:forContext:]):

Source/WebKit2:

* WebProcess/WebCoreSupport/mac/WebSystemInterface.mm:
(InitWebCoreSystemInterface): Deleted.

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp
trunk/Source/WebCore/platform/graphics/cg/ImageBufferCG.cpp
trunk/Source/WebCore/platform/ios/WebCoreSystemInterfaceIOS.mm
trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.h
trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.mm
trunk/Source/WebCore/platform/spi/cg/CoreGraphicsSPI.h
trunk/Source/WebKit/mac/ChangeLog
trunk/Source/WebKit/mac/WebCoreSupport/WebSystemInterface.mm
trunk/Source/WebKit/mac/WebView/WebView.mm
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebSystemInterface.mm




Diff

Modified: trunk/Source/WebCore/ChangeLog (191147 => 191148)

--- trunk/Source/WebCore/ChangeLog	2015-10-15 23:18:09 UTC (rev 191147)
+++ trunk/Source/WebCore/ChangeLog	2015-10-15 23:20:07 UTC (rev 191148)
@@ -1,3 +1,21 @@
+2015-10-15  Myles C. Maxfield  
+
+Migrate to CGContextSetBaseCTM() and CGContextResetClip() from WKSI
+https://bugs.webkit.org/show_bug.cgi?id=150155
+
+Reviewed by Tim Horton.
+
+No new tests because there is no behavior change.
+
+* platform/graphics/cg/GraphicsContextCG.cpp:
+(WebCore::GraphicsContext::drawPattern):
+(WebCore::GraphicsContext::platformApplyDeviceScaleFactor):
+* platform/graphics/cg/ImageBufferCG.cpp:
+(WebCore::ImageBuffer::putByteArray):
+* platform/ios/WebCoreSystemInterfaceIOS.mm:
+* platform/mac/WebCoreSystemInterface.h:
+* platform/mac/WebCoreSystemInterface.mm:
+
 2015-10-15  Dan Bernstein  
 
 Fixed the build.


Modified: trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp (191147 => 191148)

--- trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp	2015-10-15 23:18:09 UTC (rev 191147)
+++ trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp	2015-10-15 23:20:07 UTC (rev 191148)
@@ -336,8 +336,7 @@
 RetainPtr color = adoptCF(CGColorCreateWithPattern(patternSpace.get(), pattern.get(), ));
 CGContextSetFillColorSpace(context, patternSpace.get());
 
-// FIXME: Really want a public API for this. It is just CGContextSetBaseCTM(context, CGAffineTransformIdentiy).
-wkSetBaseCTM(context, CGAffineTransformIdentity);
+CGContextSetBaseCTM(context, CGAffineTransformIdentity);
 CGContextSetPatternPhase(context, CGSizeZero);
 
 CGContextSetFillColorWithColor(context, color.get());
@@ -1695,7 +1694,7 @@
 // CoreGraphics expects the base CTM of a HiDPI context to have the scale factor applied to it.
 // Failing to change the base level CTM will cause certain CG features, such as focus rings,
 // to draw with a scale factor of 1 rather than the actual scale factor.
-wkSetBaseCTM(platformContext(), CGAffineTransformScale(CGContextGetBaseCTM(platformContext()), deviceScaleFactor, deviceScaleFactor));
+CGContextSetBaseCTM(platformContext(), CGAffineTransformScale(CGContextGetBaseCTM(platformContext()), deviceScaleFactor, deviceScaleFactor));
 }
 
 void GraphicsContext::platformFillEllipse(const FloatRect& ellipse)


Modified: trunk/Source/WebCore/platform/graphics/cg/ImageBufferCG.cpp (191147 => 191148)

--- trunk/Source/WebCore/platform/graphics/cg/ImageBufferCG.cpp	2015-10-15 23:18:09 UTC (rev 191147)
+++ trunk/Source/WebCore/platform/graphics/cg/ImageBufferCG.cpp	2015-10-15 23:20:07 UTC (rev 191148)
@@ -325,7 +325,7 @@
 CGContextConcatCTM(destContext, AffineTransform(wkGetUserToBaseCTM(destContext)).inverse());
 else
 CGContextConcatCTM(destContext, AffineTransform(CGContextGetCTM(destContext)).inverse());
-wkCGContextResetClip(destContext);
+CGContextResetClip(destContext);
 CGContextSetInterpolationQuality(destContext, kCGInterpolationNone);
 CGContextSetAlpha(destContext, 1.0);
 CGContextSetBlendMode(destContext, kCGBlendModeCopy);


Modified: 

[webkit-changes] [191151] trunk

2015-10-15 Thread hyatt
Title: [191151] trunk








Revision 191151
Author hy...@apple.com
Date 2015-10-15 16:54:46 -0700 (Thu, 15 Oct 2015)


Log Message
Add support for the CSS 'unset' keyword.
https://bugs.webkit.org/show_bug.cgi?id=148614

Reviewed by Dean Jackson.

Source/WebCore:

Added new test in fast/css, and existing variables tests also use unset in several tests.

* WebCore.xcodeproj/project.pbxproj:
Add CSSUnsetValue.cpp to the project.

* bindings/objc/DOMCSS.mm:
(kitClass):
Make sure UNSET is handled in the switch.

* css/CSSParser.cpp:
(WebCore::parseKeywordValue):
(WebCore::CSSParser::parseValue):
(WebCore::CSSParser::parseCustomPropertyDeclaration):
Add cases to create a CSSUnsetValue properly.

* css/CSSToStyleMap.cpp:
(WebCore::CSSToStyleMap::styleImage):
(WebCore::CSSToStyleMap::mapFillAttachment):
(WebCore::CSSToStyleMap::mapFillClip):
(WebCore::CSSToStyleMap::mapFillComposite):
(WebCore::CSSToStyleMap::mapFillBlendMode):
(WebCore::CSSToStyleMap::mapFillOrigin):
(WebCore::CSSToStyleMap::mapFillImage):
(WebCore::CSSToStyleMap::mapFillRepeatX):
(WebCore::CSSToStyleMap::mapFillRepeatY):
(WebCore::convertToLengthSize):
(WebCore::CSSToStyleMap::mapFillSize):
(WebCore::CSSToStyleMap::mapFillXPosition):
(WebCore::CSSToStyleMap::mapFillYPosition):
(WebCore::CSSToStyleMap::mapFillMaskSourceType):
(WebCore::CSSToStyleMap::mapAnimationDelay):
(WebCore::CSSToStyleMap::mapAnimationDirection):
(WebCore::CSSToStyleMap::mapAnimationDuration):
(WebCore::CSSToStyleMap::mapAnimationFillMode):
(WebCore::CSSToStyleMap::mapAnimationIterationCount):
(WebCore::CSSToStyleMap::mapAnimationName):
(WebCore::CSSToStyleMap::mapAnimationPlayState):
(WebCore::CSSToStyleMap::mapAnimationProperty):
(WebCore::CSSToStyleMap::mapAnimationTimingFunction):
(WebCore::CSSToStyleMap::mapAnimationTrigger):
The background and animation functions need to check for unset and be able to map it properly to initial. This is done
with a new treatAsInitial method on CSSValue that can take the property ID and check for both initial
or unset on a non-inherited property.

* css/CSSUnsetValue.cpp: Added.
(WebCore::CSSUnsetValue::customCSSText):
* css/CSSUnsetValue.h: Added.
(WebCore::CSSUnsetValue::create):
(WebCore::CSSUnsetValue::equals):
(WebCore::CSSUnsetValue::CSSUnsetValue):
This new value looks exactly like CSSInheritedValue and CSSInitialValue.

* css/CSSValue.cpp:
(WebCore::CSSValue::cssValueType):
(WebCore::CSSValue::cssText):
(WebCore::CSSValue::destroy):
(WebCore::CSSValue::isInvalidCustomPropertyValue):
(WebCore::CSSValue::treatAsInheritedValue):
(WebCore::CSSValue::treatAsInitialValue):
* css/CSSValue.h:
(WebCore::CSSValue::isUnsetValue):
Add isUnsetValue and the UnsetClass. Add support for treatAsInheritedValue and treatAsInitialValue to have
a way to query for initial/inherit or the matching unset type.

* css/CSSValueKeywords.in:
Add the unset keyword.

* css/CSSValuePool.cpp:
(WebCore::CSSValuePool::CSSValuePool):
* css/CSSValuePool.h:
(WebCore::CSSValuePool::createUnsetValue):
Have a singleton model for unset just like we do for inherit/initial.

* css/StyleResolver.cpp:
(WebCore::StyleResolver::applyProperty):
Handle unset correctly. It maps to inherit for inherited properties and initial for non-inherited ones.

LayoutTests:

* TestExpectations:
Remove the 3 failing variables tests that used the unset keyword now that they pass.

* fast/css/unset-keyword-expected.html: Added.
* fast/css/unset-keyword.html: Added.
New test for both inherited and initial properties.

* fast/css/variables/test-suite/129-expected.html: Added.
* fast/css/variables/test-suite/129.html: Added.
* fast/css/variables/test-suite/130-expected.html: Added.
* fast/css/variables/test-suite/130.html: Added.
* fast/css/variables/test-suite/134-expected.html: Added.
* fast/css/variables/test-suite/134.html: Added.
* fast/css/variables/test-suite/failures/129-expected.html: Removed.
* fast/css/variables/test-suite/failures/129.html: Removed.
* fast/css/variables/test-suite/failures/130-expected.html: Removed.
* fast/css/variables/test-suite/failures/130.html: Removed.
* fast/css/variables/test-suite/failures/134-expected.html: Removed.
* fast/css/variables/test-suite/failures/134.html: Removed.
Move these tests into the passing directory.

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/LayoutTests/TestExpectations
trunk/Source/WebCore/CMakeLists.txt
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj
trunk/Source/WebCore/bindings/objc/DOMCSS.mm
trunk/Source/WebCore/css/CSSParser.cpp
trunk/Source/WebCore/css/CSSToStyleMap.cpp
trunk/Source/WebCore/css/CSSValue.cpp
trunk/Source/WebCore/css/CSSValue.h
trunk/Source/WebCore/css/CSSValueKeywords.in
trunk/Source/WebCore/css/CSSValuePool.cpp
trunk/Source/WebCore/css/CSSValuePool.h
trunk/Source/WebCore/css/StyleResolver.cpp


Added Paths

trunk/LayoutTests/fast/css/unset-keyword-expected.html
trunk/LayoutTests/fast/css/unset-keyword.html

[webkit-changes] [191157] trunk

2015-10-15 Thread commit-queue
Title: [191157] trunk








Revision 191157
Author commit-qu...@webkit.org
Date 2015-10-15 17:34:38 -0700 (Thu, 15 Oct 2015)


Log Message
Unreviewed, rolling out r191156.
https://bugs.webkit.org/show_bug.cgi?id=150215

Introduced crashing test (Requested by bradee-oh on #webkit).

Reverted changeset:

"Modern IDB: Support IDBDatabase.close()."
https://bugs.webkit.org/show_bug.cgi?id=150150
http://trac.webkit.org/changeset/191156

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/LayoutTests/storage/indexeddb/modern/opendatabase-versions-expected.txt
trunk/LayoutTests/storage/indexeddb/modern/opendatabase-versions.html
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionToServer.cpp
trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionToServer.h
trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionToServerDelegate.h
trunk/Source/WebCore/Modules/indexeddb/client/IDBDatabaseImpl.cpp
trunk/Source/WebCore/Modules/indexeddb/client/IDBDatabaseImpl.h
trunk/Source/WebCore/Modules/indexeddb/client/IDBRequestImpl.cpp
trunk/Source/WebCore/Modules/indexeddb/server/IDBServer.cpp
trunk/Source/WebCore/Modules/indexeddb/server/IDBServer.h
trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.cpp
trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.h
trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabaseConnection.cpp
trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabaseConnection.h
trunk/Source/WebCore/Modules/indexeddb/shared/InProcessIDBServer.cpp
trunk/Source/WebCore/Modules/indexeddb/shared/InProcessIDBServer.h




Diff

Modified: trunk/LayoutTests/ChangeLog (191156 => 191157)

--- trunk/LayoutTests/ChangeLog	2015-10-16 00:25:02 UTC (rev 191156)
+++ trunk/LayoutTests/ChangeLog	2015-10-16 00:34:38 UTC (rev 191157)
@@ -1,3 +1,16 @@
+2015-10-15  Commit Queue  
+
+Unreviewed, rolling out r191156.
+https://bugs.webkit.org/show_bug.cgi?id=150215
+
+Introduced crashing test (Requested by bradee-oh on #webkit).
+
+Reverted changeset:
+
+"Modern IDB: Support IDBDatabase.close()."
+https://bugs.webkit.org/show_bug.cgi?id=150150
+http://trac.webkit.org/changeset/191156
+
 2015-10-15  Brady Eidson  
 
 Modern IDB: Support IDBDatabase.close().


Modified: trunk/LayoutTests/storage/indexeddb/modern/opendatabase-versions-expected.txt (191156 => 191157)

--- trunk/LayoutTests/storage/indexeddb/modern/opendatabase-versions-expected.txt	2015-10-16 00:25:02 UTC (rev 191156)
+++ trunk/LayoutTests/storage/indexeddb/modern/opendatabase-versions-expected.txt	2015-10-16 00:34:38 UTC (rev 191157)
@@ -4,10 +4,6 @@
 ALERT: Version change complete (firstPhase). Database version is now - 1
 ALERT: [object IDBOpenDBRequest] (secondPhase)
 ALERT: Successfully opened database at version 1 (secondPhase)
-ALERT: [object IDBOpenDBRequest] (thirdPhase)
-ALERT: upgradeneeded (thirdPhase): old version - 1 new version - 2
-ALERT: [object IDBTransaction]
-ALERT: Version change complete (thirdPhase). Database version is now - 2
 ALERT: Done
 This test creates a new database with the default version, commits that versionchange transaction, and then reopens it at different versions to make sure the IDBOpenDBRequests behave appropriately.
 


Modified: trunk/LayoutTests/storage/indexeddb/modern/opendatabase-versions.html (191156 => 191157)

--- trunk/LayoutTests/storage/indexeddb/modern/opendatabase-versions.html	2015-10-16 00:25:02 UTC (rev 191156)
+++ trunk/LayoutTests/storage/indexeddb/modern/opendatabase-versions.html	2015-10-16 00:34:38 UTC (rev 191157)
@@ -34,7 +34,6 @@
 request.transaction._oncomplete_ = function()
 {
 alert("Version change complete (firstPhase). Database version is now - " + request.transaction.db.version);
-request.transaction.db.close();
 secondPhase();
 }
 request.transaction._onabort_ = function()
@@ -56,9 +55,10 @@
 request._onsuccess_ = function()
 {
 alert("Successfully opened database at version 1 (secondPhase)");
-request.result.close();
-request.result.close(); // Close it twice just for the heck of it
-thirdPhase();
+
+// FIXME: The following call will be used once bugs 150147-150150 are resolved.
+// thirdPhase();
+done();
 }
 request._onerror_ = function(e)
 {
@@ -78,13 +78,13 @@
 alert(request + " (thirdPhase)");
 request._onsuccess_ = function()
 {
-alert("Unexpected success (thirdPhase)");
-done();
+ alert("Unexpected success (thirdPhase)");
+ done();
 }
 request._onerror_ = function(e)
 {
-alert("Unexpected error (thirdPhase)");
-done();
+ alert("Unexpected error (thirdPhase)");
+ done();
 }
 request._onupgradeneeded_ = function(e)
 {
@@ -93,7 +93,6 @@
 request.transaction._oncomplete_ = function()
 {
  

[webkit-changes] [191159] trunk

2015-10-15 Thread joepeck
Title: [191159] trunk








Revision 191159
Author joep...@webkit.org
Date 2015-10-15 19:15:56 -0700 (Thu, 15 Oct 2015)


Log Message
Web Inspector: Include Garbage Collection Event in Timeline
https://bugs.webkit.org/show_bug.cgi?id=142510

Reviewed by Geoffrey Garen and Brian Burg.

Source/_javascript_Core:

* CMakeLists.txt:
* DerivedSources.make:
* _javascript_Core.xcodeproj/project.pbxproj:
Include new files in the build.

* heap/HeapObserver.h:
(JSC::HeapObserver::~HeapObserver):
* heap/Heap.cpp:
(JSC::Heap::willStartCollection):
(JSC::Heap::didFinishCollection):
* heap/Heap.h:
(JSC::Heap::addObserver):
(JSC::Heap::removeObserver):
Allow observers on heap to add hooks for starting / ending garbage collection.

* inspector/InspectorEnvironment.h:
* inspector/JSGlobalObjectInspectorController.cpp:
(Inspector::JSGlobalObjectInspectorController::JSGlobalObjectInspectorController):
(Inspector::JSGlobalObjectInspectorController::vm):
* inspector/JSGlobalObjectInspectorController.h:
Access the VM through the InspectorEnvironment as it won't change.

* inspector/agents/InspectorHeapAgent.cpp: Added.
(Inspector::InspectorHeapAgent::InspectorHeapAgent):
(Inspector::InspectorHeapAgent::~InspectorHeapAgent):
(Inspector::InspectorHeapAgent::didCreateFrontendAndBackend):
(Inspector::InspectorHeapAgent::willDestroyFrontendAndBackend):
(Inspector::InspectorHeapAgent::enable):
(Inspector::InspectorHeapAgent::disable):
(Inspector::InspectorHeapAgent::gc):
(Inspector::protocolTypeForHeapOperation):
(Inspector::InspectorHeapAgent::willGarbageCollect):
(Inspector::InspectorHeapAgent::didGarbageCollect):
* inspector/agents/InspectorHeapAgent.h: Added.
* inspector/protocol/Heap.json: Added.
New domain and agent to handle tasks related to the _javascript_Core heap.

Source/WebCore:

Tests: inspector/heap/garbageCollected.html
   inspector/heap/gc.html

* ForwardingHeaders/heap/HeapObserver.h: Added.
* ForwardingHeaders/inspector/agents/InspectorHeapAgent.h: Added.
* WebCore.vcxproj/WebCore.vcxproj:
* WebCore.vcxproj/WebCore.vcxproj.filters:
Forwarding headers.

* inspector/InspectorController.cpp:
(WebCore::InspectorController::InspectorController):
(WebCore::InspectorController::vm):
* inspector/InspectorController.h:
* inspector/WorkerInspectorController.cpp:
(WebCore::WorkerInspectorController::vm):
* inspector/WorkerInspectorController.h:
Implement InspectorEnvironment::vm and create a Heap agent for the
Page inspector controller.

Source/WebInspectorUI:

* UserInterface/Base/Utilities.js:
(Array.prototype.partition):
Helper to partition an Array into two arrays.

* Localizations/en.lproj/localizedStrings.js:
* UserInterface/Base/Main.js:
(WebInspector.loaded):
* UserInterface/Test.html:
* UserInterface/Test/Test.js:
(WebInspector.loaded):
* UserInterface/Protocol/HeapObserver.js: Added.
(WebInspector.HeapObserver.prototype.garbageCollected):
(WebInspector.HeapObserver):
Create the new observer and manager.

* UserInterface/Models/GarbageCollection.js: Added.
(WebInspector.GarbageCollection):
(WebInspector.GarbageCollection.fromPayload):
(WebInspector.GarbageCollection.prototype.get type):
(WebInspector.GarbageCollection.prototype.get startTime):
(WebInspector.GarbageCollection.prototype.get endTime):
(WebInspector.GarbageCollection.prototype.get duration):
Model object for Heap.GarbageCollection.

* UserInterface/Controllers/HeapManager.js: Added.
(WebInspector.HeapManager):
(WebInspector.HeapManager.prototype.garbageCollected):
Dispatch events with the GC object.

* UserInterface/Controllers/TimelineManager.js:
(WebInspector.TimelineManager):
(WebInspector.TimelineManager.prototype._garbageCollected):
Include new GC Timeline Events as Script events.

* UserInterface/Views/ScriptTimelineOverviewGraph.js:
(WebInspector.ScriptTimelineOverviewGraph.prototype.updateLayout):
For the Script overview, make two sets of bars, one for Scripts and one for GCs.
The GCs bar will be overlaid on top of the the Scripts bar. This is particularly
useful since a GC can happen during script execution.

* UserInterface/Images/TimelineRecordGarbageCollection.svg: Added.
* UserInterface/Main.html:
* UserInterface/Models/ScriptTimelineRecord.js:
(WebInspector.ScriptTimelineRecord.prototype.isGarbageCollection):
(WebInspector.ScriptTimelineRecord.EventType.displayName):
* UserInterface/Views/ScriptTimelineDataGridNode.js:
(WebInspector.ScriptTimelineDataGridNode.prototype.get data):
(WebInspector.ScriptTimelineDataGridNode.prototype.createCellContent):
(WebInspector.ScriptTimelineDataGridNode):
* UserInterface/Views/ScriptTimelineView.js:
(WebInspector.ScriptTimelineView.prototype._processPendingRecords):
* UserInterface/Views/SourceCodeTimelineTreeElement.js:
(WebInspector.SourceCodeTimelineTreeElement):
* UserInterface/Views/TimelineIcons.css:
(.garbage-collection-profile-record .icon):
* UserInterface/Views/TimelineRecordBar.css:
(.timeline-record-bar.timeline-record-type-script.script-timeline-record-garbage-collected > .segment):

[webkit-changes] [191163] trunk/Source/WebKit2

2015-10-15 Thread gyuyoung . kim
Title: [191163] trunk/Source/WebKit2








Revision 191163
Author gyuyoung@webkit.org
Date 2015-10-15 19:51:06 -0700 (Thu, 15 Oct 2015)


Log Message
 EFL build fix since r191137

 Unreviewed EFL build fix.

* UIProcess/CoordinatedGraphics/WebView.cpp: Removed.

Modified Paths

trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/WebView.cpp
trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/WebView.h
trunk/Source/WebKit2/UIProcess/efl/WebContextMenuProxyEfl.cpp
trunk/Source/WebKit2/UIProcess/efl/WebContextMenuProxyEfl.h
trunk/Source/WebKit2/UIProcess/efl/WebPopupMenuListenerEfl.cpp
trunk/Source/WebKit2/UIProcess/efl/WebViewEfl.cpp
trunk/Source/WebKit2/UIProcess/efl/WebViewEfl.h




Diff

Modified: trunk/Source/WebKit2/ChangeLog (191162 => 191163)

--- trunk/Source/WebKit2/ChangeLog	2015-10-16 02:36:29 UTC (rev 191162)
+++ trunk/Source/WebKit2/ChangeLog	2015-10-16 02:51:06 UTC (rev 191163)
@@ -1,3 +1,11 @@
+2015-10-15  Gyuyoung Kim  
+
+ EFL build fix since r191137
+
+ Unreviewed EFL build fix.
+
+* UIProcess/CoordinatedGraphics/WebView.cpp: Removed.
+
 2015-10-15  Myles C. Maxfield  
 
 Migrate to CGContextSetBaseCTM() and CGContextResetClip() from WKSI


Modified: trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/WebView.cpp (191162 => 191163)

--- trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/WebView.cpp	2015-10-16 02:36:29 UTC (rev 191162)
+++ trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/WebView.cpp	2015-10-16 02:51:06 UTC (rev 191163)
@@ -432,13 +432,13 @@
 }
 #endif
 
-RefPtr WebView::createPopupMenuProxy(WebPageProxy*)
+RefPtr WebView::createPopupMenuProxy(WebPageProxy&)
 {
 notImplemented();
 return nullptr;
 }
 
-RefPtr WebView::createContextMenuProxy(WebPageProxy*)
+RefPtr WebView::createContextMenuProxy(WebPageProxy&, const ContextMenuContextData&, const UserData&)
 {
 notImplemented();
 return nullptr;


Modified: trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/WebView.h (191162 => 191163)

--- trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/WebView.h	2015-10-16 02:36:29 UTC (rev 191162)
+++ trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/WebView.h	2015-10-16 02:51:06 UTC (rev 191163)
@@ -179,8 +179,8 @@
 virtual void doneWithTouchEvent(const NativeWebTouchEvent&, bool wasEventHandled) override;
 #endif
 
-virtual RefPtr createPopupMenuProxy(WebPageProxy*) override;
-virtual RefPtr createContextMenuProxy(WebPageProxy*) override;
+virtual RefPtr createPopupMenuProxy(WebPageProxy&) override;
+virtual RefPtr createContextMenuProxy(WebPageProxy&, const ContextMenuContextData&, const UserData&) override;
 #if ENABLE(INPUT_TYPE_COLOR)
 virtual RefPtr createColorPicker(WebPageProxy*, const WebCore::Color& initialColor, const WebCore::IntRect&) override;
 #endif


Modified: trunk/Source/WebKit2/UIProcess/efl/WebContextMenuProxyEfl.cpp (191162 => 191163)

--- trunk/Source/WebKit2/UIProcess/efl/WebContextMenuProxyEfl.cpp	2015-10-16 02:36:29 UTC (rev 191162)
+++ trunk/Source/WebKit2/UIProcess/efl/WebContextMenuProxyEfl.cpp	2015-10-16 02:51:06 UTC (rev 191163)
@@ -37,7 +37,8 @@
 
 namespace WebKit {
 
-WebContextMenuProxyEfl::WebContextMenuProxyEfl(EwkView*, WebPageProxy*)
+WebContextMenuProxyEfl::WebContextMenuProxyEfl(EwkView*, WebPageProxy&, const ContextMenuContextData& context, const UserData& userData)
+: WebContextMenuProxy(context, userData)
 {
 }
 
@@ -45,7 +46,7 @@
 {
 }
 
-void WebContextMenuProxyEfl::showContextMenu(const WebCore::IntPoint&, const Vector&, const ContextMenuContextData&)
+void WebContextMenuProxyEfl::showContextMenu(const Vector&)
 {
 notImplemented();
 }
@@ -55,6 +56,12 @@
 notImplemented();
 }
 
+void WebContextMenuProxyEfl::cancelTracking()
+{
+notImplemented();
+}
+
+
 } // namespace WebKit
 
 #endif // ENABLE(CONTEXT_MENUS)


Modified: trunk/Source/WebKit2/UIProcess/efl/WebContextMenuProxyEfl.h (191162 => 191163)

--- trunk/Source/WebKit2/UIProcess/efl/WebContextMenuProxyEfl.h	2015-10-16 02:36:29 UTC (rev 191162)
+++ trunk/Source/WebKit2/UIProcess/efl/WebContextMenuProxyEfl.h	2015-10-16 02:51:06 UTC (rev 191163)
@@ -41,18 +41,19 @@
 
 class WebContextMenuProxyEfl : public WebContextMenuProxy {
 public:
-static PassRefPtr create(EwkView* viewImpl, WebPageProxy* page)
+static Ref create(EwkView* viewImpl, WebPageProxy& page, const ContextMenuContextData& context, const UserData& userData)
 {
-return adoptRef(new WebContextMenuProxyEfl(viewImpl, page));
+return adoptRef(*new WebContextMenuProxyEfl(viewImpl, page, context, userData));
 }
 
 ~WebContextMenuProxyEfl();
 
-void showContextMenu(const WebCore::IntPoint&, const Vector&, const ContextMenuContextData&);
-void hideContextMenu();
+virtual void showContextMenu(const Vector&) override;
+virtual void hideContextMenu() override;
+virtual void 

[webkit-changes] [191149] tags/Safari-602.1.7/Source/JavaScriptCore

2015-10-15 Thread bshafiei
Title: [191149] tags/Safari-602.1.7/Source/_javascript_Core








Revision 191149
Author bshaf...@apple.com
Date 2015-10-15 16:38:21 -0700 (Thu, 15 Oct 2015)


Log Message
Roll out r190904. rdar://problem/23128791

Modified Paths

tags/Safari-602.1.7/Source/_javascript_Core/ChangeLog
tags/Safari-602.1.7/Source/_javascript_Core/runtime/JSObject.cpp




Diff

Modified: tags/Safari-602.1.7/Source/_javascript_Core/ChangeLog (191148 => 191149)

--- tags/Safari-602.1.7/Source/_javascript_Core/ChangeLog	2015-10-15 23:20:07 UTC (rev 191148)
+++ tags/Safari-602.1.7/Source/_javascript_Core/ChangeLog	2015-10-15 23:38:21 UTC (rev 191149)
@@ -1,3 +1,7 @@
+2015-10-15  Babak Shafiei  
+
+Roll out r190904.
+
 2015-10-14  Mark Lam  
 
 Speculative build fix: the CallSiteIndex constructor is explicit and requires an uint32_t.


Modified: tags/Safari-602.1.7/Source/_javascript_Core/runtime/JSObject.cpp (191148 => 191149)

--- tags/Safari-602.1.7/Source/_javascript_Core/runtime/JSObject.cpp	2015-10-15 23:20:07 UTC (rev 191148)
+++ tags/Safari-602.1.7/Source/_javascript_Core/runtime/JSObject.cpp	2015-10-15 23:38:21 UTC (rev 191149)
@@ -2494,8 +2494,8 @@
 ASSERT(length < MAX_ARRAY_INDEX);
 ASSERT(length < MAX_STORAGE_VECTOR_LENGTH);
 ASSERT(hasContiguous(indexingType()) || hasInt32(indexingType()) || hasDouble(indexingType()) || hasUndecided(indexingType()));
-ASSERT(m_butterfly.get(this)->vectorLength() > length);
-ASSERT(!m_butterfly.get(this)->indexingHeader()->preCapacity(structure()));
+ASSERT(m_butterfly->vectorLength() > length);
+ASSERT(!m_butterfly->indexingHeader()->preCapacity(structure()));
 
 DeferGC deferGC(vm.heap);
 Butterfly* newButterfly = m_butterfly.get(this)->resizeArray(vm, this, structure(), 0, ArrayStorage::sizeFor(length));






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


[webkit-changes] [191158] trunk/LayoutTests

2015-10-15 Thread dino
Title: [191158] trunk/LayoutTests








Revision 191158
Author d...@apple.com
Date 2015-10-15 18:33:00 -0700 (Thu, 15 Oct 2015)


Log Message
Remove deprecated function insertRule(), replace with appendRule()
https://bugs.webkit.org/show_bug.cgi?id=150188

Unreviewed. This was a mistake in my review of Ryan's patch.
The CSSOM is confusing. This test was not always using a CSSKeyframesRule
object, so it should still be calling insertRule. This does produce
a console message, so added that to the expected result.

* http/tests/css/resources/shared-stylesheet-mutation.js:
(executeTests): Back to insertRule.
* http/tests/css/shared-stylesheet-mutation-expected.txt:
* http/tests/css/shared-stylesheet-mutation-preconstruct-expected.txt:

* http/tests/css/resources/shared-stylesheet-mutation.js:
(executeTests): Back to insertRule.

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/LayoutTests/http/tests/css/resources/shared-stylesheet-mutation.js
trunk/LayoutTests/http/tests/css/shared-stylesheet-mutation-expected.txt
trunk/LayoutTests/http/tests/css/shared-stylesheet-mutation-preconstruct-expected.txt




Diff

Modified: trunk/LayoutTests/ChangeLog (191157 => 191158)

--- trunk/LayoutTests/ChangeLog	2015-10-16 00:34:38 UTC (rev 191157)
+++ trunk/LayoutTests/ChangeLog	2015-10-16 01:33:00 UTC (rev 191158)
@@ -1,3 +1,21 @@
+2015-10-15  Dean Jackson  
+
+Remove deprecated function insertRule(), replace with appendRule()
+https://bugs.webkit.org/show_bug.cgi?id=150188
+
+Unreviewed. This was a mistake in my review of Ryan's patch.
+The CSSOM is confusing. This test was not always using a CSSKeyframesRule
+object, so it should still be calling insertRule. This does produce
+a console message, so added that to the expected result.
+
+* http/tests/css/resources/shared-stylesheet-mutation.js:
+(executeTests): Back to insertRule.
+* http/tests/css/shared-stylesheet-mutation-expected.txt:
+* http/tests/css/shared-stylesheet-mutation-preconstruct-expected.txt:
+
+* http/tests/css/resources/shared-stylesheet-mutation.js:
+(executeTests): Back to insertRule.
+
 2015-10-15  Commit Queue  
 
 Unreviewed, rolling out r191156.


Modified: trunk/LayoutTests/http/tests/css/resources/shared-stylesheet-mutation.js (191157 => 191158)

--- trunk/LayoutTests/http/tests/css/resources/shared-stylesheet-mutation.js	2015-10-16 00:34:38 UTC (rev 191157)
+++ trunk/LayoutTests/http/tests/css/resources/shared-stylesheet-mutation.js	2015-10-16 01:33:00 UTC (rev 191158)
@@ -77,9 +77,9 @@
 
 mutationTest(0, '', 'red');
 
-mutationTest(1, 'sheet.appendRule("#testdiv { background-color: green; }", 3)', 'green');
+mutationTest(1, 'sheet.insertRule("#testdiv { background-color: green; }", 3)', 'green');
 mutationTest(2, 'sheet.deleteRule(2)');
-mutationTest(3, 'sheet.cssRules[2].appendRule("#testdiv { background-color: green; }", 1)', 'green');
+mutationTest(3, 'sheet.cssRules[2].insertRule("#testdiv { background-color: green; }", 1)', 'green');
 mutationTest(4, 'sheet.cssRules[2].deleteRule(0)', 'green');
 mutationTest(5, 'sheet.cssRules[2].cssRules[0].style.setProperty("background-color", "green", "")', 'green');
 mutationTest(6, 'sheet.cssRules[2].cssRules[0].style.removeProperty("background-color")', 'green');
@@ -95,7 +95,7 @@
 
 var testString = '\
 sheet.deleteRule(3);\
-sheet.appendRule("#testdiv { background-color: green; }", 1);\
+sheet.insertRule("#testdiv { background-color: green; }", 1);\
 sheet.deleteRule(2);\
 sheet.deleteRule(0);\
 sheet.deleteRule(3);\
@@ -105,10 +105,10 @@
 mutationTest(11, testString, 'green');
 
 var importRule = '@import "data:text/css;charset=utf-8,%23testdiv%7Bbackground-color%3Agreen%20!important%7D";';
-mutationTest(12, "sheet.appendRule('"+importRule+"', 1)", 'green');
+mutationTest(12, "sheet.insertRule('"+importRule+"', 1)", 'green');
 
 mutationTest(13, 'sheet.cssRules[3].selectorText = "foo"', 'red');
-mutationTest(14, 'sheet.cssRules[4].appendRule("40% { left: 40px; }")', 'red');
+mutationTest(14, 'sheet.cssRules[4].insertRule("40% { left: 40px; }")', 'red');
 mutationTest(15, 'sheet.cssRules[4].deleteRule("100%")', 'red');
 mutationTest(16, 'sheet.cssRules[5].style.setProperty("font-family", "Bar", "")', 'red');
 


Modified: trunk/LayoutTests/http/tests/css/shared-stylesheet-mutation-expected.txt (191157 => 191158)

--- trunk/LayoutTests/http/tests/css/shared-stylesheet-mutation-expected.txt	2015-10-16 00:34:38 UTC (rev 191157)
+++ trunk/LayoutTests/http/tests/css/shared-stylesheet-mutation-expected.txt	2015-10-16 01:33:00 UTC (rev 191158)
@@ -1,3 +1,4 @@
+CONSOLE MESSAGE: line 1: CSSKeyframesRule 'insertRule' function is deprecated.  Use 'appendRule' instead.
 The test loads the same stylesheet to different frames and then 

[webkit-changes] [191144] trunk/Source/WebKit2

2015-10-15 Thread andersca
Title: [191144] trunk/Source/WebKit2








Revision 191144
Author ander...@apple.com
Date 2015-10-15 15:51:33 -0700 (Thu, 15 Oct 2015)


Log Message
Use the context inside WebContextMenuProxyMac
https://bugs.webkit.org/show_bug.cgi?id=150196

Reviewed by Tim Horton.

* UIProcess/WebContextMenuProxy.h:
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::internalShowContextMenu):
* UIProcess/mac/WebContextMenuProxyMac.h:
* UIProcess/mac/WebContextMenuProxyMac.mm:
(WebKit::WebContextMenuProxyMac::populate):
(WebKit::WebContextMenuProxyMac::showContextMenu):

Modified Paths

trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/WebContextMenuProxy.h
trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp
trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.h
trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm




Diff

Modified: trunk/Source/WebKit2/ChangeLog (191143 => 191144)

--- trunk/Source/WebKit2/ChangeLog	2015-10-15 22:34:20 UTC (rev 191143)
+++ trunk/Source/WebKit2/ChangeLog	2015-10-15 22:51:33 UTC (rev 191144)
@@ -1,5 +1,20 @@
 2015-10-15  Anders Carlsson  
 
+Use the context inside WebContextMenuProxyMac
+https://bugs.webkit.org/show_bug.cgi?id=150196
+
+Reviewed by Tim Horton.
+
+* UIProcess/WebContextMenuProxy.h:
+* UIProcess/WebPageProxy.cpp:
+(WebKit::WebPageProxy::internalShowContextMenu):
+* UIProcess/mac/WebContextMenuProxyMac.h:
+* UIProcess/mac/WebContextMenuProxyMac.mm:
+(WebKit::WebContextMenuProxyMac::populate):
+(WebKit::WebContextMenuProxyMac::showContextMenu):
+
+2015-10-15  Anders Carlsson  
+
 Use the context menu location that's stored in the context data
 https://bugs.webkit.org/show_bug.cgi?id=150194
 


Modified: trunk/Source/WebKit2/UIProcess/WebContextMenuProxy.h (191143 => 191144)

--- trunk/Source/WebKit2/UIProcess/WebContextMenuProxy.h	2015-10-15 22:34:20 UTC (rev 191143)
+++ trunk/Source/WebKit2/UIProcess/WebContextMenuProxy.h	2015-10-15 22:51:33 UTC (rev 191144)
@@ -39,7 +39,7 @@
 public:
 virtual ~WebContextMenuProxy();
 
-virtual void showContextMenu(const Vector&, const ContextMenuContextData&) = 0;
+virtual void showContextMenu(const Vector&) = 0;
 virtual void hideContextMenu() = 0;
 virtual void cancelTracking() { }
 


Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (191143 => 191144)

--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp	2015-10-15 22:34:20 UTC (rev 191143)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp	2015-10-15 22:51:33 UTC (rev 191144)
@@ -4236,7 +4236,7 @@
 
 const Vector& itemsToShow = useProposedItems ? proposedAPIItems : clientItems;
 if (!m_contextMenuClient->showContextMenu(*this, contextMenuContextData.menuLocation(), itemsToShow))
-m_activeContextMenu->showContextMenu(itemsToShow, contextMenuContextData);
+m_activeContextMenu->showContextMenu(itemsToShow);
 
 m_contextMenuClient->contextMenuDismissed(*this);
 }


Modified: trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.h (191143 => 191144)

--- trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.h	2015-10-15 22:34:20 UTC (rev 191143)
+++ trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.h	2015-10-15 22:51:33 UTC (rev 191144)
@@ -50,7 +50,7 @@
 }
 ~WebContextMenuProxyMac();
 
-virtual void showContextMenu(const Vector&, const ContextMenuContextData&) override;
+virtual void showContextMenu(const Vector&) override;
 
 virtual void hideContextMenu() override;
 virtual void cancelTracking() override;
@@ -67,7 +67,7 @@
 private:
 WebContextMenuProxyMac(WKView*, WebPageProxy&, const ContextMenuContextData&, const UserData&);
 
-void populate(const Vector&, const ContextMenuContextData&);
+void populate(const Vector&);
 
 #if ENABLE(SERVICE_CONTROLS)
 void setupServicesMenu(const ContextMenuContextData&);


Modified: trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm (191143 => 191144)

--- trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm	2015-10-15 22:34:20 UTC (rev 191143)
+++ trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm	2015-10-15 22:51:33 UTC (rev 191144)
@@ -324,11 +324,11 @@
 }
 #endif
 
-void WebContextMenuProxyMac::populate(const Vector& items, const ContextMenuContextData& context)
+void WebContextMenuProxyMac::populate(const Vector& items)
 {
 #if ENABLE(SERVICE_CONTROLS)
-if (context.needsServicesMenu()) {
-setupServicesMenu(context);
+if (m_context.needsServicesMenu()) {
+setupServicesMenu(m_context);
 return;
 }
 #endif
@@ -346,17 +346,17 @@
 populateNSMenu(menu, nsMenuItemVector(items));
 }
 
-void WebContextMenuProxyMac::showContextMenu(const Vector& items, const ContextMenuContextData& context)
+void WebContextMenuProxyMac::showContextMenu(const 

[webkit-changes] [191147] trunk/LayoutTests

2015-10-15 Thread dino
Title: [191147] trunk/LayoutTests








Revision 191147
Author d...@apple.com
Date 2015-10-15 16:18:09 -0700 (Thu, 15 Oct 2015)


Log Message
Remove deprecated function insertRule(), replace with appendRule()
https://bugs.webkit.org/show_bug.cgi?id=150188

Patch by Ryan Haddad  on 2015-10-15
Reviewed by Dean Jackson.

* http/tests/css/resources/shared-stylesheet-mutation.js:
(executeTests):

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/LayoutTests/http/tests/css/resources/shared-stylesheet-mutation.js




Diff

Modified: trunk/LayoutTests/ChangeLog (191146 => 191147)

--- trunk/LayoutTests/ChangeLog	2015-10-15 23:03:17 UTC (rev 191146)
+++ trunk/LayoutTests/ChangeLog	2015-10-15 23:18:09 UTC (rev 191147)
@@ -1,3 +1,13 @@
+2015-10-15  Ryan Haddad  
+
+Remove deprecated function insertRule(), replace with appendRule()
+https://bugs.webkit.org/show_bug.cgi?id=150188
+
+Reviewed by Dean Jackson.
+
+* http/tests/css/resources/shared-stylesheet-mutation.js:
+(executeTests):
+
 2015-10-15  Commit Queue  
 
 Unreviewed, rolling out r191135.


Modified: trunk/LayoutTests/http/tests/css/resources/shared-stylesheet-mutation.js (191146 => 191147)

--- trunk/LayoutTests/http/tests/css/resources/shared-stylesheet-mutation.js	2015-10-15 23:03:17 UTC (rev 191146)
+++ trunk/LayoutTests/http/tests/css/resources/shared-stylesheet-mutation.js	2015-10-15 23:18:09 UTC (rev 191147)
@@ -77,9 +77,9 @@
 
 mutationTest(0, '', 'red');
 
-mutationTest(1, 'sheet.insertRule("#testdiv { background-color: green; }", 3)', 'green');
+mutationTest(1, 'sheet.appendRule("#testdiv { background-color: green; }", 3)', 'green');
 mutationTest(2, 'sheet.deleteRule(2)');
-mutationTest(3, 'sheet.cssRules[2].insertRule("#testdiv { background-color: green; }", 1)', 'green');
+mutationTest(3, 'sheet.cssRules[2].appendRule("#testdiv { background-color: green; }", 1)', 'green');
 mutationTest(4, 'sheet.cssRules[2].deleteRule(0)', 'green');
 mutationTest(5, 'sheet.cssRules[2].cssRules[0].style.setProperty("background-color", "green", "")', 'green');
 mutationTest(6, 'sheet.cssRules[2].cssRules[0].style.removeProperty("background-color")', 'green');
@@ -95,7 +95,7 @@
 
 var testString = '\
 sheet.deleteRule(3);\
-sheet.insertRule("#testdiv { background-color: green; }", 1);\
+sheet.appendRule("#testdiv { background-color: green; }", 1);\
 sheet.deleteRule(2);\
 sheet.deleteRule(0);\
 sheet.deleteRule(3);\
@@ -105,10 +105,10 @@
 mutationTest(11, testString, 'green');
 
 var importRule = '@import "data:text/css;charset=utf-8,%23testdiv%7Bbackground-color%3Agreen%20!important%7D";';
-mutationTest(12, "sheet.insertRule('"+importRule+"', 1)", 'green');
+mutationTest(12, "sheet.appendRule('"+importRule+"', 1)", 'green');
 
 mutationTest(13, 'sheet.cssRules[3].selectorText = "foo"', 'red');
-mutationTest(14, 'sheet.cssRules[4].insertRule("40% { left: 40px; }")', 'red');
+mutationTest(14, 'sheet.cssRules[4].appendRule("40% { left: 40px; }")', 'red');
 mutationTest(15, 'sheet.cssRules[4].deleteRule("100%")', 'red');
 mutationTest(16, 'sheet.cssRules[5].style.setProperty("font-family", "Bar", "")', 'red');
 






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


[webkit-changes] [191155] trunk/Source/WebCore

2015-10-15 Thread hyatt
Title: [191155] trunk/Source/WebCore








Revision 191155
Author hy...@apple.com
Date 2015-10-15 17:18:35 -0700 (Thu, 15 Oct 2015)


Log Message
Patch parseKeywordValue to accept "unset" so that it goes down the faster parsing path.
https://bugs.webkit.org/show_bug.cgi?id=150213

Reviewed by Dean Jackson.

No new tests as correctness doesn't change (just speed).

* css/CSSParser.cpp:
(WebCore::parseKeywordValue):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/css/CSSParser.cpp




Diff

Modified: trunk/Source/WebCore/ChangeLog (191154 => 191155)

--- trunk/Source/WebCore/ChangeLog	2015-10-16 00:13:36 UTC (rev 191154)
+++ trunk/Source/WebCore/ChangeLog	2015-10-16 00:18:35 UTC (rev 191155)
@@ -1,5 +1,17 @@
 2015-10-15  David Hyatt  
 
+Patch parseKeywordValue to accept "unset" so that it goes down the faster parsing path.
+https://bugs.webkit.org/show_bug.cgi?id=150213
+
+Reviewed by Dean Jackson.
+
+No new tests as correctness doesn't change (just speed).
+
+* css/CSSParser.cpp:
+(WebCore::parseKeywordValue):
+
+2015-10-15  David Hyatt  
+
 Add support for the CSS 'unset' keyword.
 https://bugs.webkit.org/show_bug.cgi?id=148614
 


Modified: trunk/Source/WebCore/css/CSSParser.cpp (191154 => 191155)

--- trunk/Source/WebCore/css/CSSParser.cpp	2015-10-16 00:13:36 UTC (rev 191154)
+++ trunk/Source/WebCore/css/CSSParser.cpp	2015-10-16 00:18:35 UTC (rev 191155)
@@ -1197,10 +1197,10 @@
 if (!isKeywordPropertyID(propertyId)) {
 // All properties accept the values of "initial" and "inherit".
 String lowerCaseString = string.lower();
-if (lowerCaseString != "initial" && lowerCaseString != "inherit")
+if (lowerCaseString != "initial" && lowerCaseString != "inherit" && lowerCaseString != "unset")
 return CSSParser::ParseResult::Error;
 
-// Parse initial/inherit shorthands using the CSSParser.
+// Parse initial/inherit/unset shorthands using the CSSParser.
 if (shorthandForProperty(propertyId).length())
 return CSSParser::ParseResult::Error;
 }






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


[webkit-changes] [191156] trunk

2015-10-15 Thread beidson
Title: [191156] trunk








Revision 191156
Author beid...@apple.com
Date 2015-10-15 17:25:02 -0700 (Thu, 15 Oct 2015)


Log Message
Modern IDB: Support IDBDatabase.close().
https://bugs.webkit.org/show_bug.cgi?id=150150

Reviewed by Alex Christensen.

Source/WebCore:

No new tests (Covered by changes to storage/indexeddb/modern/opendatabase-versions.html).

* Modules/indexeddb/client/IDBConnectionToServer.cpp:
(WebCore::IDBClient::IDBConnectionToServer::databaseConnectionClosed):
* Modules/indexeddb/client/IDBConnectionToServer.h:
* Modules/indexeddb/client/IDBConnectionToServerDelegate.h:

* Modules/indexeddb/client/IDBDatabaseImpl.cpp:
(WebCore::IDBClient::IDBDatabase::IDBDatabase):
(WebCore::IDBClient::IDBDatabase::~IDBDatabase):
(WebCore::IDBClient::IDBDatabase::close):
(WebCore::IDBClient::IDBDatabase::maybeCloseInServer):
(WebCore::IDBClient::IDBDatabase::commitTransaction):
* Modules/indexeddb/client/IDBDatabaseImpl.h:
(WebCore::IDBClient::IDBDatabase::databaseConnectionIdentifier):

* Modules/indexeddb/client/IDBRequestImpl.cpp:
(WebCore::IDBClient::IDBRequest::result):

* Modules/indexeddb/server/IDBServer.cpp:
(WebCore::IDBServer::IDBServer::databaseConnectionClosed):
* Modules/indexeddb/server/IDBServer.h:

* Modules/indexeddb/server/UniqueIDBDatabase.cpp:
(WebCore::IDBServer::UniqueIDBDatabase::connectionClosedFromClient):
(WebCore::IDBServer::UniqueIDBDatabase::handleOpenDatabaseOperations): Deleted.
* Modules/indexeddb/server/UniqueIDBDatabase.h:

* Modules/indexeddb/server/UniqueIDBDatabaseConnection.cpp:
(WebCore::IDBServer::UniqueIDBDatabaseConnection::UniqueIDBDatabaseConnection):
(WebCore::IDBServer::UniqueIDBDatabaseConnection::~UniqueIDBDatabaseConnection):
(WebCore::IDBServer::UniqueIDBDatabaseConnection::hasNonFinishedTransactions):
(WebCore::IDBServer::UniqueIDBDatabaseConnection::connectionClosedFromClient):
* Modules/indexeddb/server/UniqueIDBDatabaseConnection.h:

* Modules/indexeddb/shared/InProcessIDBServer.cpp:
(WebCore::InProcessIDBServer::databaseConnectionClosed):
* Modules/indexeddb/shared/InProcessIDBServer.h:

LayoutTests:

* storage/indexeddb/modern/opendatabase-versions-expected.txt:
* storage/indexeddb/modern/opendatabase-versions.html:

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/LayoutTests/storage/indexeddb/modern/opendatabase-versions-expected.txt
trunk/LayoutTests/storage/indexeddb/modern/opendatabase-versions.html
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionToServer.cpp
trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionToServer.h
trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionToServerDelegate.h
trunk/Source/WebCore/Modules/indexeddb/client/IDBDatabaseImpl.cpp
trunk/Source/WebCore/Modules/indexeddb/client/IDBDatabaseImpl.h
trunk/Source/WebCore/Modules/indexeddb/client/IDBRequestImpl.cpp
trunk/Source/WebCore/Modules/indexeddb/server/IDBServer.cpp
trunk/Source/WebCore/Modules/indexeddb/server/IDBServer.h
trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.cpp
trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.h
trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabaseConnection.cpp
trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabaseConnection.h
trunk/Source/WebCore/Modules/indexeddb/shared/InProcessIDBServer.cpp
trunk/Source/WebCore/Modules/indexeddb/shared/InProcessIDBServer.h




Diff

Modified: trunk/LayoutTests/ChangeLog (191155 => 191156)

--- trunk/LayoutTests/ChangeLog	2015-10-16 00:18:35 UTC (rev 191155)
+++ trunk/LayoutTests/ChangeLog	2015-10-16 00:25:02 UTC (rev 191156)
@@ -1,3 +1,13 @@
+2015-10-15  Brady Eidson  
+
+Modern IDB: Support IDBDatabase.close().
+https://bugs.webkit.org/show_bug.cgi?id=150150
+
+Reviewed by Alex Christensen.
+
+* storage/indexeddb/modern/opendatabase-versions-expected.txt:
+* storage/indexeddb/modern/opendatabase-versions.html:
+
 2015-10-15  Ryan Haddad  
 
 Marking another disk-cache test as flaky on mac-wk2


Modified: trunk/LayoutTests/storage/indexeddb/modern/opendatabase-versions-expected.txt (191155 => 191156)

--- trunk/LayoutTests/storage/indexeddb/modern/opendatabase-versions-expected.txt	2015-10-16 00:18:35 UTC (rev 191155)
+++ trunk/LayoutTests/storage/indexeddb/modern/opendatabase-versions-expected.txt	2015-10-16 00:25:02 UTC (rev 191156)
@@ -4,6 +4,10 @@
 ALERT: Version change complete (firstPhase). Database version is now - 1
 ALERT: [object IDBOpenDBRequest] (secondPhase)
 ALERT: Successfully opened database at version 1 (secondPhase)
+ALERT: [object IDBOpenDBRequest] (thirdPhase)
+ALERT: upgradeneeded (thirdPhase): old version - 1 new version - 2
+ALERT: [object IDBTransaction]
+ALERT: Version change complete (thirdPhase). Database version is now - 2
 ALERT: Done
 This test creates a new database with the default version, commits that versionchange transaction, and then reopens it at different versions to 

[webkit-changes] [191160] branches/safari-601-branch/LayoutTests

2015-10-15 Thread ap
Title: [191160] branches/safari-601-branch/LayoutTests








Revision 191160
Author a...@apple.com
Date 2015-10-15 19:19:57 -0700 (Thu, 15 Oct 2015)


Log Message
Update test results on the branch.

* platform/mac-yosemite/http: Added.
* platform/mac-yosemite/http/tests: Added.
* platform/mac-yosemite/http/tests/multipart: Added.
* platform/mac-yosemite/http/tests/multipart/multipart-replace-non-html-content-expected.txt: Copied from LayoutTests/http/tests/multipart/multipart-replace-non-html-content-expected.txt.
* platform/mac/http/tests/multipart/multipart-replace-non-html-content-expected.txt:

Modified Paths

branches/safari-601-branch/LayoutTests/ChangeLog
branches/safari-601-branch/LayoutTests/platform/mac/http/tests/multipart/multipart-replace-non-html-content-expected.txt


Added Paths

branches/safari-601-branch/LayoutTests/platform/mac-yosemite/http/
branches/safari-601-branch/LayoutTests/platform/mac-yosemite/http/tests/
branches/safari-601-branch/LayoutTests/platform/mac-yosemite/http/tests/multipart/
branches/safari-601-branch/LayoutTests/platform/mac-yosemite/http/tests/multipart/multipart-replace-non-html-content-expected.txt




Diff

Modified: branches/safari-601-branch/LayoutTests/ChangeLog (191159 => 191160)

--- branches/safari-601-branch/LayoutTests/ChangeLog	2015-10-16 02:15:56 UTC (rev 191159)
+++ branches/safari-601-branch/LayoutTests/ChangeLog	2015-10-16 02:19:57 UTC (rev 191160)
@@ -1,3 +1,13 @@
+2015-10-15  Alexey Proskuryakov  
+
+Update test results on the branch.
+
+* platform/mac-yosemite/http: Added.
+* platform/mac-yosemite/http/tests: Added.
+* platform/mac-yosemite/http/tests/multipart: Added.
+* platform/mac-yosemite/http/tests/multipart/multipart-replace-non-html-content-expected.txt: Copied from LayoutTests/http/tests/multipart/multipart-replace-non-html-content-expected.txt.
+* platform/mac/http/tests/multipart/multipart-replace-non-html-content-expected.txt:
+
 2015-10-14  Matthew Hanson  
 
 Merge r191077. rdar://problem/22993325


Modified: branches/safari-601-branch/LayoutTests/platform/mac/http/tests/multipart/multipart-replace-non-html-content-expected.txt (191159 => 191160)

--- branches/safari-601-branch/LayoutTests/platform/mac/http/tests/multipart/multipart-replace-non-html-content-expected.txt	2015-10-16 02:15:56 UTC (rev 191159)
+++ branches/safari-601-branch/LayoutTests/platform/mac/http/tests/multipart/multipart-replace-non-html-content-expected.txt	2015-10-16 02:19:57 UTC (rev 191160)
@@ -1 +1,3 @@
 This text should only appear once 10 
  

[webkit-changes] [191166] trunk/LayoutTests

2015-10-15 Thread joepeck
Title: [191166] trunk/LayoutTests








Revision 191166
Author joep...@webkit.org
Date 2015-10-15 20:54:06 -0700 (Thu, 15 Oct 2015)


Log Message
Unreviewed gardening. Make inspector/heap/gc.html more reliable.

* inspector/heap/gc.html:
Stop outputing after we see the first Full GC. Resolving waits
for pending events which could incldue more GCs.

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/LayoutTests/inspector/heap/gc.html




Diff

Modified: trunk/LayoutTests/ChangeLog (191165 => 191166)

--- trunk/LayoutTests/ChangeLog	2015-10-16 03:07:25 UTC (rev 191165)
+++ trunk/LayoutTests/ChangeLog	2015-10-16 03:54:06 UTC (rev 191166)
@@ -1,3 +1,11 @@
+2015-10-15  Joseph Pecoraro  
+
+Unreviewed gardening. Make inspector/heap/gc.html more reliable.
+
+* inspector/heap/gc.html:
+Stop outputing after we see the first Full GC. Resolving waits
+for pending events which could incldue more GCs.
+
 2015-10-14  Joseph Pecoraro  
 
 Web Inspector: Include Garbage Collection Event in Timeline


Modified: trunk/LayoutTests/inspector/heap/gc.html (191165 => 191166)

--- trunk/LayoutTests/inspector/heap/gc.html	2015-10-16 03:07:25 UTC (rev 191165)
+++ trunk/LayoutTests/inspector/heap/gc.html	2015-10-16 03:54:06 UTC (rev 191166)
@@ -12,12 +12,14 @@
 description: "Calling Heap.gc should trigger Heap.garbageCollected event if enabled.",
 test: (resolve, reject) => {
 HeapAgent.gc();
+let resolving = false;
 WebInspector.heapManager.addEventListener(WebInspector.HeapManager.Event.GarbageCollected, (event) => {
 // Due to the asynchronous nature of Heap.garbageCollected events, we may see
 // non-Full GC events before we see the Full collection triggered by HeapAgent.gc.
-if (event.data.collection.type === WebInspector.GarbageCollection.Type.Full) {
+if (!resolving && event.data.collection.type === WebInspector.GarbageCollection.Type.Full) {
 InspectorTest.expectThat(event.data.collection instanceof WebInspector.GarbageCollection, "Event should have GarbageCollection data.");
 InspectorTest.expectThat(event.data.collection.type === WebInspector.GarbageCollection.Type.Full, "GarbageCollection type should be Full.");
+resolving = true;
 resolve();
 }
 });






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


[webkit-changes] [191164] trunk/Source/JavaScriptCore

2015-10-15 Thread joepeck
Title: [191164] trunk/Source/_javascript_Core








Revision 191164
Author joep...@webkit.org
Date 2015-10-15 19:58:36 -0700 (Thu, 15 Oct 2015)


Log Message
Unreviewed. Attempted EFL build fix after r191159.

* PlatformEfl.cmake:

Modified Paths

trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/PlatformEfl.cmake




Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (191163 => 191164)

--- trunk/Source/_javascript_Core/ChangeLog	2015-10-16 02:51:06 UTC (rev 191163)
+++ trunk/Source/_javascript_Core/ChangeLog	2015-10-16 02:58:36 UTC (rev 191164)
@@ -1,5 +1,11 @@
 2015-10-15  Joseph Pecoraro  
 
+Unreviewed. Attempted EFL build fix after r191159.
+
+* PlatformEfl.cmake:
+
+2015-10-15  Joseph Pecoraro  
+
 Unreviewed. Build fix after r191160.
 
 * inspector/agents/InspectorHeapAgent.cpp:


Modified: trunk/Source/_javascript_Core/PlatformEfl.cmake (191163 => 191164)

--- trunk/Source/_javascript_Core/PlatformEfl.cmake	2015-10-16 02:51:06 UTC (rev 191163)
+++ trunk/Source/_javascript_Core/PlatformEfl.cmake	2015-10-16 02:58:36 UTC (rev 191164)
@@ -1,5 +1,6 @@
 list(APPEND _javascript_Core_INCLUDE_DIRECTORIES
 ${ECORE_INCLUDE_DIRS}
+${ECORE_EVAS_INCLUDE_DIRS}
 ${EINA_INCLUDE_DIRS}
 ${EO_INCLUDE_DIRS}
 "${WTF_DIR}"






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


[webkit-changes] [191154] branches/safari-601.1.46-branch

2015-10-15 Thread matthew_hanson
Title: [191154] branches/safari-601.1.46-branch








Revision 191154
Author matthew_han...@apple.com
Date 2015-10-15 17:13:36 -0700 (Thu, 15 Oct 2015)


Log Message
Rollout r188486. rdar://problem/22707497

Modified Paths

branches/safari-601.1.46-branch/Source/WebCore/ChangeLog
branches/safari-601.1.46-branch/Source/WebCore/dom/Document.cpp
branches/safari-601.1.46-branch/Source/WebCore/loader/DocumentLoader.cpp
branches/safari-601.1.46-branch/Source/WebCore/loader/DocumentLoader.h
branches/safari-601.1.46-branch/Source/WebCore/loader/SubresourceLoader.cpp
branches/safari-601.1.46-branch/Source/WebCore/loader/SubresourceLoader.h
branches/safari-601.1.46-branch/Source/WebCore/loader/appcache/ApplicationCacheHost.cpp
branches/safari-601.1.46-branch/Source/WebCore/loader/mac/DocumentLoaderMac.cpp
branches/safari-601.1.46-branch/Source/WebKit/mac/ChangeLog
branches/safari-601.1.46-branch/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm
branches/safari-601.1.46-branch/Source/WebKit/win/ChangeLog
branches/safari-601.1.46-branch/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp
branches/safari-601.1.46-branch/Source/WebKit2/ChangeLog
branches/safari-601.1.46-branch/Source/WebKit2/WebProcess/Network/WebResourceLoader.cpp
branches/safari-601.1.46-branch/Source/WebKit2/WebProcess/WebPage/WebFrame.cpp
branches/safari-601.1.46-branch/Tools/ChangeLog
branches/safari-601.1.46-branch/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/Download.mm




Diff

Modified: branches/safari-601.1.46-branch/Source/WebCore/ChangeLog (191153 => 191154)

--- branches/safari-601.1.46-branch/Source/WebCore/ChangeLog	2015-10-16 00:13:28 UTC (rev 191153)
+++ branches/safari-601.1.46-branch/Source/WebCore/ChangeLog	2015-10-16 00:13:36 UTC (rev 191154)
@@ -1,5 +1,9 @@
 2015-10-15  Matthew Hanson  
 
+Rollout r188486. rdar://problem/22707497
+
+2015-10-15  Matthew Hanson  
+
 Rollout r188531. rdar://problem/22707497
 
 2015-10-15  Matthew Hanson  


Modified: branches/safari-601.1.46-branch/Source/WebCore/dom/Document.cpp (191153 => 191154)

--- branches/safari-601.1.46-branch/Source/WebCore/dom/Document.cpp	2015-10-16 00:13:28 UTC (rev 191153)
+++ branches/safari-601.1.46-branch/Source/WebCore/dom/Document.cpp	2015-10-16 00:13:36 UTC (rev 191154)
@@ -124,6 +124,7 @@
 #include "RenderView.h"
 #include "RenderWidget.h"
 #include "ResourceLoadScheduler.h"
+#include "ResourceLoader.h"
 #include "RuntimeEnabledFeatures.h"
 #include "SVGDocumentExtensions.h"
 #include "SVGElement.h"
@@ -146,7 +147,6 @@
 #include "StyleResolver.h"
 #include "StyleSheetContents.h"
 #include "StyleSheetList.h"
-#include "SubresourceLoader.h"
 #include "TextNodeTraversal.h"
 #include "TextResourceDecoder.h"
 #include "TransformSource.h"


Modified: branches/safari-601.1.46-branch/Source/WebCore/loader/DocumentLoader.cpp (191153 => 191154)

--- branches/safari-601.1.46-branch/Source/WebCore/loader/DocumentLoader.cpp	2015-10-16 00:13:28 UTC (rev 191153)
+++ branches/safari-601.1.46-branch/Source/WebCore/loader/DocumentLoader.cpp	2015-10-16 00:13:36 UTC (rev 191154)
@@ -154,7 +154,7 @@
 return _frame->loader();
 }
 
-SubresourceLoader* DocumentLoader::mainResourceLoader() const
+ResourceLoader* DocumentLoader::mainResourceLoader() const
 {
 return m_mainResource ? m_mainResource->loader() : 0;
 }
@@ -720,7 +720,7 @@
 
 // It might have gone missing
 if (mainResourceLoader())
-static_cast(mainResourceLoader())->didFail(interruptedForPolicyChangeError());
+mainResourceLoader()->didFail(interruptedForPolicyChangeError());
 return;
 }
 case PolicyIgnore:


Modified: branches/safari-601.1.46-branch/Source/WebCore/loader/DocumentLoader.h (191153 => 191154)

--- branches/safari-601.1.46-branch/Source/WebCore/loader/DocumentLoader.h	2015-10-16 00:13:28 UTC (rev 191153)
+++ branches/safari-601.1.46-branch/Source/WebCore/loader/DocumentLoader.h	2015-10-16 00:13:36 UTC (rev 191154)
@@ -70,7 +70,6 @@
 class Page;
 class ResourceLoader;
 class SharedBuffer;
-class SubresourceLoader;
 class SubstituteResource;
 
 #if ENABLE(CONTENT_FILTERING)
@@ -95,7 +94,7 @@
 WEBCORE_EXPORT virtual void detachFromFrame();
 
 WEBCORE_EXPORT FrameLoader* frameLoader() const;
-WEBCORE_EXPORT SubresourceLoader* mainResourceLoader() const;
+WEBCORE_EXPORT ResourceLoader* mainResourceLoader() const;
 WEBCORE_EXPORT PassRefPtr mainResourceData() const;
 
 DocumentWriter& writer() const { return m_writer; }


Modified: branches/safari-601.1.46-branch/Source/WebCore/loader/SubresourceLoader.cpp (191153 => 191154)

--- branches/safari-601.1.46-branch/Source/WebCore/loader/SubresourceLoader.cpp	2015-10-16 00:13:28 UTC (rev 191153)
+++ branches/safari-601.1.46-branch/Source/WebCore/loader/SubresourceLoader.cpp	2015-10-16 00:13:36 UTC (rev 191154)
@@ -44,7 

[webkit-changes] [191161] trunk/Source/JavaScriptCore

2015-10-15 Thread joepeck
Title: [191161] trunk/Source/_javascript_Core








Revision 191161
Author joep...@webkit.org
Date 2015-10-15 19:34:24 -0700 (Thu, 15 Oct 2015)


Log Message
Unreviewed. Revert part of r191159 which caused ASSERTs.

A review comment suggested using WeakPtr. It is not suitable
here and causes ASSERTs across threads. Will address separately.

* inspector/agents/InspectorHeapAgent.h:
* inspector/agents/InspectorHeapAgent.cpp:
(Inspector::InspectorHeapAgent::didGarbageCollect):
(Inspector::InspectorHeapAgent::InspectorHeapAgent): Deleted.

Modified Paths

trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/inspector/agents/InspectorHeapAgent.cpp
trunk/Source/_javascript_Core/inspector/agents/InspectorHeapAgent.h




Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (191160 => 191161)

--- trunk/Source/_javascript_Core/ChangeLog	2015-10-16 02:19:57 UTC (rev 191160)
+++ trunk/Source/_javascript_Core/ChangeLog	2015-10-16 02:34:24 UTC (rev 191161)
@@ -1,3 +1,15 @@
+2015-10-15  Joseph Pecoraro  
+
+Unreviewed. Revert part of r191159 which caused ASSERTs.
+
+A review comment suggested using WeakPtr. It is not suitable
+here and causes ASSERTs across threads. Will address separately.
+
+* inspector/agents/InspectorHeapAgent.h:
+* inspector/agents/InspectorHeapAgent.cpp:
+(Inspector::InspectorHeapAgent::didGarbageCollect):
+(Inspector::InspectorHeapAgent::InspectorHeapAgent): Deleted.
+
 2015-10-14  Joseph Pecoraro  
 
 Web Inspector: Include Garbage Collection Event in Timeline


Modified: trunk/Source/_javascript_Core/inspector/agents/InspectorHeapAgent.cpp (191160 => 191161)

--- trunk/Source/_javascript_Core/inspector/agents/InspectorHeapAgent.cpp	2015-10-16 02:19:57 UTC (rev 191160)
+++ trunk/Source/_javascript_Core/inspector/agents/InspectorHeapAgent.cpp	2015-10-16 02:34:24 UTC (rev 191161)
@@ -40,7 +40,6 @@
 , m_frontendDispatcher(std::make_unique(context.frontendRouter))
 , m_backendDispatcher(HeapBackendDispatcher::create(context.backendDispatcher, this))
 , m_environment(context.environment)
-, m_weakPtrFactory(this)
 {
 }
 
@@ -124,11 +123,7 @@
 // with WebKitLegacy's in process inspector which shares the same
 // VM as the inspected page.
 
-auto weakThis = m_weakPtrFactory.createWeakPtr();
-RunLoop::current().dispatch([weakThis, startTime, endTime, operation]() {
-if (!weakThis)
-return;
-
+RunLoop::current().dispatch([this, startTime, endTime, operation]() {
 auto collection = Inspector::Protocol::Heap::GarbageCollection::create()
 .setType(protocolTypeForHeapOperation(operation))
 .setStartTime(startTime)


Modified: trunk/Source/_javascript_Core/inspector/agents/InspectorHeapAgent.h (191160 => 191161)

--- trunk/Source/_javascript_Core/inspector/agents/InspectorHeapAgent.h	2015-10-16 02:19:57 UTC (rev 191160)
+++ trunk/Source/_javascript_Core/inspector/agents/InspectorHeapAgent.h	2015-10-16 02:34:24 UTC (rev 191161)
@@ -32,7 +32,6 @@
 #include "inspector/InspectorAgentBase.h"
 #include 
 #include 
-#include 
 
 namespace Inspector {
 
@@ -60,7 +59,6 @@
 std::unique_ptr m_frontendDispatcher;
 RefPtr m_backendDispatcher;
 InspectorEnvironment& m_environment;
-WeakPtrFactory m_weakPtrFactory;
 bool m_enabled { false };
 double m_gcStartTime { NAN };
 };






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


[webkit-changes] [191165] trunk/Source/JavaScriptCore

2015-10-15 Thread joepeck
Title: [191165] trunk/Source/_javascript_Core








Revision 191165
Author joep...@webkit.org
Date 2015-10-15 20:07:25 -0700 (Thu, 15 Oct 2015)


Log Message
Unreviewed. Attempted EFL build fix 2 after r191159.

* PlatformEfl.cmake:

Modified Paths

trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/PlatformEfl.cmake




Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (191164 => 191165)

--- trunk/Source/_javascript_Core/ChangeLog	2015-10-16 02:58:36 UTC (rev 191164)
+++ trunk/Source/_javascript_Core/ChangeLog	2015-10-16 03:07:25 UTC (rev 191165)
@@ -1,5 +1,11 @@
 2015-10-15  Joseph Pecoraro  
 
+Unreviewed. Attempted EFL build fix 2 after r191159.
+
+* PlatformEfl.cmake:
+
+2015-10-15  Joseph Pecoraro  
+
 Unreviewed. Attempted EFL build fix after r191159.
 
 * PlatformEfl.cmake:


Modified: trunk/Source/_javascript_Core/PlatformEfl.cmake (191164 => 191165)

--- trunk/Source/_javascript_Core/PlatformEfl.cmake	2015-10-16 02:58:36 UTC (rev 191164)
+++ trunk/Source/_javascript_Core/PlatformEfl.cmake	2015-10-16 03:07:25 UTC (rev 191165)
@@ -1,6 +1,7 @@
 list(APPEND _javascript_Core_INCLUDE_DIRECTORIES
+${ECORE_EVAS_INCLUDE_DIRS}
+${ECORE_IMF_INCLUDE_DIRS}
 ${ECORE_INCLUDE_DIRS}
-${ECORE_EVAS_INCLUDE_DIRS}
 ${EINA_INCLUDE_DIRS}
 ${EO_INCLUDE_DIRS}
 "${WTF_DIR}"






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


[webkit-changes] [191132] trunk

2015-10-15 Thread dino
Title: [191132] trunk








Revision 191132
Author d...@apple.com
Date 2015-10-15 12:57:43 -0700 (Thu, 15 Oct 2015)


Log Message
CSSKeyframesRule::appendRule is deprecated, but is actually the spec
https://bugs.webkit.org/show_bug.cgi?id=150113

Reviewed by Simon Fraser.

Source/WebCore:

I stupidly deprecated the wrong function in
http://trac.webkit.org/changeset/174469

* css/CSSKeyframesRule.cpp:
(WebCore::CSSKeyframesRule::insertRule): Swap the code between these two.
(WebCore::CSSKeyframesRule::appendRule):

LayoutTests:

Update tests to deprecate the correct function.

* animations/change-keyframes-expected.txt:
* animations/keyframes-rule.html:
* animations/unprefixed-keyframes-rule.html:

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/LayoutTests/animations/change-keyframes-expected.txt
trunk/LayoutTests/animations/keyframes-rule.html
trunk/LayoutTests/animations/unprefixed-keyframes-rule.html
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/css/CSSKeyframesRule.cpp




Diff

Modified: trunk/LayoutTests/ChangeLog (191131 => 191132)

--- trunk/LayoutTests/ChangeLog	2015-10-15 19:56:38 UTC (rev 191131)
+++ trunk/LayoutTests/ChangeLog	2015-10-15 19:57:43 UTC (rev 191132)
@@ -1,3 +1,16 @@
+2015-10-15  Dean Jackson  
+
+CSSKeyframesRule::appendRule is deprecated, but is actually the spec
+https://bugs.webkit.org/show_bug.cgi?id=150113
+
+Reviewed by Simon Fraser.
+
+Update tests to deprecate the correct function.
+
+* animations/change-keyframes-expected.txt:
+* animations/keyframes-rule.html:
+* animations/unprefixed-keyframes-rule.html:
+
 2015-10-15  Zalan Bujtas  
 
 [Win] Update anonymous table results for Win port.


Modified: trunk/LayoutTests/animations/change-keyframes-expected.txt (191131 => 191132)

--- trunk/LayoutTests/animations/change-keyframes-expected.txt	2015-10-15 19:56:38 UTC (rev 191131)
+++ trunk/LayoutTests/animations/change-keyframes-expected.txt	2015-10-15 19:57:43 UTC (rev 191132)
@@ -1,5 +1,5 @@
-CONSOLE MESSAGE: line 58: CSSKeyframesRule 'appendRule' function is deprecated.  Use 'insertRule' instead.
-CONSOLE MESSAGE: line 60: CSSKeyframesRule 'appendRule' function is deprecated.  Use 'insertRule' instead.
+CONSOLE MESSAGE: line 57: CSSKeyframesRule 'insertRule' function is deprecated.  Use 'appendRule' instead.
+CONSOLE MESSAGE: line 59: CSSKeyframesRule 'insertRule' function is deprecated.  Use 'appendRule' instead.
 This test performs an animation of the left property and makes sure it is animating. Then it stops the animation, changes the keyframes to an animation of the top property, restarts the animation and makes sure top is animating.
 PASS - "left" property for "box" element at 0.5s saw something close to: 200
 PASS - "top" property for "box" element at 1s saw something close to: 100


Modified: trunk/LayoutTests/animations/keyframes-rule.html (191131 => 191132)

--- trunk/LayoutTests/animations/keyframes-rule.html	2015-10-15 19:56:38 UTC (rev 191131)
+++ trunk/LayoutTests/animations/keyframes-rule.html	2015-10-15 19:57:43 UTC (rev 191132)
@@ -88,9 +88,9 @@
 
 debug("");
 debug("Insert three new rules");
-keyframes1.insertRule("30% { left: 30px; }");
-keyframes1.insertRule("60% { left: 60px; }");
-keyframes1.insertRule("20% { left: 50px; }");
+keyframes1.appendRule("30% { left: 30px; }");
+keyframes1.appendRule("60% { left: 60px; }");
+keyframes1.appendRule("20% { left: 50px; }");
 shouldBe("rules1.length", "5");
 
 shouldBe("rules1.item(0).cssText", "'0% { left: 10px; }'");


Modified: trunk/LayoutTests/animations/unprefixed-keyframes-rule.html (191131 => 191132)

--- trunk/LayoutTests/animations/unprefixed-keyframes-rule.html	2015-10-15 19:56:38 UTC (rev 191131)
+++ trunk/LayoutTests/animations/unprefixed-keyframes-rule.html	2015-10-15 19:57:43 UTC (rev 191132)
@@ -88,9 +88,9 @@
 
 debug("");
 debug("Insert three new rules");
-keyframes1.insertRule("30% { left: 30px; }");
-keyframes1.insertRule("60% { left: 60px; }");
-keyframes1.insertRule("20% { left: 50px; }");
+keyframes1.appendRule("30% { left: 30px; }");
+keyframes1.appendRule("60% { left: 60px; }");
+keyframes1.appendRule("20% { left: 50px; }");
 shouldBe("rules1.length", "5");
 
 shouldBe("rules1.item(0).cssText", "'0% { left: 10px; }'");


Modified: trunk/Source/WebCore/ChangeLog (191131 => 191132)

--- trunk/Source/WebCore/ChangeLog	2015-10-15 19:56:38 UTC (rev 191131)
+++ trunk/Source/WebCore/ChangeLog	2015-10-15 19:57:43 UTC (rev 191132)
@@ -1,3 +1,17 @@
+2015-10-15  Dean Jackson  
+
+CSSKeyframesRule::appendRule is deprecated, but is actually the spec
+https://bugs.webkit.org/show_bug.cgi?id=150113
+
+Reviewed by Simon Fraser.
+
+I stupidly deprecated the wrong function in
+http://trac.webkit.org/changeset/174469
+
+* css/CSSKeyframesRule.cpp:
+(WebCore::CSSKeyframesRule::insertRule): Swap the code between these two.
+

[webkit-changes] [191142] trunk/Source/WebCore

2015-10-15 Thread mitz
Title: [191142] trunk/Source/WebCore








Revision 191142
Author m...@apple.com
Date 2015-10-15 15:20:03 -0700 (Thu, 15 Oct 2015)


Log Message
Fixed the build.

* platform/network/mac/ResourceHandleMac.mm:

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/network/mac/ResourceHandleMac.mm




Diff

Modified: trunk/Source/WebCore/ChangeLog (191141 => 191142)

--- trunk/Source/WebCore/ChangeLog	2015-10-15 22:15:45 UTC (rev 191141)
+++ trunk/Source/WebCore/ChangeLog	2015-10-15 22:20:03 UTC (rev 191142)
@@ -1,5 +1,11 @@
 2015-10-15  Dan Bernstein  
 
+Fixed the build.
+
+* platform/network/mac/ResourceHandleMac.mm:
+
+2015-10-15  Dan Bernstein  
+
 [Cocoa] Stop using WKSetNSURLConnectionDefersCallbacks
 https://bugs.webkit.org/show_bug.cgi?id=150189
 


Modified: trunk/Source/WebCore/platform/network/mac/ResourceHandleMac.mm (191141 => 191142)

--- trunk/Source/WebCore/platform/network/mac/ResourceHandleMac.mm	2015-10-15 22:15:45 UTC (rev 191141)
+++ trunk/Source/WebCore/platform/network/mac/ResourceHandleMac.mm	2015-10-15 22:20:03 UTC (rev 191142)
@@ -38,6 +38,7 @@
 #import "HTTPHeaderNames.h"
 #import "Logging.h"
 #import "MIMETypeRegistry.h"
+#import "NSURLConnectionSPI.h"
 #import "NetworkingContext.h"
 #import "Page.h"
 #import "ResourceError.h"






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


[webkit-changes] [191130] trunk/Source/JavaScriptCore

2015-10-15 Thread mark . lam
Title: [191130] trunk/Source/_javascript_Core








Revision 191130
Author mark@apple.com
Date 2015-10-15 12:54:02 -0700 (Thu, 15 Oct 2015)


Log Message
Add MASM_PROBE support for ARM64.
https://bugs.webkit.org/show_bug.cgi?id=150128

Reviewed by Michael Saboff.

* _javascript_Core.xcodeproj/project.pbxproj:
* assembler/ARM64Assembler.h:
- Convert the ARM64 registers enum list into a macro list so that we can use
  it elsewhere e.g. to declare fields in the probe CPUState.
  Also de-tabbed the contents of the ARM64Registers namespace since the enum
  list change touches almost all of it anyway. This reduces the amount of
  complaints from the style checker.

* assembler/AbstractMacroAssembler.h:
(JSC::AbstractMacroAssembler::CPUState::registerName):
(JSC::AbstractMacroAssembler::CPUState::registerValue):
- Change CPUState methods to allow for registers ID that do not map to one of
  its fields. This is needed because ARM64's registers include aliases for some
  register names. The CPUState will not allocate separate storage for the
  aliases. 

* assembler/MacroAssemblerARM64.cpp: Added.
(JSC::arm64ProbeTrampoline):
- Unlike the probe mechanism for other CPUs, the ARM64 implementation does not
  allow the probe function to modify the sp and pc registers.  We insert this
  wrapper function between ctiMasmProbeTrampoline() and the user's probe function
  so that we can check if the user tried to modify sp and pc.  If so, we will
  print an error message so that we can alert the user that we don't support
  that on ARM64.

  See the comment in ctiMasmProbeTrampoline() in JITStubsARM64.h for details
  on why we cannot support sp and pc modifications by the probe function.

(JSC::MacroAssemblerARM64::probe):

* assembler/MacroAssemblerARM64.h:
(JSC::MacroAssemblerARM64::repatchCall):
(JSC::MacroAssemblerARM64::makeBranch):
* jit/JITStubs.cpp:
* jit/JITStubsARM64.h: Added.

Modified Paths

trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj
trunk/Source/_javascript_Core/assembler/ARM64Assembler.h
trunk/Source/_javascript_Core/assembler/AbstractMacroAssembler.h
trunk/Source/_javascript_Core/assembler/MacroAssemblerARM64.h
trunk/Source/_javascript_Core/jit/JITStubs.cpp


Added Paths

trunk/Source/_javascript_Core/assembler/MacroAssemblerARM64.cpp
trunk/Source/_javascript_Core/jit/JITStubsARM64.h




Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (191129 => 191130)

--- trunk/Source/_javascript_Core/ChangeLog	2015-10-15 19:52:34 UTC (rev 191129)
+++ trunk/Source/_javascript_Core/ChangeLog	2015-10-15 19:54:02 UTC (rev 191130)
@@ -1,5 +1,48 @@
 2015-10-15  Mark Lam  
 
+Add MASM_PROBE support for ARM64.
+https://bugs.webkit.org/show_bug.cgi?id=150128
+
+Reviewed by Michael Saboff.
+
+* _javascript_Core.xcodeproj/project.pbxproj:
+* assembler/ARM64Assembler.h:
+- Convert the ARM64 registers enum list into a macro list so that we can use
+  it elsewhere e.g. to declare fields in the probe CPUState.
+  Also de-tabbed the contents of the ARM64Registers namespace since the enum
+  list change touches almost all of it anyway. This reduces the amount of
+  complaints from the style checker.
+
+* assembler/AbstractMacroAssembler.h:
+(JSC::AbstractMacroAssembler::CPUState::registerName):
+(JSC::AbstractMacroAssembler::CPUState::registerValue):
+- Change CPUState methods to allow for registers ID that do not map to one of
+  its fields. This is needed because ARM64's registers include aliases for some
+  register names. The CPUState will not allocate separate storage for the
+  aliases. 
+
+* assembler/MacroAssemblerARM64.cpp: Added.
+(JSC::arm64ProbeTrampoline):
+- Unlike the probe mechanism for other CPUs, the ARM64 implementation does not
+  allow the probe function to modify the sp and pc registers.  We insert this
+  wrapper function between ctiMasmProbeTrampoline() and the user's probe function
+  so that we can check if the user tried to modify sp and pc.  If so, we will
+  print an error message so that we can alert the user that we don't support
+  that on ARM64.
+
+  See the comment in ctiMasmProbeTrampoline() in JITStubsARM64.h for details
+  on why we cannot support sp and pc modifications by the probe function.
+
+(JSC::MacroAssemblerARM64::probe):
+
+* assembler/MacroAssemblerARM64.h:
+(JSC::MacroAssemblerARM64::repatchCall):
+(JSC::MacroAssemblerARM64::makeBranch):
+* jit/JITStubs.cpp:
+* jit/JITStubsARM64.h: Added.
+
+2015-10-15  Mark Lam  
+
 Fix some typos in comments.
 https://bugs.webkit.org/show_bug.cgi?id=150181
 


Modified: trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj (191129 => 

[webkit-changes] [191134] trunk/Source/JavaScriptCore

2015-10-15 Thread fpizlo
Title: [191134] trunk/Source/_javascript_Core








Revision 191134
Author fpi...@apple.com
Date 2015-10-15 13:34:10 -0700 (Thu, 15 Oct 2015)


Log Message
InferredTypeTable should ref its keys
https://bugs.webkit.org/show_bug.cgi?id=150138
rdar://problem/23080555

Reviewed by Michael Saboff.

InferredTypeTable was incorrectly using a key hash traits that caused the underlying HashTable to
store keys as UniquedStringImpl* rather than RefPtr, even though the HashMap's
nominal key type was RefPtr. This arose because I copy-pasted the HashMap type
instantiation from other places and then made random changes to adapt it to my needs, rather than
actually thinking about what I was doing. The solution is to remove the key hash traits argument,
since all it accomplishes is to produce this bug.

The way this bug manifested is probably best described in http://webkit.org/b/150008. After a while
the InferredTypeTable would have dangling references to its strings, if some recompilation or other
thing caused us to drop all other references to those strings. InferredTypeTable is particularly
susceptible to this because it is designed to know about a superset of the property names that its
client Structures know about. The debug assert would then happen when we rehashed the
InferredTypeTable's HashMap, because we'd try to get the hashes of strings that were already
deleted. AFAICT, we didn't have release crashes arising from those strings' memory being returned
to the OS - but it's totally possible that this could have happened. So, we definitely should treat
this bug as more than just a debug issue.

Interestingly, we could have also solved this problem by changing the hash function to use PtrHash.
In all other ways, it's OK for InferredTypeTable to hold dangling references, since it uses the
address of the UniquedStringImpl as a way to name an abstract heap. It's fine if the name of an
abstract heap is a bogus memory address, and it's also fine if that name referred to an entirely
different UniquedStringImpl at some point in the past. That's a nice benefit of any data structure
that keys by abstract heap - if two of them get unified then it's no big deal. I've filed another
bug, http://webkit.org/b/150137 about changing all of our UniquedStringImpl* hashing to use
PtrHash.

* runtime/Identifier.h: Add a comment about http://webkit.org/b/150137.
* runtime/InferredTypeTable.h: Fix the bug.
* tests/stress/inferred-type-table-stale-identifiers.js: Added. I couldn't get this to cause a crash before my change, but it's an interesting test nonetheless.

Modified Paths

trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/runtime/Identifier.h
trunk/Source/_javascript_Core/runtime/InferredTypeTable.h


Added Paths

trunk/Source/_javascript_Core/tests/stress/inferred-type-table-stale-identifiers.js




Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (191133 => 191134)

--- trunk/Source/_javascript_Core/ChangeLog	2015-10-15 20:21:06 UTC (rev 191133)
+++ trunk/Source/_javascript_Core/ChangeLog	2015-10-15 20:34:10 UTC (rev 191134)
@@ -1,3 +1,41 @@
+2015-10-15  Filip Pizlo  
+
+InferredTypeTable should ref its keys
+https://bugs.webkit.org/show_bug.cgi?id=150138
+rdar://problem/23080555
+
+Reviewed by Michael Saboff.
+
+InferredTypeTable was incorrectly using a key hash traits that caused the underlying HashTable to
+store keys as UniquedStringImpl* rather than RefPtr, even though the HashMap's
+nominal key type was RefPtr. This arose because I copy-pasted the HashMap type
+instantiation from other places and then made random changes to adapt it to my needs, rather than
+actually thinking about what I was doing. The solution is to remove the key hash traits argument,
+since all it accomplishes is to produce this bug.
+
+The way this bug manifested is probably best described in http://webkit.org/b/150008. After a while
+the InferredTypeTable would have dangling references to its strings, if some recompilation or other
+thing caused us to drop all other references to those strings. InferredTypeTable is particularly
+susceptible to this because it is designed to know about a superset of the property names that its
+client Structures know about. The debug assert would then happen when we rehashed the
+InferredTypeTable's HashMap, because we'd try to get the hashes of strings that were already
+deleted. AFAICT, we didn't have release crashes arising from those strings' memory being returned
+to the OS - but it's totally possible that this could have happened. So, we definitely should treat
+this bug as more than just a debug issue.
+
+Interestingly, we could have also solved this problem by changing the hash function to use PtrHash.
+In all other ways, it's OK for InferredTypeTable to hold dangling references, since it uses the

[webkit-changes] [191139] trunk/Source/JavaScriptCore

2015-10-15 Thread ggaren
Title: [191139] trunk/Source/_javascript_Core








Revision 191139
Author gga...@apple.com
Date 2015-10-15 14:52:05 -0700 (Thu, 15 Oct 2015)


Log Message
2015-10-15  Geoffrey Garen  

Unreviewed, rolling out r191003.
https://bugs.webkit.org/show_bug.cgi?id=150042

We're seeing some crashes in GC beneath speculationFromCell. Maybe this
patch caused them?

Reverted changeset:

CodeBlock write barriers should be precise
https://bugs.webkit.org/show_bug.cgi?id=150042
http://trac.webkit.org/changeset/191003

Modified Paths

trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/bytecode/CodeBlock.h
trunk/Source/_javascript_Core/dfg/DFGOSRExitCompilerCommon.cpp




Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (191138 => 191139)

--- trunk/Source/_javascript_Core/ChangeLog	2015-10-15 21:31:09 UTC (rev 191138)
+++ trunk/Source/_javascript_Core/ChangeLog	2015-10-15 21:52:05 UTC (rev 191139)
@@ -1,3 +1,17 @@
+2015-10-15  Geoffrey Garen  
+
+Unreviewed, rolling out r191003.
+https://bugs.webkit.org/show_bug.cgi?id=150042
+
+We're seeing some crashes in GC beneath speculationFromCell. Maybe this
+patch caused them?
+
+Reverted changeset:
+
+CodeBlock write barriers should be precise
+https://bugs.webkit.org/show_bug.cgi?id=150042
+http://trac.webkit.org/changeset/191003
+
 2015-10-15  Joseph Pecoraro  
 
 Web Inspector: _javascript_Core should parse sourceURL and sourceMappingURL directives


Modified: trunk/Source/_javascript_Core/bytecode/CodeBlock.h (191138 => 191139)

--- trunk/Source/_javascript_Core/bytecode/CodeBlock.h	2015-10-15 21:31:09 UTC (rev 191138)
+++ trunk/Source/_javascript_Core/bytecode/CodeBlock.h	2015-10-15 21:52:05 UTC (rev 191139)
@@ -1376,6 +1376,11 @@
 if (!codeBlock)
 return;
 
+// Try to recover gracefully if we forget to execute a barrier for a
+// CodeBlock that does value profiling. This is probably overkill, but we
+// have always done it.
+Heap::heap(codeBlock)->writeBarrier(codeBlock);
+
 m_currentlyExecuting.add(codeBlock);
 }
 


Modified: trunk/Source/_javascript_Core/dfg/DFGOSRExitCompilerCommon.cpp (191138 => 191139)

--- trunk/Source/_javascript_Core/dfg/DFGOSRExitCompilerCommon.cpp	2015-10-15 21:31:09 UTC (rev 191138)
+++ trunk/Source/_javascript_Core/dfg/DFGOSRExitCompilerCommon.cpp	2015-10-15 21:52:05 UTC (rev 191139)
@@ -266,31 +266,30 @@
 ownerIsRememberedOrInEden.link();
 }
 
-static void osrWriteBarrier(CCallHelpers& jit, const OSRExitBase& exit)
+void adjustAndJumpToTarget(CCallHelpers& jit, const OSRExitBase& exit, bool isExitingToOpCatch)
 {
-HashSet codeBlocksToWriteBarrier;
+jit.move(
+AssemblyHelpers::TrustedImmPtr(
+jit.codeBlock()->baselineAlternative()), GPRInfo::argumentGPR1);
+osrWriteBarrier(jit, GPRInfo::argumentGPR1, GPRInfo::nonArgGPR0);
 
-// Note that the value profiling CodeBlock and the baseline CodeBlock might
-// not be equal. In "f() { a(); b(); }", if both 'a' and 'b' are inlined,
-// we might exit to 'b' due to a bad value loaded from 'a'.
-codeBlocksToWriteBarrier.add(jit.baselineCodeBlockFor(exit.m_codeOriginForExitProfile));
-
-codeBlocksToWriteBarrier.add(jit.codeBlock()->baselineAlternative());
-
-for (InlineCallFrame* inlineCallFrame = exit.m_codeOrigin.inlineCallFrame; inlineCallFrame; inlineCallFrame = inlineCallFrame->directCaller.inlineCallFrame)
-codeBlocksToWriteBarrier.add(inlineCallFrame->baselineCodeBlock.get());
-
-for (CodeBlock* codeBlock : codeBlocksToWriteBarrier) {
-jit.move(
-AssemblyHelpers::TrustedImmPtr(codeBlock), GPRInfo::argumentGPR1);
-osrWriteBarrier(jit, GPRInfo::argumentGPR1, GPRInfo::nonArgGPR0);
+// We barrier all inlined frames -- and not just the current inline stack --
+// because we don't know which inlined function owns the value profile that
+// we'll update when we exit. In the case of "f() { a(); b(); }", if both
+// a and b are inlined, we might exit inside b due to a bad value loaded
+// from a.
+// FIXME: MethodOfGettingAValueProfile should remember which CodeBlock owns
+// the value profile.
+InlineCallFrameSet* inlineCallFrames = jit.codeBlock()->jitCode()->dfgCommon()->inlineCallFrames.get();
+if (inlineCallFrames) {
+for (InlineCallFrame* inlineCallFrame : *inlineCallFrames) {
+jit.move(
+AssemblyHelpers::TrustedImmPtr(
+inlineCallFrame->baselineCodeBlock.get()), GPRInfo::argumentGPR1);
+osrWriteBarrier(jit, GPRInfo::argumentGPR1, GPRInfo::nonArgGPR0);
+}
 }
-}
 
-void adjustAndJumpToTarget(CCallHelpers& jit, const OSRExitBase& exit, bool isExitingToOpCatch)
-{
-osrWriteBarrier(jit, exit);
-
 if 

[webkit-changes] [191140] trunk/Source

2015-10-15 Thread mitz
Title: [191140] trunk/Source








Revision 191140
Author m...@apple.com
Date 2015-10-15 14:59:24 -0700 (Thu, 15 Oct 2015)


Log Message
[Cocoa] Stop using WKSetNSURLConnectionDefersCallbacks
https://bugs.webkit.org/show_bug.cgi?id=150189

Reviewed by Anders Carlsson.

Source/WebCore:

* platform/ios/WebCoreSystemInterfaceIOS.mm: Removed definition.
* platform/mac/WebCoreSystemInterface.h: Removed declaration.
* platform/mac/WebCoreSystemInterface.mm: Removed definition.

* platform/network/mac/ResourceHandleMac.mm:
(WebCore::ResourceHandle::start): Changed to use -[NSURLConnection setDefersLoading:].
(WebCore::ResourceHandle::platformSetDefersLoading): Ditto.

* platform/spi/cocoa/NSURLConnectionSPI.h: Added declaration of
  -[NSURLConnection setDefersLoading:].

Source/WebKit/mac:

* WebCoreSupport/WebSystemInterface.mm:
(InitWebCoreSystemInterface): Removed initialization.

Source/WebKit2:

* WebProcess/WebCoreSupport/mac/WebSystemInterface.mm:
(InitWebCoreSystemInterface): Removed initialization.

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/ios/WebCoreSystemInterfaceIOS.mm
trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.h
trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.mm
trunk/Source/WebCore/platform/network/mac/ResourceHandleMac.mm
trunk/Source/WebCore/platform/spi/cocoa/NSURLConnectionSPI.h
trunk/Source/WebKit/mac/ChangeLog
trunk/Source/WebKit/mac/WebCoreSupport/WebSystemInterface.mm
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebSystemInterface.mm




Diff

Modified: trunk/Source/WebCore/ChangeLog (191139 => 191140)

--- trunk/Source/WebCore/ChangeLog	2015-10-15 21:52:05 UTC (rev 191139)
+++ trunk/Source/WebCore/ChangeLog	2015-10-15 21:59:24 UTC (rev 191140)
@@ -1,3 +1,21 @@
+2015-10-15  Dan Bernstein  
+
+[Cocoa] Stop using WKSetNSURLConnectionDefersCallbacks
+https://bugs.webkit.org/show_bug.cgi?id=150189
+
+Reviewed by Anders Carlsson.
+
+* platform/ios/WebCoreSystemInterfaceIOS.mm: Removed definition.
+* platform/mac/WebCoreSystemInterface.h: Removed declaration.
+* platform/mac/WebCoreSystemInterface.mm: Removed definition.
+
+* platform/network/mac/ResourceHandleMac.mm:
+(WebCore::ResourceHandle::start): Changed to use -[NSURLConnection setDefersLoading:].
+(WebCore::ResourceHandle::platformSetDefersLoading): Ditto.
+
+* platform/spi/cocoa/NSURLConnectionSPI.h: Added declaration of
+  -[NSURLConnection setDefersLoading:].
+
 2015-10-15  Dean Jackson  
 
 CSSKeyframesRule::appendRule is deprecated, but is actually the spec


Modified: trunk/Source/WebCore/platform/ios/WebCoreSystemInterfaceIOS.mm (191139 => 191140)

--- trunk/Source/WebCore/platform/ios/WebCoreSystemInterfaceIOS.mm	2015-10-15 21:52:05 UTC (rev 191139)
+++ trunk/Source/WebCore/platform/ios/WebCoreSystemInterfaceIOS.mm	2015-10-15 21:59:24 UTC (rev 191140)
@@ -38,7 +38,6 @@
 WEBCORE_EXPORT CGAffineTransform (*wkGetUserToBaseCTM)(CGContextRef);
 WEBCORE_EXPORT bool (*wkCGContextIsPDFContext)(CGContextRef);
 WEBCORE_EXPORT NSString* (*wkCopyNSURLResponseStatusLine)(NSURLResponse*);
-WEBCORE_EXPORT void (*wkSetNSURLConnectionDefersCallbacks)(NSURLConnection *, BOOL);
 WEBCORE_EXPORT void (*wkSetNSURLRequestShouldContentSniff)(NSMutableURLRequest *, BOOL);
 WEBCORE_EXPORT id (*wkCreateNSURLConnectionDelegateProxy)(void);
 WEBCORE_EXPORT unsigned (*wkInitializeMaximumHTTPConnectionCountPerHost)(unsigned preferredConnectionCount);


Modified: trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.h (191139 => 191140)

--- trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.h	2015-10-15 21:52:05 UTC (rev 191139)
+++ trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.h	2015-10-15 21:59:24 UTC (rev 191140)
@@ -197,7 +197,6 @@
 extern void (*wkSetCookieStoragePrivateBrowsingEnabled)(BOOL);
 extern void (*wkSetDragImage)(NSImage*, NSPoint offset);
 #endif
-extern void (*wkSetNSURLConnectionDefersCallbacks)(NSURLConnection *, BOOL);
 extern void (*wkSetNSURLRequestShouldContentSniff)(NSMutableURLRequest *, BOOL);
 extern void (*wkSetBaseCTM)(CGContextRef, CGAffineTransform);
 extern void (*wkSetPatternPhaseInUserSpace)(CGContextRef, CGPoint);


Modified: trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.mm (191139 => 191140)

--- trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.mm	2015-10-15 21:52:05 UTC (rev 191139)
+++ trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.mm	2015-10-15 21:59:24 UTC (rev 191140)
@@ -81,7 +81,6 @@
 void (*wkSetPatternPhaseInUserSpace)(CGContextRef, CGPoint point);
 CGAffineTransform (*wkGetUserToBaseCTM)(CGContextRef);
 bool (*wkCGContextIsPDFContext)(CGContextRef);
-void (*wkSetNSURLConnectionDefersCallbacks)(NSURLConnection *, BOOL);
 void (*wkSetNSURLRequestShouldContentSniff)(NSMutableURLRequest *, BOOL);
 unsigned 

[webkit-changes] [191131] trunk/Source/WebKit2

2015-10-15 Thread andersca
Title: [191131] trunk/Source/WebKit2








Revision 191131
Author ander...@apple.com
Date 2015-10-15 12:56:38 -0700 (Thu, 15 Oct 2015)


Log Message
The menu location and menu items should be part of ContextMenuContextData
https://bugs.webkit.org/show_bug.cgi?id=150182

Reviewed by Andreas Kling.

* Shared/ContextMenuContextData.cpp:
(WebKit::ContextMenuContextData::ContextMenuContextData):
(WebKit::ContextMenuContextData::encode):
(WebKit::ContextMenuContextData::decode):
* Shared/ContextMenuContextData.h:
(WebKit::ContextMenuContextData::menuLocation):
(WebKit::ContextMenuContextData::menuItems):
(WebKit::ContextMenuContextData::ContextMenuContextData):
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::showContextMenu):
(WebKit::WebPageProxy::internalShowContextMenu):
* UIProcess/WebPageProxy.h:
* UIProcess/WebPageProxy.messages.in:
* UIProcess/mac/WebPageProxyMac.mm:
(WebKit::WebPageProxy::showSelectionServiceMenu):
* WebProcess/WebPage/WebContextMenu.cpp:
(WebKit::WebContextMenu::show):

Modified Paths

trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/Shared/ContextMenuContextData.cpp
trunk/Source/WebKit2/Shared/ContextMenuContextData.h
trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp
trunk/Source/WebKit2/UIProcess/WebPageProxy.h
trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in
trunk/Source/WebKit2/UIProcess/mac/WebPageProxyMac.mm
trunk/Source/WebKit2/WebProcess/WebPage/WebContextMenu.cpp




Diff

Modified: trunk/Source/WebKit2/ChangeLog (191130 => 191131)

--- trunk/Source/WebKit2/ChangeLog	2015-10-15 19:54:02 UTC (rev 191130)
+++ trunk/Source/WebKit2/ChangeLog	2015-10-15 19:56:38 UTC (rev 191131)
@@ -1,3 +1,28 @@
+2015-10-15  Anders Carlsson  
+
+The menu location and menu items should be part of ContextMenuContextData
+https://bugs.webkit.org/show_bug.cgi?id=150182
+
+Reviewed by Andreas Kling.
+
+* Shared/ContextMenuContextData.cpp:
+(WebKit::ContextMenuContextData::ContextMenuContextData):
+(WebKit::ContextMenuContextData::encode):
+(WebKit::ContextMenuContextData::decode):
+* Shared/ContextMenuContextData.h:
+(WebKit::ContextMenuContextData::menuLocation):
+(WebKit::ContextMenuContextData::menuItems):
+(WebKit::ContextMenuContextData::ContextMenuContextData):
+* UIProcess/WebPageProxy.cpp:
+(WebKit::WebPageProxy::showContextMenu):
+(WebKit::WebPageProxy::internalShowContextMenu):
+* UIProcess/WebPageProxy.h:
+* UIProcess/WebPageProxy.messages.in:
+* UIProcess/mac/WebPageProxyMac.mm:
+(WebKit::WebPageProxy::showSelectionServiceMenu):
+* WebProcess/WebPage/WebContextMenu.cpp:
+(WebKit::WebContextMenu::show):
+
 2015-10-15  Carlos Garcia Campos  
 
 [GTK] Test WebKit2.RestoreSessionStateContainingFormData fails


Modified: trunk/Source/WebKit2/Shared/ContextMenuContextData.cpp (191130 => 191131)

--- trunk/Source/WebKit2/Shared/ContextMenuContextData.cpp	2015-10-15 19:54:02 UTC (rev 191130)
+++ trunk/Source/WebKit2/Shared/ContextMenuContextData.cpp	2015-10-15 19:56:38 UTC (rev 191131)
@@ -44,8 +44,10 @@
 {
 }
 
-ContextMenuContextData::ContextMenuContextData(const ContextMenuContext& context)
-: m_webHitTestResultData(context.hitTestResult(), true)
+ContextMenuContextData::ContextMenuContextData(const WebCore::IntPoint& menuLocation, const Vector& menuItems, const ContextMenuContext& context)
+: m_menuLocation(menuLocation)
+, m_menuItems(menuItems)
+, m_webHitTestResultData(context.hitTestResult(), true)
 , m_selectedText(context.selectedText())
 #if ENABLE(SERVICE_CONTROLS)
 , m_selectionIsEditable(false)
@@ -64,6 +66,8 @@
 
 void ContextMenuContextData::encode(IPC::ArgumentEncoder& encoder) const
 {
+encoder << m_menuLocation;
+encoder << m_menuItems;
 encoder << m_webHitTestResultData;
 encoder << m_selectedText;
 
@@ -75,21 +79,27 @@
 #endif
 }
 
-bool ContextMenuContextData::decode(IPC::ArgumentDecoder& decoder, ContextMenuContextData& contextMenuContextData)
+bool ContextMenuContextData::decode(IPC::ArgumentDecoder& decoder, ContextMenuContextData& result)
 {
-if (!decoder.decode(contextMenuContextData.m_webHitTestResultData))
+if (!decoder.decode(result.m_menuLocation))
 return false;
 
-if (!decoder.decode(contextMenuContextData.m_selectedText))
+if (!decoder.decode(result.m_menuItems))
 return false;
 
+if (!decoder.decode(result.m_webHitTestResultData))
+return false;
+
+if (!decoder.decode(result.m_selectedText))
+return false;
+
 #if ENABLE(SERVICE_CONTROLS)
 ShareableBitmap::Handle handle;
 if (!decoder.decode(handle))
 return false;
 
 if (!handle.isNull())
-contextMenuContextData.m_controlledImage = ShareableBitmap::create(handle, SharedMemory::Protection::ReadOnly);
+result.m_controlledImage = ShareableBitmap::create(handle, 

[webkit-changes] [191133] trunk/Tools

2015-10-15 Thread ossy
Title: [191133] trunk/Tools








Revision 191133
Author o...@webkit.org
Date 2015-10-15 13:21:06 -0700 (Thu, 15 Oct 2015)


Log Message
Update the help message of --system-malloc
https://bugs.webkit.org/show_bug.cgi?id=150169

Reviewed by Geoffrey Garen.

* Scripts/webkitperl/FeatureList.pm:

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/Scripts/webkitperl/FeatureList.pm




Diff

Modified: trunk/Tools/ChangeLog (191132 => 191133)

--- trunk/Tools/ChangeLog	2015-10-15 19:57:43 UTC (rev 191132)
+++ trunk/Tools/ChangeLog	2015-10-15 20:21:06 UTC (rev 191133)
@@ -1,3 +1,12 @@
+2015-10-15  Csaba Osztrogonác  
+
+Update the help message of --system-malloc
+https://bugs.webkit.org/show_bug.cgi?id=150169
+
+Reviewed by Geoffrey Garen.
+
+* Scripts/webkitperl/FeatureList.pm:
+
 2015-10-15  Youenn Fablet  
 
 Update ImportExpectations according currently imported wpt tests


Modified: trunk/Tools/Scripts/webkitperl/FeatureList.pm (191132 => 191133)

--- trunk/Tools/Scripts/webkitperl/FeatureList.pm	2015-10-15 19:57:43 UTC (rev 191132)
+++ trunk/Tools/Scripts/webkitperl/FeatureList.pm	2015-10-15 20:21:06 UTC (rev 191133)
@@ -395,7 +395,7 @@
 { option => "svg-fonts", desc => "Toggle SVG Fonts support",
   define => "ENABLE_SVG_FONTS", default => 1, value => \$svgFontsSupport },
 
-{ option => "system-malloc", desc => "Toggle system allocator instead of TCmalloc",
+{ option => "system-malloc", desc => "Toggle system allocator instead of bmalloc",
   define => "USE_SYSTEM_MALLOC", default => 0, value => \$systemMallocSupport },
 
 { option => "template-element", desc => "Toggle HTMLTemplateElement support",






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


[webkit-changes] [191137] trunk/Source/WebKit2

2015-10-15 Thread andersca
Title: [191137] trunk/Source/WebKit2








Revision 191137
Author ander...@apple.com
Date 2015-10-15 14:27:15 -0700 (Thu, 15 Oct 2015)


Log Message
CTTE menu proxies
https://bugs.webkit.org/show_bug.cgi?id=150187

Reviewed by Tim Horton.

* UIProcess/PageClient.h:
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::showPopupMenu):
(WebKit::WebPageProxy::internalShowContextMenu):
* UIProcess/WebPopupMenuProxy.h:
(WebKit::WebPopupMenuProxy::WebPopupMenuProxy):
* UIProcess/ios/PageClientImplIOS.h:
* UIProcess/ios/PageClientImplIOS.mm:
(WebKit::PageClientImpl::createPopupMenuProxy):
(WebKit::PageClientImpl::createContextMenuProxy): Deleted.
* UIProcess/mac/PageClientImpl.h:
* UIProcess/mac/PageClientImpl.mm:
(WebKit::PageClientImpl::createPopupMenuProxy):
(WebKit::PageClientImpl::createContextMenuProxy):
* UIProcess/mac/WebContextMenuProxyMac.h:
(WebKit::WebContextMenuProxyMac::create):
(WebKit::WebContextMenuProxyMac::page):
* UIProcess/mac/WebContextMenuProxyMac.mm:
(WebKit::WebContextMenuProxyMac::WebContextMenuProxyMac):
(WebKit::WebContextMenuProxyMac::~WebContextMenuProxyMac):
(WebKit::WebContextMenuProxyMac::contextMenuItemSelected):
* UIProcess/mac/WebPopupMenuProxyMac.h:
(WebKit::WebPopupMenuProxyMac::create):
* UIProcess/mac/WebPopupMenuProxyMac.mm:
(WebKit::WebPopupMenuProxyMac::WebPopupMenuProxyMac):

Modified Paths

trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/PageClient.h
trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp
trunk/Source/WebKit2/UIProcess/WebPopupMenuProxy.h
trunk/Source/WebKit2/UIProcess/ios/PageClientImplIOS.h
trunk/Source/WebKit2/UIProcess/ios/PageClientImplIOS.mm
trunk/Source/WebKit2/UIProcess/mac/PageClientImpl.h
trunk/Source/WebKit2/UIProcess/mac/PageClientImpl.mm
trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.h
trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm
trunk/Source/WebKit2/UIProcess/mac/WebPopupMenuProxyMac.h
trunk/Source/WebKit2/UIProcess/mac/WebPopupMenuProxyMac.mm




Diff

Modified: trunk/Source/WebKit2/ChangeLog (191136 => 191137)

--- trunk/Source/WebKit2/ChangeLog	2015-10-15 21:16:03 UTC (rev 191136)
+++ trunk/Source/WebKit2/ChangeLog	2015-10-15 21:27:15 UTC (rev 191137)
@@ -1,5 +1,38 @@
 2015-10-15  Anders Carlsson  
 
+CTTE menu proxies
+https://bugs.webkit.org/show_bug.cgi?id=150187
+
+Reviewed by Tim Horton.
+
+* UIProcess/PageClient.h:
+* UIProcess/WebPageProxy.cpp:
+(WebKit::WebPageProxy::showPopupMenu):
+(WebKit::WebPageProxy::internalShowContextMenu):
+* UIProcess/WebPopupMenuProxy.h:
+(WebKit::WebPopupMenuProxy::WebPopupMenuProxy):
+* UIProcess/ios/PageClientImplIOS.h:
+* UIProcess/ios/PageClientImplIOS.mm:
+(WebKit::PageClientImpl::createPopupMenuProxy):
+(WebKit::PageClientImpl::createContextMenuProxy): Deleted.
+* UIProcess/mac/PageClientImpl.h:
+* UIProcess/mac/PageClientImpl.mm:
+(WebKit::PageClientImpl::createPopupMenuProxy):
+(WebKit::PageClientImpl::createContextMenuProxy):
+* UIProcess/mac/WebContextMenuProxyMac.h:
+(WebKit::WebContextMenuProxyMac::create):
+(WebKit::WebContextMenuProxyMac::page):
+* UIProcess/mac/WebContextMenuProxyMac.mm:
+(WebKit::WebContextMenuProxyMac::WebContextMenuProxyMac):
+(WebKit::WebContextMenuProxyMac::~WebContextMenuProxyMac):
+(WebKit::WebContextMenuProxyMac::contextMenuItemSelected):
+* UIProcess/mac/WebPopupMenuProxyMac.h:
+(WebKit::WebPopupMenuProxyMac::create):
+* UIProcess/mac/WebPopupMenuProxyMac.mm:
+(WebKit::WebPopupMenuProxyMac::WebPopupMenuProxyMac):
+
+2015-10-15  Anders Carlsson  
+
 Add -[WKFrameInfo _handle]
 https://bugs.webkit.org/show_bug.cgi?id=150185
 rdar://problem/23132371


Modified: trunk/Source/WebKit2/UIProcess/PageClient.h (191136 => 191137)

--- trunk/Source/WebKit2/UIProcess/PageClient.h	2015-10-15 21:16:03 UTC (rev 191136)
+++ trunk/Source/WebKit2/UIProcess/PageClient.h	2015-10-15 21:27:15 UTC (rev 191137)
@@ -219,8 +219,8 @@
 virtual void doneWithTouchEvent(const NativeWebTouchEvent&, bool wasEventHandled) = 0;
 #endif
 
-virtual RefPtr createPopupMenuProxy(WebPageProxy*) = 0;
-virtual RefPtr createContextMenuProxy(WebPageProxy*) = 0;
+virtual RefPtr createPopupMenuProxy(WebPageProxy&) = 0;
+virtual RefPtr createContextMenuProxy(WebPageProxy&) = 0;
 
 #if ENABLE(INPUT_TYPE_COLOR)
 virtual RefPtr createColorPicker(WebPageProxy*, const WebCore::Color& initialColor, const WebCore::IntRect&) = 0;


Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (191136 => 191137)

--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp	2015-10-15 21:16:03 UTC (rev 191136)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp	2015-10-15 21:27:15 UTC (rev 191137)
@@ -4148,7 +4148,7 @@
 m_activePopupMenu = nullptr;
 }
 
-m_activePopupMenu 

[webkit-changes] [191141] trunk/Source/WebKit2

2015-10-15 Thread andersca
Title: [191141] trunk/Source/WebKit2








Revision 191141
Author ander...@apple.com
Date 2015-10-15 15:15:45 -0700 (Thu, 15 Oct 2015)


Log Message
Store the context menu data and user data in the WebContextMenuProxy object
https://bugs.webkit.org/show_bug.cgi?id=150191

Reviewed by Tim Horton.

* UIProcess/PageClient.h:
* UIProcess/WebContextMenuProxy.cpp:
(WebKit::WebContextMenuProxy::WebContextMenuProxy):
* UIProcess/WebContextMenuProxy.h:
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::internalShowContextMenu):
* UIProcess/ios/PageClientImplIOS.h:
* UIProcess/ios/PageClientImplIOS.mm:
(WebKit::PageClientImpl::createContextMenuProxy):
* UIProcess/mac/PageClientImpl.h:
* UIProcess/mac/PageClientImpl.mm:
(WebKit::PageClientImpl::createContextMenuProxy):
* UIProcess/mac/WebContextMenuProxyMac.h:
(WebKit::WebContextMenuProxyMac::create):
* UIProcess/mac/WebContextMenuProxyMac.mm:
(WebKit::WebContextMenuProxyMac::WebContextMenuProxyMac):

Modified Paths

trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/PageClient.h
trunk/Source/WebKit2/UIProcess/WebContextMenuProxy.cpp
trunk/Source/WebKit2/UIProcess/WebContextMenuProxy.h
trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp
trunk/Source/WebKit2/UIProcess/ios/PageClientImplIOS.h
trunk/Source/WebKit2/UIProcess/ios/PageClientImplIOS.mm
trunk/Source/WebKit2/UIProcess/mac/PageClientImpl.h
trunk/Source/WebKit2/UIProcess/mac/PageClientImpl.mm
trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.h
trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm




Diff

Modified: trunk/Source/WebKit2/ChangeLog (191140 => 191141)

--- trunk/Source/WebKit2/ChangeLog	2015-10-15 21:59:24 UTC (rev 191140)
+++ trunk/Source/WebKit2/ChangeLog	2015-10-15 22:15:45 UTC (rev 191141)
@@ -1,3 +1,27 @@
+2015-10-15  Anders Carlsson  
+
+Store the context menu data and user data in the WebContextMenuProxy object
+https://bugs.webkit.org/show_bug.cgi?id=150191
+
+Reviewed by Tim Horton.
+
+* UIProcess/PageClient.h:
+* UIProcess/WebContextMenuProxy.cpp:
+(WebKit::WebContextMenuProxy::WebContextMenuProxy):
+* UIProcess/WebContextMenuProxy.h:
+* UIProcess/WebPageProxy.cpp:
+(WebKit::WebPageProxy::internalShowContextMenu):
+* UIProcess/ios/PageClientImplIOS.h:
+* UIProcess/ios/PageClientImplIOS.mm:
+(WebKit::PageClientImpl::createContextMenuProxy):
+* UIProcess/mac/PageClientImpl.h:
+* UIProcess/mac/PageClientImpl.mm:
+(WebKit::PageClientImpl::createContextMenuProxy):
+* UIProcess/mac/WebContextMenuProxyMac.h:
+(WebKit::WebContextMenuProxyMac::create):
+* UIProcess/mac/WebContextMenuProxyMac.mm:
+(WebKit::WebContextMenuProxyMac::WebContextMenuProxyMac):
+
 2015-10-15  Dan Bernstein  
 
 [Cocoa] Stop using WKSetNSURLConnectionDefersCallbacks


Modified: trunk/Source/WebKit2/UIProcess/PageClient.h (191140 => 191141)

--- trunk/Source/WebKit2/UIProcess/PageClient.h	2015-10-15 21:59:24 UTC (rev 191140)
+++ trunk/Source/WebKit2/UIProcess/PageClient.h	2015-10-15 22:15:45 UTC (rev 191141)
@@ -220,7 +220,7 @@
 #endif
 
 virtual RefPtr createPopupMenuProxy(WebPageProxy&) = 0;
-virtual RefPtr createContextMenuProxy(WebPageProxy&) = 0;
+virtual RefPtr createContextMenuProxy(WebPageProxy&, const ContextMenuContextData&, const UserData&) = 0;
 
 #if ENABLE(INPUT_TYPE_COLOR)
 virtual RefPtr createColorPicker(WebPageProxy*, const WebCore::Color& initialColor, const WebCore::IntRect&) = 0;


Modified: trunk/Source/WebKit2/UIProcess/WebContextMenuProxy.cpp (191140 => 191141)

--- trunk/Source/WebKit2/UIProcess/WebContextMenuProxy.cpp	2015-10-15 21:59:24 UTC (rev 191140)
+++ trunk/Source/WebKit2/UIProcess/WebContextMenuProxy.cpp	2015-10-15 22:15:45 UTC (rev 191141)
@@ -28,7 +28,9 @@
 
 namespace WebKit {
 
-WebContextMenuProxy::WebContextMenuProxy()
+WebContextMenuProxy::WebContextMenuProxy(const ContextMenuContextData& context, const UserData& userData)
+: m_context(context)
+, m_userData(userData)
 {
 }
 


Modified: trunk/Source/WebKit2/UIProcess/WebContextMenuProxy.h (191140 => 191141)

--- trunk/Source/WebKit2/UIProcess/WebContextMenuProxy.h	2015-10-15 21:59:24 UTC (rev 191140)
+++ trunk/Source/WebKit2/UIProcess/WebContextMenuProxy.h	2015-10-15 22:15:45 UTC (rev 191141)
@@ -26,14 +26,10 @@
 #ifndef WebContextMenuProxy_h
 #define WebContextMenuProxy_h
 
-#include 
+#include "ContextMenuContextData.h"
+#include "UserData.h"
 #include 
-#include 
 
-namespace WebCore {
-class IntPoint;
-}
-
 namespace WebKit {
 
 class ContextMenuContextData;
@@ -48,7 +44,10 @@
 virtual void cancelTracking() { }
 
 protected:
-WebContextMenuProxy();
+WebContextMenuProxy(const ContextMenuContextData&, const UserData&);
+
+const ContextMenuContextData m_context;
+const UserData m_userData;
 };
 
 } // namespace WebKit


Modified: 

[webkit-changes] [191129] trunk/LayoutTests

2015-10-15 Thread zalan
Title: [191129] trunk/LayoutTests








Revision 191129
Author za...@apple.com
Date 2015-10-15 12:52:34 -0700 (Thu, 15 Oct 2015)


Log Message
[Win] Update anonymous table results for Win port.

Unreviewed gardening.

* platform/win/css2.1/tables/table-anonymous-objects-103-expected.txt: Added.
* platform/win/css2.1/tables/table-anonymous-objects-104-expected.txt: Added.
* platform/win/css2.1/tables/table-anonymous-objects-117-expected.txt: Added.
* platform/win/css2.1/tables/table-anonymous-objects-118-expected.txt: Added.
* platform/win/css2.1/tables/table-anonymous-objects-119-expected.txt: Added.
* platform/win/css2.1/tables/table-anonymous-objects-120-expected.txt: Added.

Modified Paths

trunk/LayoutTests/ChangeLog


Added Paths

trunk/LayoutTests/platform/win/css2.1/tables/table-anonymous-objects-103-expected.txt
trunk/LayoutTests/platform/win/css2.1/tables/table-anonymous-objects-104-expected.txt
trunk/LayoutTests/platform/win/css2.1/tables/table-anonymous-objects-117-expected.txt
trunk/LayoutTests/platform/win/css2.1/tables/table-anonymous-objects-118-expected.txt
trunk/LayoutTests/platform/win/css2.1/tables/table-anonymous-objects-119-expected.txt
trunk/LayoutTests/platform/win/css2.1/tables/table-anonymous-objects-120-expected.txt




Diff

Modified: trunk/LayoutTests/ChangeLog (191128 => 191129)

--- trunk/LayoutTests/ChangeLog	2015-10-15 19:48:58 UTC (rev 191128)
+++ trunk/LayoutTests/ChangeLog	2015-10-15 19:52:34 UTC (rev 191129)
@@ -1,3 +1,16 @@
+2015-10-15  Zalan Bujtas  
+
+[Win] Update anonymous table results for Win port.
+
+Unreviewed gardening.
+
+* platform/win/css2.1/tables/table-anonymous-objects-103-expected.txt: Added.
+* platform/win/css2.1/tables/table-anonymous-objects-104-expected.txt: Added.
+* platform/win/css2.1/tables/table-anonymous-objects-117-expected.txt: Added.
+* platform/win/css2.1/tables/table-anonymous-objects-118-expected.txt: Added.
+* platform/win/css2.1/tables/table-anonymous-objects-119-expected.txt: Added.
+* platform/win/css2.1/tables/table-anonymous-objects-120-expected.txt: Added.
+
 2015-10-14  David Hyatt  
 
 Implement CSS Variables.


Added: trunk/LayoutTests/platform/win/css2.1/tables/table-anonymous-objects-103-expected.txt (0 => 191129)

--- trunk/LayoutTests/platform/win/css2.1/tables/table-anonymous-objects-103-expected.txt	(rev 0)
+++ trunk/LayoutTests/platform/win/css2.1/tables/table-anonymous-objects-103-expected.txt	2015-10-15 19:52:34 UTC (rev 191129)
@@ -0,0 +1,80 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x141
+  RenderBlock {html} at (0,0) size 800x141
+RenderBody {body} at (8,13) size 784x120
+  RenderBlock {p} at (0,0) size 784x15
+RenderText {#text} at (0,0) size 488x15
+  text run at (0,0) width 488: "There should be no red below, except for antialiasing issues."
+layer at (8,41) size 784x92
+  RenderBlock (relative positioned) {div} at (0,28) size 784x92
+layer at (8,41) size 784x92
+  RenderBlock (relative positioned) zI: 1 {div} at (0,0) size 784x92 [color=#FF]
+RenderTable at (1,1) size 672x90
+  RenderTableSection {span} at (0,0) size 672x30
+RenderTableRow (anonymous) at (0,0) size 672x30
+  RenderTableCell {span} at (0,0) size 224x30 [r=0 c=0 rs=1 cs=1]
+RenderText {#text} at (0,0) size 192x30
+  text run at (0,0) width 192: "Row 1, Col 1"
+  RenderTableCell {span} at (224,0) size 224x30 [r=0 c=1 rs=1 cs=1]
+RenderText {#text} at (0,0) size 192x30
+  text run at (0,0) width 192: "Row 1, Col 2"
+  RenderTableCell {span} at (448,0) size 224x30 [r=0 c=2 rs=1 cs=1]
+RenderText {#text} at (0,0) size 192x30
+  text run at (0,0) width 192: "Row 1, Col 3"
+  RenderTableSection {span} at (0,30) size 672x30
+RenderTableRow (anonymous) at (0,0) size 672x30
+  RenderTableCell {span} at (0,0) size 224x30 [r=0 c=0 rs=1 cs=1]
+RenderText {#text} at (0,0) size 208x30
+  text run at (0,0) width 208: "Row 22, Col 1"
+  RenderTableCell {span} at (224,0) size 224x30 [r=0 c=1 rs=1 cs=1]
+RenderText {#text} at (0,0) size 208x30
+  text run at (0,0) width 208: "Row 22, Col 2"
+  RenderTableCell {span} at (448,0) size 224x30 [r=0 c=2 rs=1 cs=1]
+RenderText {#text} at (0,0) size 208x30
+  text run at (0,0) width 208: "Row 22, Col 3"
+  RenderTableSection {span} at (0,60) size 672x30
+RenderTableRow (anonymous) at (0,0) size 672x30
+  RenderTableCell {span} at (0,0) size 224x30 [r=0 c=0 rs=1 cs=1]
+RenderText {#text} at (0,0) size 224x30
+  text run at (0,0) width 224: "Row 333, Col 1"
+  RenderTableCell {span} at (224,0) size 224x30 [r=0 c=1 rs=1 cs=1]
+RenderText 

[webkit-changes] [191136] trunk/Source/WebKit2

2015-10-15 Thread andersca
Title: [191136] trunk/Source/WebKit2








Revision 191136
Author ander...@apple.com
Date 2015-10-15 14:16:03 -0700 (Thu, 15 Oct 2015)


Log Message
Add -[WKFrameInfo _handle]
https://bugs.webkit.org/show_bug.cgi?id=150185
rdar://problem/23132371

Reviewed by Tim Horton.

* UIProcess/API/APIFrameInfo.cpp:
(API::FrameInfo::FrameInfo):
* UIProcess/API/APIFrameInfo.h:
* UIProcess/API/Cocoa/WKFrameInfo.mm:
(-[WKFrameInfo _handle]):
* UIProcess/API/Cocoa/WKFrameInfoInternal.h:
* UIProcess/API/Cocoa/WKFrameInfoPrivate.h: Copied from Source/WebKit2/UIProcess/API/Cocoa/WKFrameInfoInternal.h.
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::showPopupMenu):
(WebKit::WebPageProxy::internalShowContextMenu):
* UIProcess/WebPopupMenuProxy.h:
(WebKit::WebPopupMenuProxy::WebPopupMenuProxy):
* WebKit2.xcodeproj/project.pbxproj:

Modified Paths

trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/API/APIFrameInfo.cpp
trunk/Source/WebKit2/UIProcess/API/APIFrameInfo.h
trunk/Source/WebKit2/UIProcess/API/Cocoa/WKFrameInfo.mm
trunk/Source/WebKit2/UIProcess/API/Cocoa/WKFrameInfoInternal.h
trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj


Added Paths

trunk/Source/WebKit2/UIProcess/API/Cocoa/WKFrameInfoPrivate.h




Diff

Modified: trunk/Source/WebKit2/ChangeLog (191135 => 191136)

--- trunk/Source/WebKit2/ChangeLog	2015-10-15 20:50:02 UTC (rev 191135)
+++ trunk/Source/WebKit2/ChangeLog	2015-10-15 21:16:03 UTC (rev 191136)
@@ -1,5 +1,27 @@
 2015-10-15  Anders Carlsson  
 
+Add -[WKFrameInfo _handle]
+https://bugs.webkit.org/show_bug.cgi?id=150185
+rdar://problem/23132371
+
+Reviewed by Tim Horton.
+
+* UIProcess/API/APIFrameInfo.cpp:
+(API::FrameInfo::FrameInfo):
+* UIProcess/API/APIFrameInfo.h:
+* UIProcess/API/Cocoa/WKFrameInfo.mm:
+(-[WKFrameInfo _handle]):
+* UIProcess/API/Cocoa/WKFrameInfoInternal.h:
+* UIProcess/API/Cocoa/WKFrameInfoPrivate.h: Copied from Source/WebKit2/UIProcess/API/Cocoa/WKFrameInfoInternal.h.
+* UIProcess/WebPageProxy.cpp:
+(WebKit::WebPageProxy::showPopupMenu):
+(WebKit::WebPageProxy::internalShowContextMenu):
+* UIProcess/WebPopupMenuProxy.h:
+(WebKit::WebPopupMenuProxy::WebPopupMenuProxy):
+* WebKit2.xcodeproj/project.pbxproj:
+
+2015-10-15  Anders Carlsson  
+
 The menu location and menu items should be part of ContextMenuContextData
 https://bugs.webkit.org/show_bug.cgi?id=150182
 


Modified: trunk/Source/WebKit2/UIProcess/API/APIFrameInfo.cpp (191135 => 191136)

--- trunk/Source/WebKit2/UIProcess/API/APIFrameInfo.cpp	2015-10-15 20:50:02 UTC (rev 191135)
+++ trunk/Source/WebKit2/UIProcess/API/APIFrameInfo.cpp	2015-10-15 21:16:03 UTC (rev 191136)
@@ -26,6 +26,7 @@
 #include "config.h"
 #include "APIFrameInfo.h"
 
+#include "APIFrameHandle.h"
 #include "WebFrameProxy.h"
 
 namespace API {
@@ -35,6 +36,7 @@
 : m_isMainFrame(frame.isMainFrame())
 , m_request(WebCore::ResourceRequest(frame.url()))
 , m_securityOrigin(adoptRef(*SecurityOrigin::create(securityOrigin).leakRef()))
+, m_handle(API::FrameHandle::create(frame.frameID()))
 {
 }
 


Modified: trunk/Source/WebKit2/UIProcess/API/APIFrameInfo.h (191135 => 191136)

--- trunk/Source/WebKit2/UIProcess/API/APIFrameInfo.h	2015-10-15 20:50:02 UTC (rev 191135)
+++ trunk/Source/WebKit2/UIProcess/API/APIFrameInfo.h	2015-10-15 21:16:03 UTC (rev 191136)
@@ -37,6 +37,8 @@
 
 namespace API {
 
+class FrameHandle;
+
 class FrameInfo final : public ObjectImpl {
 public:
 static Ref create(const WebKit::WebFrameProxy& frame, const WebCore::SecurityOrigin& securityOrigin)
@@ -49,11 +51,13 @@
 bool isMainFrame() const { return m_isMainFrame; }
 const WebCore::ResourceRequest& request() const { return m_request; }
 SecurityOrigin& securityOrigin() { return m_securityOrigin.get(); }
+API::FrameHandle& handle() { return m_handle.get(); }
 
 private:
 bool m_isMainFrame;
 WebCore::ResourceRequest m_request;
 Ref m_securityOrigin;
+Ref m_handle;
 };
 
 } // namespace API


Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKFrameInfo.mm (191135 => 191136)

--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKFrameInfo.mm	2015-10-15 20:50:02 UTC (rev 191135)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKFrameInfo.mm	2015-10-15 21:16:03 UTC (rev 191136)
@@ -29,6 +29,7 @@
 #if WK_API_ENABLED
 
 #import "WKSecurityOriginInternal.h"
+#import "_WKFrameHandleInternal.h"
 
 @implementation WKFrameInfo
 
@@ -73,5 +74,13 @@
 
 @end
 
+@implementation WKFrameInfo (WKPrivate)
+
+- (_WKFrameHandle *)_handle
+{
+return WebKit::wrapper(_frameInfo->handle());
+}
+
+@end
 #endif
 


Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKFrameInfoInternal.h (191135 => 191136)

--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKFrameInfoInternal.h	2015-10-15 20:50:02 UTC (rev 191135)
+++ 

[webkit-changes] [191138] trunk/Source/WebKit2

2015-10-15 Thread andersca
Title: [191138] trunk/Source/WebKit2








Revision 191138
Author ander...@apple.com
Date 2015-10-15 14:31:09 -0700 (Thu, 15 Oct 2015)


Log Message
Fix build.

* UIProcess/API/APIFrameInfo.cpp:
(API::FrameInfo::~FrameInfo):
* UIProcess/API/APIFrameInfo.h:
* UIProcess/API/Cocoa/WKUserContentController.mm:

Modified Paths

trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/API/APIFrameInfo.cpp
trunk/Source/WebKit2/UIProcess/API/APIFrameInfo.h
trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUserContentController.mm




Diff

Modified: trunk/Source/WebKit2/ChangeLog (191137 => 191138)

--- trunk/Source/WebKit2/ChangeLog	2015-10-15 21:27:15 UTC (rev 191137)
+++ trunk/Source/WebKit2/ChangeLog	2015-10-15 21:31:09 UTC (rev 191138)
@@ -1,5 +1,14 @@
 2015-10-15  Anders Carlsson  
 
+Fix build.
+
+* UIProcess/API/APIFrameInfo.cpp:
+(API::FrameInfo::~FrameInfo):
+* UIProcess/API/APIFrameInfo.h:
+* UIProcess/API/Cocoa/WKUserContentController.mm:
+
+2015-10-15  Anders Carlsson  
+
 CTTE menu proxies
 https://bugs.webkit.org/show_bug.cgi?id=150187
 


Modified: trunk/Source/WebKit2/UIProcess/API/APIFrameInfo.cpp (191137 => 191138)

--- trunk/Source/WebKit2/UIProcess/API/APIFrameInfo.cpp	2015-10-15 21:27:15 UTC (rev 191137)
+++ trunk/Source/WebKit2/UIProcess/API/APIFrameInfo.cpp	2015-10-15 21:31:09 UTC (rev 191138)
@@ -40,4 +40,8 @@
 {
 }
 
+FrameInfo::~FrameInfo()
+{
+}
+
 } // namespace API


Modified: trunk/Source/WebKit2/UIProcess/API/APIFrameInfo.h (191137 => 191138)

--- trunk/Source/WebKit2/UIProcess/API/APIFrameInfo.h	2015-10-15 21:27:15 UTC (rev 191137)
+++ trunk/Source/WebKit2/UIProcess/API/APIFrameInfo.h	2015-10-15 21:31:09 UTC (rev 191138)
@@ -27,10 +27,12 @@
 #define APIFrameInfo_h
 
 #include "APIObject.h"
-#include "APISecurityOrigin.h"
 #include 
-#include 
 
+namespace WebCore {
+class SecurityOrigin;
+}
+
 namespace WebKit {
 class WebFrameProxy;
 }
@@ -38,6 +40,7 @@
 namespace API {
 
 class FrameHandle;
+class SecurityOrigin;
 
 class FrameInfo final : public ObjectImpl {
 public:
@@ -45,6 +48,7 @@
 {
 return adoptRef(*new FrameInfo(frame, securityOrigin));
 }
+virtual ~FrameInfo();
 
 FrameInfo(const WebKit::WebFrameProxy&, const WebCore::SecurityOrigin&);
 


Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUserContentController.mm (191137 => 191138)

--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUserContentController.mm	2015-10-15 21:27:15 UTC (rev 191137)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUserContentController.mm	2015-10-15 21:31:09 UTC (rev 191138)
@@ -38,6 +38,7 @@
 #import "WebScriptMessageHandler.h"
 #import "WebUserContentControllerProxy.h"
 #import "_WKUserContentFilterInternal.h"
+#import 
 #import 
 #import 
 






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


[webkit-changes] [191143] trunk/Source/WebKit2

2015-10-15 Thread andersca
Title: [191143] trunk/Source/WebKit2








Revision 191143
Author ander...@apple.com
Date 2015-10-15 15:34:20 -0700 (Thu, 15 Oct 2015)


Log Message
Use the context menu location that's stored in the context data
https://bugs.webkit.org/show_bug.cgi?id=150194

Reviewed by Tim Horton.

* UIProcess/WebContextMenuProxy.h:
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::internalShowContextMenu):
* UIProcess/mac/WebContextMenuProxyMac.h:
* UIProcess/mac/WebContextMenuProxyMac.mm:
(WebKit::WebContextMenuProxyMac::showContextMenu):

Modified Paths

trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/WebContextMenuProxy.h
trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp
trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.h
trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm




Diff

Modified: trunk/Source/WebKit2/ChangeLog (191142 => 191143)

--- trunk/Source/WebKit2/ChangeLog	2015-10-15 22:20:03 UTC (rev 191142)
+++ trunk/Source/WebKit2/ChangeLog	2015-10-15 22:34:20 UTC (rev 191143)
@@ -1,5 +1,19 @@
 2015-10-15  Anders Carlsson  
 
+Use the context menu location that's stored in the context data
+https://bugs.webkit.org/show_bug.cgi?id=150194
+
+Reviewed by Tim Horton.
+
+* UIProcess/WebContextMenuProxy.h:
+* UIProcess/WebPageProxy.cpp:
+(WebKit::WebPageProxy::internalShowContextMenu):
+* UIProcess/mac/WebContextMenuProxyMac.h:
+* UIProcess/mac/WebContextMenuProxyMac.mm:
+(WebKit::WebContextMenuProxyMac::showContextMenu):
+
+2015-10-15  Anders Carlsson  
+
 Store the context menu data and user data in the WebContextMenuProxy object
 https://bugs.webkit.org/show_bug.cgi?id=150191
 


Modified: trunk/Source/WebKit2/UIProcess/WebContextMenuProxy.h (191142 => 191143)

--- trunk/Source/WebKit2/UIProcess/WebContextMenuProxy.h	2015-10-15 22:20:03 UTC (rev 191142)
+++ trunk/Source/WebKit2/UIProcess/WebContextMenuProxy.h	2015-10-15 22:34:20 UTC (rev 191143)
@@ -39,7 +39,7 @@
 public:
 virtual ~WebContextMenuProxy();
 
-virtual void showContextMenu(const WebCore::IntPoint&, const Vector&, const ContextMenuContextData&) = 0;
+virtual void showContextMenu(const Vector&, const ContextMenuContextData&) = 0;
 virtual void hideContextMenu() = 0;
 virtual void cancelTracking() { }
 


Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (191142 => 191143)

--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp	2015-10-15 22:20:03 UTC (rev 191142)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp	2015-10-15 22:34:20 UTC (rev 191143)
@@ -4236,7 +4236,7 @@
 
 const Vector& itemsToShow = useProposedItems ? proposedAPIItems : clientItems;
 if (!m_contextMenuClient->showContextMenu(*this, contextMenuContextData.menuLocation(), itemsToShow))
-m_activeContextMenu->showContextMenu(contextMenuContextData.menuLocation(), itemsToShow, contextMenuContextData);
+m_activeContextMenu->showContextMenu(itemsToShow, contextMenuContextData);
 
 m_contextMenuClient->contextMenuDismissed(*this);
 }


Modified: trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.h (191142 => 191143)

--- trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.h	2015-10-15 22:20:03 UTC (rev 191142)
+++ trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.h	2015-10-15 22:34:20 UTC (rev 191143)
@@ -50,7 +50,7 @@
 }
 ~WebContextMenuProxyMac();
 
-virtual void showContextMenu(const WebCore::IntPoint&, const Vector&, const ContextMenuContextData&) override;
+virtual void showContextMenu(const Vector&, const ContextMenuContextData&) override;
 
 virtual void hideContextMenu() override;
 virtual void cancelTracking() override;


Modified: trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm (191142 => 191143)

--- trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm	2015-10-15 22:20:03 UTC (rev 191142)
+++ trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm	2015-10-15 22:34:20 UTC (rev 191143)
@@ -346,7 +346,7 @@
 populateNSMenu(menu, nsMenuItemVector(items));
 }
 
-void WebContextMenuProxyMac::showContextMenu(const IntPoint& menuLocation, const Vector& items, const ContextMenuContextData& context)
+void WebContextMenuProxyMac::showContextMenu(const Vector& items, const ContextMenuContextData& context)
 {
 #if ENABLE(SERVICE_CONTROLS)
 if (items.isEmpty() && !context.needsServicesMenu())
@@ -360,7 +360,8 @@
 
 [[WKMenuTarget sharedMenuTarget] setMenuProxy:this];
 
-NSRect menuRect = NSMakeRect(menuLocation.x(), menuLocation.y(), 0, 0);
+NSPoint menuLocation = m_context.menuLocation();
+NSRect menuRect = NSMakeRect(menuLocation.x, menuLocation.y, 0, 0);
 
 #if ENABLE(SERVICE_CONTROLS)
 if (context.needsServicesMenu())






___
webkit-changes mailing list

[webkit-changes] [191167] trunk

2015-10-15 Thread achristensen
Title: [191167] trunk








Revision 191167
Author achristen...@apple.com
Date 2015-10-15 21:26:43 -0700 (Thu, 15 Oct 2015)


Log Message
[Content Extensions] Content blocking rules are not consulted for pings
https://bugs.webkit.org/show_bug.cgi?id=149873

Patch by Roopesh Chander  on 2015-10-15
Reviewed by Alex Christensen.

Source/WebCore:

This patch makes requests sent through the PingLoader
respect content blocking rules. Specifically, the following
are now subject to content blocking rules:
 
 1.  pings
 2. Images loaded in unload / beforeunload / pagehide handlers
 3. X-XSS-Protection / CSP violation reports

Tests: http/tests/contentextensions/block-cookies-in-csp-report.html
   http/tests/contentextensions/block-cookies-in-image-load-in-onunload.html
   http/tests/contentextensions/block-cookies-in-ping.html
   http/tests/contentextensions/block-csp-report.html
   http/tests/contentextensions/block-image-load-in-onunload.html
   http/tests/contentextensions/block-ping.html
   http/tests/contentextensions/hide-on-csp-report.html

* loader/PingLoader.cpp:
(WebCore::processContentExtensionRulesForLoad):
(WebCore::PingLoader::loadImage):
(WebCore::PingLoader::sendPing):
(WebCore::PingLoader::sendViolationReport):

LayoutTests:

Tests for ensuring that requests loaded through the PingLoader
are subject to content blocking rules.

* http/tests/contentextensions/block-cookies-in-csp-report-expected.txt: Added.
* http/tests/contentextensions/block-cookies-in-csp-report.html: Added.
* http/tests/contentextensions/block-cookies-in-csp-report.html.json: Added.
* http/tests/contentextensions/block-cookies-in-image-load-in-onunload-expected.txt: Added.
* http/tests/contentextensions/block-cookies-in-image-load-in-onunload.html: Added.
* http/tests/contentextensions/block-cookies-in-image-load-in-onunload.html.json: Added.
* http/tests/contentextensions/block-cookies-in-ping-expected.txt: Added.
* http/tests/contentextensions/block-cookies-in-ping.html: Added.
* http/tests/contentextensions/block-cookies-in-ping.html.json: Added.
* http/tests/contentextensions/block-csp-report-expected.txt: Added.
* http/tests/contentextensions/block-csp-report.html: Added.
* http/tests/contentextensions/block-csp-report.html.json: Added.
* http/tests/contentextensions/block-image-load-in-onunload-expected.txt: Added.
* http/tests/contentextensions/block-image-load-in-onunload.html: Added.
* http/tests/contentextensions/block-image-load-in-onunload.html.json: Added.
* http/tests/contentextensions/block-ping-expected.txt: Added.
* http/tests/contentextensions/block-ping.html: Added.
* http/tests/contentextensions/block-ping.html.json: Added.
* http/tests/contentextensions/hide-on-csp-report-expected.txt: Added.
* http/tests/contentextensions/hide-on-csp-report.html: Added.
* http/tests/contentextensions/hide-on-csp-report.html.json: Added.
* http/tests/contentextensions/resources/check-ping.html: Added.
* http/tests/contentextensions/resources/delete-ping.php: Added.
* http/tests/contentextensions/resources/get-ping-data.php: Added.
* http/tests/contentextensions/resources/ping-file-path.php: Added.
* http/tests/contentextensions/resources/redirect.php: Added.
* http/tests/contentextensions/resources/save-ping.php: Added.

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/loader/PingLoader.cpp


Added Paths

trunk/LayoutTests/http/tests/contentextensions/block-cookies-in-csp-report-expected.txt
trunk/LayoutTests/http/tests/contentextensions/block-cookies-in-csp-report.html
trunk/LayoutTests/http/tests/contentextensions/block-cookies-in-csp-report.html.json
trunk/LayoutTests/http/tests/contentextensions/block-cookies-in-image-load-in-onunload-expected.txt
trunk/LayoutTests/http/tests/contentextensions/block-cookies-in-image-load-in-onunload.html
trunk/LayoutTests/http/tests/contentextensions/block-cookies-in-image-load-in-onunload.html.json
trunk/LayoutTests/http/tests/contentextensions/block-cookies-in-ping-expected.txt
trunk/LayoutTests/http/tests/contentextensions/block-cookies-in-ping.html
trunk/LayoutTests/http/tests/contentextensions/block-cookies-in-ping.html.json
trunk/LayoutTests/http/tests/contentextensions/block-csp-report-expected.txt
trunk/LayoutTests/http/tests/contentextensions/block-csp-report.html
trunk/LayoutTests/http/tests/contentextensions/block-csp-report.html.json
trunk/LayoutTests/http/tests/contentextensions/block-image-load-in-onunload-expected.txt
trunk/LayoutTests/http/tests/contentextensions/block-image-load-in-onunload.html
trunk/LayoutTests/http/tests/contentextensions/block-image-load-in-onunload.html.json
trunk/LayoutTests/http/tests/contentextensions/block-ping-expected.txt
trunk/LayoutTests/http/tests/contentextensions/block-ping.html
trunk/LayoutTests/http/tests/contentextensions/block-ping.html.json
trunk/LayoutTests/http/tests/contentextensions/hide-on-csp-report-expected.txt

[webkit-changes] [191114] trunk

2015-10-15 Thread beidson
Title: [191114] trunk








Revision 191114
Author beid...@apple.com
Date 2015-10-15 09:41:30 -0700 (Thu, 15 Oct 2015)


Log Message
Modern IDB: Add basic transaction committing.
https://bugs.webkit.org/show_bug.cgi?id=150147

Reviewed by Alex Christensen.

Source/WebCore:

Test: storage/indexeddb/modern/opendatabase-versions.html

* Modules/indexeddb/IDBTransaction.h:

* Modules/indexeddb/IndexedDB.h:

* Modules/indexeddb/client/IDBConnectionToServer.cpp:
(WebCore::IDBClient::IDBConnectionToServer::commitTransaction):
(WebCore::IDBClient::IDBConnectionToServer::didCommitTransaction):
* Modules/indexeddb/client/IDBConnectionToServer.h:
* Modules/indexeddb/client/IDBConnectionToServerDelegate.h:

* Modules/indexeddb/client/IDBDatabaseImpl.cpp:
(WebCore::IDBClient::IDBDatabase::startVersionChangeTransaction):
(WebCore::IDBClient::IDBDatabase::commitTransaction):
(WebCore::IDBClient::IDBDatabase::didCommitTransaction):
(WebCore::IDBClient::IDBDatabase::didAbortTransaction):
(WebCore::IDBClient::IDBDatabase::didCommitOrAbortTransaction):
* Modules/indexeddb/client/IDBDatabaseImpl.h:

* Modules/indexeddb/client/IDBFactoryImpl.cpp:
(WebCore::IDBClient::IDBFactory::open):

* Modules/indexeddb/client/IDBOpenDBRequestImpl.cpp:
(WebCore::IDBClient::IDBOpenDBRequest::onSuccess):
* Modules/indexeddb/client/IDBOpenDBRequestImpl.h:

* Modules/indexeddb/client/IDBTransactionImpl.cpp:
(WebCore::IDBClient::IDBTransaction::IDBTransaction):
(WebCore::IDBClient::IDBTransaction::db):
(WebCore::IDBClient::IDBTransaction::hasPendingActivity):
(WebCore::IDBClient::IDBTransaction::isActive):
(WebCore::IDBClient::IDBTransaction::scheduleOperationTimer):
(WebCore::IDBClient::IDBTransaction::operationTimerFired):
(WebCore::IDBClient::IDBTransaction::commit):
(WebCore::IDBClient::IDBTransaction::didCommit):
(WebCore::IDBClient::IDBTransaction::fireOnComplete):
(WebCore::IDBClient::IDBTransaction::fireOnAbort):
(WebCore::IDBClient::IDBTransaction::enqueueEvent):
(WebCore::IDBClient::IDBTransaction::dispatchEvent):
* Modules/indexeddb/client/IDBTransactionImpl.h:
(WebCore::IDBClient::IDBTransaction::database):

* Modules/indexeddb/legacy/LegacyTransaction.cpp:
(WebCore::LegacyTransaction::db):
* Modules/indexeddb/legacy/LegacyTransaction.h:

* Modules/indexeddb/server/IDBConnectionToClient.cpp:
(WebCore::IDBServer::IDBConnectionToClient::didCommitTransaction):
* Modules/indexeddb/server/IDBConnectionToClient.h:
* Modules/indexeddb/server/IDBConnectionToClientDelegate.h:

* Modules/indexeddb/server/IDBServer.cpp:
(WebCore::IDBServer::IDBServer::registerTransaction):
(WebCore::IDBServer::IDBServer::unregisterTransaction):
(WebCore::IDBServer::IDBServer::commitTransaction):
* Modules/indexeddb/server/IDBServer.h:

* Modules/indexeddb/server/UniqueIDBDatabase.cpp:
(WebCore::IDBServer::generateUniqueCallbackIdentifier):
(WebCore::IDBServer::UniqueIDBDatabase::storeCallback):
(WebCore::IDBServer::UniqueIDBDatabase::commitTransaction):
(WebCore::IDBServer::UniqueIDBDatabase::performCommitTransaction):
(WebCore::IDBServer::UniqueIDBDatabase::didPerformCommitTransaction):
(WebCore::IDBServer::UniqueIDBDatabase::performErrorCallback):
(WebCore::IDBServer::UniqueIDBDatabase::startVersionChangeTransaction): Deleted.
* Modules/indexeddb/server/UniqueIDBDatabase.h:
(WebCore::IDBServer::UniqueIDBDatabase::server):

* Modules/indexeddb/server/UniqueIDBDatabaseConnection.cpp:
(WebCore::IDBServer::UniqueIDBDatabaseConnection::createVersionChangeTransaction):
(WebCore::IDBServer::UniqueIDBDatabaseConnection::didCommitTransaction):
* Modules/indexeddb/server/UniqueIDBDatabaseConnection.h:

* Modules/indexeddb/server/UniqueIDBDatabaseTransaction.cpp:
(WebCore::IDBServer::UniqueIDBDatabaseTransaction::UniqueIDBDatabaseTransaction):
(WebCore::IDBServer::UniqueIDBDatabaseTransaction::~UniqueIDBDatabaseTransaction):
(WebCore::IDBServer::UniqueIDBDatabaseTransaction::commit):
* Modules/indexeddb/server/UniqueIDBDatabaseTransaction.h:

* Modules/indexeddb/shared/IDBDatabaseInfo.h:
(WebCore::IDBDatabaseInfo::setVersion):

* Modules/indexeddb/shared/IDBError.cpp:
(WebCore::IDBError::isolatedCopy):
* Modules/indexeddb/shared/IDBError.h:

* Modules/indexeddb/shared/IDBRequestData.h:

* Modules/indexeddb/shared/IDBResourceIdentifier.cpp:
(WebCore::IDBResourceIdentifier::isolatedCopy):
* Modules/indexeddb/shared/IDBResourceIdentifier.h:

* Modules/indexeddb/shared/InProcessIDBServer.cpp:
(WebCore::InProcessIDBServer::didCommitTransaction):
(WebCore::InProcessIDBServer::commitTransaction):
* Modules/indexeddb/shared/InProcessIDBServer.h:

* WebCore.xcodeproj/project.pbxproj:

* platform/CrossThreadCopier.cpp:
(WebCore::IDBResourceIdentifier>::copy):
(WebCore::IDBError>::copy):
* platform/CrossThreadCopier.h:

LayoutTests:

* storage/indexeddb/modern/opendatabase-versions-expected.txt: Added.
* storage/indexeddb/modern/opendatabase-versions.html: Added.

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/Source/WebCore/ChangeLog

[webkit-changes] [191115] trunk/Websites/perf.webkit.org

2015-10-15 Thread rniwa
Title: [191115] trunk/Websites/perf.webkit.org








Revision 191115
Author rn...@webkit.org
Date 2015-10-15 09:44:33 -0700 (Thu, 15 Oct 2015)


Log Message
Unreviewed fix of a test after r190687.

* tests/admin-regenerate-manifest.js:

Modified Paths

trunk/Websites/perf.webkit.org/ChangeLog
trunk/Websites/perf.webkit.org/tests/admin-regenerate-manifest.js




Diff

Modified: trunk/Websites/perf.webkit.org/ChangeLog (191114 => 191115)

--- trunk/Websites/perf.webkit.org/ChangeLog	2015-10-15 16:41:30 UTC (rev 191114)
+++ trunk/Websites/perf.webkit.org/ChangeLog	2015-10-15 16:44:33 UTC (rev 191115)
@@ -1,3 +1,9 @@
+2015-10-15  Ryosuke Niwa  
+
+Unreviewed fix of a test after r190687.
+
+* tests/admin-regenerate-manifest.js:
+
 2015-10-12  Ryosuke Niwa  
 
 Perf dashboard tools shouldn't require server credentials in multiple configuration files


Modified: trunk/Websites/perf.webkit.org/tests/admin-regenerate-manifest.js (191114 => 191115)

--- trunk/Websites/perf.webkit.org/tests/admin-regenerate-manifest.js	2015-10-15 16:41:30 UTC (rev 191114)
+++ trunk/Websites/perf.webkit.org/tests/admin-regenerate-manifest.js	2015-10-15 16:44:33 UTC (rev 191115)
@@ -9,6 +9,7 @@
 delete manifest.defaultDashboard;
 delete manifest.dashboards;
 delete manifest.elapsedTime;
+delete manifest.siteTitle;
 assert.deepEqual(manifest, {
 all: {},
 bugTrackers: {},






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


[webkit-changes] [191117] trunk/Source/WebCore

2015-10-15 Thread simon . fraser
Title: [191117] trunk/Source/WebCore








Revision 191117
Author simon.fra...@apple.com
Date 2015-10-15 10:20:10 -0700 (Thu, 15 Oct 2015)


Log Message
Move ImageBuffer:clip() into GraphicsContextCG
https://bugs.webkit.org/show_bug.cgi?id=150140

Reviewed by Zalan Bujtas.

Move the guts of CG's ImageBuffer:clip() into GraphicsContextCG.

* platform/graphics/GraphicsContext.h:
* platform/graphics/cg/GraphicsContextCG.cpp:
(WebCore::GraphicsContext::clipToNativeImage):
* platform/graphics/cg/ImageBufferCG.cpp:
(WebCore::ImageBuffer::clip):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/graphics/GraphicsContext.h
trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp
trunk/Source/WebCore/platform/graphics/cg/ImageBufferCG.cpp




Diff

Modified: trunk/Source/WebCore/ChangeLog (191116 => 191117)

--- trunk/Source/WebCore/ChangeLog	2015-10-15 16:54:49 UTC (rev 191116)
+++ trunk/Source/WebCore/ChangeLog	2015-10-15 17:20:10 UTC (rev 191117)
@@ -1,3 +1,18 @@
+2015-10-14  Simon Fraser  
+
+Move ImageBuffer:clip() into GraphicsContextCG
+https://bugs.webkit.org/show_bug.cgi?id=150140
+
+Reviewed by Zalan Bujtas.
+
+Move the guts of CG's ImageBuffer:clip() into GraphicsContextCG.
+
+* platform/graphics/GraphicsContext.h:
+* platform/graphics/cg/GraphicsContextCG.cpp:
+(WebCore::GraphicsContext::clipToNativeImage):
+* platform/graphics/cg/ImageBufferCG.cpp:
+(WebCore::ImageBuffer::clip):
+
 2015-10-14  Brady Eidson  
 
 Modern IDB: Add basic transaction committing.


Modified: trunk/Source/WebCore/platform/graphics/GraphicsContext.h (191116 => 191117)

--- trunk/Source/WebCore/platform/graphics/GraphicsContext.h	2015-10-15 16:54:49 UTC (rev 191116)
+++ trunk/Source/WebCore/platform/graphics/GraphicsContext.h	2015-10-15 17:20:10 UTC (rev 191117)
@@ -262,6 +262,8 @@
 
 WEBCORE_EXPORT void drawNativeImage(PassNativeImagePtr, const FloatSize& selfSize, ColorSpace styleColorSpace, const FloatRect& destRect, const FloatRect& srcRect, CompositeOperator = CompositeSourceOver, BlendMode = BlendModeNormal, ImageOrientation = DefaultImageOrientation);
 
+void clipToNativeImage(PassNativeImagePtr, const FloatRect& destRect, const FloatSize& bufferSize);
+
 // Allow font smoothing (LCD antialiasing). Not part of the graphics state.
 void setAllowsFontSmoothing(bool);
 


Modified: trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp (191116 => 191117)

--- trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp	2015-10-15 16:54:49 UTC (rev 191116)
+++ trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp	2015-10-15 17:20:10 UTC (rev 191117)
@@ -345,6 +345,18 @@
 }
 }
 
+void GraphicsContext::clipToNativeImage(PassNativeImagePtr image, const FloatRect& destRect, const FloatSize& bufferSize)
+{
+CGContextRef context = platformContext();
+// FIXME: This image needs to be grayscale to be used as an alpha mask here.
+CGContextTranslateCTM(context, destRect.x(), destRect.y() + bufferSize.height());
+CGContextScaleCTM(context, 1, -1);
+CGContextClipToRect(context, FloatRect(FloatPoint(0, bufferSize.height() - destRect.height()), destRect.size()));
+CGContextClipToMask(context, FloatRect(FloatPoint(), bufferSize), image);
+CGContextScaleCTM(context, 1, -1);
+CGContextTranslateCTM(context, -destRect.x(), -destRect.y() - destRect.height());
+}
+
 // Draws a filled rectangle with a stroked border.
 void GraphicsContext::drawRect(const FloatRect& rect, float borderThickness)
 {


Modified: trunk/Source/WebCore/platform/graphics/cg/ImageBufferCG.cpp (191116 => 191117)

--- trunk/Source/WebCore/platform/graphics/cg/ImageBufferCG.cpp	2015-10-15 16:54:49 UTC (rev 191116)
+++ trunk/Source/WebCore/platform/graphics/cg/ImageBufferCG.cpp	2015-10-15 17:20:10 UTC (rev 191117)
@@ -266,16 +266,8 @@
 void ImageBuffer::clip(GraphicsContext& contextToClip, const FloatRect& rect) const
 {
 FloatSize backingStoreSizeInUserSpace = scaleSizeToUserSpace(rect.size(), m_data.backingStoreSize, internalSize());
-
-CGContextRef platformContextToClip = contextToClip.platformContext();
-// FIXME: This image needs to be grayscale to be used as an alpha mask here.
 RetainPtr image = copyNativeImage(DontCopyBackingStore);
-CGContextTranslateCTM(platformContextToClip, rect.x(), rect.y() + backingStoreSizeInUserSpace.height());
-CGContextScaleCTM(platformContextToClip, 1, -1);
-CGContextClipToRect(platformContextToClip, FloatRect(FloatPoint(0, backingStoreSizeInUserSpace.height() - rect.height()), rect.size()));
-CGContextClipToMask(platformContextToClip, FloatRect(FloatPoint(), backingStoreSizeInUserSpace), image.get());
-CGContextScaleCTM(platformContextToClip, 1, -1);
-CGContextTranslateCTM(platformContextToClip, -rect.x(), -rect.y() - rect.height());
+

[webkit-changes] [191116] trunk/LayoutTests

2015-10-15 Thread bfulgham
Title: [191116] trunk/LayoutTests








Revision 191116
Author bfulg...@apple.com
Date 2015-10-15 09:54:49 -0700 (Thu, 15 Oct 2015)


Log Message
[Win] Unreviewed gardenining after r190816.

Update Windows expectation to match new mac test expectation.

* platform/win/svg/custom/simple-text-double-shadow-expected.txt:

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/LayoutTests/platform/win/svg/custom/simple-text-double-shadow-expected.txt




Diff

Modified: trunk/LayoutTests/ChangeLog (191115 => 191116)

--- trunk/LayoutTests/ChangeLog	2015-10-15 16:44:33 UTC (rev 191115)
+++ trunk/LayoutTests/ChangeLog	2015-10-15 16:54:49 UTC (rev 191116)
@@ -1,3 +1,11 @@
+2015-10-15  Brent Fulgham  
+
+[Win] Unreviewed gardenining after r190816.
+
+Update Windows expectation to match new mac test expectation.
+
+* platform/win/svg/custom/simple-text-double-shadow-expected.txt:
+
 2015-10-14  Brady Eidson  
 
 Modern IDB: Add basic transaction committing.


Modified: trunk/LayoutTests/platform/win/svg/custom/simple-text-double-shadow-expected.txt (191115 => 191116)

--- trunk/LayoutTests/platform/win/svg/custom/simple-text-double-shadow-expected.txt	2015-10-15 16:44:33 UTC (rev 191115)
+++ trunk/LayoutTests/platform/win/svg/custom/simple-text-double-shadow-expected.txt	2015-10-15 16:54:49 UTC (rev 191116)
@@ -1,7 +1,7 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
 layer at (0,0) size 800x600
-  RenderSVGRoot {svg} at (20,26) size 480x294
+  RenderSVGRoot {svg} at (20,26) size 380x194
 RenderSVGText {text} at (20,26) size 217x18 contains 1 chunk(s)
   RenderSVGInlineText {#text} at (0,0) size 217x18
 chunk 1 text run 1 at (20.00,40.00) startOffset 0 endOffset 34 width 217.00: "This text should appear only twice"






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


[webkit-changes] [191118] trunk/Source/WebCore

2015-10-15 Thread simon . fraser
Title: [191118] trunk/Source/WebCore








Revision 191118
Author simon.fra...@apple.com
Date 2015-10-15 10:23:32 -0700 (Thu, 15 Oct 2015)


Log Message
Un-indent contents of the WebCore namespace
in GraphicsContext.h. No code changes.

* platform/graphics/GraphicsContext.h:

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/graphics/GraphicsContext.h




Diff

Modified: trunk/Source/WebCore/ChangeLog (191117 => 191118)

--- trunk/Source/WebCore/ChangeLog	2015-10-15 17:20:10 UTC (rev 191117)
+++ trunk/Source/WebCore/ChangeLog	2015-10-15 17:23:32 UTC (rev 191118)
@@ -1,3 +1,10 @@
+2015-10-15  Simon Fraser  
+
+Un-indent contents of the WebCore namespace
+in GraphicsContext.h. No code changes.
+
+* platform/graphics/GraphicsContext.h:
+
 2015-10-14  Simon Fraser  
 
 Move ImageBuffer:clip() into GraphicsContextCG


Modified: trunk/Source/WebCore/platform/graphics/GraphicsContext.h (191117 => 191118)

--- trunk/Source/WebCore/platform/graphics/GraphicsContext.h	2015-10-15 17:20:10 UTC (rev 191117)
+++ trunk/Source/WebCore/platform/graphics/GraphicsContext.h	2015-10-15 17:23:32 UTC (rev 191118)
@@ -64,551 +64,550 @@
 namespace WebCore {
 
 #if USE(WINGDI)
-class SharedBitmap;
-class Font;
-class GlyphBuffer;
+class SharedBitmap;
+class Font;
+class GlyphBuffer;
 #endif
 
-const int cMisspellingLineThickness = 3;
-const int cMisspellingLinePatternWidth = 4;
-const int cMisspellingLinePatternGapWidth = 1;
+const int cMisspellingLineThickness = 3;
+const int cMisspellingLinePatternWidth = 4;
+const int cMisspellingLinePatternGapWidth = 1;
 
-class AffineTransform;
-class FloatRoundedRect;
-class Gradient;
-class GraphicsContextPlatformPrivate;
-class ImageBuffer;
-class IntRect;
-class RoundedRect;
-class URL;
-class GraphicsContext3D;
-class TextRun;
-class TransformationMatrix;
+class AffineTransform;
+class FloatRoundedRect;
+class Gradient;
+class GraphicsContextPlatformPrivate;
+class ImageBuffer;
+class IntRect;
+class RoundedRect;
+class URL;
+class GraphicsContext3D;
+class TextRun;
+class TransformationMatrix;
 
-enum TextDrawingMode {
-TextModeFill = 1 << 0,
-TextModeStroke = 1 << 1,
+enum TextDrawingMode {
+TextModeFill = 1 << 0,
+TextModeStroke = 1 << 1,
 #if ENABLE(LETTERPRESS)
-TextModeLetterpress = 1 << 2,
+TextModeLetterpress = 1 << 2,
 #endif
-};
-typedef unsigned TextDrawingModeFlags;
+};
+typedef unsigned TextDrawingModeFlags;
 
-enum StrokeStyle {
-NoStroke,
-SolidStroke,
-DottedStroke,
-DashedStroke,
-DoubleStroke,
-WavyStroke,
-};
+enum StrokeStyle {
+NoStroke,
+SolidStroke,
+DottedStroke,
+DashedStroke,
+DoubleStroke,
+WavyStroke,
+};
 
-enum InterpolationQuality {
-InterpolationDefault,
-InterpolationNone,
-InterpolationLow,
-InterpolationMedium,
-InterpolationHigh
-};
+enum InterpolationQuality {
+InterpolationDefault,
+InterpolationNone,
+InterpolationLow,
+InterpolationMedium,
+InterpolationHigh
+};
 
-struct GraphicsContextState {
-GraphicsContextState()
-: shouldAntialias(true)
-, shouldSmoothFonts(true)
-, antialiasedFontDilationEnabled(true)
-, shouldSubpixelQuantizeFonts(true)
-, paintingDisabled(false)
-, shadowsIgnoreTransforms(false)
+struct GraphicsContextState {
+GraphicsContextState()
+: shouldAntialias(true)
+, shouldSmoothFonts(true)
+, antialiasedFontDilationEnabled(true)
+, shouldSubpixelQuantizeFonts(true)
+, paintingDisabled(false)
+, shadowsIgnoreTransforms(false)
 #if USE(CG)
-// Core Graphics incorrectly renders shadows with radius > 8px (),
-// but we need to preserve this buggy behavior for canvas and -webkit-box-shadow.
-, shadowsUseLegacyRadius(false)
+// Core Graphics incorrectly renders shadows with radius > 8px (),
+// but we need to preserve this buggy behavior for canvas and -webkit-box-shadow.
+, shadowsUseLegacyRadius(false)
 #endif
-, drawLuminanceMask(false)
-{
-}
+, drawLuminanceMask(false)
+{
+}
 
-RefPtr strokeGradient;
-RefPtr strokePattern;
-
-RefPtr fillGradient;
-RefPtr fillPattern;
+RefPtr strokeGradient;
+RefPtr strokePattern;
+
+RefPtr fillGradient;
+RefPtr fillPattern;
 
-FloatSize shadowOffset;
+FloatSize shadowOffset;
 
-float strokeThickness { 0 };
-float shadowBlur { 0 };
+float strokeThickness { 0 };
+float shadowBlur { 0 };
 
-TextDrawingModeFlags textDrawingMode { TextModeFill };
+TextDrawingModeFlags textDrawingMode { 

[webkit-changes] [191119] trunk

2015-10-15 Thread zalan
Title: [191119] trunk








Revision 191119
Author za...@apple.com
Date 2015-10-15 10:30:26 -0700 (Thu, 15 Oct 2015)


Log Message
Anonymous table objects: Collapse anonymous table rows.
https://bugs.webkit.org/show_bug.cgi?id=150154

Reviewed by David Hyatt.

Merge anonymous table rows when they are not needed anymore.
Generated table rows can be collapsed into one when there's no
non-generated sibling table row left in the tree.

Import W3C CSS2.1 anonymous table tests.

Source/WebCore:

* rendering/RenderObject.cpp:
(WebCore::collapseAnonymousTableRowsIfNeeded):
(WebCore::RenderObject::destroyAndCleanupAnonymousWrappers):

LayoutTests:

* css2.1/tables/table-anonymous-objects-103.xht: Added.
* css2.1/tables/table-anonymous-objects-104.xht: Added.
* css2.1/tables/table-anonymous-objects-117.xht: Added.
* css2.1/tables/table-anonymous-objects-118.xht: Added.
* css2.1/tables/table-anonymous-objects-119.xht: Added.
* css2.1/tables/table-anonymous-objects-120.xht: Added.
* platform/mac/css2.1/tables/table-anonymous-objects-103-expected.txt: Added.
* platform/mac/css2.1/tables/table-anonymous-objects-104-expected.txt: Added.
* platform/mac/css2.1/tables/table-anonymous-objects-117-expected.txt: Added.
* platform/mac/css2.1/tables/table-anonymous-objects-118-expected.txt: Added.
* platform/mac/css2.1/tables/table-anonymous-objects-119-expected.txt: Added.
* platform/mac/css2.1/tables/table-anonymous-objects-120-expected.txt: Added.

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/rendering/RenderObject.cpp


Added Paths

trunk/LayoutTests/css2.1/tables/table-anonymous-objects-103.xht
trunk/LayoutTests/css2.1/tables/table-anonymous-objects-104.xht
trunk/LayoutTests/css2.1/tables/table-anonymous-objects-117.xht
trunk/LayoutTests/css2.1/tables/table-anonymous-objects-118.xht
trunk/LayoutTests/css2.1/tables/table-anonymous-objects-119.xht
trunk/LayoutTests/css2.1/tables/table-anonymous-objects-120.xht
trunk/LayoutTests/platform/mac/css2.1/tables/table-anonymous-objects-103-expected.txt
trunk/LayoutTests/platform/mac/css2.1/tables/table-anonymous-objects-104-expected.txt
trunk/LayoutTests/platform/mac/css2.1/tables/table-anonymous-objects-117-expected.txt
trunk/LayoutTests/platform/mac/css2.1/tables/table-anonymous-objects-118-expected.txt
trunk/LayoutTests/platform/mac/css2.1/tables/table-anonymous-objects-119-expected.txt
trunk/LayoutTests/platform/mac/css2.1/tables/table-anonymous-objects-120-expected.txt




Diff

Modified: trunk/LayoutTests/ChangeLog (191118 => 191119)

--- trunk/LayoutTests/ChangeLog	2015-10-15 17:23:32 UTC (rev 191118)
+++ trunk/LayoutTests/ChangeLog	2015-10-15 17:30:26 UTC (rev 191119)
@@ -1,3 +1,29 @@
+2015-10-15  Zalan Bujtas  
+
+Anonymous table objects: Collapse anonymous table rows.
+https://bugs.webkit.org/show_bug.cgi?id=150154
+
+Reviewed by David Hyatt.
+
+Merge anonymous table rows when they are not needed anymore.
+Generated table rows can be collapsed into one when there's no
+non-generated sibling table row left in the tree.
+
+Import W3C CSS2.1 anonymous table tests.
+
+* css2.1/tables/table-anonymous-objects-103.xht: Added.
+* css2.1/tables/table-anonymous-objects-104.xht: Added.
+* css2.1/tables/table-anonymous-objects-117.xht: Added.
+* css2.1/tables/table-anonymous-objects-118.xht: Added.
+* css2.1/tables/table-anonymous-objects-119.xht: Added.
+* css2.1/tables/table-anonymous-objects-120.xht: Added.
+* platform/mac/css2.1/tables/table-anonymous-objects-103-expected.txt: Added.
+* platform/mac/css2.1/tables/table-anonymous-objects-104-expected.txt: Added.
+* platform/mac/css2.1/tables/table-anonymous-objects-117-expected.txt: Added.
+* platform/mac/css2.1/tables/table-anonymous-objects-118-expected.txt: Added.
+* platform/mac/css2.1/tables/table-anonymous-objects-119-expected.txt: Added.
+* platform/mac/css2.1/tables/table-anonymous-objects-120-expected.txt: Added.
+
 2015-10-15  Brent Fulgham  
 
 [Win] Unreviewed gardenining after r190816.


Added: trunk/LayoutTests/css2.1/tables/table-anonymous-objects-103.xht (0 => 191119)

--- trunk/LayoutTests/css2.1/tables/table-anonymous-objects-103.xht	(rev 0)
+++ trunk/LayoutTests/css2.1/tables/table-anonymous-objects-103.xht	2015-10-15 17:30:26 UTC (rev 191119)
@@ -0,0 +1,61 @@
+
+
+
+  CSS Test: Auto-imported from Gecko test dynamic-removal-3.html
+  
+
+
+  
+
+There should be no red below, except for antialiasing issues.
+
+
+
+ 
+  Row 1, Col 1
+  Row 1, Col 2
+  Row 1, Col 3
+
+ 
+  Row 22, Col 1
+  To be removed
+  Row 22, Col 2
+  

[webkit-changes] [191125] trunk/Source/JavaScriptCore

2015-10-15 Thread mark . lam
Title: [191125] trunk/Source/_javascript_Core








Revision 191125
Author mark@apple.com
Date 2015-10-15 12:31:12 -0700 (Thu, 15 Oct 2015)


Log Message
Fix some typos in comments.
https://bugs.webkit.org/show_bug.cgi?id=150181

Rubber stamped by Michael Saboff.

* jit/JITStubsARM.h:
* jit/JITStubsARMv7.h:

Modified Paths

trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/jit/JITStubsARM.h
trunk/Source/_javascript_Core/jit/JITStubsARMv7.h




Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (191124 => 191125)

--- trunk/Source/_javascript_Core/ChangeLog	2015-10-15 18:38:58 UTC (rev 191124)
+++ trunk/Source/_javascript_Core/ChangeLog	2015-10-15 19:31:12 UTC (rev 191125)
@@ -1,5 +1,15 @@
 2015-10-15  Mark Lam  
 
+Fix some typos in comments.
+https://bugs.webkit.org/show_bug.cgi?id=150181
+
+Rubber stamped by Michael Saboff.
+
+* jit/JITStubsARM.h:
+* jit/JITStubsARMv7.h:
+
+2015-10-15  Mark Lam  
+
 Refactoring: give the MASM probe CPUState methods shorter names.
 https://bugs.webkit.org/show_bug.cgi?id=150177
 


Modified: trunk/Source/_javascript_Core/jit/JITStubsARM.h (191124 => 191125)

--- trunk/Source/_javascript_Core/jit/JITStubsARM.h	2015-10-15 18:38:58 UTC (rev 191124)
+++ trunk/Source/_javascript_Core/jit/JITStubsARM.h	2015-10-15 19:31:12 UTC (rev 191125)
@@ -111,7 +111,7 @@
 COMPILE_ASSERT(PROBE_OFFSETOF(cpu.r4) == PROBE_CPU_R4_OFFSET, ProbeContext_cpu_r4_offset_matches_ctiMasmProbeTrampoline);
 COMPILE_ASSERT(PROBE_OFFSETOF(cpu.r5) == PROBE_CPU_R5_OFFSET, ProbeContext_cpu_r5_offset_matches_ctiMasmProbeTrampoline);
 COMPILE_ASSERT(PROBE_OFFSETOF(cpu.r6) == PROBE_CPU_R6_OFFSET, ProbeContext_cpu_r6_offset_matches_ctiMasmProbeTrampoline);
-COMPILE_ASSERT(PROBE_OFFSETOF(cpu.r7) == PROBE_CPU_R7_OFFSET, ProbeContext_cpu_r70_offset_matches_ctiMasmProbeTrampoline);
+COMPILE_ASSERT(PROBE_OFFSETOF(cpu.r7) == PROBE_CPU_R7_OFFSET, ProbeContext_cpu_r7_offset_matches_ctiMasmProbeTrampoline);
 COMPILE_ASSERT(PROBE_OFFSETOF(cpu.r8) == PROBE_CPU_R8_OFFSET, ProbeContext_cpu_r8_offset_matches_ctiMasmProbeTrampoline);
 COMPILE_ASSERT(PROBE_OFFSETOF(cpu.r9) == PROBE_CPU_R9_OFFSET, ProbeContext_cpu_r9_offset_matches_ctiMasmProbeTrampoline);
 COMPILE_ASSERT(PROBE_OFFSETOF(cpu.r10) == PROBE_CPU_R10_OFFSET, ProbeContext_cpu_r10_offset_matches_ctiMasmProbeTrampoline);


Modified: trunk/Source/_javascript_Core/jit/JITStubsARMv7.h (191124 => 191125)

--- trunk/Source/_javascript_Core/jit/JITStubsARMv7.h	2015-10-15 18:38:58 UTC (rev 191124)
+++ trunk/Source/_javascript_Core/jit/JITStubsARMv7.h	2015-10-15 19:31:12 UTC (rev 191125)
@@ -126,7 +126,7 @@
 COMPILE_ASSERT(PROBE_OFFSETOF(cpu.r4) == PROBE_CPU_R4_OFFSET, ProbeContext_cpu_r4_offset_matches_ctiMasmProbeTrampoline);
 COMPILE_ASSERT(PROBE_OFFSETOF(cpu.r5) == PROBE_CPU_R5_OFFSET, ProbeContext_cpu_r5_offset_matches_ctiMasmProbeTrampoline);
 COMPILE_ASSERT(PROBE_OFFSETOF(cpu.r6) == PROBE_CPU_R6_OFFSET, ProbeContext_cpu_r6_offset_matches_ctiMasmProbeTrampoline);
-COMPILE_ASSERT(PROBE_OFFSETOF(cpu.r7) == PROBE_CPU_R7_OFFSET, ProbeContext_cpu_r70_offset_matches_ctiMasmProbeTrampoline);
+COMPILE_ASSERT(PROBE_OFFSETOF(cpu.r7) == PROBE_CPU_R7_OFFSET, ProbeContext_cpu_r7_offset_matches_ctiMasmProbeTrampoline);
 COMPILE_ASSERT(PROBE_OFFSETOF(cpu.r8) == PROBE_CPU_R8_OFFSET, ProbeContext_cpu_r8_offset_matches_ctiMasmProbeTrampoline);
 COMPILE_ASSERT(PROBE_OFFSETOF(cpu.r9) == PROBE_CPU_R9_OFFSET, ProbeContext_cpu_r9_offset_matches_ctiMasmProbeTrampoline);
 COMPILE_ASSERT(PROBE_OFFSETOF(cpu.r10) == PROBE_CPU_R10_OFFSET, ProbeContext_cpu_r10_offset_matches_ctiMasmProbeTrampoline);
@@ -261,10 +261,10 @@
 //ProbeContext.cpu.lr, not the return address).
 //
 //The solution is to store the return address on the stack and load the
-// pc from there.
+//pc from there.
 //
 // 2. Issue 1 means we will need to write to the stack location at
-//ProbeContext.cpu.sp - 4. But if the user probe function had  modified
+//ProbeContext.cpu.sp - 4. But if the user probe function had modified
 //the value of ProbeContext.cpu.sp to point in the range between
 // thru , then the action for
 //Issue 1 may trash the values to be restored before we can restore






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


[webkit-changes] [191126] trunk/Source/WebCore

2015-10-15 Thread ossy
Title: [191126] trunk/Source/WebCore








Revision 191126
Author o...@webkit.org
Date 2015-10-15 12:34:09 -0700 (Thu, 15 Oct 2015)


Log Message
Get rid of the only once used isIntegerArray function
https://bugs.webkit.org/show_bug.cgi?id=150170

Reviewed by Geoffrey Garen.

* page/Crypto.cpp:
(WebCore::Crypto::getRandomValues):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/page/Crypto.cpp




Diff

Modified: trunk/Source/WebCore/ChangeLog (191125 => 191126)

--- trunk/Source/WebCore/ChangeLog	2015-10-15 19:31:12 UTC (rev 191125)
+++ trunk/Source/WebCore/ChangeLog	2015-10-15 19:34:09 UTC (rev 191126)
@@ -1,3 +1,13 @@
+2015-10-15  Csaba Osztrogonác  
+
+Get rid of the only once used isIntegerArray function
+https://bugs.webkit.org/show_bug.cgi?id=150170
+
+Reviewed by Geoffrey Garen.
+
+* page/Crypto.cpp:
+(WebCore::Crypto::getRandomValues):
+
 2015-10-15  Tim Horton  
 
 Try to fix the iOS build.


Modified: trunk/Source/WebCore/page/Crypto.cpp (191125 => 191126)

--- trunk/Source/WebCore/page/Crypto.cpp	2015-10-15 19:31:12 UTC (rev 191125)
+++ trunk/Source/WebCore/page/Crypto.cpp	2015-10-15 19:34:09 UTC (rev 191126)
@@ -39,15 +39,6 @@
 
 namespace WebCore {
 
-namespace {
-
-bool isIntegerArray(ArrayBufferView* array)
-{
-return JSC::isInt(array->getType());
-}
-
-}
-
 Crypto::Crypto(Document& document)
 : ContextDestructionObserver()
 {
@@ -64,7 +55,7 @@
 
 void Crypto::getRandomValues(ArrayBufferView* array, ExceptionCode& ec)
 {
-if (!array || !isIntegerArray(array)) {
+if (!array || !JSC::isInt(array->getType())) {
 ec = TYPE_MISMATCH_ERR;
 return;
 }






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


[webkit-changes] [191127] trunk/Source/WebCore

2015-10-15 Thread ossy
Title: [191127] trunk/Source/WebCore








Revision 191127
Author o...@webkit.org
Date 2015-10-15 12:46:24 -0700 (Thu, 15 Oct 2015)


Log Message
Fix the !(ENABLE(SHADOW_DOM) || ENABLE(DETAILS_ELEMENT)) build after r191112
https://bugs.webkit.org/show_bug.cgi?id=150175

Reviewed by Antti Koivisto.

* dom/ComposedTreeAncestorIterator.h:
(WebCore::ComposedTreeAncestorIterator::traverseParent):
* dom/ComposedTreeIterator.cpp:
(WebCore::ComposedTreeIterator::initializeShadowStack):
* dom/Element.cpp:
(WebCore::Element::childrenChanged):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/dom/ComposedTreeAncestorIterator.h
trunk/Source/WebCore/dom/ComposedTreeIterator.cpp
trunk/Source/WebCore/dom/Element.cpp




Diff

Modified: trunk/Source/WebCore/ChangeLog (191126 => 191127)

--- trunk/Source/WebCore/ChangeLog	2015-10-15 19:34:09 UTC (rev 191126)
+++ trunk/Source/WebCore/ChangeLog	2015-10-15 19:46:24 UTC (rev 191127)
@@ -1,5 +1,19 @@
 2015-10-15  Csaba Osztrogonác  
 
+Fix the !(ENABLE(SHADOW_DOM) || ENABLE(DETAILS_ELEMENT)) build after r191112
+https://bugs.webkit.org/show_bug.cgi?id=150175
+
+Reviewed by Antti Koivisto.
+
+* dom/ComposedTreeAncestorIterator.h:
+(WebCore::ComposedTreeAncestorIterator::traverseParent):
+* dom/ComposedTreeIterator.cpp:
+(WebCore::ComposedTreeIterator::initializeShadowStack):
+* dom/Element.cpp:
+(WebCore::Element::childrenChanged):
+
+2015-10-15  Csaba Osztrogonác  
+
 Get rid of the only once used isIntegerArray function
 https://bugs.webkit.org/show_bug.cgi?id=150170
 


Modified: trunk/Source/WebCore/dom/ComposedTreeAncestorIterator.h (191126 => 191127)

--- trunk/Source/WebCore/dom/ComposedTreeAncestorIterator.h	2015-10-15 19:34:09 UTC (rev 191126)
+++ trunk/Source/WebCore/dom/ComposedTreeAncestorIterator.h	2015-10-15 19:46:24 UTC (rev 191127)
@@ -92,6 +92,7 @@
 #if ENABLE(SHADOW_DOM) || ENABLE(DETAILS_ELEMENT)
 m_current = shadowRoot->findAssignedSlot(*m_current);
 #else
+UNUSED_PARAM(shadowRoot);
 m_current = nullptr;
 #endif
 return *this;


Modified: trunk/Source/WebCore/dom/ComposedTreeIterator.cpp (191126 => 191127)

--- trunk/Source/WebCore/dom/ComposedTreeIterator.cpp	2015-10-15 19:34:09 UTC (rev 191126)
+++ trunk/Source/WebCore/dom/ComposedTreeIterator.cpp	2015-10-15 19:46:24 UTC (rev 191127)
@@ -63,6 +63,7 @@
 }
 // The node is not part of the composed tree.
 #else
+UNUSED_PARAM(shadowRoot);
 m_current = nullptr;
 return;
 #endif


Modified: trunk/Source/WebCore/dom/Element.cpp (191126 => 191127)

--- trunk/Source/WebCore/dom/Element.cpp	2015-10-15 19:34:09 UTC (rev 191126)
+++ trunk/Source/WebCore/dom/Element.cpp	2015-10-15 19:46:24 UTC (rev 191127)
@@ -1845,8 +1845,8 @@
 checkForSiblingStyleChanges(*this, checkType, change.previousSiblingElement, change.nextSiblingElement);
 }
 
+#if ENABLE(SHADOW_DOM) || ENABLE(DETAILS_ELEMENT)
 if (ShadowRoot* shadowRoot = this->shadowRoot()) {
-#if ENABLE(SHADOW_DOM) || ENABLE(DETAILS_ELEMENT)
 switch (change.type) {
 case ElementInserted:
 case ElementRemoved:
@@ -1861,8 +1861,8 @@
 case NonContentsChildChanged:
 break;
 }
+}
 #endif
-}
 }
 
 void Element::removeAllEventListeners()






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


[webkit-changes] [191120] trunk

2015-10-15 Thread youenn . fablet
Title: [191120] trunk








Revision 191120
Author youenn.fab...@crf.canon.fr
Date 2015-10-15 10:45:43 -0700 (Thu, 15 Oct 2015)


Log Message
Update ImportExpectations according currently imported wpt tests
https://bugs.webkit.org/show_bug.cgi?id=150158

Reviewed by Chris Dumez.

LayoutTests/imported/w3c:

* resources/ImportExpectations:

Tools:

* Scripts/webkitpy/w3c/test_downloader.py:
(TestDownloader.copy_tests): ensuring that directories marked as [ Skip ] are not copied.

Modified Paths

trunk/LayoutTests/imported/w3c/ChangeLog
trunk/LayoutTests/imported/w3c/resources/ImportExpectations
trunk/Tools/ChangeLog
trunk/Tools/Scripts/webkitpy/w3c/test_downloader.py




Diff

Modified: trunk/LayoutTests/imported/w3c/ChangeLog (191119 => 191120)

--- trunk/LayoutTests/imported/w3c/ChangeLog	2015-10-15 17:30:26 UTC (rev 191119)
+++ trunk/LayoutTests/imported/w3c/ChangeLog	2015-10-15 17:45:43 UTC (rev 191120)
@@ -1,3 +1,12 @@
+2015-10-15  Youenn Fablet  
+
+Update ImportExpectations according currently imported wpt tests
+https://bugs.webkit.org/show_bug.cgi?id=150158
+
+Reviewed by Chris Dumez.
+
+* resources/ImportExpectations:
+
 2015-10-14  Ryan Haddad  
 
 Fixing expectations for imported/w3c/web-platform-tests/html/dom/interfaces.html


Modified: trunk/LayoutTests/imported/w3c/resources/ImportExpectations (191119 => 191120)

--- trunk/LayoutTests/imported/w3c/resources/ImportExpectations	2015-10-15 17:30:26 UTC (rev 191119)
+++ trunk/LayoutTests/imported/w3c/resources/ImportExpectations	2015-10-15 17:45:43 UTC (rev 191120)
@@ -59,8 +59,37 @@
 web-platform-tests/content-security-policy [ Skip ]
 web-platform-tests/cors [ Skip ]
 web-platform-tests/custom-elements [ Skip ]
-web-platform-tests/dom [ Skip ]
+#web-platform-tests/dom [ Pass ]
+web-platform-tests/dom/events/Event-dispatch-propagation-stopped.html [ Skip ]
+web-platform-tests/dom/nodes/Document-createElement-namespace-tests [ Skip ]
+web-platform-tests/dom/nodes/Document-createProcessingInstruction.xhtml [ Skip ]
+web-platform-tests/dom/nodes/Document-getElementsByTagName.xhtml [ Skip ]
+web-platform-tests/dom/nodes/Element-childElement-null.svg [ Skip ]
+web-platform-tests/dom/nodes/Element-childElement-null.xhtml [ Skip ]
+web-platform-tests/dom/nodes/Element-childElementCount-dynamic-add.svg [ Skip ]
+web-platform-tests/dom/nodes/Element-childElementCount-dynamic-remove.svg [ Skip ]
+web-platform-tests/dom/nodes/Element-childElementCount-dynamic-remove.xhtml [ Skip ]
+web-platform-tests/dom/nodes/Element-childElementCount-nochild.svg [ Skip ]
+web-platform-tests/dom/nodes/Element-childElementCount.svg [ Skip ]
+web-platform-tests/dom/nodes/Element-childElementCount.xhtml [ Skip ]
+web-platform-tests/dom/nodes/Element-firstElementChild-entity.svg [ Skip ]
+web-platform-tests/dom/nodes/Element-firstElementChild-entity.xhtml [ Skip ]
+web-platform-tests/dom/nodes/Element-firstElementChild-namespace.svg [ Skip ]
+web-platform-tests/dom/nodes/Element-firstElementChild-namespace.xhtml [ Skip ]
+web-platform-tests/dom/nodes/Element-firstElementChild.svg [ Skip ]
+web-platform-tests/dom/nodes/Element-lastElementChild.svg [ Skip ]
+web-platform-tests/dom/nodes/Element-lastElementChild.xhtml [ Skip ]
+web-platform-tests/dom/nodes/Element-nextElementSibling.svg [ Skip ]
+web-platform-tests/dom/nodes/Element-previousElementSibling.svg [ Skip ]
+web-platform-tests/dom/nodes/Element-siblingElement-null.svg [ Skip ]
+web-platform-tests/dom/nodes/Element-siblingElement-null.xhtml [ Skip ]
+web-platform-tests/dom/nodes/Node-contains.xml [ Skip ]
+web-platform-tests/dom/nodes/Node-nodeName.xhtml [ Skip ]
+web-platform-tests/dom/nodes/ParentNode-querySelector-All.xht [ Skip ]
+web-platform-tests/dom/traversal/unfinished [ Skip ]
 #web-platform-tests/domparsing [ Pass ]
+web-platform-tests/domparsing/DOMParser-parseFromString-xml.html [ Skip ]
+web-platform-tests/domparsing/XMLSerializer-serializeToString.html [ Skip ]
 web-platform-tests/domxpath [ Skip ]
 web-platform-tests/editing [ Skip ]
 web-platform-tests/encoding [ Skip ]
@@ -70,7 +99,190 @@
 web-platform-tests/geolocation-API [ Skip ]
 web-platform-tests/gamepad [ Skip ]
 web-platform-tests/hr-time [ Skip ]
-web-platform-tests/html [ Skip ]
+#web-platform-tests/html [ Pass ]
+web-platform-tests/html/browsers [ Skip ]
+web-platform-tests/html/dom/documents/dom-tree-accessors/Document.currentScript.sub.html [ Skip ]
+web-platform-tests/html/dom/dynamic-markup-insertion/opening-the-input-stream/010.html [ Skip ]
+web-platform-tests/html/dom/elements/global-attributes/dir_auto-EN-L-ref-expected.html [ Skip ]
+web-platform-tests/html/dom/elements/global-attributes/dir_auto-EN-L-ref.html [ Skip ]
+web-platform-tests/html/dom/elements/global-attributes/dir_auto-EN-R-ref-expected.html [ Skip ]
+web-platform-tests/html/dom/elements/global-attributes/dir_auto-EN-R-ref.html [ Skip ]

[webkit-changes] [191124] trunk/LayoutTests

2015-10-15 Thread commit-queue
Title: [191124] trunk/LayoutTests








Revision 191124
Author commit-qu...@webkit.org
Date 2015-10-15 11:38:58 -0700 (Thu, 15 Oct 2015)


Log Message
Rebaselining css2.1/tables/table-anonymous-objects-045.xht for win
https://bugs.webkit.org/show_bug.cgi?id=150125

Patch by Ryan Haddad  on 2015-10-15
Reviewed by Zalan Bujtas.

* platform/win/css2.1/tables/table-anonymous-objects-045-expected.txt:

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/LayoutTests/platform/win/css2.1/tables/table-anonymous-objects-045-expected.txt




Diff

Modified: trunk/LayoutTests/ChangeLog (191123 => 191124)

--- trunk/LayoutTests/ChangeLog	2015-10-15 18:37:38 UTC (rev 191123)
+++ trunk/LayoutTests/ChangeLog	2015-10-15 18:38:58 UTC (rev 191124)
@@ -1,3 +1,12 @@
+2015-10-15  Ryan Haddad  
+
+Rebaselining css2.1/tables/table-anonymous-objects-045.xht for win
+https://bugs.webkit.org/show_bug.cgi?id=150125
+
+Reviewed by Zalan Bujtas.
+
+* platform/win/css2.1/tables/table-anonymous-objects-045-expected.txt:
+
 2015-10-15  Zalan Bujtas  
 
 [iOS] Update anonymous table results for iOS port.


Modified: trunk/LayoutTests/platform/win/css2.1/tables/table-anonymous-objects-045-expected.txt (191123 => 191124)

--- trunk/LayoutTests/platform/win/css2.1/tables/table-anonymous-objects-045-expected.txt	2015-10-15 18:37:38 UTC (rev 191123)
+++ trunk/LayoutTests/platform/win/css2.1/tables/table-anonymous-objects-045-expected.txt	2015-10-15 18:38:58 UTC (rev 191124)
@@ -1,26 +1,26 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x115
-  RenderBlock {html} at (0,0) size 800x115
-RenderBody {body} at (8,16) size 784x91
+layer at (0,0) size 800x107
+  RenderBlock {html} at (0,0) size 800x107
+RenderBody {body} at (8,16) size 784x83
   RenderBlock {p} at (0,0) size 784x18
 RenderText {#text} at (0,0) size 380x18
   text run at (0,0) width 380: "There should be no red below, except for antialiasing issues."
-layer at (8,50) size 784x57
-  RenderBlock (relative positioned) {div} at (0,34) size 784x57
-layer at (8,50) size 784x57
-  RenderBlock (relative positioned) zI: 1 {div} at (0,0) size 784x57 [color=#FF]
-RenderTable {table} at (1,1) size 61x55 [border: (5px outset #808080)]
-  RenderTableSection (anonymous) at (5,5) size 51x45
+layer at (8,50) size 784x49
+  RenderBlock (relative positioned) {div} at (0,34) size 784x49
+layer at (8,50) size 784x49
+  RenderBlock (relative positioned) zI: 1 {div} at (0,0) size 784x49 [color=#FF]
+RenderTable {table} at (1,1) size 53x47 [border: (1px outset #808080)]
+  RenderTableSection {tbody} at (1,1) size 51x45
 RenderTableRow {tr} at (0,2) size 51x41
   RenderTableCell {td} at (2,2) size 47x41 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
 RenderText {#text} at (2,2) size 43x37
   text run at (2,2) width 43: "TD"
-layer at (8,50) size 63x57
-  RenderBlock (positioned) zI: 2 {div} at (0,0) size 63x57 [color=#008000]
-RenderTable {table} at (1,1) size 61x55 [border: (5px outset #808080)]
-  RenderTableSection (anonymous) at (5,5) size 51x45
+layer at (8,50) size 55x49
+  RenderBlock (positioned) zI: 2 {div} at (0,0) size 55x49 [color=#008000]
+RenderTable {table} at (1,1) size 53x47 [border: (1px outset #808080)]
+  RenderTableSection {tbody} at (1,1) size 51x45
 RenderTableRow {tr} at (0,2) size 51x41
   RenderTableCell {td} at (2,2) size 47x41 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
 RenderText {#text} at (2,2) size 43x37
-  text run at (2,2) width 43: "TD"
+  text run at (2,2) width 43: "TD"
\ No newline at end of file






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


[webkit-changes] [191122] trunk/LayoutTests

2015-10-15 Thread zalan
Title: [191122] trunk/LayoutTests








Revision 191122
Author za...@apple.com
Date 2015-10-15 11:09:50 -0700 (Thu, 15 Oct 2015)


Log Message
[iOS] Update anonymous table results for iOS port.

Unreviewed gardening.

* platform/ios-simulator/css2.1/tables/table-anonymous-objects-103-expected.txt: Added.
* platform/ios-simulator/css2.1/tables/table-anonymous-objects-104-expected.txt: Added.
* platform/ios-simulator/css2.1/tables/table-anonymous-objects-117-expected.txt: Added.
* platform/ios-simulator/css2.1/tables/table-anonymous-objects-118-expected.txt: Added.
* platform/ios-simulator/css2.1/tables/table-anonymous-objects-119-expected.txt: Added.
* platform/ios-simulator/css2.1/tables/table-anonymous-objects-120-expected.txt: Added.

Modified Paths

trunk/LayoutTests/ChangeLog


Added Paths

trunk/LayoutTests/platform/ios-simulator/css2.1/tables/table-anonymous-objects-103-expected.txt
trunk/LayoutTests/platform/ios-simulator/css2.1/tables/table-anonymous-objects-104-expected.txt
trunk/LayoutTests/platform/ios-simulator/css2.1/tables/table-anonymous-objects-117-expected.txt
trunk/LayoutTests/platform/ios-simulator/css2.1/tables/table-anonymous-objects-118-expected.txt
trunk/LayoutTests/platform/ios-simulator/css2.1/tables/table-anonymous-objects-119-expected.txt
trunk/LayoutTests/platform/ios-simulator/css2.1/tables/table-anonymous-objects-120-expected.txt




Diff

Modified: trunk/LayoutTests/ChangeLog (191121 => 191122)

--- trunk/LayoutTests/ChangeLog	2015-10-15 18:02:47 UTC (rev 191121)
+++ trunk/LayoutTests/ChangeLog	2015-10-15 18:09:50 UTC (rev 191122)
@@ -1,5 +1,18 @@
 2015-10-15  Zalan Bujtas  
 
+[iOS] Update anonymous table results for iOS port.
+
+Unreviewed gardening.
+
+* platform/ios-simulator/css2.1/tables/table-anonymous-objects-103-expected.txt: Added.
+* platform/ios-simulator/css2.1/tables/table-anonymous-objects-104-expected.txt: Added.
+* platform/ios-simulator/css2.1/tables/table-anonymous-objects-117-expected.txt: Added.
+* platform/ios-simulator/css2.1/tables/table-anonymous-objects-118-expected.txt: Added.
+* platform/ios-simulator/css2.1/tables/table-anonymous-objects-119-expected.txt: Added.
+* platform/ios-simulator/css2.1/tables/table-anonymous-objects-120-expected.txt: Added.
+
+2015-10-15  Zalan Bujtas  
+
 Anonymous table objects: Collapse anonymous table rows.
 https://bugs.webkit.org/show_bug.cgi?id=150154
 


Added: trunk/LayoutTests/platform/ios-simulator/css2.1/tables/table-anonymous-objects-103-expected.txt (0 => 191122)

--- trunk/LayoutTests/platform/ios-simulator/css2.1/tables/table-anonymous-objects-103-expected.txt	(rev 0)
+++ trunk/LayoutTests/platform/ios-simulator/css2.1/tables/table-anonymous-objects-103-expected.txt	2015-10-15 18:09:50 UTC (rev 191122)
@@ -0,0 +1,80 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x131
+  RenderBlock {html} at (0,0) size 800x131
+RenderBody {body} at (8,13) size 784x110
+  RenderBlock {p} at (0,0) size 784x14
+RenderText {#text} at (0,0) size 476x14
+  text run at (0,0) width 476: "There should be no red below, except for antialiasing issues."
+layer at (8,40) size 784x83
+  RenderBlock (relative positioned) {div} at (0,27) size 784x83
+layer at (8,40) size 784x83
+  RenderBlock (relative positioned) zI: 1 {div} at (0,0) size 784x83 [color=#FF]
+RenderTable at (1,1) size 657x81
+  RenderTableSection {span} at (0,0) size 657x27
+RenderTableRow (anonymous) at (0,0) size 657x27
+  RenderTableCell {span} at (0,0) size 219x27 [r=0 c=0 rs=1 cs=1]
+RenderText {#text} at (0,0) size 188x27
+  text run at (0,0) width 188: "Row 1, Col 1"
+  RenderTableCell {span} at (219,0) size 219x27 [r=0 c=1 rs=1 cs=1]
+RenderText {#text} at (0,0) size 188x27
+  text run at (0,0) width 188: "Row 1, Col 2"
+  RenderTableCell {span} at (438,0) size 219x27 [r=0 c=2 rs=1 cs=1]
+RenderText {#text} at (0,0) size 188x27
+  text run at (0,0) width 188: "Row 1, Col 3"
+  RenderTableSection {span} at (0,27) size 657x27
+RenderTableRow (anonymous) at (0,0) size 657x27
+  RenderTableCell {span} at (0,0) size 219x27 [r=0 c=0 rs=1 cs=1]
+RenderText {#text} at (0,0) size 203x27
+  text run at (0,0) width 203: "Row 22, Col 1"
+  RenderTableCell {span} at (219,0) size 219x27 [r=0 c=1 rs=1 cs=1]
+RenderText {#text} at (0,0) size 203x27
+  text run at (0,0) width 203: "Row 22, Col 2"
+  RenderTableCell {span} at (438,0) size 219x27 [r=0 c=2 rs=1 cs=1]
+RenderText {#text} at (0,0) size 203x27
+  text run at (0,0) width 203: "Row 22, Col 3"
+  RenderTableSection {span} at (0,54) size 657x27
+RenderTableRow (anonymous) at (0,0) size 

[webkit-changes] [191123] trunk/Source/JavaScriptCore

2015-10-15 Thread mark . lam
Title: [191123] trunk/Source/_javascript_Core








Revision 191123
Author mark@apple.com
Date 2015-10-15 11:37:38 -0700 (Thu, 15 Oct 2015)


Log Message
Refactoring: give the MASM probe CPUState methods shorter names.
https://bugs.webkit.org/show_bug.cgi?id=150177

Reviewed by Michael Saboff.

The existing names are longer than they need to be.  Renaming them as follows:
For GPR, registerName ==> gprName
For GPR, registerValue ==> gpr
For FPR, registerName ==> fprName
For FPR, registerValue ==> fpr

* assembler/AbstractMacroAssembler.h:
(JSC::AbstractMacroAssembler::CPUState::gprName):
(JSC::AbstractMacroAssembler::CPUState::fprName):
(JSC::AbstractMacroAssembler::CPUState::gpr):
(JSC::AbstractMacroAssembler::CPUState::fpr):
(JSC::AbstractMacroAssembler::CPUState::registerName): Deleted.
(JSC::AbstractMacroAssembler::CPUState::registerValue): Deleted.

* assembler/MacroAssemblerPrinter.cpp:
(JSC::printRegister):
(JSC::printMemory):
- Updated to use the new names.

Modified Paths

trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/assembler/AbstractMacroAssembler.h
trunk/Source/_javascript_Core/assembler/MacroAssemblerPrinter.cpp




Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (191122 => 191123)

--- trunk/Source/_javascript_Core/ChangeLog	2015-10-15 18:09:50 UTC (rev 191122)
+++ trunk/Source/_javascript_Core/ChangeLog	2015-10-15 18:37:38 UTC (rev 191123)
@@ -1,3 +1,29 @@
+2015-10-15  Mark Lam  
+
+Refactoring: give the MASM probe CPUState methods shorter names.
+https://bugs.webkit.org/show_bug.cgi?id=150177
+
+Reviewed by Michael Saboff.
+
+The existing names are longer than they need to be.  Renaming them as follows:
+For GPR, registerName ==> gprName
+For GPR, registerValue ==> gpr
+For FPR, registerName ==> fprName
+For FPR, registerValue ==> fpr
+
+* assembler/AbstractMacroAssembler.h:
+(JSC::AbstractMacroAssembler::CPUState::gprName):
+(JSC::AbstractMacroAssembler::CPUState::fprName):
+(JSC::AbstractMacroAssembler::CPUState::gpr):
+(JSC::AbstractMacroAssembler::CPUState::fpr):
+(JSC::AbstractMacroAssembler::CPUState::registerName): Deleted.
+(JSC::AbstractMacroAssembler::CPUState::registerValue): Deleted.
+
+* assembler/MacroAssemblerPrinter.cpp:
+(JSC::printRegister):
+(JSC::printMemory):
+- Updated to use the new names.
+
 2015-10-15  Yusuke Suzuki  
 
 [ES6] Class _expression_ should have lexical environment that has itself as an imutable binding


Modified: trunk/Source/_javascript_Core/assembler/AbstractMacroAssembler.h (191122 => 191123)

--- trunk/Source/_javascript_Core/assembler/AbstractMacroAssembler.h	2015-10-15 18:09:50 UTC (rev 191122)
+++ trunk/Source/_javascript_Core/assembler/AbstractMacroAssembler.h	2015-10-15 18:37:38 UTC (rev 191123)
@@ -852,7 +852,7 @@
 FOR_EACH_CPU_REGISTER(DECLARE_REGISTER)
 #undef DECLARE_REGISTER
 
-static const char* registerName(RegisterID regID)
+static const char* gprName(RegisterID regID)
 {
 switch (regID) {
 #define DECLARE_REGISTER(_type, _regName) \
@@ -864,7 +864,7 @@
 RELEASE_ASSERT_NOT_REACHED();
 }
 
-static const char* registerName(FPRegisterID regID)
+static const char* fprName(FPRegisterID regID)
 {
 switch (regID) {
 #define DECLARE_REGISTER(_type, _regName) \
@@ -876,7 +876,7 @@
 RELEASE_ASSERT_NOT_REACHED();
 }
 
-void* registerValue(RegisterID regID)
+void* gpr(RegisterID regID)
 {
 switch (regID) {
 #define DECLARE_REGISTER(_type, _regName) \
@@ -888,7 +888,7 @@
 RELEASE_ASSERT_NOT_REACHED();
 }
 
-double registerValue(FPRegisterID regID)
+double fpr(FPRegisterID regID)
 {
 switch (regID) {
 #define DECLARE_REGISTER(_type, _regName) \


Modified: trunk/Source/_javascript_Core/assembler/MacroAssemblerPrinter.cpp (191122 => 191123)

--- trunk/Source/_javascript_Core/assembler/MacroAssemblerPrinter.cpp	2015-10-15 18:09:50 UTC (rev 191122)
+++ trunk/Source/_javascript_Core/assembler/MacroAssemblerPrinter.cpp	2015-10-15 18:37:38 UTC (rev 191123)
@@ -91,23 +91,23 @@
 
 void printRegister(CPUState& cpu, RegisterID regID)
 {
-const char* name = CPUState::registerName(regID);
+const char* name = CPUState::gprName(regID);
 union {
 void* voidPtr;
 intptr_t intptrValue;
 } u;
-u.voidPtr = cpu.registerValue(regID);
+u.voidPtr = cpu.gpr(regID);
 dataLogF("%s:<%p %ld>", name, u.voidPtr, u.intptrValue);
 }
 
 void printRegister(CPUState& cpu, FPRegisterID regID)
 {
-const char* name = CPUState::registerName(regID);
+const char* name = 

[webkit-changes] [191121] trunk/Source/WebCore

2015-10-15 Thread timothy_horton
Title: [191121] trunk/Source/WebCore








Revision 191121
Author timothy_hor...@apple.com
Date 2015-10-15 11:02:47 -0700 (Thu, 15 Oct 2015)


Log Message
Try to fix the iOS build.

* page/EventHandler.h:

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/page/EventHandler.h




Diff

Modified: trunk/Source/WebCore/ChangeLog (191120 => 191121)

--- trunk/Source/WebCore/ChangeLog	2015-10-15 17:45:43 UTC (rev 191120)
+++ trunk/Source/WebCore/ChangeLog	2015-10-15 18:02:47 UTC (rev 191121)
@@ -1,3 +1,9 @@
+2015-10-15  Tim Horton  
+
+Try to fix the iOS build.
+
+* page/EventHandler.h:
+
 2015-10-15  Zalan Bujtas  
 
 Anonymous table objects: Collapse anonymous table rows.


Modified: trunk/Source/WebCore/page/EventHandler.h (191120 => 191121)

--- trunk/Source/WebCore/page/EventHandler.h	2015-10-15 17:45:43 UTC (rev 191120)
+++ trunk/Source/WebCore/page/EventHandler.h	2015-10-15 18:02:47 UTC (rev 191121)
@@ -110,6 +110,7 @@
 
 #if ENABLE(IOS_GESTURE_EVENTS)
 extern const float GestureUnknown;
+extern const unsigned InvalidTouchIdentifier;
 #endif
 
 enum AppendTrailingWhitespace { ShouldAppendTrailingWhitespace, DontAppendTrailingWhitespace };






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