date:20191015

Title: [251127] trunk/Source/WebKit








Revision 251127
Author carlo...@webkit.org
Date 2019-10-15 02:11:39 -0700 (Tue, 15 Oct 2019)


Log Message
[GTK][WPE] WebKitWebContext should identify web views by their WebPageProxy identifier
https://bugs.webkit.org/show_bug.cgi?id=202924

Reviewed by Adrian Perez de Castro.

Instead of the WebPage identifier, since it maps WebPageProxy to WebKitWebView.

* UIProcess/API/glib/WebKitWebContext.cpp:
(webkitWebContextCreatePageForWebView):
(webkitWebContextWebViewDestroyed):
(webkitWebContextGetWebViewForPage):

Modified Paths

trunk/Source/WebKit/ChangeLog
trunk/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp




Diff

Modified: trunk/Source/WebKit/ChangeLog (251126 => 251127)

--- trunk/Source/WebKit/ChangeLog	2019-10-15 08:59:11 UTC (rev 251126)
+++ trunk/Source/WebKit/ChangeLog	2019-10-15 09:11:39 UTC (rev 251127)
@@ -1,3 +1,17 @@
+2019-10-15  Carlos Garcia Campos  
+
+[GTK][WPE] WebKitWebContext should identify web views by their WebPageProxy identifier
+https://bugs.webkit.org/show_bug.cgi?id=202924
+
+Reviewed by Adrian Perez de Castro.
+
+Instead of the WebPage identifier, since it maps WebPageProxy to WebKitWebView.
+
+* UIProcess/API/glib/WebKitWebContext.cpp:
+(webkitWebContextCreatePageForWebView):
+(webkitWebContextWebViewDestroyed):
+(webkitWebContextGetWebViewForPage):
+
 2019-10-15  youenn fablet  
 
 Handle service worker loads through NetworkResourceLoader


Modified: trunk/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp (251126 => 251127)

--- trunk/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp	2019-10-15 08:59:11 UTC (rev 251126)
+++ trunk/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp	2019-10-15 09:11:39 UTC (rev 251127)
@@ -205,7 +205,7 @@
 WebKitTLSErrorsPolicy tlsErrorsPolicy;
 WebKitProcessModel processModel;
 
-HashMap webViews;
+HashMap webViews;
 
 CString webExtensionsDirectory;
 GRefPtr webExtensionsInitializationUserData;
@@ -1748,15 +1748,15 @@
 page.setURLSchemeHandlerForScheme(WTFMove(handler), it.key);
 }
 
-context->priv->webViews.set(webkit_web_view_get_page_id(webView), webView);
+context->priv->webViews.set(page.identifier(), webView);
 }
 
 void webkitWebContextWebViewDestroyed(WebKitWebContext* context, WebKitWebView* webView)
 {
-context->priv->webViews.remove(webkit_web_view_get_page_id(webView));
+context->priv->webViews.remove(webkitWebViewGetPage(webView).identifier());
 }
 
 WebKitWebView* webkitWebContextGetWebViewForPage(WebKitWebContext* context, WebPageProxy* page)
 {
-return page ? context->priv->webViews.get(page->webPageID().toUInt64()) : nullptr;
+return page ? context->priv->webViews.get(page->identifier()) : nullptr;
 }






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

[webkit-changes] [251128] trunk

Title: [251128] trunk








Revision 251128
Author carlo...@webkit.org
Date 2019-10-15 03:12:11 -0700 (Tue, 15 Oct 2019)


Log Message
Unreviewed. Fix GTK test /webkit/WebKitSettings/webkit-settings after r249962.

Source/WebKit:

Legacy private browsing was removed in r249962, so webkit_settings_set_enable_private_browsing() is now no-op.

* UIProcess/API/glib/WebKitSettings.cpp:
(webKitSettingsSetProperty): Only call webkit_settings_set_enable_private_browsing() when trying to enable it.
(webkit_settings_set_enable_private_browsing): Show a warning to let users know that it does nothing now.

Tools:

Stop testing WebKitSettings:enable-private-browsing.

* TestWebKitAPI/Tests/WebKitGLib/TestWebKitSettings.cpp:
(testWebKitSettings):

Modified Paths

trunk/Source/WebKit/ChangeLog
trunk/Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp
trunk/Tools/ChangeLog
trunk/Tools/TestWebKitAPI/Tests/WebKitGLib/TestWebKitSettings.cpp




Diff

Modified: trunk/Source/WebKit/ChangeLog (251127 => 251128)

--- trunk/Source/WebKit/ChangeLog	2019-10-15 09:11:39 UTC (rev 251127)
+++ trunk/Source/WebKit/ChangeLog	2019-10-15 10:12:11 UTC (rev 251128)
@@ -1,5 +1,15 @@
 2019-10-15  Carlos Garcia Campos  
 
+Unreviewed. Fix GTK test /webkit/WebKitSettings/webkit-settings after r249962.
+
+Legacy private browsing was removed in r249962, so webkit_settings_set_enable_private_browsing() is now no-op.
+
+* UIProcess/API/glib/WebKitSettings.cpp:
+(webKitSettingsSetProperty): Only call webkit_settings_set_enable_private_browsing() when trying to enable it.
+(webkit_settings_set_enable_private_browsing): Show a warning to let users know that it does nothing now.
+
+2019-10-15  Carlos Garcia Campos  
+
 [GTK][WPE] WebKitWebContext should identify web views by their WebPageProxy identifier
 https://bugs.webkit.org/show_bug.cgi?id=202924
 


Modified: trunk/Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp (251127 => 251128)

--- trunk/Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp	2019-10-15 09:11:39 UTC (rev 251127)
+++ trunk/Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp	2019-10-15 10:12:11 UTC (rev 251128)
@@ -284,7 +284,8 @@
 #if PLATFORM(GTK)
 case PROP_ENABLE_PRIVATE_BROWSING:
 G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
-webkit_settings_set_enable_private_browsing(settings, g_value_get_boolean(value));
+if (g_value_get_boolean(value))
+webkit_settings_set_enable_private_browsing(settings, TRUE);
 G_GNUC_END_IGNORE_DEPRECATIONS;
 break;
 #endif
@@ -2403,6 +2404,8 @@
 void webkit_settings_set_enable_private_browsing(WebKitSettings* settings, gboolean enabled)
 {
 g_return_if_fail(WEBKIT_IS_SETTINGS(settings));
+
+g_warning("webkit_settings_set_enable_private_browsing is deprecated and does nothing, use #WebKitWebView:is-ephemeral or #WebKitWebContext:is-ephemeral instead");
 }
 #endif
 


Modified: trunk/Tools/ChangeLog (251127 => 251128)

--- trunk/Tools/ChangeLog	2019-10-15 09:11:39 UTC (rev 251127)
+++ trunk/Tools/ChangeLog	2019-10-15 10:12:11 UTC (rev 251128)
@@ -1,3 +1,12 @@
+2019-10-15  Carlos Garcia Campos  
+
+Unreviewed. Fix GTK test /webkit/WebKitSettings/webkit-settings after r249962.
+
+Stop testing WebKitSettings:enable-private-browsing.
+
+* TestWebKitAPI/Tests/WebKitGLib/TestWebKitSettings.cpp:
+(testWebKitSettings):
+
 2019-10-15  Alicia Boya García  
 
 gdb webkit.py: Fix iterator error in Python3


Modified: trunk/Tools/TestWebKitAPI/Tests/WebKitGLib/TestWebKitSettings.cpp (251127 => 251128)

--- trunk/Tools/TestWebKitAPI/Tests/WebKitGLib/TestWebKitSettings.cpp	2019-10-15 09:11:39 UTC (rev 251127)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKitGLib/TestWebKitSettings.cpp	2019-10-15 10:12:11 UTC (rev 251128)
@@ -200,14 +200,6 @@
 webkit_settings_set_default_charset(settings, "utf8");
 g_assert_cmpstr(webkit_settings_get_default_charset(settings), ==, "utf8");
 
-#if PLATFORM(GTK)
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
-g_assert_false(webkit_settings_get_enable_private_browsing(settings));
-webkit_settings_set_enable_private_browsing(settings, TRUE);
-g_assert_true(webkit_settings_get_enable_private_browsing(settings));
-G_GNUC_END_IGNORE_DEPRECATIONS;
-#endif
-
 g_assert_false(webkit_settings_get_enable_developer_extras(settings));
 webkit_settings_set_enable_developer_extras(settings, TRUE);
 g_assert_true(webkit_settings_get_enable_developer_extras(settings));






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

[webkit-changes] [251129] trunk

Title: [251129] trunk








Revision 251129
Author carlo...@webkit.org
Date 2019-10-15 03:37:14 -0700 (Tue, 15 Oct 2019)


Log Message
Unreviewed. Fix GTK test /webkit/Authentication/authentication-storage after r249962

Source/WebKit:

* UIProcess/API/glib/WebKitWebView.cpp:
(webkitWebViewHandleAuthenticationChallenge): Do not use webkit_settings_get_enable_private_browsing().

Tools:

The test was still using the legacy private browsing API that is a no-op since r249962. This partch updates the
test to use a ephemeral WebView instead.

* TestWebKitAPI/Tests/WebKitGLib/TestAuthentication.cpp:
(EphemeralAuthenticationTest::setup):
(EphemeralAuthenticationTest::teardown):
(testWebViewAuthenticationEphemeral):
(testWebViewAuthenticationStorage):
(beforeAll):
* TestWebKitAPI/glib/WebKitGLib/WebViewTest.cpp:
(WebViewTest::initializeWebView):
* TestWebKitAPI/glib/WebKitGLib/WebViewTest.h:

Modified Paths

trunk/Source/WebKit/ChangeLog
trunk/Source/WebKit/UIProcess/API/glib/WebKitWebView.cpp
trunk/Tools/ChangeLog
trunk/Tools/TestWebKitAPI/Tests/WebKitGLib/TestAuthentication.cpp
trunk/Tools/TestWebKitAPI/glib/WebKitGLib/WebViewTest.cpp
trunk/Tools/TestWebKitAPI/glib/WebKitGLib/WebViewTest.h




Diff

Modified: trunk/Source/WebKit/ChangeLog (251128 => 251129)

--- trunk/Source/WebKit/ChangeLog	2019-10-15 10:12:11 UTC (rev 251128)
+++ trunk/Source/WebKit/ChangeLog	2019-10-15 10:37:14 UTC (rev 251129)
@@ -1,5 +1,12 @@
 2019-10-15  Carlos Garcia Campos  
 
+Unreviewed. Fix GTK test /webkit/Authentication/authentication-storage after r249962
+
+* UIProcess/API/glib/WebKitWebView.cpp:
+(webkitWebViewHandleAuthenticationChallenge): Do not use webkit_settings_get_enable_private_browsing().
+
+2019-10-15  Carlos Garcia Campos  
+
 Unreviewed. Fix GTK test /webkit/WebKitSettings/webkit-settings after r249962.
 
 Legacy private browsing was removed in r249962, so webkit_settings_set_enable_private_browsing() is now no-op.


Modified: trunk/Source/WebKit/UIProcess/API/glib/WebKitWebView.cpp (251128 => 251129)

--- trunk/Source/WebKit/UIProcess/API/glib/WebKitWebView.cpp	2019-10-15 10:12:11 UTC (rev 251128)
+++ trunk/Source/WebKit/UIProcess/API/glib/WebKitWebView.cpp	2019-10-15 10:37:14 UTC (rev 251129)
@@ -2515,14 +2515,7 @@
 
 void webkitWebViewHandleAuthenticationChallenge(WebKitWebView* webView, AuthenticationChallengeProxy* authenticationChallenge)
 {
-#if PLATFORM(GTK)
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
-gboolean privateBrowsingEnabled = webView->priv->isEphemeral || webkit_settings_get_enable_private_browsing(webView->priv->settings.get());
-G_GNUC_END_IGNORE_DEPRECATIONS;
-#else
-gboolean privateBrowsingEnabled = webView->priv->isEphemeral;
-#endif
-webView->priv->authenticationRequest = adoptGRef(webkitAuthenticationRequestCreate(authenticationChallenge, privateBrowsingEnabled));
+webView->priv->authenticationRequest = adoptGRef(webkitAuthenticationRequestCreate(authenticationChallenge, webView->priv->isEphemeral));
 gboolean returnValue;
 g_signal_emit(webView, signals[AUTHENTICATE], 0, webView->priv->authenticationRequest.get(), &returnValue);
 }


Modified: trunk/Tools/ChangeLog (251128 => 251129)

--- trunk/Tools/ChangeLog	2019-10-15 10:12:11 UTC (rev 251128)
+++ trunk/Tools/ChangeLog	2019-10-15 10:37:14 UTC (rev 251129)
@@ -1,5 +1,22 @@
 2019-10-15  Carlos Garcia Campos  
 
+Unreviewed. Fix GTK test /webkit/Authentication/authentication-storage after r249962
+
+The test was still using the legacy private browsing API that is a no-op since r249962. This partch updates the
+test to use a ephemeral WebView instead.
+
+* TestWebKitAPI/Tests/WebKitGLib/TestAuthentication.cpp:
+(EphemeralAuthenticationTest::setup):
+(EphemeralAuthenticationTest::teardown):
+(testWebViewAuthenticationEphemeral):
+(testWebViewAuthenticationStorage):
+(beforeAll):
+* TestWebKitAPI/glib/WebKitGLib/WebViewTest.cpp:
+(WebViewTest::initializeWebView):
+* TestWebKitAPI/glib/WebKitGLib/WebViewTest.h:
+
+2019-10-15  Carlos Garcia Campos  
+
 Unreviewed. Fix GTK test /webkit/WebKitSettings/webkit-settings after r249962.
 
 Stop testing WebKitSettings:enable-private-browsing.


Modified: trunk/Tools/TestWebKitAPI/Tests/WebKitGLib/TestAuthentication.cpp (251128 => 251129)

--- trunk/Tools/TestWebKitAPI/Tests/WebKitGLib/TestAuthentication.cpp	2019-10-15 10:12:11 UTC (rev 251128)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKitGLib/TestAuthentication.cpp	2019-10-15 10:37:14 UTC (rev 251129)
@@ -78,6 +78,21 @@
 GRefPtr m_authenticationRequest;
 };
 
+class EphemeralAuthenticationTest : public AuthenticationTest {
+public:
+MAKE_GLIB_TEST_FIXTURE_WITH_SETUP_TEARDOWN(EphemeralAuthenticationTest, setup, teardown);
+
+static void setup()
+{
+WebViewTest::shouldCreateEphemeralWebView = true;
+}
+
+static void teardown()
+{
+WebViewTest

[webkit-changes] [251130] trunk/LayoutTests

Title: [251130] trunk/LayoutTests








Revision 251130
Author commit-qu...@webkit.org
Date 2019-10-15 03:39:06 -0700 (Tue, 15 Oct 2019)


Log Message
Remove duplicate MathML tests
https://bugs.webkit.org/show_bug.cgi?id=202979

Patch by Rob Buis  on 2019-10-15
Reviewed by Frédéric Wang.

Remove mo-paint-lspace-rspace.html, this got imported
as presentation-markup/operators/mo-paint-lspace-rspace.html.

Remove mo-movablelimits.html, this got imported
as presentation-markup/operators/mo-movablelimits.html.

Remove mo-movablelimits-dynamic.html, this got imported as
presentation-markup/operators/mo-movablelimits-dynamic.html.

Remove mo-movablelimits-default.html, this got imported as
presentation-markup/operators/mo-movablelimits-default.html.

Remove direction.html, this got imported as
presentation-markup/direction/direction.html.

Remove direction-token.html, this got imported as
presentation-markup/direction/direction-token.html.

Remove direction-overall.html, this got imported as
presentation-markup/direction/direction-overall.html.

Remove inferred-mrow-baseline.html, this got imported as
presentation-markup/mrow/inferred-mrow-baseline.html.

Remove inferred-mrow-stretchy.html, this got imported as
presentation-markup/mrow/inferred-mrow-stretchy.html.

* mathml/presentation/direction-expected.html: Removed.
* mathml/presentation/direction-overall-expected.html: Removed.
* mathml/presentation/direction-overall.html: Removed.
* mathml/presentation/direction-token-expected.html: Removed.
* mathml/presentation/direction-token.html: Removed.
* mathml/presentation/direction.html: Removed.
* mathml/presentation/inferred-mrow-baseline-expected.txt: Removed.
* mathml/presentation/inferred-mrow-baseline.html: Removed.
* mathml/presentation/inferred-mrow-stretchy-expected.txt: Removed.
* mathml/presentation/inferred-mrow-stretchy.html: Removed.
* mathml/presentation/mo-movablelimits-default-expected.html: Removed.
* mathml/presentation/mo-movablelimits-default.html: Removed.
* mathml/presentation/mo-movablelimits-dynamic-expected.html: Removed.
* mathml/presentation/mo-movablelimits-dynamic.html: Removed.
* mathml/presentation/mo-movablelimits-expected.html: Removed.
* mathml/presentation/mo-movablelimits.html: Removed.
* mathml/presentation/mo-paint-lspace-rspace-expected.html: Removed.
* mathml/presentation/mo-paint-lspace-rspace.html: Removed.

Modified Paths

trunk/LayoutTests/ChangeLog


Removed Paths

trunk/LayoutTests/mathml/presentation/direction-expected.html
trunk/LayoutTests/mathml/presentation/direction-overall-expected.html
trunk/LayoutTests/mathml/presentation/direction-overall.html
trunk/LayoutTests/mathml/presentation/direction-token-expected.html
trunk/LayoutTests/mathml/presentation/direction-token.html
trunk/LayoutTests/mathml/presentation/direction.html
trunk/LayoutTests/mathml/presentation/inferred-mrow-baseline-expected.txt
trunk/LayoutTests/mathml/presentation/inferred-mrow-baseline.html
trunk/LayoutTests/mathml/presentation/inferred-mrow-stretchy-expected.txt
trunk/LayoutTests/mathml/presentation/inferred-mrow-stretchy.html
trunk/LayoutTests/mathml/presentation/mo-movablelimits-default-expected.html
trunk/LayoutTests/mathml/presentation/mo-movablelimits-default.html
trunk/LayoutTests/mathml/presentation/mo-movablelimits-dynamic-expected.html
trunk/LayoutTests/mathml/presentation/mo-movablelimits-dynamic.html
trunk/LayoutTests/mathml/presentation/mo-movablelimits-expected.html
trunk/LayoutTests/mathml/presentation/mo-movablelimits.html
trunk/LayoutTests/mathml/presentation/mo-paint-lspace-rspace-expected.html
trunk/LayoutTests/mathml/presentation/mo-paint-lspace-rspace.html




Diff

Modified: trunk/LayoutTests/ChangeLog (251129 => 251130)

--- trunk/LayoutTests/ChangeLog	2019-10-15 10:37:14 UTC (rev 251129)
+++ trunk/LayoutTests/ChangeLog	2019-10-15 10:39:06 UTC (rev 251130)
@@ -1,3 +1,56 @@
+2019-10-15  Rob Buis  
+
+Remove duplicate MathML tests
+https://bugs.webkit.org/show_bug.cgi?id=202979
+
+Reviewed by Frédéric Wang.
+
+Remove mo-paint-lspace-rspace.html, this got imported
+as presentation-markup/operators/mo-paint-lspace-rspace.html.
+
+Remove mo-movablelimits.html, this got imported
+as presentation-markup/operators/mo-movablelimits.html.
+
+Remove mo-movablelimits-dynamic.html, this got imported as
+presentation-markup/operators/mo-movablelimits-dynamic.html.
+
+Remove mo-movablelimits-default.html, this got imported as
+presentation-markup/operators/mo-movablelimits-default.html.
+
+Remove direction.html, this got imported as
+presentation-markup/direction/direction.html.
+
+Remove direction-token.html, this got imported as
+presentation-markup/direction/direction-token.html.
+
+Remove direction-overall.html, this got imported as
+presentation-markup/direction/direction-overall.html.
+
+Remove inferred-mrow-baseline.html, this got im

[webkit-changes] [251131] trunk/Tools

Title: [251131] trunk/Tools








Revision 251131
Author carlo...@webkit.org
Date 2019-10-15 04:01:01 -0700 (Tue, 15 Oct 2019)


Log Message
Unreviewed. Fix GTK test /WebKit2Gtk/TestWebViewEditor

It's failing since we delay the web process launch until the first load. Load about:blank in the test
constructor to fix it.

* TestWebKitAPI/Tests/WebKitGtk/TestWebViewEditor.cpp:

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/TestWebKitAPI/Tests/WebKitGtk/TestWebViewEditor.cpp




Diff

Modified: trunk/Tools/ChangeLog (251130 => 251131)

--- trunk/Tools/ChangeLog	2019-10-15 10:39:06 UTC (rev 251130)
+++ trunk/Tools/ChangeLog	2019-10-15 11:01:01 UTC (rev 251131)
@@ -1,5 +1,14 @@
 2019-10-15  Carlos Garcia Campos  
 
+Unreviewed. Fix GTK test /WebKit2Gtk/TestWebViewEditor
+
+It's failing since we delay the web process launch until the first load. Load about:blank in the test
+constructor to fix it.
+
+* TestWebKitAPI/Tests/WebKitGtk/TestWebViewEditor.cpp:
+
+2019-10-15  Carlos Garcia Campos  
+
 Unreviewed. Fix GTK test /webkit/Authentication/authentication-storage after r249962
 
 The test was still using the legacy private browsing API that is a no-op since r249962. This partch updates the


Modified: trunk/Tools/TestWebKitAPI/Tests/WebKitGtk/TestWebViewEditor.cpp (251130 => 251131)

--- trunk/Tools/TestWebKitAPI/Tests/WebKitGtk/TestWebViewEditor.cpp	2019-10-15 10:39:06 UTC (rev 251130)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKitGtk/TestWebViewEditor.cpp	2019-10-15 11:01:01 UTC (rev 251131)
@@ -35,6 +35,8 @@
 , m_editorState(nullptr)
 {
 showInWindowAndWaitUntilMapped(GTK_WINDOW_TOPLEVEL);
+loadURI("about:blank");
+waitUntilLoadFinished();
 gtk_clipboard_clear(m_clipboard);
 }
 






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

[webkit-changes] [251132] trunk

Title: [251132] trunk








Revision 251132
Author carlo...@webkit.org
Date 2019-10-15 05:20:34 -0700 (Tue, 15 Oct 2019)


Log Message
Unreviewed. Fix several GTK tests in /WebKit2Gtk/TestUIClient crashing since r241988

Source/WebKit:

Show a warning message and return nullptr from WebKitWebView::create if the new web view is not related to the
given one. Also make it clear in the documentation that the new web view should be related to the given one.

* UIProcess/API/glib/WebKitWebView.cpp:
(webkit_web_view_class_init):
(webkitWebViewCreateNewPage):

Tools:

This was not caused by r241988, but revealed the existing bug. We were not creating the new WebKitWebView in
UIClientTest with the related WebKitWebView. Since r241988, the new WebPageProxy drawing area is passed to
creationParameters(), but it's nullptr because the WebPageProxy hasn't been initialized yet. When using related
views, the new WebPageProxy is already initialized because it has running processes on creation.

* TestWebKitAPI/Tests/WebKitGLib/TestUIClient.cpp:
(testWebViewCreateNavigationData):

Modified Paths

trunk/Source/WebKit/ChangeLog
trunk/Source/WebKit/UIProcess/API/glib/WebKitWebView.cpp
trunk/Tools/ChangeLog
trunk/Tools/TestWebKitAPI/Tests/WebKitGLib/TestUIClient.cpp




Diff

Modified: trunk/Source/WebKit/ChangeLog (251131 => 251132)

--- trunk/Source/WebKit/ChangeLog	2019-10-15 11:01:01 UTC (rev 251131)
+++ trunk/Source/WebKit/ChangeLog	2019-10-15 12:20:34 UTC (rev 251132)
@@ -1,5 +1,16 @@
 2019-10-15  Carlos Garcia Campos  
 
+Unreviewed. Fix several GTK tests in /WebKit2Gtk/TestUIClient crashing since r241988
+
+Show a warning message and return nullptr from WebKitWebView::create if the new web view is not related to the
+given one. Also make it clear in the documentation that the new web view should be related to the given one.
+
+* UIProcess/API/glib/WebKitWebView.cpp:
+(webkit_web_view_class_init):
+(webkitWebViewCreateNewPage):
+
+2019-10-15  Carlos Garcia Campos  
+
 Unreviewed. Fix GTK test /webkit/Authentication/authentication-storage after r249962
 
 * UIProcess/API/glib/WebKitWebView.cpp:


Modified: trunk/Source/WebKit/UIProcess/API/glib/WebKitWebView.cpp (251131 => 251132)

--- trunk/Source/WebKit/UIProcess/API/glib/WebKitWebView.cpp	2019-10-15 11:01:01 UTC (rev 251131)
+++ trunk/Source/WebKit/UIProcess/API/glib/WebKitWebView.cpp	2019-10-15 12:20:34 UTC (rev 251132)
@@ -1353,10 +1353,8 @@
  * The #WebKitNavigationAction parameter contains information about the
  * navigation action that triggered this signal.
  *
- * When using %WEBKIT_PROCESS_MODEL_MULTIPLE_SECONDARY_PROCESSES
- * process model, the new #WebKitWebView should be related to
- * @web_view to share the same web process, see webkit_web_view_new_with_related_view()
- * for more details.
+ * The new #WebKitWebView must be related to @web_view, see
+ * webkit_web_view_new_with_related_view() for more details.
  *
  * The new #WebKitWebView should not be displayed to the user
  * until the #WebKitWebView::ready-to-show signal is emitted.
@@ -2216,8 +2214,13 @@
 WebKitWebView* newWebView;
 g_signal_emit(webView, signals[CREATE], 0, navigationAction, &newWebView);
 if (!newWebView)
-return 0;
+return nullptr;
 
+if (&getPage(webView).process() != &getPage(newWebView).process()) {
+g_warning("WebKitWebView returned by WebKitWebView::create signal was not created with the related WebKitWebView");
+return nullptr;
+}
+
 webkitWindowPropertiesUpdateFromWebWindowFeatures(newWebView->priv->windowProperties.get(), windowFeatures);
 
 RefPtr newPage = &getPage(newWebView);


Modified: trunk/Tools/ChangeLog (251131 => 251132)

--- trunk/Tools/ChangeLog	2019-10-15 11:01:01 UTC (rev 251131)
+++ trunk/Tools/ChangeLog	2019-10-15 12:20:34 UTC (rev 251132)
@@ -1,5 +1,17 @@
 2019-10-15  Carlos Garcia Campos  
 
+Unreviewed. Fix several GTK tests in /WebKit2Gtk/TestUIClient crashing since r241988
+
+This was not caused by r241988, but revealed the existing bug. We were not creating the new WebKitWebView in
+UIClientTest with the related WebKitWebView. Since r241988, the new WebPageProxy drawing area is passed to
+creationParameters(), but it's nullptr because the WebPageProxy hasn't been initialized yet. When using related
+views, the new WebPageProxy is already initialized because it has running processes on creation.
+
+* TestWebKitAPI/Tests/WebKitGLib/TestUIClient.cpp:
+(testWebViewCreateNavigationData):
+
+2019-10-15  Carlos Garcia Campos  
+
 Unreviewed. Fix GTK test /WebKit2Gtk/TestWebViewEditor
 
 It's failing since we delay the web process launch until the first load. Load about:blank in the test


Modified: trunk/Tools/TestWebKitAPI/Tests/WebKitGLib/TestUIClient.cpp (251131 => 251132)

--- trunk/Tools/TestWebKitAPI/Tests/We

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

Title: [251133] trunk/Source/WebCore








Revision 251133
Author za...@apple.com
Date 2019-10-15 06:45:45 -0700 (Tue, 15 Oct 2019)


Log Message
[LFC][IFC] Add support for text-transform: uppercase/lowercase
https://bugs.webkit.org/show_bug.cgi?id=202968


Reviewed by Antti Koivisto.

The text content on the layout box should be in its final state (This might change if we actually need the original content for some reason though).

* layout/layouttree/LayoutTreeBuilder.cpp:
(WebCore::Layout::applyTextTransform):
(WebCore::Layout::TreeBuilder::createLayoutBox):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/layout/layouttree/LayoutTreeBuilder.cpp




Diff

Modified: trunk/Source/WebCore/ChangeLog (251132 => 251133)

--- trunk/Source/WebCore/ChangeLog	2019-10-15 12:20:34 UTC (rev 251132)
+++ trunk/Source/WebCore/ChangeLog	2019-10-15 13:45:45 UTC (rev 251133)
@@ -1,3 +1,17 @@
+2019-10-15  Zalan Bujtas  
+
+[LFC][IFC] Add support for text-transform: uppercase/lowercase
+https://bugs.webkit.org/show_bug.cgi?id=202968
+
+
+Reviewed by Antti Koivisto.
+
+The text content on the layout box should be in its final state (This might change if we actually need the original content for some reason though).
+
+* layout/layouttree/LayoutTreeBuilder.cpp:
+(WebCore::Layout::applyTextTransform):
+(WebCore::Layout::TreeBuilder::createLayoutBox):
+
 2019-10-14  Youenn Fablet  
 
 Handle service worker loads through NetworkResourceLoader


Modified: trunk/Source/WebCore/layout/layouttree/LayoutTreeBuilder.cpp (251132 => 251133)

--- trunk/Source/WebCore/layout/layouttree/LayoutTreeBuilder.cpp	2019-10-15 12:20:34 UTC (rev 251132)
+++ trunk/Source/WebCore/layout/layouttree/LayoutTreeBuilder.cpp	2019-10-15 13:45:45 UTC (rev 251133)
@@ -93,6 +93,24 @@
 return block.relativePositionOffset();
 }
 
+static String applyTextTransform(const String& text, const RenderStyle& style)
+{
+switch (style.textTransform()) {
+case TextTransform::None:
+return text;
+case TextTransform::Capitalize: {
+ASSERT_NOT_IMPLEMENTED_YET();
+return text;
+}
+case TextTransform::Uppercase:
+return text.convertToUppercaseWithLocale(style.locale());
+case TextTransform::Lowercase:
+return text.convertToLowercaseWithLocale(style.locale());
+}
+ASSERT_NOT_REACHED();
+return text;
+}
+
 std::unique_ptr TreeBuilder::createLayoutBox(const RenderElement& parentRenderer, const RenderObject& childRenderer)
 {
 auto elementAttributes = [] (const RenderElement& renderer) -> Optional {
@@ -115,11 +133,13 @@
 
 std::unique_ptr childLayoutBox;
 if (is(childRenderer)) {
+auto& textRenderer = downcast(childRenderer);
+auto textContent = applyTextTransform(textRenderer.originalText(), parentRenderer.style());
 // FIXME: Clearly there must be a helper function for this.
 if (parentRenderer.style().display() == DisplayType::Inline)
-childLayoutBox = makeUnique(downcast(childRenderer).originalText(), RenderStyle::clone(parentRenderer.style()));
+childLayoutBox = makeUnique(textContent, RenderStyle::clone(parentRenderer.style()));
 else
-childLayoutBox = makeUnique(downcast(childRenderer).originalText(), RenderStyle::createAnonymousStyleWithDisplay(parentRenderer.style(), DisplayType::Inline));
+childLayoutBox = makeUnique(textContent, RenderStyle::createAnonymousStyleWithDisplay(parentRenderer.style(), DisplayType::Inline));
 childLayoutBox->setIsAnonymous();
 return childLayoutBox;
 }






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

[webkit-changes] [251134] trunk

Title: [251134] trunk

Revision 251134
Author wenson_hs...@apple.com
Date 2019-10-15 07:30:16 -0700 (Tue, 15 Oct 2019)

Log Message
[Clipboard API] Implement getType() for ClipboardItems created from bindings
https://bugs.webkit.org/show_bug.cgi?id=202943

Reviewed by Tim Horton.

Source/WebCore:

Adds basic support for ClipboardItem.getType(), in the case where the ClipboardItems are created by the page. To
achieve this, we introduce ClipboardItemDataSource, which represents the data source backing a given clipboard
item. This backing may either consist of a list of types and their corresponding DOMPromises (for ClipboardItems
that come from the page), or may consist of a list of items that will ask the platformr pasteboard for their
data (to be supported in a future patch).

See below for more details.

Test: editing/async-clipboard/clipboard-item-basic.html

* Modules/async-clipboard/Clipboard.h:
* Modules/async-clipboard/ClipboardItem.cpp:
(WebCore::clipboardItemPresentationStyle):
(WebCore::ClipboardItem::ClipboardItem):

Pass in the parent Clipboard object for ClipboardItems that are backed by the platform pasteboard (which are
returned by Clipboard.read()). (Note that this doesn't make any difference until this codepath is actually
exercised when we add support for Clipboard.read()).

(WebCore::ClipboardItem::create):
(WebCore::ClipboardItem::types const):
(WebCore::ClipboardItem::getType):

Plumb types() and getType() to the clipboard item's datasource.

(WebCore::ClipboardItem::navigator):

Make navigator() return the parent Clipboard object's navigator.

* Modules/async-clipboard/ClipboardItem.h:
* Modules/async-clipboard/ClipboardItemBindingsDataSource.cpp: Added.
(WebCore::blobFromString):
(WebCore::ClipboardItemBindingsDataSource::ClipboardItemBindingsDataSource):

Store the given list of types and DOM promises.

(WebCore::ClipboardItemBindingsDataSource::types const):
(WebCore::ClipboardItemBindingsDataSource::getType):

Implement getType() by finding the matching promised type in the item's array of types, and waiting for the
promise to either resolve or reject. If the promise resolves to either a string or blob, we deliver the result
back to the page by resolving the promise returned by getType(). Otherwise, we reject it.

* Modules/async-clipboard/ClipboardItemBindingsDataSource.h:
* Modules/async-clipboard/ClipboardItemDataSource.h:
(WebCore::ClipboardItemDataSource::ClipboardItemDataSource):
* Modules/async-clipboard/ClipboardItemPasteboardDataSource.cpp:

Add a stub implementation of a clipboard item data source that is backed by data in the platform pasteboard. In
a future patch, this will implement getType() by calling out to the platform pasteboard.

(WebCore::ClipboardItemPasteboardDataSource::ClipboardItemPasteboardDataSource):
(WebCore::ClipboardItemPasteboardDataSource::types const):
(WebCore::ClipboardItemPasteboardDataSource::getType):
* Modules/async-clipboard/ClipboardItemPasteboardDataSource.h:
* Modules/mediastream/RTCRtpReceiver.cpp:
* Modules/mediastream/libwebrtc/LibWebRTCCertificateGenerator.cpp:

Unrelated build fixes, due to changes in unified source groupings.

* Sources.txt:
* WebCore.xcodeproj/project.pbxproj:
* platform/network/mac/UTIUtilities.mm:

More build fixes, due to changes in unified source groupings.

LayoutTests:

Add a new layout test to verify that we can create and ask ClipboardItems for data. Exercises the following
corner cases:
- Promise rejection when returning item data.
- Resolving promises to incorrect data types.
- Setting types to custom strings (including emojis and non-ASCII characters).
- Returning values with emojis and non-ASCII characters.
- Resolving promises using both Blobs and DOMStrings.
- Delayed promise rejection/resolution (using setTimeout).

* editing/async-clipboard/clipboard-item-basic-expected.txt: Added.
* editing/async-clipboard/clipboard-item-basic.html: Added.
* editing/async-clipboard/resources/async-clipboard-helpers.js: Added.

Add a resource file with some helper functions for creating blobs, and loading images and text from blobs.

* platform/win/TestExpectations:

Temporarily mark a test as failing; I'll fix this and some other failing tests in a followup. See
.

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/LayoutTests/platform/win/TestExpectations
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/Modules/async-clipboard/Clipboard.h
trunk/Source/WebCore/Modules/async-clipboard/ClipboardItem.cpp
trunk/Source/WebCore/Modules/async-clipboard/ClipboardItem.h
trunk/Source/WebCore/Modules/mediastream/RTCRtpReceiver.cpp
trunk/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCCertificateGenerator.cpp
trunk/Source/WebCore/Sources.txt
trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj
trunk/Source/WebCore/platform/network/mac/UTIUtilities.mm

Added Paths

trunk/LayoutTests/editing/async-clipboard/clipboard-item-basic-expected.txt
trunk/LayoutTests/editing/async-clipboard/clipboard-item-basic.html
tr

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

Title: [251135] trunk/Source/WebCore








Revision 251135
Author za...@apple.com
Date 2019-10-15 07:47:10 -0700 (Tue, 15 Oct 2019)


Log Message
[LFC] Adjust computed height value when box sizing is border-box
https://bugs.webkit.org/show_bug.cgi?id=202965


Reviewed by Antti Koivisto.

box-sizing: border-box; means the height value sets the size of the border box (and not the content box).

* layout/FormattingContext.cpp:
(WebCore::Layout::FormattingContext::computeOutOfFlowHorizontalGeometry):
(WebCore::Layout::FormattingContext::computeOutOfFlowVerticalGeometry):
* layout/FormattingContext.h:
* layout/FormattingContextGeometry.cpp:
(WebCore::Layout::FormattingContext::Geometry::computedContentHeight const):
(WebCore::Layout::FormattingContext::Geometry::outOfFlowNonReplacedVerticalGeometry const):
(WebCore::Layout::FormattingContext::Geometry::outOfFlowReplacedVerticalGeometry const):
(WebCore::Layout::FormattingContext::Geometry::outOfFlowReplacedHorizontalGeometry const):
(WebCore::Layout::FormattingContext::Geometry::complicatedCases const):
(WebCore::Layout::FormattingContext::Geometry::floatingNonReplacedWidthAndMargin):
(WebCore::Layout::FormattingContext::Geometry::floatingReplacedHeightAndMargin const):
(WebCore::Layout::FormattingContext::Geometry::floatingReplacedWidthAndMargin const):
(WebCore::Layout::FormattingContext::Geometry::floatingHeightAndMargin const):
(WebCore::Layout::FormattingContext::Geometry::floatingWidthAndMargin):
(WebCore::Layout::FormattingContext::Geometry::inlineReplacedHeightAndMargin const):
(WebCore::Layout::FormattingContext::Geometry::inlineReplacedWidthAndMargin const):
* layout/LayoutState.cpp:
(WebCore::Layout::LayoutState::displayBoxForLayoutBox):
* layout/LayoutUnits.h:
* layout/blockformatting/BlockFormattingContext.cpp:
(WebCore::Layout::BlockFormattingContext::computeWidthAndMargin):
(WebCore::Layout::BlockFormattingContext::computeHeightAndMargin):
* layout/blockformatting/BlockFormattingContext.h:
* layout/blockformatting/BlockFormattingContextGeometry.cpp:
(WebCore::Layout::BlockFormattingContext::Geometry::inFlowNonReplacedHeightAndMargin):
(WebCore::Layout::BlockFormattingContext::Geometry::inFlowNonReplacedWidthAndMargin const):
(WebCore::Layout::BlockFormattingContext::Geometry::inFlowReplacedWidthAndMargin const):
(WebCore::Layout::BlockFormattingContext::Geometry::inFlowHeightAndMargin):
(WebCore::Layout::BlockFormattingContext::Geometry::inFlowWidthAndMargin):
* layout/blockformatting/BlockFormattingContextQuirks.cpp:
(WebCore::Layout::BlockFormattingContext::Quirks::stretchedInFlowHeight):
* layout/displaytree/DisplayBox.cpp:
(WebCore::Display::Box::Box):
(WebCore::Display::Box::Style::Style): Deleted.
* layout/displaytree/DisplayBox.h:
* layout/inlineformatting/InlineFormattingContext.cpp:
(WebCore::Layout::InlineFormattingContext::computeWidthAndMargin):
(WebCore::Layout::InlineFormattingContext::computeHeightAndMargin):
* layout/inlineformatting/InlineFormattingContext.h:
* layout/inlineformatting/InlineFormattingContextGeometry.cpp:
(WebCore::Layout::InlineFormattingContext::Geometry::inlineBlockWidthAndMargin):
(WebCore::Layout::InlineFormattingContext::Geometry::inlineBlockHeightAndMargin const):
* layout/tableformatting/TableFormattingContext.cpp:
(WebCore::Layout::TableFormattingContext::layoutTableCellBox):
* layout/tableformatting/TableFormattingContext.h:
* layout/tableformatting/TableFormattingContextGeometry.cpp:
(WebCore::Layout::TableFormattingContext::Geometry::tableCellHeightAndMargin const):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/layout/FormattingContext.cpp
trunk/Source/WebCore/layout/FormattingContext.h
trunk/Source/WebCore/layout/FormattingContextGeometry.cpp
trunk/Source/WebCore/layout/LayoutState.cpp
trunk/Source/WebCore/layout/LayoutUnits.h
trunk/Source/WebCore/layout/blockformatting/BlockFormattingContext.cpp
trunk/Source/WebCore/layout/blockformatting/BlockFormattingContext.h
trunk/Source/WebCore/layout/blockformatting/BlockFormattingContextGeometry.cpp
trunk/Source/WebCore/layout/blockformatting/BlockFormattingContextQuirks.cpp
trunk/Source/WebCore/layout/displaytree/DisplayBox.cpp
trunk/Source/WebCore/layout/displaytree/DisplayBox.h
trunk/Source/WebCore/layout/inlineformatting/InlineFormattingContext.cpp
trunk/Source/WebCore/layout/inlineformatting/InlineFormattingContext.h
trunk/Source/WebCore/layout/inlineformatting/InlineFormattingContextGeometry.cpp
trunk/Source/WebCore/layout/tableformatting/TableFormattingContext.cpp
trunk/Source/WebCore/layout/tableformatting/TableFormattingContext.h
trunk/Source/WebCore/layout/tableformatting/TableFormattingContextGeometry.cpp




Diff

Modified: trunk/Source/WebCore/ChangeLog (251134 => 251135)

--- trunk/Source/WebCore/ChangeLog	2019-10-15 14:30:16 UTC (rev 251134)
+++ trunk/Source/WebCore/ChangeLog	2019-10-15 14:47:10 UTC (rev 251135)
@@ -1,3 +1,62 @@
+2019-10-15  Zalan Bujtas  
+
+[LFC] Adjust computed height value when box sizing is

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

Title: [251136] trunk/Source/WebCore








Revision 251136
Author za...@apple.com
Date 2019-10-15 08:03:03 -0700 (Tue, 15 Oct 2019)


Log Message
[LFC][TFC] Add  element's width attribute value to Layout::Box rare data
https://bugs.webkit.org/show_bug.cgi?id=202988


Reviewed by Antti Koivisto.

Sadly RenderStyle does not have this value.

* layout/layouttree/LayoutBox.cpp:
(WebCore::Layout::Box::setColumnWidth):
(WebCore::Layout::Box::columnWidth const):
* layout/layouttree/LayoutBox.h:
* layout/layouttree/LayoutTreeBuilder.cpp:
(WebCore::Layout::TreeBuilder::createLayoutBox):
(WebCore::Layout::outputLayoutBox):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/layout/layouttree/LayoutBox.cpp
trunk/Source/WebCore/layout/layouttree/LayoutBox.h
trunk/Source/WebCore/layout/layouttree/LayoutTreeBuilder.cpp




Diff

Modified: trunk/Source/WebCore/ChangeLog (251135 => 251136)

--- trunk/Source/WebCore/ChangeLog	2019-10-15 14:47:10 UTC (rev 251135)
+++ trunk/Source/WebCore/ChangeLog	2019-10-15 15:03:03 UTC (rev 251136)
@@ -1,5 +1,23 @@
 2019-10-15  Zalan Bujtas  
 
+[LFC][TFC] Add  element's width attribute value to Layout::Box rare data
+https://bugs.webkit.org/show_bug.cgi?id=202988
+
+
+Reviewed by Antti Koivisto.
+
+Sadly RenderStyle does not have this value.
+
+* layout/layouttree/LayoutBox.cpp:
+(WebCore::Layout::Box::setColumnWidth):
+(WebCore::Layout::Box::columnWidth const):
+* layout/layouttree/LayoutBox.h:
+* layout/layouttree/LayoutTreeBuilder.cpp:
+(WebCore::Layout::TreeBuilder::createLayoutBox):
+(WebCore::Layout::outputLayoutBox):
+
+2019-10-15  Zalan Bujtas  
+
 [LFC] Adjust computed height value when box sizing is border-box
 https://bugs.webkit.org/show_bug.cgi?id=202965
 


Modified: trunk/Source/WebCore/layout/layouttree/LayoutBox.cpp (251135 => 251136)

--- trunk/Source/WebCore/layout/layouttree/LayoutBox.cpp	2019-10-15 14:47:10 UTC (rev 251135)
+++ trunk/Source/WebCore/layout/layouttree/LayoutBox.cpp	2019-10-15 15:03:03 UTC (rev 251136)
@@ -439,6 +439,18 @@
 return rareData().columnSpan;
 }
 
+void Box::setColumnWidth(LayoutUnit columnWidth)
+{
+ensureRareData().columnWidth = columnWidth;
+}
+
+Optional Box::columnWidth() const
+{
+if (!hasRareData())
+return { };
+return rareData().columnWidth;
+}
+
 Box::RareDataMap& Box::rareDataMap()
 {
 static NeverDestroyed map;


Modified: trunk/Source/WebCore/layout/layouttree/LayoutBox.h (251135 => 251136)

--- trunk/Source/WebCore/layout/layouttree/LayoutBox.h	2019-10-15 14:47:10 UTC (rev 251135)
+++ trunk/Source/WebCore/layout/layouttree/LayoutBox.h	2019-10-15 15:03:03 UTC (rev 251136)
@@ -146,10 +146,14 @@
 
 // FIXME: Find a better place for random DOM things.
 void setRowSpan(unsigned);
+unsigned rowSpan() const;
+
 void setColumnSpan(unsigned);
-unsigned rowSpan() const;
 unsigned columnSpan() const;
 
+void setColumnWidth(LayoutUnit);
+Optional columnWidth() const;
+
 void setParent(Container& parent) { m_parent = &parent; }
 void setNextSibling(Box& nextSibling) { m_nextSibling = &nextSibling; }
 void setPreviousSibling(Box& previousSibling) { m_previousSibling = &previousSibling; }
@@ -171,6 +175,7 @@
 std::unique_ptr replaced;
 unsigned rowSpan { 1 };
 unsigned columnSpan { 1 };
+Optional columnWidth;
 };
 
 bool hasRareData() const { return m_hasRareData; }


Modified: trunk/Source/WebCore/layout/layouttree/LayoutTreeBuilder.cpp (251135 => 251136)

--- trunk/Source/WebCore/layout/layouttree/LayoutTreeBuilder.cpp	2019-10-15 14:47:10 UTC (rev 251135)
+++ trunk/Source/WebCore/layout/layouttree/LayoutTreeBuilder.cpp	2019-10-15 15:03:03 UTC (rev 251136)
@@ -31,6 +31,7 @@
 #include "DisplayBox.h"
 #include "DisplayRun.h"
 #include "HTMLTableCellElement.h"
+#include "HTMLTableColElement.h"
 #include "InlineFormattingState.h"
 #include "LayoutBox.h"
 #include "LayoutChildIterator.h"
@@ -182,8 +183,13 @@
 else if (displayType == DisplayType::TableCaption || displayType == DisplayType::TableCell) {
 childLayoutBox = makeUnique(elementAttributes(renderer), RenderStyle::clone(renderer.style()));
 } else if (displayType == DisplayType::TableRowGroup || displayType == DisplayType::TableHeaderGroup || displayType == DisplayType::TableFooterGroup
-|| displayType == DisplayType::TableRow || displayType == DisplayType::TableColumnGroup || displayType == DisplayType::TableColumn) {
+|| displayType == DisplayType::TableRow || displayType == DisplayType::TableColumnGroup) {
 childLayoutBox = makeUnique(elementAttributes(renderer), RenderStyle::clone(renderer.style()));
+} else if (displayType == DisplayType::TableColumn) {
+childLayoutBox = makeUnique(elementAttributes(renderer), RenderStyle::clone(renderer.style()));
+

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

Title: [251137] trunk/Source/WebCore








Revision 251137
Author za...@apple.com
Date 2019-10-15 08:09:04 -0700 (Tue, 15 Oct 2019)


Log Message
[LFC] Adjust computed width value when box sizing is border-box
https://bugs.webkit.org/show_bug.cgi?id=202966


Reviewed by Antti Koivisto.

box-sizing: border-box; means the width value sets the size of the border box (and not the content box).

* layout/FormattingContext.cpp:
(WebCore::Layout::FormattingContext::computeOutOfFlowHorizontalGeometry):
* layout/FormattingContext.h:
* layout/FormattingContextGeometry.cpp:
(WebCore::Layout::FormattingContext::Geometry::computedContentWidth const):
(WebCore::Layout::FormattingContext::Geometry::computedMinWidth const):
(WebCore::Layout::FormattingContext::Geometry::computedMaxWidth const):
(WebCore::Layout::FormattingContext::Geometry::outOfFlowNonReplacedHorizontalGeometry):
(WebCore::Layout::FormattingContext::Geometry::floatingNonReplacedWidthAndMargin):
(WebCore::Layout::FormattingContext::Geometry::inlineReplacedWidthAndMargin const):
* layout/blockformatting/BlockFormattingContext.cpp:
(WebCore::Layout::BlockFormattingContext::computeWidthAndMargin):
* layout/blockformatting/BlockFormattingContextGeometry.cpp:
(WebCore::Layout::BlockFormattingContext::Geometry::inFlowNonReplacedWidthAndMargin const):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/layout/FormattingContext.cpp
trunk/Source/WebCore/layout/FormattingContext.h
trunk/Source/WebCore/layout/FormattingContextGeometry.cpp
trunk/Source/WebCore/layout/blockformatting/BlockFormattingContext.cpp
trunk/Source/WebCore/layout/blockformatting/BlockFormattingContextGeometry.cpp




Diff

Modified: trunk/Source/WebCore/ChangeLog (251136 => 251137)

--- trunk/Source/WebCore/ChangeLog	2019-10-15 15:03:03 UTC (rev 251136)
+++ trunk/Source/WebCore/ChangeLog	2019-10-15 15:09:04 UTC (rev 251137)
@@ -1,5 +1,30 @@
 2019-10-15  Zalan Bujtas  
 
+[LFC] Adjust computed width value when box sizing is border-box
+https://bugs.webkit.org/show_bug.cgi?id=202966
+
+
+Reviewed by Antti Koivisto.
+
+box-sizing: border-box; means the width value sets the size of the border box (and not the content box).
+
+* layout/FormattingContext.cpp:
+(WebCore::Layout::FormattingContext::computeOutOfFlowHorizontalGeometry):
+* layout/FormattingContext.h:
+* layout/FormattingContextGeometry.cpp:
+(WebCore::Layout::FormattingContext::Geometry::computedContentWidth const):
+(WebCore::Layout::FormattingContext::Geometry::computedMinWidth const):
+(WebCore::Layout::FormattingContext::Geometry::computedMaxWidth const):
+(WebCore::Layout::FormattingContext::Geometry::outOfFlowNonReplacedHorizontalGeometry):
+(WebCore::Layout::FormattingContext::Geometry::floatingNonReplacedWidthAndMargin):
+(WebCore::Layout::FormattingContext::Geometry::inlineReplacedWidthAndMargin const):
+* layout/blockformatting/BlockFormattingContext.cpp:
+(WebCore::Layout::BlockFormattingContext::computeWidthAndMargin):
+* layout/blockformatting/BlockFormattingContextGeometry.cpp:
+(WebCore::Layout::BlockFormattingContext::Geometry::inFlowNonReplacedWidthAndMargin const):
+
+2019-10-15  Zalan Bujtas  
+
 [LFC][TFC] Add  element's width attribute value to Layout::Box rare data
 https://bugs.webkit.org/show_bug.cgi?id=202988
 


Modified: trunk/Source/WebCore/layout/FormattingContext.cpp (251136 => 251137)

--- trunk/Source/WebCore/layout/FormattingContext.cpp	2019-10-15 15:03:03 UTC (rev 251136)
+++ trunk/Source/WebCore/layout/FormattingContext.cpp	2019-10-15 15:09:04 UTC (rev 251137)
@@ -87,13 +87,13 @@
 };
 
 auto horizontalGeometry = compute({ });
-if (auto maxWidth = geometry().computedValueIfNotAuto(layoutBox.style().logicalMaxWidth(), containingBlockWidth)) {
+if (auto maxWidth = geometry().computedMaxWidth(layoutBox, containingBlockWidth)) {
 auto maxHorizontalGeometry = compute(maxWidth);
 if (horizontalGeometry.contentWidthAndMargin.contentWidth > maxHorizontalGeometry.contentWidthAndMargin.contentWidth)
 horizontalGeometry = maxHorizontalGeometry;
 }
 
-if (auto minWidth = geometry().computedValueIfNotAuto(layoutBox.style().logicalMinWidth(), containingBlockWidth)) {
+if (auto minWidth = geometry().computedMinWidth(layoutBox, containingBlockWidth)) {
 auto minHorizontalGeometry = compute(minWidth);
 if (horizontalGeometry.contentWidthAndMargin.contentWidth < minHorizontalGeometry.contentWidthAndMargin.contentWidth)
 horizontalGeometry = minHorizontalGeometry;


Modified: trunk/Source/WebCore/layout/FormattingContext.h (251136 => 251137)

--- trunk/Source/WebCore/layout/FormattingContext.h	2019-10-15 15:03:03 UTC (rev 251136)
+++ trunk/Source/WebCore/layout/FormattingContext.h	2019-10-15 15:09:04 UTC (rev 251137)
@@ -133,6 +133,9 @@
 Op

[webkit-changes] [251138] trunk

2019-10-15 Thread achristensen

Title: [251138] trunk








Revision 251138
Author achristen...@apple.com
Date 2019-10-15 09:09:55 -0700 (Tue, 15 Oct 2019)


Log Message
Pass CORS-enabled schemes through WebProcess instead of having them NetworkProcess-global
https://bugs.webkit.org/show_bug.cgi?id=202891

Reviewed by Youenn Fablet.

Source/WebCore:

* platform/LegacySchemeRegistry.cpp:
(WebCore::LegacySchemeRegistry::registerURLSchemeAsCORSEnabled):
(WebCore::LegacySchemeRegistry::shouldTreatURLSchemeAsCORSEnabled):
(WebCore::LegacySchemeRegistry::allURLSchemesRegisteredAsCORSEnabled):
* platform/LegacySchemeRegistry.h:

Source/WebKit:

No change in behavior.  Now the LegacySchemeRegistry is not used as much in the NetworkProcess, a step towards no use at all.
This functionality is currently only available through the glib API webkit_security_manager_register_uri_scheme_as_cors_enabled
but it has been requested in bug 201180 and bug 199064.

* NetworkProcess/NetworkConnectionToWebProcess.cpp:
(WebKit::NetworkConnectionToWebProcess::NetworkConnectionToWebProcess):
(WebKit::NetworkConnectionToWebProcess::loadPing):
(WebKit::NetworkConnectionToWebProcess::registerURLSchemesAsCORSEnabled):
* NetworkProcess/NetworkConnectionToWebProcess.h:
(WebKit::NetworkConnectionToWebProcess::schemeRegistry):
* NetworkProcess/NetworkConnectionToWebProcess.messages.in:
* NetworkProcess/NetworkLoadChecker.cpp:
(WebKit::NetworkLoadChecker::NetworkLoadChecker):
(WebKit::NetworkLoadChecker::doesNotNeedCORSCheck const):
* NetworkProcess/NetworkLoadChecker.h:
* NetworkProcess/NetworkProcess.cpp:
(WebKit::NetworkProcess::initializeNetworkProcess):
(WebKit::NetworkProcess::registerURLSchemeAsCORSEnabled const): Deleted.
* NetworkProcess/NetworkProcess.messages.in:
* NetworkProcess/NetworkProcessCreationParameters.cpp:
(WebKit::NetworkProcessCreationParameters::encode const):
(WebKit::NetworkProcessCreationParameters::decode):
* NetworkProcess/NetworkProcessCreationParameters.h:
* NetworkProcess/NetworkResourceLoader.cpp:
(WebKit::m_shouldCaptureExtraNetworkLoadMetrics):
* NetworkProcess/NetworkSchemeRegistry.cpp: Added.
(WebKit::NetworkSchemeRegistry::registerURLSchemeAsCORSEnabled):
(WebKit::NetworkSchemeRegistry::shouldTreatURLSchemeAsCORSEnabled):
* NetworkProcess/NetworkSchemeRegistry.h: Added.
(WebKit::NetworkSchemeRegistry::create):
* NetworkProcess/PingLoad.cpp:
(WebKit::PingLoad::PingLoad):
Use nullptr, indicating that the PingLoad constructor that is used in ad click attribution should not check the custom scheme registry.
This is Ok because ad click attribution is only used for HTTP family schemes.
(WebKit::m_blobFiles):
* NetworkProcess/PingLoad.h:
* Sources.txt:
* UIProcess/WebProcessPool.cpp:
(WebKit::WebProcessPool::ensureNetworkProcess):
(WebKit::WebProcessPool::registerURLSchemeAsCORSEnabled):
* WebKit.xcodeproj/project.pbxproj:
* WebProcess/WebProcess.cpp:
(WebKit::WebProcess::initializeWebProcess):
(WebKit::WebProcess::registerURLSchemeAsCORSEnabled):
(WebKit::WebProcess::ensureNetworkProcessConnection):
(WebKit::WebProcess::registerURLSchemeAsCORSEnabled const): Deleted.
* WebProcess/WebProcess.h:

Tools:

* TestWebKitAPI/Tests/WebKitCocoa/ServiceWorkerBasic.mm:
(-[SWMessageHandlerWithExpectedMessage userContentController:didReceiveScriptMessage:]):
Use EXPECT_WK_STREQ so I can see what is going on on EWS.

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/LegacySchemeRegistry.cpp
trunk/Source/WebCore/platform/LegacySchemeRegistry.h
trunk/Source/WebKit/ChangeLog
trunk/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp
trunk/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.h
trunk/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.messages.in
trunk/Source/WebKit/NetworkProcess/NetworkLoadChecker.cpp
trunk/Source/WebKit/NetworkProcess/NetworkLoadChecker.h
trunk/Source/WebKit/NetworkProcess/NetworkProcess.cpp
trunk/Source/WebKit/NetworkProcess/NetworkProcess.messages.in
trunk/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.cpp
trunk/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.h
trunk/Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp
trunk/Source/WebKit/NetworkProcess/PingLoad.cpp
trunk/Source/WebKit/NetworkProcess/PingLoad.h
trunk/Source/WebKit/Sources.txt
trunk/Source/WebKit/UIProcess/WebProcessPool.cpp
trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj
trunk/Source/WebKit/WebProcess/WebProcess.cpp
trunk/Source/WebKit/WebProcess/WebProcess.h
trunk/Tools/ChangeLog
trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/ServiceWorkerBasic.mm


Added Paths

trunk/Source/WebKit/NetworkProcess/NetworkSchemeRegistry.cpp
trunk/Source/WebKit/NetworkProcess/NetworkSchemeRegistry.h




Diff

Modified: trunk/Source/WebCore/ChangeLog (251137 => 251138)

--- trunk/Source/WebCore/ChangeLog	2019-10-15 15:09:04 UTC (rev 251137)
+++ trunk/Source/WebCore/ChangeLog	2019-10-15 16:09:55 UTC (rev 251138)
@@ -1,3 +1,16 @@
+2019-10-15  Alex Christensen  
+
+Pass CORS-enabled sch

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

Title: [251139] trunk/Source/_javascript_Core








Revision 251139
Author commit-qu...@webkit.org
Date 2019-10-15 09:35:05 -0700 (Tue, 15 Oct 2019)


Log Message
Interpreter: Don't assert that reference is nonnull
https://bugs.webkit.org/show_bug.cgi?id=202986

Patch by Angelos Oikonomopoulos  on 2019-10-15
Reviewed by Keith Miller.

G++ 9.2 can assume that the address of a reference is nonnull and
emits multiple warnings to that effect in --debug builds.

* interpreter/FrameTracers.h:
(JSC::NativeCallFrameTracer::NativeCallFrameTracer):

Modified Paths

trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/interpreter/FrameTracers.h




Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (251138 => 251139)

--- trunk/Source/_javascript_Core/ChangeLog	2019-10-15 16:09:55 UTC (rev 251138)
+++ trunk/Source/_javascript_Core/ChangeLog	2019-10-15 16:35:05 UTC (rev 251139)
@@ -1,3 +1,16 @@
+2019-10-15  Angelos Oikonomopoulos  
+
+Interpreter: Don't assert that reference is nonnull
+https://bugs.webkit.org/show_bug.cgi?id=202986
+
+Reviewed by Keith Miller.
+
+G++ 9.2 can assume that the address of a reference is nonnull and
+emits multiple warnings to that effect in --debug builds.
+
+* interpreter/FrameTracers.h:
+(JSC::NativeCallFrameTracer::NativeCallFrameTracer):
+
 2019-10-14  Commit Queue  
 
 Unreviewed, rolling out r251090.


Modified: trunk/Source/_javascript_Core/interpreter/FrameTracers.h (251138 => 251139)

--- trunk/Source/_javascript_Core/interpreter/FrameTracers.h	2019-10-15 16:09:55 UTC (rev 251138)
+++ trunk/Source/_javascript_Core/interpreter/FrameTracers.h	2019-10-15 16:35:05 UTC (rev 251139)
@@ -85,7 +85,6 @@
 public:
 ALWAYS_INLINE NativeCallFrameTracer(VM& vm, CallFrame* callFrame)
 {
-ASSERT(&vm);
 ASSERT(callFrame);
 ASSERT(reinterpret_cast(callFrame) < reinterpret_cast(vm.topEntryFrame));
 assertStackPointerIsAligned();






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

[webkit-changes] [251140] branches/safari-608.3.10.0-branch/Source

Title: [251140] branches/safari-608.3.10.0-branch/Source








Revision 251140
Author alanc...@apple.com
Date 2019-10-15 09:40:44 -0700 (Tue, 15 Oct 2019)


Log Message
Versioning.

Modified Paths

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




Diff

Modified: branches/safari-608.3.10.0-branch/Source/_javascript_Core/Configurations/Version.xcconfig (251139 => 251140)

--- branches/safari-608.3.10.0-branch/Source/_javascript_Core/Configurations/Version.xcconfig	2019-10-15 16:35:05 UTC (rev 251139)
+++ branches/safari-608.3.10.0-branch/Source/_javascript_Core/Configurations/Version.xcconfig	2019-10-15 16:40:44 UTC (rev 251140)
@@ -25,7 +25,7 @@
 MINOR_VERSION = 3;
 TINY_VERSION = 10;
 MICRO_VERSION = 0;
-NANO_VERSION = 2;
+NANO_VERSION = 3;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION).$(NANO_VERSION);
 
 // The bundle version and short version string are set based on the current build configuration, see below.


Modified: branches/safari-608.3.10.0-branch/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig (251139 => 251140)

--- branches/safari-608.3.10.0-branch/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig	2019-10-15 16:35:05 UTC (rev 251139)
+++ branches/safari-608.3.10.0-branch/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig	2019-10-15 16:40:44 UTC (rev 251140)
@@ -25,7 +25,7 @@
 MINOR_VERSION = 3;
 TINY_VERSION = 10;
 MICRO_VERSION = 0;
-NANO_VERSION = 2;
+NANO_VERSION = 3;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION).$(NANO_VERSION);
 
 // The bundle version and short version string are set based on the current build configuration, see below.


Modified: branches/safari-608.3.10.0-branch/Source/WebCore/Configurations/Version.xcconfig (251139 => 251140)

--- branches/safari-608.3.10.0-branch/Source/WebCore/Configurations/Version.xcconfig	2019-10-15 16:35:05 UTC (rev 251139)
+++ branches/safari-608.3.10.0-branch/Source/WebCore/Configurations/Version.xcconfig	2019-10-15 16:40:44 UTC (rev 251140)
@@ -25,7 +25,7 @@
 MINOR_VERSION = 3;
 TINY_VERSION = 10;
 MICRO_VERSION = 0;
-NANO_VERSION = 2;
+NANO_VERSION = 3;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION).$(NANO_VERSION);
 
 // The bundle version and short version string are set based on the current build configuration, see below.


Modified: branches/safari-608.3.10.0-branch/Source/WebCore/PAL/Configurations/Version.xcconfig (251139 => 251140)

--- branches/safari-608.3.10.0-branch/Source/WebCore/PAL/Configurations/Version.xcconfig	2019-10-15 16:35:05 UTC (rev 251139)
+++ branches/safari-608.3.10.0-branch/Source/WebCore/PAL/Configurations/Version.xcconfig	2019-10-15 16:40:44 UTC (rev 251140)
@@ -25,7 +25,7 @@
 MINOR_VERSION = 3;
 TINY_VERSION = 10;
 MICRO_VERSION = 0;
-NANO_VERSION = 2;
+NANO_VERSION = 3;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION).$(NANO_VERSION);
 
 // The bundle version and short version string are set based on the current build configuration, see below.


Modified: branches/safari-608.3.10.0-branch/Source/WebInspectorUI/Configurations/Version.xcconfig (251139 => 251140)

--- branches/safari-608.3.10.0-branch/Source/WebInspectorUI/Configurations/Version.xcconfig	2019-10-15 16:35:05 UTC (rev 251139)
+++ branches/safari-608.3.10.0-branch/Source/WebInspectorUI/Configurations/Version.xcconfig	2019-10-15 16:40:44 UTC (rev 251140)
@@ -2,7 +2,7 @@
 MINOR_VERSION = 3;
 TINY_VERSION = 10;
 MICRO_VERSION = 0;
-NANO_VERSION = 2;
+NANO_VERSION = 3;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION).$(NANO_VERSION);
 
 // The system version prefix is based on the current system version.


Modified: branches/safari-608.3.10.0-branch/Source/WebKit/Configurations/Version.xcconfig (251139 => 251140)

--- branches/safari-608.3.10.0-branch/Source/WebKit/Configurations/Version.xcconfig	2019-10-15 16:35:05 UTC (rev 251139)
+++ branches/safari-608.3.10.0-branch/Source/WebKit/Configurations/Version.xcconfig	2019-10-15 16:40:44 UTC (rev 251140)
@@ -25,7 +25,7 @@
 MINOR_VERSION = 3;
 TINY_VERSION = 10;
 MICRO_VERSION = 0;
-NANO_VERSION = 2;
+NANO_VERSION = 3;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION).$(NANO_VERSION);
 
 // The bundle version and short version string are set based on the current build configuration, see below.


Modified: branches/saf

[webkit-changes] [251141] branches/safari-608.3.10.0-branch/Source/WebKit

Title: [251141] branches/safari-608.3.10.0-branch/Source/WebKit








Revision 251141
Author alanc...@apple.com
Date 2019-10-15 09:42:55 -0700 (Tue, 15 Oct 2019)


Log Message
Cherry-pick r250773. rdar://problem/56271907

WebPageProxy::updatePlayingMediaDidChange should protect from a null m_userMediaPermissionRequestManager
https://bugs.webkit.org/show_bug.cgi?id=202628


Reviewed by Eric Carlson.

On process swap on navigation or process crash, m_userMediaPermissionRequestManager is made null.
At the same time, the media state is set back to not playing.
Future calls of updatePlayingMediaDidChange should not have any capture state change until getUserMedia/getDisplayMedia
is called, which would create m_userMediaPermissionRequestManager.
But this assumption is not always true given that the media state is computed as process-wide in MediaStreamTrack::captureState on iOS.
The above behavior is fixed as part of https://bugs.webkit.org/show_bug.cgi?id=202627.
Since the call to updatePlayingMediaDidChange is triggered straight from IPC, it should not be trusted and a null check should be added.

* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::updatePlayingMediaDidChange):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@250773 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Modified Paths

branches/safari-608.3.10.0-branch/Source/WebKit/ChangeLog
branches/safari-608.3.10.0-branch/Source/WebKit/UIProcess/WebPageProxy.cpp




Diff

Modified: branches/safari-608.3.10.0-branch/Source/WebKit/ChangeLog (251140 => 251141)

--- branches/safari-608.3.10.0-branch/Source/WebKit/ChangeLog	2019-10-15 16:40:44 UTC (rev 251140)
+++ branches/safari-608.3.10.0-branch/Source/WebKit/ChangeLog	2019-10-15 16:42:55 UTC (rev 251141)
@@ -1,3 +1,46 @@
+2019-10-15  Alan Coon  
+
+Cherry-pick r250773. rdar://problem/56271907
+
+WebPageProxy::updatePlayingMediaDidChange should protect from a null m_userMediaPermissionRequestManager
+https://bugs.webkit.org/show_bug.cgi?id=202628
+
+
+Reviewed by Eric Carlson.
+
+On process swap on navigation or process crash, m_userMediaPermissionRequestManager is made null.
+At the same time, the media state is set back to not playing.
+Future calls of updatePlayingMediaDidChange should not have any capture state change until getUserMedia/getDisplayMedia
+is called, which would create m_userMediaPermissionRequestManager.
+But this assumption is not always true given that the media state is computed as process-wide in MediaStreamTrack::captureState on iOS.
+The above behavior is fixed as part of https://bugs.webkit.org/show_bug.cgi?id=202627.
+Since the call to updatePlayingMediaDidChange is triggered straight from IPC, it should not be trusted and a null check should be added.
+
+* UIProcess/WebPageProxy.cpp:
+(WebKit::WebPageProxy::updatePlayingMediaDidChange):
+
+
+git-svn-id: https://svn.webkit.org/repository/webkit/trunk@250773 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+2019-10-07  youenn fablet  
+
+WebPageProxy::updatePlayingMediaDidChange should protect from a null m_userMediaPermissionRequestManager
+https://bugs.webkit.org/show_bug.cgi?id=202628
+
+
+Reviewed by Eric Carlson.
+
+On process swap on navigation or process crash, m_userMediaPermissionRequestManager is made null.
+At the same time, the media state is set back to not playing.
+Future calls of updatePlayingMediaDidChange should not have any capture state change until getUserMedia/getDisplayMedia
+is called, which would create m_userMediaPermissionRequestManager.
+But this assumption is not always true given that the media state is computed as process-wide in MediaStreamTrack::captureState on iOS.
+The above behavior is fixed as part of https://bugs.webkit.org/show_bug.cgi?id=202627.
+Since the call to updatePlayingMediaDidChange is triggered straight from IPC, it should not be trusted and a null check should be added.
+
+* UIProcess/WebPageProxy.cpp:
+(WebKit::WebPageProxy::updatePlayingMediaDidChange):
+
 2019-10-08  Alan Coon  
 
 Cherry-pick r250438. rdar://problem/55984974


Modified: branches/safari-608.3.10.0-branch/Source/WebKit/UIProcess/WebPageProxy.cpp (251140 => 251141)

--- branches/safari-608.3.10.0-branch/Source/WebKit/UIProcess/WebPageProxy.cpp	2019-10-15 16:40:44 UTC (rev 251140)
+++ branches/safari-608.3.10.0-branch/Source/WebKit/UIProcess/WebPageProxy.cpp	2019-10-15 16:42:55 UTC (rev 251141)
@@ -8275,7 +8275,9 @@
 #if ENABLE(MEDIA_STREAM)
 if (oldMediaCaptureState != newMediaCaptureState) {
 m_uiClient->mediaCaptureStateDidChange(m_mediaState);
-m_userMediaPermissionRequestManager->captureStateChanged(oldMediaCaptureState, newMediaCaptureState);
+ASSERT(m_userMediaPermissionReques

[webkit-changes] [251142] trunk/Source

Title: [251142] trunk/Source








Revision 251142
Author cdu...@apple.com
Date 2019-10-15 09:56:13 -0700 (Tue, 15 Oct 2019)


Log Message
Stop using inheritance for WebBackForwardCacheEntry
https://bugs.webkit.org/show_bug.cgi?id=202989

Reviewed by Alex Christensen.

Source/WebCore:

* history/BackForwardItemIdentifier.h:
(WebCore::BackForwardItemIdentifier::operator bool const):

Source/WebKit:

Stop using inheritance for WebBackForwardCacheEntry. This simplifies the code a bit.

* Sources.txt:
* UIProcess/WebBackForwardCache.cpp:
(WebKit::WebBackForwardCache::addEntry):
(): Deleted.
* UIProcess/WebBackForwardCacheEntry.cpp: Copied from Source/WebKit/UIProcess/WebBackForwardCacheEntry.h.
(WebKit::WebBackForwardCacheEntry::WebBackForwardCacheEntry):
(WebKit::WebBackForwardCacheEntry::~WebBackForwardCacheEntry):
(WebKit::WebBackForwardCacheEntry::takeSuspendedPage):
(WebKit::WebBackForwardCacheEntry::process const):
* UIProcess/WebBackForwardCacheEntry.h:
(WebKit::WebBackForwardCacheEntry::suspendedPage const):
(WebKit::WebBackForwardCacheEntry::processIdentifier const):
(WebKit::WebBackForwardCacheEntry::WebBackForwardCacheEntry): Deleted.
* WebKit.xcodeproj/project.pbxproj:

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/history/BackForwardItemIdentifier.h
trunk/Source/WebKit/ChangeLog
trunk/Source/WebKit/Sources.txt
trunk/Source/WebKit/UIProcess/WebBackForwardCache.cpp
trunk/Source/WebKit/UIProcess/WebBackForwardCacheEntry.h
trunk/Source/WebKit/UIProcess/WebPasteboardProxy.cpp
trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj


Added Paths

trunk/Source/WebKit/UIProcess/WebBackForwardCacheEntry.cpp




Diff

Modified: trunk/Source/WebCore/ChangeLog (251141 => 251142)

--- trunk/Source/WebCore/ChangeLog	2019-10-15 16:42:55 UTC (rev 251141)
+++ trunk/Source/WebCore/ChangeLog	2019-10-15 16:56:13 UTC (rev 251142)
@@ -1,3 +1,13 @@
+2019-10-15  Chris Dumez  
+
+Stop using inheritance for WebBackForwardCacheEntry
+https://bugs.webkit.org/show_bug.cgi?id=202989
+
+Reviewed by Alex Christensen.
+
+* history/BackForwardItemIdentifier.h:
+(WebCore::BackForwardItemIdentifier::operator bool const):
+
 2019-10-15  Alex Christensen  
 
 Pass CORS-enabled schemes through WebProcess instead of having them NetworkProcess-global


Modified: trunk/Source/WebCore/history/BackForwardItemIdentifier.h (251141 => 251142)

--- trunk/Source/WebCore/history/BackForwardItemIdentifier.h	2019-10-15 16:42:55 UTC (rev 251141)
+++ trunk/Source/WebCore/history/BackForwardItemIdentifier.h	2019-10-15 16:56:13 UTC (rev 251142)
@@ -38,6 +38,7 @@
 ObjectIdentifier itemIdentifier;
 
 unsigned hash() const;
+explicit operator bool() const { return processIdentifier && itemIdentifier; }
 
 template void encode(Encoder&) const;
 template static Optional decode(Decoder&);


Modified: trunk/Source/WebKit/ChangeLog (251141 => 251142)

--- trunk/Source/WebKit/ChangeLog	2019-10-15 16:42:55 UTC (rev 251141)
+++ trunk/Source/WebKit/ChangeLog	2019-10-15 16:56:13 UTC (rev 251142)
@@ -1,3 +1,27 @@
+2019-10-15  Chris Dumez  
+
+Stop using inheritance for WebBackForwardCacheEntry
+https://bugs.webkit.org/show_bug.cgi?id=202989
+
+Reviewed by Alex Christensen.
+
+Stop using inheritance for WebBackForwardCacheEntry. This simplifies the code a bit.
+
+* Sources.txt:
+* UIProcess/WebBackForwardCache.cpp:
+(WebKit::WebBackForwardCache::addEntry):
+(): Deleted.
+* UIProcess/WebBackForwardCacheEntry.cpp: Copied from Source/WebKit/UIProcess/WebBackForwardCacheEntry.h.
+(WebKit::WebBackForwardCacheEntry::WebBackForwardCacheEntry):
+(WebKit::WebBackForwardCacheEntry::~WebBackForwardCacheEntry):
+(WebKit::WebBackForwardCacheEntry::takeSuspendedPage):
+(WebKit::WebBackForwardCacheEntry::process const):
+* UIProcess/WebBackForwardCacheEntry.h:
+(WebKit::WebBackForwardCacheEntry::suspendedPage const):
+(WebKit::WebBackForwardCacheEntry::processIdentifier const):
+(WebKit::WebBackForwardCacheEntry::WebBackForwardCacheEntry): Deleted.
+* WebKit.xcodeproj/project.pbxproj:
+
 2019-10-15  Alex Christensen  
 
 Pass CORS-enabled schemes through WebProcess instead of having them NetworkProcess-global


Modified: trunk/Source/WebKit/Sources.txt (251141 => 251142)

--- trunk/Source/WebKit/Sources.txt	2019-10-15 16:42:55 UTC (rev 251141)
+++ trunk/Source/WebKit/Sources.txt	2019-10-15 16:56:13 UTC (rev 251142)
@@ -262,6 +262,7 @@
 UIProcess/UserMediaProcessManager.cpp
 UIProcess/VisitedLinkStore.cpp
 UIProcess/WebBackForwardCache.cpp
+UIProcess/WebBackForwardCacheEntry.cpp
 UIProcess/WebBackForwardList.cpp
 UIProcess/WebColorPicker.cpp
 UIProcess/WebConnectionToWebProcess.cpp


Modified: trunk/Source/WebKit/UIProcess/WebBackForwardCache.cpp (251141 => 251142)

--- trunk/Source/WebKit/UIProcess/WebBackForwardCache.cpp	2019-10-15 16:42:55 UTC

[webkit-changes] [251143] branches/safari-608-branch/Source

Title: [251143] branches/safari-608-branch/Source








Revision 251143
Author alanc...@apple.com
Date 2019-10-15 10:10:23 -0700 (Tue, 15 Oct 2019)


Log Message
Versioning.

Modified Paths

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




Diff

Modified: branches/safari-608-branch/Source/_javascript_Core/Configurations/Version.xcconfig (251142 => 251143)

--- branches/safari-608-branch/Source/_javascript_Core/Configurations/Version.xcconfig	2019-10-15 16:56:13 UTC (rev 251142)
+++ branches/safari-608-branch/Source/_javascript_Core/Configurations/Version.xcconfig	2019-10-15 17:10:23 UTC (rev 251143)
@@ -23,7 +23,7 @@
 
 MAJOR_VERSION = 608;
 MINOR_VERSION = 4;
-TINY_VERSION = 1;
+TINY_VERSION = 2;
 MICRO_VERSION = 0;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION);


Modified: branches/safari-608-branch/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig (251142 => 251143)

--- branches/safari-608-branch/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig	2019-10-15 16:56:13 UTC (rev 251142)
+++ branches/safari-608-branch/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig	2019-10-15 17:10:23 UTC (rev 251143)
@@ -23,7 +23,7 @@
 
 MAJOR_VERSION = 608;
 MINOR_VERSION = 4;
-TINY_VERSION = 1;
+TINY_VERSION = 2;
 MICRO_VERSION = 0;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION);


Modified: branches/safari-608-branch/Source/WebCore/Configurations/Version.xcconfig (251142 => 251143)

--- branches/safari-608-branch/Source/WebCore/Configurations/Version.xcconfig	2019-10-15 16:56:13 UTC (rev 251142)
+++ branches/safari-608-branch/Source/WebCore/Configurations/Version.xcconfig	2019-10-15 17:10:23 UTC (rev 251143)
@@ -23,7 +23,7 @@
 
 MAJOR_VERSION = 608;
 MINOR_VERSION = 4;
-TINY_VERSION = 1;
+TINY_VERSION = 2;
 MICRO_VERSION = 0;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION);


Modified: branches/safari-608-branch/Source/WebCore/PAL/Configurations/Version.xcconfig (251142 => 251143)

--- branches/safari-608-branch/Source/WebCore/PAL/Configurations/Version.xcconfig	2019-10-15 16:56:13 UTC (rev 251142)
+++ branches/safari-608-branch/Source/WebCore/PAL/Configurations/Version.xcconfig	2019-10-15 17:10:23 UTC (rev 251143)
@@ -23,7 +23,7 @@
 
 MAJOR_VERSION = 608;
 MINOR_VERSION = 4;
-TINY_VERSION = 1;
+TINY_VERSION = 2;
 MICRO_VERSION = 0;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION);


Modified: branches/safari-608-branch/Source/WebInspectorUI/Configurations/Version.xcconfig (251142 => 251143)

--- branches/safari-608-branch/Source/WebInspectorUI/Configurations/Version.xcconfig	2019-10-15 16:56:13 UTC (rev 251142)
+++ branches/safari-608-branch/Source/WebInspectorUI/Configurations/Version.xcconfig	2019-10-15 17:10:23 UTC (rev 251143)
@@ -1,6 +1,6 @@
 MAJOR_VERSION = 608;
 MINOR_VERSION = 4;
-TINY_VERSION = 1;
+TINY_VERSION = 2;
 MICRO_VERSION = 0;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION);


Modified: branches/safari-608-branch/Source/WebKit/Configurations/Version.xcconfig (251142 => 251143)

--- branches/safari-608-branch/Source/WebKit/Configurations/Version.xcconfig	2019-10-15 16:56:13 UTC (rev 251142)
+++ branches/safari-608-branch/Source/WebKit/Configurations/Version.xcconfig	2019-10-15 17:10:23 UTC (rev 251143)
@@ -23,7 +23,7 @@
 
 MAJOR_VERSION = 608;
 MINOR_VERSION = 4;
-TINY_VERSION = 1;
+TINY_VERSION = 2;
 MICRO_VERSION = 0;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION);


Modified: branches/safari-608-branch/Source/WebKitLegacy/mac/Configurations/Version.xcconfig (251142 => 251143)

--- branches/safari-608-branch/Source/WebKitLegacy/mac/Configurations/Version.xcconfig	2019-10-15 16:56:13 UTC (rev 251142)
+++ branches/safari-608-branch/Source/WebKitLegacy/mac/Configurations/Version.xcconfig	2019-10-15 17:10:23 UTC (rev 251143)
@@ -23,7 +23,7 @@
 
 MAJOR_VERSION = 608;
 MINOR_VERSION = 4;
-TINY_VERSION = 1;
+TINY_VERSION = 2;
 MICRO_VERSION = 0;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION);






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

[webkit-changes] [251145] trunk/LayoutTests

2019-10-15 Thread dino

Title: [251145] trunk/LayoutTests








Revision 251145
Author d...@apple.com
Date 2019-10-15 10:16:05 -0700 (Tue, 15 Oct 2019)


Log Message
Reset maxCanvasPixelMemory between tests
https://bugs.webkit.org/show_bug.cgi?id=202941


Attempt to fix flakiness.

* fast/canvas/canvas-too-large-to-draw-expected.txt:
* fast/canvas/canvas-too-large-to-draw.html:

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/LayoutTests/fast/canvas/canvas-too-large-to-draw-expected.txt
trunk/LayoutTests/fast/canvas/canvas-too-large-to-draw.html




Diff

Modified: trunk/LayoutTests/ChangeLog (251144 => 251145)

--- trunk/LayoutTests/ChangeLog	2019-10-15 17:15:40 UTC (rev 251144)
+++ trunk/LayoutTests/ChangeLog	2019-10-15 17:16:05 UTC (rev 251145)
@@ -1,3 +1,14 @@
+2019-10-15  Dean Jackson  
+
+Reset maxCanvasPixelMemory between tests
+https://bugs.webkit.org/show_bug.cgi?id=202941
+
+
+Attempt to fix flakiness.
+
+* fast/canvas/canvas-too-large-to-draw-expected.txt:
+* fast/canvas/canvas-too-large-to-draw.html:
+
 2019-10-15  Wenson Hsieh  
 
 [Clipboard API] Implement getType() for ClipboardItems created from bindings


Modified: trunk/LayoutTests/fast/canvas/canvas-too-large-to-draw-expected.txt (251144 => 251145)

--- trunk/LayoutTests/fast/canvas/canvas-too-large-to-draw-expected.txt	2019-10-15 17:15:40 UTC (rev 251144)
+++ trunk/LayoutTests/fast/canvas/canvas-too-large-to-draw-expected.txt	2019-10-15 17:16:05 UTC (rev 251145)
@@ -1,4 +1,4 @@
-CONSOLE MESSAGE: line 33: Total canvas memory use exceeds the maximum limit (15 MB).
+CONSOLE MESSAGE: line 31: Total canvas memory use exceeds the maximum limit (15 MB).
 This test requires Internals.
 
  


Modified: trunk/LayoutTests/fast/canvas/canvas-too-large-to-draw.html (251144 => 251145)

--- trunk/LayoutTests/fast/canvas/canvas-too-large-to-draw.html	2019-10-15 17:15:40 UTC (rev 251144)
+++ trunk/LayoutTests/fast/canvas/canvas-too-large-to-draw.html	2019-10-15 17:16:05 UTC (rev 251145)
@@ -23,8 +23,6 @@
 const MAX_WIDTH = 2000;
 const MAX_HEIGHT = MAX_WIDTH;
 
-window.internals.setMaxCanvasPixelMemory(MAX_WIDTH * MAX_HEIGHT * 4);
-
 function fillCanvas(id, width, height) {
 const canvas = document.getElementById(id);
 canvas.width = width;
@@ -41,6 +39,8 @@
 // This one should always work.
 fillCanvas("canvas2", 10, 10);
 
+window.internals.setMaxCanvasPixelMemory(MAX_WIDTH * MAX_HEIGHT * 4);
+
 // And this one should exceed the memory limit.
 fillCanvas("canvas1", MAX_WIDTH + 1, MAX_HEIGHT + 1);
 }






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

[webkit-changes] [251144] trunk/Source/WebInspectorUI

2019-10-15 Thread drousso

Title: [251144] trunk/Source/WebInspectorUI








Revision 251144
Author drou...@apple.com
Date 2019-10-15 10:15:40 -0700 (Tue, 15 Oct 2019)


Log Message
Web Inspector: Local Resource Overrides: automatically create an image/font local override when dragging content over a non-overridden resource
https://bugs.webkit.org/show_bug.cgi?id=202957

Reviewed by Joseph Pecoraro.

Since non-text resources aren't editable, some users of local resource overrides kept trying
to drag image/font files over the actual resource content view (not the local override),
which didn't do anything. Rather than having to click "Create Local Override" and then do a
drag/drop, we should support the "shorter" workflow of drag/drop over the actual resource.

* UserInterface/Base/FileUtilities.js:
(WI.FileUtilities.import): Added.
(WI.FileUtilities.importText):
(WI.FileUtilities.importJSON):
(WI.FileUtilities.importData): Added.
(WI.FileUtilities.async readText):
(WI.FileUtilities.async readJSON):
(WI.FileUtilities.async readData): Added.
(WI.FileUtilities.async _read): Added.
Create utility functions for importing non-text content as data.
Drive-by: fix a bug in the `import*` functions where the `callback` would be bound on the
  first call, meaning that since the `` was cached for all calls, we'd only
  ever use the first `callback` in subsequent calls.

* UserInterface/Views/DropZoneView.js:
(WI.DropZoneView):
(WI.DropZoneView.prototype.set text): Added.
Support the text content of the drop zone changing after it's initialized.

* UserInterface/Views/FontResourceContentView.js:
(WI.FontResourceContentView):
(WI.FontResourceContentView.prototype.contentAvailable):
(WI.FontResourceContentView.prototype.dropZoneHandleDragEnter): Added.
(WI.FontResourceContentView.prototype.dropZoneHandleDrop):
(WI.FontResourceContentView.prototype._handleLocalResourceContentDidChange): Added.
* UserInterface/Views/ImageResourceContentView.js:
(WI.ImageResourceContentView):
(WI.ImageResourceContentView.prototype.contentAvailable):
(WI.ImageResourceContentView.prototype.dropZoneHandleDragEnter): Added.
(WI.ImageResourceContentView.prototype.dropZoneHandleDrop):
(WI.ImageResourceContentView.prototype._handleLocalResourceContentDidChange): Added.
Support drag/drop on non-override image/font content views, which will create/update the
local resource override for that resource.

* UserInterface/Views/ResourceContentView.js:
(WI.ResourceContentView):
(WI.ResourceContentView.prototype.get navigationItems):
(WI.ResourceContentView.prototype._handleImportLocalResourceOverride): Added.
When viewing a local resource override, add an "Import" navigation item for non-drag/drop
updating of the contents of the local resource override. This is also exposed for text-based
local resource overrides, since drag/drop inserts the contents of the file (if it's text),
which attempts to determine whether the dropped file is text or data based on the MIME type.

* UserInterface/Views/AuditNavigationSidebarPanel.js:
(WI.AuditNavigationSidebarPanel.prototype._handleImportButtonNavigationItemClicked):
* UserInterface/Views/CanvasOverviewContentView.js:
(WI.CanvasOverviewContentView.prototype._handleImportButtonNavigationItemClicked):
* UserInterface/Views/CanvasSidebarPanel.js:
(WI.CanvasSidebarPanel.prototype._handleImportButtonNavigationItemClicked):
* UserInterface/Views/HeapAllocationsTimelineView.js:
(WI.HeapAllocationsTimelineView.prototype._importButtonNavigationItemClicked):
* UserInterface/Views/NetworkTableContentView.js:
(WI.NetworkTableContentView.prototype._importHAR):
* UserInterface/Views/TimelineRecordingContentView.js:
(WI.TimelineRecordingContentView.prototype._importButtonNavigationItemClicked):
Explicitly allow multiple files to be imported at the same time.

* UserInterface/Base/BlobUtilities.js:
(WI.BlobUtilities.blobForContent):
Drive-by: remove extra `base64Encoded` argument when calling `decodeBase64ToBlob`, which
  caused SVG-based image local resource overrides to show a broken image when
  closing and reopening Web Inspector.

* Localizations/en.lproj/localizedStrings.js:

Modified Paths

trunk/Source/WebInspectorUI/ChangeLog
trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js
trunk/Source/WebInspectorUI/UserInterface/Base/BlobUtilities.js
trunk/Source/WebInspectorUI/UserInterface/Base/FileUtilities.js
trunk/Source/WebInspectorUI/UserInterface/Views/AuditNavigationSidebarPanel.js
trunk/Source/WebInspectorUI/UserInterface/Views/CanvasOverviewContentView.js
trunk/Source/WebInspectorUI/UserInterface/Views/CanvasSidebarPanel.js
trunk/Source/WebInspectorUI/UserInterface/Views/DropZoneView.js
trunk/Source/WebInspectorUI/UserInterface/Views/FontResourceContentView.js
trunk/Source/WebInspectorUI/UserInterface/Views/HeapAllocationsTimelineView.js
trunk/Source/WebInspectorUI/UserInterface/Views/ImageResourceContentView.js
trunk/Source/WebInspectorUI/UserInterface/Views/NetworkTableContentView.js
trunk/Source/

[webkit-changes] [251146] trunk/Source

2019-10-15 Thread achristensen

Title: [251146] trunk/Source








Revision 251146
Author achristen...@apple.com
Date 2019-10-15 10:19:08 -0700 (Tue, 15 Oct 2019)


Log Message
Unreviewed, rolling out r251138.

Broke API tests

Reverted changeset:

"Pass CORS-enabled schemes through WebProcess instead of
having them NetworkProcess-global"
https://bugs.webkit.org/show_bug.cgi?id=202891
https://trac.webkit.org/changeset/251138

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/LegacySchemeRegistry.cpp
trunk/Source/WebCore/platform/LegacySchemeRegistry.h
trunk/Source/WebKit/ChangeLog
trunk/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp
trunk/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.h
trunk/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.messages.in
trunk/Source/WebKit/NetworkProcess/NetworkLoadChecker.cpp
trunk/Source/WebKit/NetworkProcess/NetworkLoadChecker.h
trunk/Source/WebKit/NetworkProcess/NetworkProcess.cpp
trunk/Source/WebKit/NetworkProcess/NetworkProcess.messages.in
trunk/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.cpp
trunk/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.h
trunk/Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp
trunk/Source/WebKit/NetworkProcess/PingLoad.cpp
trunk/Source/WebKit/NetworkProcess/PingLoad.h
trunk/Source/WebKit/Sources.txt
trunk/Source/WebKit/UIProcess/WebProcessPool.cpp
trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj
trunk/Source/WebKit/WebProcess/WebProcess.cpp
trunk/Source/WebKit/WebProcess/WebProcess.h


Removed Paths

trunk/Source/WebKit/NetworkProcess/NetworkSchemeRegistry.cpp
trunk/Source/WebKit/NetworkProcess/NetworkSchemeRegistry.h




Diff

Modified: trunk/Source/WebCore/ChangeLog (251145 => 251146)

--- trunk/Source/WebCore/ChangeLog	2019-10-15 17:16:05 UTC (rev 251145)
+++ trunk/Source/WebCore/ChangeLog	2019-10-15 17:19:08 UTC (rev 251146)
@@ -1,3 +1,16 @@
+2019-10-15  Alex Christensen  
+
+Unreviewed, rolling out r251138.
+
+Broke API tests
+
+Reverted changeset:
+
+"Pass CORS-enabled schemes through WebProcess instead of
+having them NetworkProcess-global"
+https://bugs.webkit.org/show_bug.cgi?id=202891
+https://trac.webkit.org/changeset/251138
+
 2019-10-15  Chris Dumez  
 
 Stop using inheritance for WebBackForwardCacheEntry


Modified: trunk/Source/WebCore/platform/LegacySchemeRegistry.cpp (251145 => 251146)

--- trunk/Source/WebCore/platform/LegacySchemeRegistry.cpp	2019-10-15 17:16:05 UTC (rev 251145)
+++ trunk/Source/WebCore/platform/LegacySchemeRegistry.cpp	2019-10-15 17:19:08 UTC (rev 251146)
@@ -26,7 +26,6 @@
 #include "config.h"
 #include "LegacySchemeRegistry.h"
 
-#include "RuntimeApplicationChecks.h"
 #include 
 #include 
 #include 
@@ -422,7 +421,6 @@
 
 void LegacySchemeRegistry::registerURLSchemeAsCORSEnabled(const String& scheme)
 {
-ASSERT(!isInNetworkProcess());
 if (scheme.isNull())
 return;
 CORSEnabledSchemes().add(scheme);
@@ -430,16 +428,9 @@
 
 bool LegacySchemeRegistry::shouldTreatURLSchemeAsCORSEnabled(const String& scheme)
 {
-ASSERT(!isInNetworkProcess());
 return !scheme.isNull() && CORSEnabledSchemes().contains(scheme);
 }
 
-Vector LegacySchemeRegistry::allURLSchemesRegisteredAsCORSEnabled()
-{
-ASSERT(!isInNetworkProcess());
-return copyToVector(CORSEnabledSchemes());
-}
-
 void LegacySchemeRegistry::registerURLSchemeAsBypassingContentSecurityPolicy(const String& scheme)
 {
 if (scheme.isNull())


Modified: trunk/Source/WebCore/platform/LegacySchemeRegistry.h (251145 => 251146)

--- trunk/Source/WebCore/platform/LegacySchemeRegistry.h	2019-10-15 17:16:05 UTC (rev 251145)
+++ trunk/Source/WebCore/platform/LegacySchemeRegistry.h	2019-10-15 17:19:08 UTC (rev 251146)
@@ -81,7 +81,6 @@
 // Allow non-HTTP schemes to be registered to allow CORS requests.
 WEBCORE_EXPORT static void registerURLSchemeAsCORSEnabled(const String& scheme);
 WEBCORE_EXPORT static bool shouldTreatURLSchemeAsCORSEnabled(const String& scheme);
-WEBCORE_EXPORT static Vector allURLSchemesRegisteredAsCORSEnabled();
 
 // Allow resources from some schemes to load on a page, regardless of its
 // Content Security Policy.


Modified: trunk/Source/WebKit/ChangeLog (251145 => 251146)

--- trunk/Source/WebKit/ChangeLog	2019-10-15 17:16:05 UTC (rev 251145)
+++ trunk/Source/WebKit/ChangeLog	2019-10-15 17:19:08 UTC (rev 251146)
@@ -1,3 +1,16 @@
+2019-10-15  Alex Christensen  
+
+Unreviewed, rolling out r251138.
+
+Broke API tests
+
+Reverted changeset:
+
+"Pass CORS-enabled schemes through WebProcess instead of
+having them NetworkProcess-global"
+https://bugs.webkit.org/show_bug.cgi?id=202891
+https://trac.webkit.org/changeset/251138
+
 2019-10-15  Chris Dumez  
 
 Stop using inheritance for WebBackForwardCacheEntry


Modified: trunk/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp (2

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

Title: [251147] trunk/Source/WebCore








Revision 251147
Author za...@apple.com
Date 2019-10-15 10:31:35 -0700 (Tue, 15 Oct 2019)


Log Message
[LFC][TFC] Add support for colgroup/col
https://bugs.webkit.org/show_bug.cgi?id=202991


Reviewed by Antti Koivisto.

This patch sets up the column context when  is present. This is in preparation for using 's width to adjust the preferred width on table columns.

* layout/layouttree/LayoutTreeBuilder.cpp:
(WebCore::Layout::TreeBuilder::createLayoutBox):
* layout/tableformatting/TableFormattingContext.cpp:
(WebCore::Layout::TableFormattingContext::ensureTableGrid):
* layout/tableformatting/TableGrid.cpp:
(WebCore::Layout::TableGrid::Column::Column):
(WebCore::Layout::TableGrid::ColumnsContext::addColumn):
* layout/tableformatting/TableGrid.h:

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/layout/layouttree/LayoutTreeBuilder.cpp
trunk/Source/WebCore/layout/tableformatting/TableFormattingContext.cpp
trunk/Source/WebCore/layout/tableformatting/TableGrid.cpp
trunk/Source/WebCore/layout/tableformatting/TableGrid.h




Diff

Modified: trunk/Source/WebCore/ChangeLog (251146 => 251147)

--- trunk/Source/WebCore/ChangeLog	2019-10-15 17:19:08 UTC (rev 251146)
+++ trunk/Source/WebCore/ChangeLog	2019-10-15 17:31:35 UTC (rev 251147)
@@ -1,3 +1,22 @@
+2019-10-15  Zalan Bujtas  
+
+[LFC][TFC] Add support for colgroup/col
+https://bugs.webkit.org/show_bug.cgi?id=202991
+
+
+Reviewed by Antti Koivisto.
+
+This patch sets up the column context when  is present. This is in preparation for using 's width to adjust the preferred width on table columns.
+
+* layout/layouttree/LayoutTreeBuilder.cpp:
+(WebCore::Layout::TreeBuilder::createLayoutBox):
+* layout/tableformatting/TableFormattingContext.cpp:
+(WebCore::Layout::TableFormattingContext::ensureTableGrid):
+* layout/tableformatting/TableGrid.cpp:
+(WebCore::Layout::TableGrid::Column::Column):
+(WebCore::Layout::TableGrid::ColumnsContext::addColumn):
+* layout/tableformatting/TableGrid.h:
+
 2019-10-15  Alex Christensen  
 
 Unreviewed, rolling out r251138.


Modified: trunk/Source/WebCore/layout/layouttree/LayoutTreeBuilder.cpp (251146 => 251147)

--- trunk/Source/WebCore/layout/layouttree/LayoutTreeBuilder.cpp	2019-10-15 17:19:08 UTC (rev 251146)
+++ trunk/Source/WebCore/layout/layouttree/LayoutTreeBuilder.cpp	2019-10-15 17:31:35 UTC (rev 251147)
@@ -187,9 +187,12 @@
 childLayoutBox = makeUnique(elementAttributes(renderer), RenderStyle::clone(renderer.style()));
 } else if (displayType == DisplayType::TableColumn) {
 childLayoutBox = makeUnique(elementAttributes(renderer), RenderStyle::clone(renderer.style()));
-auto columnWidth = static_cast(*renderer.element()).width();
+auto& tableColElement = static_cast(*renderer.element());
+auto columnWidth = tableColElement.width();
 if (!columnWidth.isEmpty())
 childLayoutBox->setColumnWidth(columnWidth.toInt());
+if (tableColElement.span() > 1)
+childLayoutBox->setColumnSpan(tableColElement.span());
 } else {
 ASSERT_NOT_IMPLEMENTED_YET();
 return { };


Modified: trunk/Source/WebCore/layout/tableformatting/TableFormattingContext.cpp (251146 => 251147)

--- trunk/Source/WebCore/layout/tableformatting/TableFormattingContext.cpp	2019-10-15 17:19:08 UTC (rev 251146)
+++ trunk/Source/WebCore/layout/tableformatting/TableFormattingContext.cpp	2019-10-15 17:31:35 UTC (rev 251147)
@@ -168,7 +168,32 @@
 tableGrid.setHorizontalSpacing(LayoutUnit { tableWrapperBox.style().horizontalBorderSpacing() });
 tableGrid.setVerticalSpacing(LayoutUnit { tableWrapperBox.style().verticalBorderSpacing() });
 
-for (auto* section = tableWrapperBox.firstChild(); section; section = section->nextSibling()) {
+auto* firstChild = tableWrapperBox.firstChild();
+const Box* tableCaption = nullptr;
+const Box* colgroup = nullptr;
+// Table caption is an optional element; if used, it is always the first child of a .
+if (firstChild->isTableCaption())
+tableCaption = firstChild;
+// The  must appear after any optional  element but before any , , ,  and  element.
+auto* colgroupCandidate = firstChild;
+if (tableCaption)
+colgroupCandidate = tableCaption->nextSibling();
+if (colgroupCandidate->isTableColumnGroup())
+colgroup = colgroupCandidate;
+
+if (colgroup) {
+auto& columnsContext = tableGrid.columnsContext();
+for (auto* column = downcast(*colgroup).firstChild(); column; column = column->nextSibling()) {
+ASSERT(column->isTableColumn());
+auto columnSpanCount = column->columnSpan();
+ASSERT(columnSpanCount > 0);
+while (columnSpanCount--)
+columnsContext.addColumn(column);
+

[webkit-changes] [251148] trunk/Tools

2019-10-15 Thread jiewen_tan

Title: [251148] trunk/Tools








Revision 251148
Author jiewen_...@apple.com
Date 2019-10-15 11:21:52 -0700 (Tue, 15 Oct 2019)


Log Message
[WebAuthn] Write more tests for _WKWebAuthenticationPanel
https://bugs.webkit.org/show_bug.cgi?id=202565


Reviewed by Brent Fulgham.

* TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj:
* TestWebKitAPI/Tests/WebKitCocoa/_WKWebAuthenticationPanel.mm:
(-[TestWebAuthenticationPanelDelegate panel:dismissWebAuthenticationPanelWithResult:]):
(-[TestWebAuthenticationPanelUIDelegate init]):
(-[TestWebAuthenticationPanelUIDelegate webView:runWebAuthenticationPanel:initiatedByFrame:completionHandler:]):
(TestWebKitAPI::TEST):
* TestWebKitAPI/Tests/WebKitCocoa/web-authentication-get-assertion-hid.html: Added.
* TestWebKitAPI/Tests/WebKitCocoa/web-authentication-get-assertion-nfc.html: Added.

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj
trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/_WKWebAuthenticationPanel.mm


Added Paths

trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/web-authentication-get-assertion-hid.html
trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/web-authentication-get-assertion-nfc.html




Diff

Modified: trunk/Tools/ChangeLog (251147 => 251148)

--- trunk/Tools/ChangeLog	2019-10-15 17:31:35 UTC (rev 251147)
+++ trunk/Tools/ChangeLog	2019-10-15 18:21:52 UTC (rev 251148)
@@ -1,3 +1,20 @@
+2019-10-15  Jiewen Tan  
+
+[WebAuthn] Write more tests for _WKWebAuthenticationPanel
+https://bugs.webkit.org/show_bug.cgi?id=202565
+
+
+Reviewed by Brent Fulgham.
+
+* TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj:
+* TestWebKitAPI/Tests/WebKitCocoa/_WKWebAuthenticationPanel.mm:
+(-[TestWebAuthenticationPanelDelegate panel:dismissWebAuthenticationPanelWithResult:]):
+(-[TestWebAuthenticationPanelUIDelegate init]):
+(-[TestWebAuthenticationPanelUIDelegate webView:runWebAuthenticationPanel:initiatedByFrame:completionHandler:]):
+(TestWebKitAPI::TEST):
+* TestWebKitAPI/Tests/WebKitCocoa/web-authentication-get-assertion-hid.html: Added.
+* TestWebKitAPI/Tests/WebKitCocoa/web-authentication-get-assertion-nfc.html: Added.
+
 2019-10-15  Alex Christensen  
 
 Pass CORS-enabled schemes through WebProcess instead of having them NetworkProcess-global


Modified: trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj (251147 => 251148)

--- trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj	2019-10-15 17:31:35 UTC (rev 251147)
+++ trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj	2019-10-15 18:21:52 UTC (rev 251148)
@@ -336,6 +336,8 @@
 		57599E281F071AA000A3FB8C /* IndexedDBStructuredCloneBackwardCompatibility.sqlite3-shm in Copy Resources */ = {isa = PBXBuildFile; fileRef = 57599E261F07192C00A3FB8C /* IndexedDBStructuredCloneBackwardCompatibility.sqlite3-shm */; };
 		57599E2A1F071AA000A3FB8C /* IndexedDBStructuredCloneBackwardCompatibilityRead.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = 57599E251F07192C00A3FB8C /* IndexedDBStructuredCloneBackwardCompatibilityRead.html */; };
 		57599E2B1F071AA000A3FB8C /* IndexedDBStructuredCloneBackwardCompatibilityWrite.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = 57599E231F07192C00A3FB8C /* IndexedDBStructuredCloneBackwardCompatibilityWrite.html */; };
+		57663DEA234EA66D00E85E09 /* web-authentication-get-assertion-nfc.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = 57663DE9234EA60B00E85E09 /* web-authentication-get-assertion-nfc.html */; };
+		57663DEC234F1F9300E85E09 /* web-authentication-get-assertion-hid.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = 57663DEB234F1F8000E85E09 /* web-authentication-get-assertion-hid.html */; };
 		5769C50B1D9B0002000847FB /* SerializedCryptoKeyWrap.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5769C50A1D9B0001000847FB /* SerializedCryptoKeyWrap.mm */; };
 		5774AA6821FBBF7800AF2A1B /* TestSOAuthorization.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5774AA6721FBBF7800AF2A1B /* TestSOAuthorization.mm */; };
 		5778D05622110A2600899E3B /* LoadWebArchive.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5778D05522110A2600899E3B /* LoadWebArchive.mm */; };
@@ -1439,6 +1441,8 @@
 CDC8E4971BC6F10800594FEC /* video-without-audio.mp4 in Copy Resources */,
 2EBD9D0A2134730D002DA758 /* video.html in Copy Resources */,
 CD577799211CE0E4001B371E /* web-audio-only.html in Copy Resources */,
+57663DEC234F1F9300E85E09 /* web-authentication-get-assertion-hid.html in Copy Resources */,
+57663DEA234EA66D00E85E09 /* web-authentication-get-assertion-nfc.html in Copy Resources */,
 57C624502346C21E00383FE7 /* web-authentication-get-assertion.html in Copy Resources */,
 1C2B81861C89259D00A5529F /* webfont.html in Copy Resources */,
 51714EB41CF8C78C004723C4 /* WebProcessKillIDBCleanup-1.html in Copy Resources */,
@@ -1856,6 +1860,8 @@

[webkit-changes] [251149] trunk

Title: [251149] trunk








Revision 251149
Author wenson_hs...@apple.com
Date 2019-10-15 11:38:00 -0700 (Tue, 15 Oct 2019)


Log Message
REGRESSION: editing/async-clipboard/clipboard-interfaces.html is failing in WebKit1
https://bugs.webkit.org/show_bug.cgi?id=202940


Reviewed by Ryosuke Niwa.

Source/WebKitLegacy/win:

Add support for the asyncClipboardAPIEnabled feature flag in legacy WebKit on Windows.

* Interfaces/IWebPreferencesPrivate.idl:
* WebPreferenceKeysPrivate.h:
* WebPreferences.cpp:
(WebPreferences::initializeDefaultSettings):
(WebPreferences::asyncClipboardAPIEnabled):
(WebPreferences::setAsyncClipboardAPIEnabled):
* WebPreferences.h:
* WebView.cpp:
(WebView::notifyPreferencesChanged):

Tools:

Add some plumbing to support the async clipboard API experimental test option in Windows.

* DumpRenderTree/win/DumpRenderTree.cpp:
(setWebPreferencesForTestOptions):

LayoutTests:

* editing/async-clipboard/clipboard-interfaces.html:
* editing/async-clipboard/clipboard-item-basic.html:
* editing/async-clipboard/clipboard-wrapper-stays-alive.html:

Tweak a few layout tests to actually turn the experimental feature on (this previously worked because
experimental feature flags are already on by default in WebKit2).

* platform/ios-wk1/TestExpectations:
* platform/mac-wk1/TestExpectations:
* platform/win/TestExpectations:

Unskip and unmark these layout tests as failing in WebKit1 on iOS, macOS, and Windows.

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/LayoutTests/editing/async-clipboard/clipboard-interfaces.html
trunk/LayoutTests/editing/async-clipboard/clipboard-item-basic.html
trunk/LayoutTests/editing/async-clipboard/clipboard-wrapper-stays-alive.html
trunk/LayoutTests/platform/ios-wk1/TestExpectations
trunk/LayoutTests/platform/mac-wk1/TestExpectations
trunk/LayoutTests/platform/win/TestExpectations
trunk/Source/WebKitLegacy/mac/WebView/WebPreferenceKeysPrivate.h
trunk/Source/WebKitLegacy/mac/WebView/WebPreferences.mm
trunk/Source/WebKitLegacy/mac/WebView/WebPreferencesPrivate.h
trunk/Source/WebKitLegacy/mac/WebView/WebView.mm
trunk/Source/WebKitLegacy/win/ChangeLog
trunk/Source/WebKitLegacy/win/Interfaces/IWebPreferencesPrivate.idl
trunk/Source/WebKitLegacy/win/WebPreferenceKeysPrivate.h
trunk/Source/WebKitLegacy/win/WebPreferences.cpp
trunk/Source/WebKitLegacy/win/WebPreferences.h
trunk/Source/WebKitLegacy/win/WebView.cpp
trunk/Tools/ChangeLog
trunk/Tools/DumpRenderTree/TestOptions.cpp
trunk/Tools/DumpRenderTree/TestOptions.h
trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm
trunk/Tools/DumpRenderTree/win/DumpRenderTree.cpp




Diff

Modified: trunk/LayoutTests/ChangeLog (251148 => 251149)

--- trunk/LayoutTests/ChangeLog	2019-10-15 18:21:52 UTC (rev 251148)
+++ trunk/LayoutTests/ChangeLog	2019-10-15 18:38:00 UTC (rev 251149)
@@ -1,3 +1,24 @@
+2019-10-15  Wenson Hsieh  
+
+REGRESSION: editing/async-clipboard/clipboard-interfaces.html is failing in WebKit1
+https://bugs.webkit.org/show_bug.cgi?id=202940
+
+
+Reviewed by Ryosuke Niwa.
+
+* editing/async-clipboard/clipboard-interfaces.html:
+* editing/async-clipboard/clipboard-item-basic.html:
+* editing/async-clipboard/clipboard-wrapper-stays-alive.html:
+
+Tweak a few layout tests to actually turn the experimental feature on (this previously worked because
+experimental feature flags are already on by default in WebKit2).
+
+* platform/ios-wk1/TestExpectations:
+* platform/mac-wk1/TestExpectations:
+* platform/win/TestExpectations:
+
+Unskip and unmark these layout tests as failing in WebKit1 on iOS, macOS, and Windows.
+
 2019-10-15  Dean Jackson  
 
 Reset maxCanvasPixelMemory between tests


Modified: trunk/LayoutTests/editing/async-clipboard/clipboard-interfaces.html (251148 => 251149)

--- trunk/LayoutTests/editing/async-clipboard/clipboard-interfaces.html	2019-10-15 18:21:52 UTC (rev 251148)
+++ trunk/LayoutTests/editing/async-clipboard/clipboard-interfaces.html	2019-10-15 18:38:00 UTC (rev 251149)
@@ -1,4 +1,4 @@
- 
+

[webkit-changes] [251150] trunk/Tools

2019-10-15 Thread jbedard

Title: [251150] trunk/Tools








Revision 251150
Author jbed...@apple.com
Date 2019-10-15 12:13:35 -0700 (Tue, 15 Oct 2019)


Log Message
results.webkit.org: Add os version to various unix ports
https://bugs.webkit.org/show_bug.cgi?id=202955

Rubber-stamped by Aakash Jain.

* Scripts/webkitpy/common/system/platforminfo.py:
(PlatformInfo.__init__): Use platform.release() to defined the os_version.

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/Scripts/webkitpy/common/system/platforminfo.py




Diff

Modified: trunk/Tools/ChangeLog (251149 => 251150)

--- trunk/Tools/ChangeLog	2019-10-15 18:38:00 UTC (rev 251149)
+++ trunk/Tools/ChangeLog	2019-10-15 19:13:35 UTC (rev 251150)
@@ -1,3 +1,13 @@
+2019-10-15  Jonathan Bedard  
+
+results.webkit.org: Add os version to various unix ports
+https://bugs.webkit.org/show_bug.cgi?id=202955
+
+Rubber-stamped by Aakash Jain.
+
+* Scripts/webkitpy/common/system/platforminfo.py:
+(PlatformInfo.__init__): Use platform.release() to defined the os_version.
+
 2019-10-15  Wenson Hsieh  
 
 REGRESSION: editing/async-clipboard/clipboard-interfaces.html is failing in WebKit1


Modified: trunk/Tools/Scripts/webkitpy/common/system/platforminfo.py (251149 => 251150)

--- trunk/Tools/Scripts/webkitpy/common/system/platforminfo.py	2019-10-15 18:38:00 UTC (rev 251149)
+++ trunk/Tools/Scripts/webkitpy/common/system/platforminfo.py	2019-10-15 19:13:35 UTC (rev 251150)
@@ -27,6 +27,7 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+import logging
 import re
 import sys
 
@@ -35,6 +36,9 @@
 from webkitpy.common.system.executive import Executive
 
 
+_log = logging.getLogger(__name__)
+
+
 class PlatformInfo(object):
 MAX = 2147483647
 
@@ -62,11 +66,13 @@
 self.os_version = Version.from_string(platform_module.mac_ver()[0])
 elif self.os_name.startswith('win'):
 self.os_version = self._win_version()
-elif self.os_name == 'linux' or self.os_name == 'freebsd' or self.os_name == 'openbsd' or self.os_name == 'netbsd':
-return
 else:
 # Most other platforms (namely iOS) return conforming version strings.
-self.os_version = Version.from_string(platform_module.release())
+version = re.search(r'\d+.\d+.\d+', platform_module.release())
+if version:
+self.os_version = Version.from_string(version.group(0))
+else:
+_log.debug('No OS version number found')
 
 def is_mac(self):
 return self.os_name == 'mac'






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

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

Title: [251151] trunk/Source/WebCore








Revision 251151
Author za...@apple.com
Date 2019-10-15 12:29:24 -0700 (Tue, 15 Oct 2019)


Log Message
[LFC][TFC] Use  to adjust the preferred column width.
https://bugs.webkit.org/show_bug.cgi?id=202997


Reviewed by Antti Koivisto.

The  elment can set the preferred width on the table column. Let's take these values into account while computing the preferred width for columns.

* layout/tableformatting/TableFormattingContext.cpp:
(WebCore::Layout::TableFormattingContext::computePreferredWidthForColumns):
* layout/tableformatting/TableFormattingContext.h:
* layout/tableformatting/TableFormattingContextGeometry.cpp:
(WebCore::Layout::TableFormattingContext::Geometry::computedColumnWidth const):
* layout/tableformatting/TableGrid.h:
(WebCore::Layout::TableGrid::Column::columnBox const):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/layout/tableformatting/TableFormattingContext.cpp
trunk/Source/WebCore/layout/tableformatting/TableFormattingContext.h
trunk/Source/WebCore/layout/tableformatting/TableFormattingContextGeometry.cpp
trunk/Source/WebCore/layout/tableformatting/TableGrid.h




Diff

Modified: trunk/Source/WebCore/ChangeLog (251150 => 251151)

--- trunk/Source/WebCore/ChangeLog	2019-10-15 19:13:35 UTC (rev 251150)
+++ trunk/Source/WebCore/ChangeLog	2019-10-15 19:29:24 UTC (rev 251151)
@@ -1,5 +1,23 @@
 2019-10-15  Zalan Bujtas  
 
+[LFC][TFC] Use  to adjust the preferred column width.
+https://bugs.webkit.org/show_bug.cgi?id=202997
+
+
+Reviewed by Antti Koivisto.
+
+The  elment can set the preferred width on the table column. Let's take these values into account while computing the preferred width for columns.
+
+* layout/tableformatting/TableFormattingContext.cpp:
+(WebCore::Layout::TableFormattingContext::computePreferredWidthForColumns):
+* layout/tableformatting/TableFormattingContext.h:
+* layout/tableformatting/TableFormattingContextGeometry.cpp:
+(WebCore::Layout::TableFormattingContext::Geometry::computedColumnWidth const):
+* layout/tableformatting/TableGrid.h:
+(WebCore::Layout::TableGrid::Column::columnBox const):
+
+2019-10-15  Zalan Bujtas  
+
 [LFC][TFC] Add support for colgroup/col
 https://bugs.webkit.org/show_bug.cgi?id=202991
 


Modified: trunk/Source/WebCore/layout/tableformatting/TableFormattingContext.cpp (251150 => 251151)

--- trunk/Source/WebCore/layout/tableformatting/TableFormattingContext.cpp	2019-10-15 19:13:35 UTC (rev 251150)
+++ trunk/Source/WebCore/layout/tableformatting/TableFormattingContext.cpp	2019-10-15 19:29:24 UTC (rev 251151)
@@ -249,9 +249,15 @@
 columnIntrinsicWidths.minimum = std::max(slot->widthConstraints.minimum, columnIntrinsicWidths.minimum);
 columnIntrinsicWidths.maximum = std::max(slot->widthConstraints.maximum, columnIntrinsicWidths.maximum);
 }
+// Now that we have the content driven min/max widths, check if  sets a preferred width on this column.
+if (auto* columnBox = columns[columnIndex].columnBox()) {
+if (auto columnPreferredWidth = geometry().computedColumnWidth(*columnBox)) {
+// Let's stay at least as wide as the preferred width.
+columnIntrinsicWidths.minimum = std::max(columnIntrinsicWidths.minimum, *columnPreferredWidth);
+}
+}
 columns[columnIndex].setWidthConstraints(columnIntrinsicWidths);
 }
-// FIXME: Take column group elements into account.
 }
 
 LayoutUnit TableFormattingContext::computedTableWidth()


Modified: trunk/Source/WebCore/layout/tableformatting/TableFormattingContext.h (251150 => 251151)

--- trunk/Source/WebCore/layout/tableformatting/TableFormattingContext.h	2019-10-15 19:13:35 UTC (rev 251150)
+++ trunk/Source/WebCore/layout/tableformatting/TableFormattingContext.h	2019-10-15 19:29:24 UTC (rev 251151)
@@ -47,6 +47,7 @@
 class Geometry : public FormattingContext::Geometry {
 public:
 ContentHeightAndMargin tableCellHeightAndMargin(const Box&) const;
+Optional computedColumnWidth(const Box& columnBox) const;
 
 private:
 friend class TableFormattingContext;


Modified: trunk/Source/WebCore/layout/tableformatting/TableFormattingContextGeometry.cpp (251150 => 251151)

--- trunk/Source/WebCore/layout/tableformatting/TableFormattingContextGeometry.cpp	2019-10-15 19:13:35 UTC (rev 251150)
+++ trunk/Source/WebCore/layout/tableformatting/TableFormattingContextGeometry.cpp	2019-10-15 19:29:24 UTC (rev 251151)
@@ -45,7 +45,16 @@
 return ContentHeightAndMargin { *height, { } };
 }
 
+Optional TableFormattingContext::Geometry::computedColumnWidth(const Box& columnBox) const
+{
+// Check both style and 's width attribute.
+// FIXME: Figure out what to do with calculated values, like .
+if (auto computedWidthValue = computedContentWidth(columnBox, { }))
+return

[webkit-changes] [251152] trunk/Source/WebKit

2019-10-15 Thread youenn

Title: [251152] trunk/Source/WebKit








Revision 251152
Author you...@apple.com
Date 2019-10-15 13:13:39 -0700 (Tue, 15 Oct 2019)


Log Message
Scheduling a service worker job in server should wait for finishing the registration import
https://bugs.webkit.org/show_bug.cgi?id=202975

Reviewed by Chris Dumez.

* WebProcess/Storage/WebSWClientConnection.cpp:
(WebKit::WebSWClientConnection::scheduleJobInServer):
We should not schedule a job until the registrations are fully imported.
Covered by ServiceWorkerBasic API test flakily hitting debug asserts.

Modified Paths

trunk/Source/WebKit/ChangeLog
trunk/Source/WebKit/WebProcess/Storage/WebSWClientConnection.cpp




Diff

Modified: trunk/Source/WebKit/ChangeLog (251151 => 251152)

--- trunk/Source/WebKit/ChangeLog	2019-10-15 19:29:24 UTC (rev 251151)
+++ trunk/Source/WebKit/ChangeLog	2019-10-15 20:13:39 UTC (rev 251152)
@@ -1,3 +1,15 @@
+2019-10-15  youenn fablet  
+
+Scheduling a service worker job in server should wait for finishing the registration import
+https://bugs.webkit.org/show_bug.cgi?id=202975
+
+Reviewed by Chris Dumez.
+
+* WebProcess/Storage/WebSWClientConnection.cpp:
+(WebKit::WebSWClientConnection::scheduleJobInServer):
+We should not schedule a job until the registrations are fully imported.
+Covered by ServiceWorkerBasic API test flakily hitting debug asserts.
+
 2019-10-15  Alex Christensen  
 
 Unreviewed, rolling out r251138.


Modified: trunk/Source/WebKit/WebProcess/Storage/WebSWClientConnection.cpp (251151 => 251152)

--- trunk/Source/WebKit/WebProcess/Storage/WebSWClientConnection.cpp	2019-10-15 19:29:24 UTC (rev 251151)
+++ trunk/Source/WebKit/WebProcess/Storage/WebSWClientConnection.cpp	2019-10-15 20:13:39 UTC (rev 251152)
@@ -73,7 +73,9 @@
 
 void WebSWClientConnection::scheduleJobInServer(const ServiceWorkerJobData& jobData)
 {
-send(Messages::WebSWServerConnection::ScheduleJobInServer { jobData });
+runOrDelayTaskForImport([this, jobData] {
+send(Messages::WebSWServerConnection::ScheduleJobInServer { jobData });
+});
 }
 
 void WebSWClientConnection::finishFetchingScriptInServer(const ServiceWorkerFetchResult& result)






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

[webkit-changes] [251153] trunk/Tools

2019-10-15 Thread aakash_jain

Title: [251153] trunk/Tools








Revision 251153
Author aakash_j...@apple.com
Date 2019-10-15 13:29:31 -0700 (Tue, 15 Oct 2019)


Log Message
[ews] Use python 3 compatible way to represent octal in buildbot code
https://bugs.webkit.org/show_bug.cgi?id=202999

Reviewed by Jonathan Bedard.

* BuildSlaveSupport/ews-build/buildbot.tac:
* BuildSlaveSupport/ews-build/steps.py:

Modified Paths

trunk/Tools/BuildSlaveSupport/ews-build/buildbot.tac
trunk/Tools/BuildSlaveSupport/ews-build/steps.py
trunk/Tools/ChangeLog




Diff

Modified: trunk/Tools/BuildSlaveSupport/ews-build/buildbot.tac (251152 => 251153)

--- trunk/Tools/BuildSlaveSupport/ews-build/buildbot.tac	2019-10-15 20:13:39 UTC (rev 251152)
+++ trunk/Tools/BuildSlaveSupport/ews-build/buildbot.tac	2019-10-15 20:29:31 UTC (rev 251153)
@@ -10,7 +10,7 @@
 configfile = 'master.cfg'
 
 # Default umask for server
-umask = 022
+umask = 0o022
 
 # if this is a relocatable tac file, get the directory containing the TAC
 if basedir == '.':


Modified: trunk/Tools/BuildSlaveSupport/ews-build/steps.py (251152 => 251153)

--- trunk/Tools/BuildSlaveSupport/ews-build/steps.py	2019-10-15 20:13:39 UTC (rev 251152)
+++ trunk/Tools/BuildSlaveSupport/ews-build/steps.py	2019-10-15 20:29:31 UTC (rev 251153)
@@ -1230,7 +1230,7 @@
 def __init__(self, **kwargs):
 kwargs['workersrc'] = self.workersrc
 kwargs['masterdest'] = self.masterdest
-kwargs['mode'] = 0644
+kwargs['mode'] = 0o0644
 kwargs['blocksize'] = 1024 * 256
 transfer.FileUpload.__init__(self, **kwargs)
 
@@ -1507,7 +1507,7 @@
 identifier = '-{}'.format(identifier)
 kwargs['workersrc'] = self.workersrc
 kwargs['masterdest'] = Interpolate('public_html/results/%(prop:buildername)s/r%(prop:patch_id)s-%(prop:buildnumber)s{}.zip'.format(identifier))
-kwargs['mode'] = 0644
+kwargs['mode'] = 0o0644
 kwargs['blocksize'] = 1024 * 256
 transfer.FileUpload.__init__(self, **kwargs)
 


Modified: trunk/Tools/ChangeLog (251152 => 251153)

--- trunk/Tools/ChangeLog	2019-10-15 20:13:39 UTC (rev 251152)
+++ trunk/Tools/ChangeLog	2019-10-15 20:29:31 UTC (rev 251153)
@@ -1,3 +1,13 @@
+2019-10-15  Aakash Jain  
+
+[ews] Use python 3 compatible way to represent octal in buildbot code
+https://bugs.webkit.org/show_bug.cgi?id=202999
+
+Reviewed by Jonathan Bedard.
+
+* BuildSlaveSupport/ews-build/buildbot.tac:
+* BuildSlaveSupport/ews-build/steps.py:
+
 2019-10-15  Jonathan Bedard  
 
 results.webkit.org: Add os version to various unix ports






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

[webkit-changes] [251154] trunk

2019-10-15 Thread jiewen_tan

Title: [251154] trunk








Revision 251154
Author jiewen_...@apple.com
Date 2019-10-15 13:45:23 -0700 (Tue, 15 Oct 2019)


Log Message
[WebAuthn] Rename -[WKUIDelegatePrivate webView:runWebAuthenticationPanel:initiatedByFrame:completionHandler:] to -[WKUIDelegatePrivate _webView:runWebAuthenticationPanel:initiatedByFrame:completionHandler:]
https://bugs.webkit.org/show_bug.cgi?id=202564


Reviewed by Brent Fulgham.

Source/WebKit:

Rename the SPI to a proper SPI style.

* UIProcess/API/Cocoa/WKUIDelegatePrivate.h:
* UIProcess/Cocoa/UIDelegate.mm:
(WebKit::UIDelegate::setDelegate):
(WebKit::UIDelegate::UIClient::runWebAuthenticationPanel):

Tools:

* TestWebKitAPI/Tests/WebKitCocoa/_WKWebAuthenticationPanel.mm:
(-[TestWebAuthenticationPanelUIDelegate _webView:runWebAuthenticationPanel:initiatedByFrame:completionHandler:]):
(-[TestWebAuthenticationPanelUIDelegate webView:runWebAuthenticationPanel:initiatedByFrame:completionHandler:]): Deleted.

Modified Paths

trunk/Source/WebKit/ChangeLog
trunk/Source/WebKit/UIProcess/API/Cocoa/WKUIDelegatePrivate.h
trunk/Source/WebKit/UIProcess/Cocoa/UIDelegate.mm
trunk/Tools/ChangeLog
trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/_WKWebAuthenticationPanel.mm




Diff

Modified: trunk/Source/WebKit/ChangeLog (251153 => 251154)

--- trunk/Source/WebKit/ChangeLog	2019-10-15 20:29:31 UTC (rev 251153)
+++ trunk/Source/WebKit/ChangeLog	2019-10-15 20:45:23 UTC (rev 251154)
@@ -1,3 +1,18 @@
+2019-10-15  Jiewen Tan  
+
+[WebAuthn] Rename -[WKUIDelegatePrivate webView:runWebAuthenticationPanel:initiatedByFrame:completionHandler:] to -[WKUIDelegatePrivate _webView:runWebAuthenticationPanel:initiatedByFrame:completionHandler:]
+https://bugs.webkit.org/show_bug.cgi?id=202564
+
+
+Reviewed by Brent Fulgham.
+
+Rename the SPI to a proper SPI style.
+
+* UIProcess/API/Cocoa/WKUIDelegatePrivate.h:
+* UIProcess/Cocoa/UIDelegate.mm:
+(WebKit::UIDelegate::setDelegate):
+(WebKit::UIDelegate::UIClient::runWebAuthenticationPanel):
+
 2019-10-15  youenn fablet  
 
 Scheduling a service worker job in server should wait for finishing the registration import


Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKUIDelegatePrivate.h (251153 => 251154)

--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKUIDelegatePrivate.h	2019-10-15 20:29:31 UTC (rev 251153)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKUIDelegatePrivate.h	2019-10-15 20:45:23 UTC (rev 251154)
@@ -137,7 +137,7 @@
 
 - (void)_webView:(WKWebView *)webView takeFocus:(_WKFocusDirection)direction WK_API_AVAILABLE(macos(10.13.4), ios(12.2));
 
-- (void)webView:(WKWebView *)webView runWebAuthenticationPanel:(_WKWebAuthenticationPanel *)panel initiatedByFrame:(WKFrameInfo *)frame completionHandler:(void (^)(_WKWebAuthenticationPanelResult))completionHandler WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA));
+- (void)_webView:(WKWebView *)webView runWebAuthenticationPanel:(_WKWebAuthenticationPanel *)panel initiatedByFrame:(WKFrameInfo *)frame completionHandler:(void (^)(_WKWebAuthenticationPanelResult))completionHandler WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA));
 
 #if TARGET_OS_IPHONE
 - (BOOL)_webView:(WKWebView *)webView shouldIncludeAppLinkActionsForElement:(_WKActivatedElementInfo *)element WK_API_AVAILABLE(ios(9.0));


Modified: trunk/Source/WebKit/UIProcess/Cocoa/UIDelegate.mm (251153 => 251154)

--- trunk/Source/WebKit/UIProcess/Cocoa/UIDelegate.mm	2019-10-15 20:29:31 UTC (rev 251153)
+++ trunk/Source/WebKit/UIProcess/Cocoa/UIDelegate.mm	2019-10-15 20:45:23 UTC (rev 251154)
@@ -174,7 +174,7 @@
 m_delegateMethods.webViewHasVideoInPictureInPictureDidChange = [delegate respondsToSelector:@selector(_webView:hasVideoInPictureInPictureDidChange:)];
 m_delegateMethods.webViewDidShowSafeBrowsingWarning = [delegate respondsToSelector:@selector(_webViewDidShowSafeBrowsingWarning:)];
 #if ENABLE(WEB_AUTHN)
-m_delegateMethods.webViewRunWebAuthenticationPanelInitiatedByFrameCompletionHandler = [delegate respondsToSelector:@selector(webView:runWebAuthenticationPanel:initiatedByFrame:completionHandler:)];
+m_delegateMethods.webViewRunWebAuthenticationPanelInitiatedByFrameCompletionHandler = [delegate respondsToSelector:@selector(_webView:runWebAuthenticationPanel:initiatedByFrame:completionHandler:)];
 #endif
 }
 
@@ -1294,8 +1294,8 @@
 return;
 }
 
-auto checker = CompletionHandlerCallChecker::create(delegate.get(), @selector(webView:runWebAuthenticationPanel:initiatedByFrame:completionHandler:));
-[(id )delegate webView:m_uiDelegate.m_webView runWebAuthenticationPanel:wrapper(panel) initiatedByFrame:nil completionHandler:makeBlockPtr([completionHandler = WTFMove(completionHandler), checker = WTFMove(checker)] (_WKWebAuthenticationPanelResult result) mutable {
+auto checker = CompletionHandlerCallChecker::create(delegate.get(), @selector(_webView:runWebAuthenticationPanel:initiatedByFrame:completionHandler:));
+[(id

[webkit-changes] [251155] trunk/Source

2019-10-15 Thread youenn

Title: [251155] trunk/Source








Revision 251155
Author you...@apple.com
Date 2019-10-15 13:54:22 -0700 (Tue, 15 Oct 2019)


Log Message
Move headers to keep from a HTTPHeaderNameSet to an OptionSet
https://bugs.webkit.org/show_bug.cgi?id=202977

Reviewed by Anders Carlsson.

Source/WebCore:

Covered by existing tests.
New representation is smaller and more efficient to process.

* loader/CrossOriginAccessControl.cpp:
(WebCore::httpHeadersToKeepFromCleaning):
(WebCore::cleanHTTPRequestHeadersForAccessControl):
* loader/CrossOriginAccessControl.h:
(WebCore::cleanHTTPRequestHeadersForAccessControl): Deleted.
* loader/ResourceLoaderOptions.h:

Source/WebKit:

* NetworkProcess/NetworkResourceLoadParameters.cpp:
(WebKit::NetworkResourceLoadParameters::decode):
* NetworkProcess/NetworkResourceLoadParameters.h:

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/loader/CrossOriginAccessControl.cpp
trunk/Source/WebCore/loader/CrossOriginAccessControl.h
trunk/Source/WebCore/loader/ResourceLoaderOptions.h
trunk/Source/WebKit/ChangeLog
trunk/Source/WebKit/NetworkProcess/NetworkResourceLoadParameters.cpp
trunk/Source/WebKit/NetworkProcess/NetworkResourceLoadParameters.h




Diff

Modified: trunk/Source/WebCore/ChangeLog (251154 => 251155)

--- trunk/Source/WebCore/ChangeLog	2019-10-15 20:45:23 UTC (rev 251154)
+++ trunk/Source/WebCore/ChangeLog	2019-10-15 20:54:22 UTC (rev 251155)
@@ -1,3 +1,20 @@
+2019-10-15  youenn fablet  
+
+Move headers to keep from a HTTPHeaderNameSet to an OptionSet
+https://bugs.webkit.org/show_bug.cgi?id=202977
+
+Reviewed by Anders Carlsson.
+
+Covered by existing tests.
+New representation is smaller and more efficient to process.
+
+* loader/CrossOriginAccessControl.cpp:
+(WebCore::httpHeadersToKeepFromCleaning):
+(WebCore::cleanHTTPRequestHeadersForAccessControl):
+* loader/CrossOriginAccessControl.h:
+(WebCore::cleanHTTPRequestHeadersForAccessControl): Deleted.
+* loader/ResourceLoaderOptions.h:
+
 2019-10-15  Zalan Bujtas  
 
 [LFC][TFC] Use  to adjust the preferred column width.


Modified: trunk/Source/WebCore/loader/CrossOriginAccessControl.cpp (251154 => 251155)

--- trunk/Source/WebCore/loader/CrossOriginAccessControl.cpp	2019-10-15 20:45:23 UTC (rev 251154)
+++ trunk/Source/WebCore/loader/CrossOriginAccessControl.cpp	2019-10-15 20:54:22 UTC (rev 251155)
@@ -134,34 +134,34 @@
 && redirectURL.pass().isEmpty();
 }
 
-HTTPHeaderNameSet httpHeadersToKeepFromCleaning(const HTTPHeaderMap& headers)
+OptionSet httpHeadersToKeepFromCleaning(const HTTPHeaderMap& headers)
 {
-HTTPHeaderNameSet headersToKeep;
+OptionSet headersToKeep;
 if (headers.contains(HTTPHeaderName::ContentType))
-headersToKeep.add(HTTPHeaderName::ContentType);
+headersToKeep.add(HTTPHeadersToKeepFromCleaning::ContentType);
 if (headers.contains(HTTPHeaderName::Referer))
-headersToKeep.add(HTTPHeaderName::Referer);
+headersToKeep.add(HTTPHeadersToKeepFromCleaning::Referer);
 if (headers.contains(HTTPHeaderName::Origin))
-headersToKeep.add(HTTPHeaderName::Origin);
+headersToKeep.add(HTTPHeadersToKeepFromCleaning::Origin);
 if (headers.contains(HTTPHeaderName::UserAgent))
-headersToKeep.add(HTTPHeaderName::UserAgent);
+headersToKeep.add(HTTPHeadersToKeepFromCleaning::UserAgent);
 if (headers.contains(HTTPHeaderName::AcceptEncoding))
-headersToKeep.add(HTTPHeaderName::AcceptEncoding);
+headersToKeep.add(HTTPHeadersToKeepFromCleaning::AcceptEncoding);
 return headersToKeep;
 }
 
-void cleanHTTPRequestHeadersForAccessControl(ResourceRequest& request, const HashSet, WTF::StrongEnumHashTraits>& headersToKeep)
+void cleanHTTPRequestHeadersForAccessControl(ResourceRequest& request, OptionSet headersToKeep)
 {
 // Remove headers that may have been added by the network layer that cause access control to fail.
-if (!headersToKeep.contains(HTTPHeaderName::ContentType) && !isCrossOriginSafeRequestHeader(HTTPHeaderName::ContentType, request.httpContentType()))
+if (!headersToKeep.contains(HTTPHeadersToKeepFromCleaning::ContentType) && !isCrossOriginSafeRequestHeader(HTTPHeaderName::ContentType, request.httpContentType()))
 request.clearHTTPContentType();
-if (!headersToKeep.contains(HTTPHeaderName::Referer))
+if (!headersToKeep.contains(HTTPHeadersToKeepFromCleaning::Referer))
 request.clearHTTPReferrer();
-if (!headersToKeep.contains(HTTPHeaderName::Origin))
+if (!headersToKeep.contains(HTTPHeadersToKeepFromCleaning::Origin))
 request.clearHTTPOrigin();
-if (!headersToKeep.contains(HTTPHeaderName::UserAgent))
+if (!headersToKeep.contains(HTTPHeadersToKeepFromCleaning::UserAgent))
 request.clearHTTPUserAgent();
-if (!headersToKeep.contains(HTTPHeaderName::AcceptEncoding))
+if (!headersToKeep.contains(HTTPHeadersToKeepFromCleanin

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

Title: [251156] trunk/Source/WebCore








Revision 251156
Author simon.fra...@apple.com
Date 2019-10-15 14:06:30 -0700 (Tue, 15 Oct 2019)


Log Message
Don't mutate a NinePieceImage to create a mask default image
https://bugs.webkit.org/show_bug.cgi?id=202967

Reviewed by Dean Jackson.

For every StyleRareNonInheritedData, the maskBoxImage undergoes copy-on-write
via maskBoxImage.setMaskDefaults(). Fix by giving NinePieceImage a constructor
argument that cna make the mask flavor of image.

* css/StyleBuilderConverter.h:
(WebCore::StyleBuilderConverter::convertBorderMask):
(WebCore::StyleBuilderConverter::convertReflection):
* rendering/style/NinePieceImage.cpp:
(WebCore::NinePieceImage::defaultMaskData):
(WebCore::NinePieceImage::NinePieceImage):
* rendering/style/NinePieceImage.h:
(WebCore::NinePieceImage::setMaskDefaults): Deleted.
* rendering/style/StyleRareNonInheritedData.cpp:
(WebCore::StyleRareNonInheritedData::StyleRareNonInheritedData):
* rendering/style/StyleReflection.h:
(WebCore::StyleReflection::StyleReflection):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/css/StyleBuilderConverter.h
trunk/Source/WebCore/rendering/style/NinePieceImage.cpp
trunk/Source/WebCore/rendering/style/NinePieceImage.h
trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.cpp
trunk/Source/WebCore/rendering/style/StyleReflection.h




Diff

Modified: trunk/Source/WebCore/ChangeLog (251155 => 251156)

--- trunk/Source/WebCore/ChangeLog	2019-10-15 20:54:22 UTC (rev 251155)
+++ trunk/Source/WebCore/ChangeLog	2019-10-15 21:06:30 UTC (rev 251156)
@@ -1,3 +1,27 @@
+2019-10-15  Simon Fraser  
+
+Don't mutate a NinePieceImage to create a mask default image
+https://bugs.webkit.org/show_bug.cgi?id=202967
+
+Reviewed by Dean Jackson.
+
+For every StyleRareNonInheritedData, the maskBoxImage undergoes copy-on-write
+via maskBoxImage.setMaskDefaults(). Fix by giving NinePieceImage a constructor
+argument that cna make the mask flavor of image.
+
+* css/StyleBuilderConverter.h:
+(WebCore::StyleBuilderConverter::convertBorderMask):
+(WebCore::StyleBuilderConverter::convertReflection):
+* rendering/style/NinePieceImage.cpp:
+(WebCore::NinePieceImage::defaultMaskData):
+(WebCore::NinePieceImage::NinePieceImage):
+* rendering/style/NinePieceImage.h:
+(WebCore::NinePieceImage::setMaskDefaults): Deleted.
+* rendering/style/StyleRareNonInheritedData.cpp:
+(WebCore::StyleRareNonInheritedData::StyleRareNonInheritedData):
+* rendering/style/StyleReflection.h:
+(WebCore::StyleReflection::StyleReflection):
+
 2019-10-15  youenn fablet  
 
 Move headers to keep from a HTTPHeaderNameSet to an OptionSet


Modified: trunk/Source/WebCore/css/StyleBuilderConverter.h (251155 => 251156)

--- trunk/Source/WebCore/css/StyleBuilderConverter.h	2019-10-15 20:54:22 UTC (rev 251155)
+++ trunk/Source/WebCore/css/StyleBuilderConverter.h	2019-10-15 21:06:30 UTC (rev 251156)
@@ -456,8 +456,7 @@
 template
 inline NinePieceImage StyleBuilderConverter::convertBorderMask(StyleResolver& styleResolver, CSSValue& value)
 {
-NinePieceImage image;
-image.setMaskDefaults();
+NinePieceImage image(NinePieceImage::Type::Mask);
 styleResolver.styleMap()->mapNinePieceImage(property, &value, image);
 return image;
 }
@@ -752,8 +751,7 @@
 reflection->setDirection(reflectValue.direction());
 reflection->setOffset(reflectValue.offset().convertToLength(styleResolver.state().cssToLengthConversionData()));
 
-NinePieceImage mask;
-mask.setMaskDefaults();
+NinePieceImage mask(NinePieceImage::Type::Mask);
 styleResolver.styleMap()->mapNinePieceImage(CSSPropertyWebkitBoxReflect, reflectValue.mask(), mask);
 reflection->setMask(mask);
 


Modified: trunk/Source/WebCore/rendering/style/NinePieceImage.cpp (251155 => 251156)

--- trunk/Source/WebCore/rendering/style/NinePieceImage.cpp	2019-10-15 20:54:22 UTC (rev 251155)
+++ trunk/Source/WebCore/rendering/style/NinePieceImage.cpp	2019-10-15 21:06:30 UTC (rev 251156)
@@ -40,11 +40,21 @@
 return data.get();
 }
 
-NinePieceImage::NinePieceImage()
-: m_data(defaultData())
+inline DataRef& NinePieceImage::defaultMaskData()
 {
+static NeverDestroyed> maskData { Data::create() };
+auto& data = ""
+data.imageSlices = LengthBox(0);
+data.fill = true;
+data.borderSlices = LengthBox();
+return maskData.get();
 }
 
+NinePieceImage::NinePieceImage(Type imageType)
+: m_data(imageType == Type::Normal ? defaultData() : defaultMaskData())
+{
+}
+
 NinePieceImage::NinePieceImage(RefPtr&& image, LengthBox imageSlices, bool fill, LengthBox borderSlices, LengthBox outset, NinePieceImageRule horizontalRule, NinePieceImageRule verticalRule)
 : m_data(Data::create(WTFMove(image), imageSlices, fill, borderSlices, outset, horizontalRule, verticalRule))
 {


Modified: trunk/Source/WebCore/rendering/

[webkit-changes] [251157] trunk/LayoutTests

2019-10-15 Thread dino

Title: [251157] trunk/LayoutTests








Revision 251157
Author d...@apple.com
Date 2019-10-15 14:16:16 -0700 (Tue, 15 Oct 2019)


Log Message
Layout test fast/events/touch/ios/passive-by-default-on-document-and-window.html is a flaky failure on Internal iOS Testers
https://bugs.webkit.org/show_bug.cgi?id=202858


Update expected results.

* fast/events/touch/ios/passive-by-default-on-document-and-window-expected.txt:

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/LayoutTests/fast/events/touch/ios/passive-by-default-on-document-and-window-expected.txt




Diff

Modified: trunk/LayoutTests/ChangeLog (251156 => 251157)

--- trunk/LayoutTests/ChangeLog	2019-10-15 21:06:30 UTC (rev 251156)
+++ trunk/LayoutTests/ChangeLog	2019-10-15 21:16:16 UTC (rev 251157)
@@ -1,3 +1,13 @@
+2019-10-15  Dean Jackson  
+
+Layout test fast/events/touch/ios/passive-by-default-on-document-and-window.html is a flaky failure on Internal iOS Testers
+https://bugs.webkit.org/show_bug.cgi?id=202858
+
+
+Update expected results.
+
+* fast/events/touch/ios/passive-by-default-on-document-and-window-expected.txt:
+
 2019-10-15  Wenson Hsieh  
 
 REGRESSION: editing/async-clipboard/clipboard-interfaces.html is failing in WebKit1


Modified: trunk/LayoutTests/fast/events/touch/ios/passive-by-default-on-document-and-window-expected.txt (251156 => 251157)

--- trunk/LayoutTests/fast/events/touch/ios/passive-by-default-on-document-and-window-expected.txt	2019-10-15 21:06:30 UTC (rev 251156)
+++ trunk/LayoutTests/fast/events/touch/ios/passive-by-default-on-document-and-window-expected.txt	2019-10-15 21:16:16 UTC (rev 251157)
@@ -1,9 +1,9 @@
-touchstart on body - cancelable: true defaultPrevented: true 
-touchstart on documentElement - cancelable: true defaultPrevented: true 
-touchstart on document - cancelable: true defaultPrevented: true 
-touchstart on window - cancelable: true defaultPrevented: true 
-touchend on body - cancelable: true defaultPrevented: true 
-touchend on documentElement - cancelable: true defaultPrevented: true 
-touchend on document - cancelable: true defaultPrevented: true 
-touchend on window - cancelable: true defaultPrevented: true 
+touchstart on body - cancelable: false defaultPrevented: false 
+touchstart on documentElement - cancelable: false defaultPrevented: false 
+touchstart on document - cancelable: false defaultPrevented: false 
+touchstart on window - cancelable: false defaultPrevented: false 
+touchend on body - cancelable: false defaultPrevented: false 
+touchend on documentElement - cancelable: false defaultPrevented: false 
+touchend on document - cancelable: false defaultPrevented: false 
+touchend on window - cancelable: false defaultPrevented: false 
 Done






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

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

Title: [251158] trunk/Source/WebCore








Revision 251158
Author simon.fra...@apple.com
Date 2019-10-15 14:18:37 -0700 (Tue, 15 Oct 2019)


Log Message
Add dumping for Animation and AnimationList
https://bugs.webkit.org/show_bug.cgi?id=202973

Reviewed by Dean Jackson.

Make Animation, AnimationList and related enums dumpable.

* platform/animation/Animation.cpp:
(WebCore::operator<<):
* platform/animation/Animation.h:
* platform/animation/AnimationList.cpp:
(WebCore::operator<<):
* platform/animation/AnimationList.h:

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/animation/Animation.cpp
trunk/Source/WebCore/platform/animation/Animation.h
trunk/Source/WebCore/platform/animation/AnimationList.cpp
trunk/Source/WebCore/platform/animation/AnimationList.h




Diff

Modified: trunk/Source/WebCore/ChangeLog (251157 => 251158)

--- trunk/Source/WebCore/ChangeLog	2019-10-15 21:16:16 UTC (rev 251157)
+++ trunk/Source/WebCore/ChangeLog	2019-10-15 21:18:37 UTC (rev 251158)
@@ -1,5 +1,21 @@
 2019-10-15  Simon Fraser  
 
+Add dumping for Animation and AnimationList
+https://bugs.webkit.org/show_bug.cgi?id=202973
+
+Reviewed by Dean Jackson.
+
+Make Animation, AnimationList and related enums dumpable.
+
+* platform/animation/Animation.cpp:
+(WebCore::operator<<):
+* platform/animation/Animation.h:
+* platform/animation/AnimationList.cpp:
+(WebCore::operator<<):
+* platform/animation/AnimationList.h:
+
+2019-10-15  Simon Fraser  
+
 Don't mutate a NinePieceImage to create a mask default image
 https://bugs.webkit.org/show_bug.cgi?id=202967
 


Modified: trunk/Source/WebCore/platform/animation/Animation.cpp (251157 => 251158)

--- trunk/Source/WebCore/platform/animation/Animation.cpp	2019-10-15 21:16:16 UTC (rev 251157)
+++ trunk/Source/WebCore/platform/animation/Animation.cpp	2019-10-15 21:18:37 UTC (rev 251158)
@@ -23,6 +23,7 @@
 #include "Animation.h"
 
 #include 
+#include 
 
 namespace WebCore {
 
@@ -138,4 +139,43 @@
 return initialValue;
 }
 
+TextStream& operator<<(TextStream& ts, Animation::AnimationMode mode)
+{
+switch (mode) {
+case Animation::AnimateAll: ts << "all"; break;
+case Animation::AnimateNone: ts << "none"; break;
+case Animation::AnimateSingleProperty: ts << "single property"; break;
+case Animation::AnimateUnknownProperty: ts << "unknown property"; break;
+}
+return ts;
+}
+
+TextStream& operator<<(TextStream& ts, Animation::AnimationDirection direction)
+{
+switch (direction) {
+case Animation::AnimationDirectionNormal: ts << "normal"; break;
+case Animation::AnimationDirectionAlternate: ts << "alternate"; break;
+case Animation::AnimationDirectionReverse: ts << "reverse"; break;
+case Animation::AnimationDirectionAlternateReverse: ts << "alternate-reverse"; break;
+}
+return ts;
+}
+
+TextStream& operator<<(TextStream& ts, const Animation& animation)
+{
+ts.dumpProperty("property", getPropertyName(animation.property()));
+ts.dumpProperty("name", animation.name());
+ts.dumpProperty("iteration count", animation.iterationCount());
+ts.dumpProperty("delay", animation.iterationCount());
+ts.dumpProperty("duration", animation.duration());
+if (animation.timingFunction())
+ts.dumpProperty("timing function", *animation.timingFunction());
+ts.dumpProperty("mode", animation.animationMode());
+ts.dumpProperty("direction", animation.direction());
+ts.dumpProperty("fill-mode", animation.fillMode());
+ts.dumpProperty("play-state", animation.playState());
+
+return ts;
+}
+
 } // namespace WebCore


Modified: trunk/Source/WebCore/platform/animation/Animation.h (251157 => 251158)

--- trunk/Source/WebCore/platform/animation/Animation.h	2019-10-15 21:16:16 UTC (rev 251157)
+++ trunk/Source/WebCore/platform/animation/Animation.h	2019-10-15 21:18:37 UTC (rev 251158)
@@ -199,4 +199,9 @@
 static Ref initialTimingFunction() { return CubicBezierTimingFunction::create(); }
 };
 
+WTF::TextStream& operator<<(WTF::TextStream&, AnimationPlayState);
+WTF::TextStream& operator<<(WTF::TextStream&, Animation::AnimationMode);
+WTF::TextStream& operator<<(WTF::TextStream&, Animation::AnimationDirection);
+WTF::TextStream& operator<<(WTF::TextStream&, const Animation&);
+
 } // namespace WebCore


Modified: trunk/Source/WebCore/platform/animation/AnimationList.cpp (251157 => 251158)

--- trunk/Source/WebCore/platform/animation/AnimationList.cpp	2019-10-15 21:16:16 UTC (rev 251157)
+++ trunk/Source/WebCore/platform/animation/AnimationList.cpp	2019-10-15 21:18:37 UTC (rev 251158)
@@ -22,6 +22,8 @@
 #include "config.h"
 #include "AnimationList.h"
 
+#include 
+
 namespace WebCore {
 
 #define FILL_UNSET_PROPERTY(test, propGet, propSet) \
@@ -63,4 +65,16 @@
 return true;
 }
 
+TextStream& operator<<(TextStream& ts, const AnimationList& animationList)
+{
+ts << "[";
+for (size_t i

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

Title: [251159] trunk/Source/WebCore








Revision 251159
Author simon.fra...@apple.com
Date 2019-10-15 14:29:28 -0700 (Tue, 15 Oct 2019)


Log Message
Add TextStream dumping for ThemeTypes enums
https://bugs.webkit.org/show_bug.cgi?id=202972

Reviewed by Dean Jackson.

Make ControlPart, SelectionPart, ThemeFont and ThemeColor dumpable.

* Sources.txt:
* WebCore.xcodeproj/project.pbxproj:
* platform/ThemeTypes.cpp: Added.
(WebCore::operator<<):
* platform/ThemeTypes.h:

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/Sources.txt
trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj
trunk/Source/WebCore/platform/ThemeTypes.h


Added Paths

trunk/Source/WebCore/platform/ThemeTypes.cpp




Diff

Modified: trunk/Source/WebCore/ChangeLog (251158 => 251159)

--- trunk/Source/WebCore/ChangeLog	2019-10-15 21:18:37 UTC (rev 251158)
+++ trunk/Source/WebCore/ChangeLog	2019-10-15 21:29:28 UTC (rev 251159)
@@ -1,5 +1,20 @@
 2019-10-15  Simon Fraser  
 
+Add TextStream dumping for ThemeTypes enums
+https://bugs.webkit.org/show_bug.cgi?id=202972
+
+Reviewed by Dean Jackson.
+
+Make ControlPart, SelectionPart, ThemeFont and ThemeColor dumpable.
+
+* Sources.txt:
+* WebCore.xcodeproj/project.pbxproj:
+* platform/ThemeTypes.cpp: Added.
+(WebCore::operator<<):
+* platform/ThemeTypes.h:
+
+2019-10-15  Simon Fraser  
+
 Add dumping for Animation and AnimationList
 https://bugs.webkit.org/show_bug.cgi?id=202973
 


Modified: trunk/Source/WebCore/Sources.txt (251158 => 251159)

--- trunk/Source/WebCore/Sources.txt	2019-10-15 21:18:37 UTC (rev 251158)
+++ trunk/Source/WebCore/Sources.txt	2019-10-15 21:29:28 UTC (rev 251159)
@@ -1753,6 +1753,7 @@
 platform/Theme.cpp
 platform/ThreadGlobalData.cpp
 platform/ThreadTimers.cpp
+platform/ThemeTypes.cpp
 platform/Timer.cpp
 platform/UserActivity.cpp
 platform/WebCoreCrossThreadCopier.cpp


Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (251158 => 251159)

--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj	2019-10-15 21:18:37 UTC (rev 251158)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj	2019-10-15 21:29:28 UTC (rev 251159)
@@ -5626,6 +5626,7 @@
 		0F26A7AB2054FCE10090A141 /* MathMLUnknownElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MathMLUnknownElement.cpp; sourceTree = ""; };
 		0F26A7AC2055C8D70090A141 /* XMLDocument.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = XMLDocument.cpp; sourceTree = ""; };
 		0F26A7AD205626100090A141 /* SVGUnknownElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SVGUnknownElement.cpp; sourceTree = ""; };
+		0F283A8D235582F8004794CA /* ThemeTypes.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = ThemeTypes.cpp; sourceTree = ""; };
 		0F36E7361BD1837A002DB891 /* LayoutPoint.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LayoutPoint.cpp; sourceTree = ""; };
 		0F36E7381BD184B9002DB891 /* LayoutSize.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LayoutSize.cpp; sourceTree = ""; };
 		0F37F0832202AC8F00A89C0B /* ScrollingTreeScrollingNodeDelegateMac.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = ScrollingTreeScrollingNodeDelegateMac.mm; sourceTree = ""; };
@@ -25675,6 +25676,7 @@
 7CC564B618BABEA6001B9652 /* TelephoneNumberDetector.h */,
 BCE65D310EAD1211007E4533 /* Theme.cpp */,
 BCE658FE0EA9248A007E4533 /* Theme.h */,
+0F283A8D235582F8004794CA /* ThemeTypes.cpp */,
 BCE659A80EA927B9007E4533 /* ThemeTypes.h */,
 51DF6D7D0B92A16D00C2DC85 /* ThreadCheck.h */,
 E1FF57A50F01256B00891EBB /* ThreadGlobalData.cpp */,


Added: trunk/Source/WebCore/platform/ThemeTypes.cpp (0 => 251159)

--- trunk/Source/WebCore/platform/ThemeTypes.cpp	(rev 0)
+++ trunk/Source/WebCore/platform/ThemeTypes.cpp	2019-10-15 21:29:28 UTC (rev 251159)
@@ -0,0 +1,178 @@
+/*
+ * Copyright (C) 2019 Apple Inc. All Rights Reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DIS

[webkit-changes] [251161] trunk/Tools

2019-10-15 Thread zhifei_fang

Title: [251161] trunk/Tools








Revision 251161
Author zhifei_f...@apple.com
Date 2019-10-15 15:24:04 -0700 (Tue, 15 Oct 2019)


Log Message
Tool to mark jsc test skip/enable
https://bugs.webkit.org/show_bug.cgi?id=202063

Reviewed by Keith Miller.

* Scripts/run-_javascript_core-tests:
(runJSCStressTests):
* Scripts/run-jsc-stress-tests:

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/Scripts/run-_javascript_core-tests
trunk/Tools/Scripts/run-jsc-stress-tests


Added Paths

trunk/Tools/Scripts/mark-jsc-stress-test




Diff

Modified: trunk/Tools/ChangeLog (251160 => 251161)

--- trunk/Tools/ChangeLog	2019-10-15 22:06:23 UTC (rev 251160)
+++ trunk/Tools/ChangeLog	2019-10-15 22:24:04 UTC (rev 251161)
@@ -1,3 +1,14 @@
+2019-10-15  Zhifei Fang  
+
+Tool to mark jsc test skip/enable
+https://bugs.webkit.org/show_bug.cgi?id=202063
+
+Reviewed by Keith Miller.
+
+* Scripts/run-_javascript_core-tests:
+(runJSCStressTests):
+* Scripts/run-jsc-stress-tests:
+
 2019-10-15  Peng Liu  
 
 [Picture-in-Picture Web API] Implement HTMLVideoElement.requestPictureInPicture() / Document.exitPictureInPicture()


Added: trunk/Tools/Scripts/mark-jsc-stress-test (0 => 251161)

--- trunk/Tools/Scripts/mark-jsc-stress-test	(rev 0)
+++ trunk/Tools/Scripts/mark-jsc-stress-test	2019-10-15 22:24:04 UTC (rev 251161)
@@ -0,0 +1,171 @@
+#!/usr/bin/env python -u
+import os
+import sys
+import getopt
+import argparse
+import re
+import logging
+import json
+
+logger = logging.getLogger()
+handler = logging.StreamHandler(sys.stdout)
+formatter = logging.Formatter('%(asctime)s - %(levelname)s - %(message)s')
+handler.setFormatter(formatter)
+logger.setLevel(logging.INFO)
+logger.addHandler(handler)
+
+def iter_dir_recusive(path, callback):
+if os.path.isfile(path) and os.path.splitext(path)[1] == '.js':
+logger.info("Processing {} ...".format(path))
+callback(path)
+else:
+for root, dirs, files in os.walk(path):
+for name in files:
+iter_dir_recusive(os.path.join(root, name), callback)
+logger.info("Done.")
+
+
+class JSCTestModifier(object):
+variables = [
+"$hostOs", "$model", "$architecture"
+]
+def __init__(self, test_pathes, conditions={}, match="all"):
+self._conditions = conditions
+self._test_pathes = test_pathes
+self._match = match
+self._skip_line_postfix = "# added by mark-jsc-stress-test.py"
+
+def skip(self):
+for path in self._test_pathes:
+logger.info("Mark {} skip".format(path))
+iter_dir_recusive(path, lambda file_path: self._skip_test_file(file_path))
+
+def enable(self):
+for path in self._test_pathes:
+logger.info("Mark {} enable".format(path))
+iter_dir_recusive(path, lambda file_path: self._enable_test_file(file_path))
+
+def _generate_condition_op(self, value):
+op = "=="
+if ("!" == value[0]):
+op = "!="
+value = value[1:]
+return op, value
+
+# Condition grammer is like !A or B or C and D
+# Translate it to ruby: $hostOs != A or $hostOs == B or $hostOs == C and $hostOs == D 
+def _parse_condition(self, variable, condition):
+res = []
+values = []
+for word in re.split(r'\s+', condition):
+if word == "or" or word == "and":
+value = " ".join(values).strip()
+values = []
+res.append('{} {} "{}"'.format(variable, *self._generate_condition_op(value)))
+res.append(word)
+else:
+values.append(word)
+if values:
+value = " ".join(values).strip()
+res.append('{} {} "{}"'.format(variable, *self._generate_condition_op(value)))
+return " ".join(res)
+
+def _generate_skip_annotation_line(self):
+skip_line_prefix = "//@ skip if"
+skip_conditions = []
+skip_line = "{} {} {}"
+supported_variables = filter(lambda variable: variable in self._conditions, JSCTestModifier.variables)
+condition_template = "{}" if len(supported_variables) == 1 else "({})"
+for variable in supported_variables:
+skip_conditions.append(condition_template.format(self._parse_condition(variable, self._conditions[variable])))
+if not skip_conditions:
+# No conditions, always skip 
+skip_conditions = ["true"]
+if self._match == "any":
+skip_line = skip_line.format(skip_line_prefix, " or ".join(skip_conditions), self._skip_line_postfix)
+elif self._match == "all":
+skip_line = skip_line.format(skip_line_prefix, " and ".join(skip_conditions), self._skip_line_postfix)
+return skip_line
+
+# This can only remove the skip annotation generated by this script
+def _enable_test_file(self, test_file):
+with

[webkit-changes] [251162] tags/Safari-608.3.10.0.3/

Title: [251162] tags/Safari-608.3.10.0.3/








Revision 251162
Author alanc...@apple.com
Date 2019-10-15 15:33:26 -0700 (Tue, 15 Oct 2019)


Log Message
Tag Safari-608.3.10.0.3.

Added Paths

tags/Safari-608.3.10.0.3/




Diff




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

[webkit-changes] [251163] trunk/LayoutTests

2019-10-15 Thread clopez

Title: [251163] trunk/LayoutTests








Revision 251163
Author clo...@igalia.com
Date 2019-10-15 15:36:18 -0700 (Tue, 15 Oct 2019)


Log Message
Import apng testcases from WPT.
https://bugs.webkit.org/show_bug.cgi?id=202783

Reviewed by Simon Fraser.

LayoutTests/imported/w3c:

Import apng tests from WTP.

* resources/import-expectations.json:
* web-platform-tests/apng/META.yml: Added.
* web-platform-tests/apng/animated-png-timeout-expected.html: Added.
* web-platform-tests/apng/animated-png-timeout.html: Added.
* web-platform-tests/apng/supported-in-source-type-expected.txt: Added.
* web-platform-tests/apng/supported-in-source-type.html: Added.
* web-platform-tests/apng/w3c-import.log: Added.

LayoutTests:

Import apng tests from WTP

* TestExpectations: Mark the new imported test as failing. One already
has a fix and the other would pass once the support for reftest-wait
is implemented in the tooling.

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/LayoutTests/TestExpectations
trunk/LayoutTests/imported/w3c/ChangeLog
trunk/LayoutTests/imported/w3c/resources/import-expectations.json


Added Paths

trunk/LayoutTests/imported/w3c/web-platform-tests/apng/
trunk/LayoutTests/imported/w3c/web-platform-tests/apng/META.yml
trunk/LayoutTests/imported/w3c/web-platform-tests/apng/animated-png-timeout-expected.html
trunk/LayoutTests/imported/w3c/web-platform-tests/apng/animated-png-timeout.html
trunk/LayoutTests/imported/w3c/web-platform-tests/apng/supported-in-source-type-expected.txt
trunk/LayoutTests/imported/w3c/web-platform-tests/apng/supported-in-source-type.html
trunk/LayoutTests/imported/w3c/web-platform-tests/apng/w3c-import.log




Diff

Modified: trunk/LayoutTests/ChangeLog (251162 => 251163)

--- trunk/LayoutTests/ChangeLog	2019-10-15 22:33:26 UTC (rev 251162)
+++ trunk/LayoutTests/ChangeLog	2019-10-15 22:36:18 UTC (rev 251163)
@@ -1,3 +1,16 @@
+2019-10-15  Carlos Alberto Lopez Perez  
+
+Import apng testcases from WPT.
+https://bugs.webkit.org/show_bug.cgi?id=202783
+
+Reviewed by Simon Fraser.
+
+Import apng tests from WTP
+
+* TestExpectations: Mark the new imported test as failing. One already
+has a fix and the other would pass once the support for reftest-wait
+is implemented in the tooling.
+
 2019-10-15  Peng Liu  
 
 [Picture-in-Picture Web API] Implement HTMLVideoElement.requestPictureInPicture() / Document.exitPictureInPicture()


Modified: trunk/LayoutTests/TestExpectations (251162 => 251163)

--- trunk/LayoutTests/TestExpectations	2019-10-15 22:33:26 UTC (rev 251162)
+++ trunk/LayoutTests/TestExpectations	2019-10-15 22:36:18 UTC (rev 251163)
@@ -1218,6 +1218,7 @@
 webkit.org/b/186045 imported/w3c/web-platform-tests/html/semantics/embedded-content/the-img-element/available-images.html [ Pass ImageOnlyFailure ]
 webkit.org/b/186045 imported/w3c/web-platform-tests/html/semantics/embedded-content/the-img-element/sizes/sizes-dynamic-001.html [ ImageOnlyFailure ]
 webkit.org/b/186045 imported/w3c/web-platform-tests/html/semantics/embedded-content/the-img-element/sizes/sizes-dynamic-002.html [ ImageOnlyFailure ]
+webkit.org/b/186045 imported/w3c/web-platform-tests/apng/animated-png-timeout.html [ Skip ]
 
 # These W3C tests time out.
 imported/w3c/web-platform-tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/autoplay-overrides-preload.html [ Skip ]
@@ -3881,3 +3882,5 @@
 webkit.org/b/200208 imported/w3c/web-platform-tests/css/css-images/gradients-with-transparent.html [ ImageOnlyFailure ]
 webkit.org/b/200209 imported/w3c/web-platform-tests/css/css-images/multiple-position-color-stop-radial.html [ ImageOnlyFailure ]
 webkit.org/b/202813 imported/w3c/web-platform-tests/css/css-images/multiple-position-color-stop-conic.html [ ImageOnlyFailure ]
+
+webkit.org/b/202785 imported/w3c/web-platform-tests/apng/supported-in-source-type.html [ Failure ]


Modified: trunk/LayoutTests/imported/w3c/ChangeLog (251162 => 251163)

--- trunk/LayoutTests/imported/w3c/ChangeLog	2019-10-15 22:33:26 UTC (rev 251162)
+++ trunk/LayoutTests/imported/w3c/ChangeLog	2019-10-15 22:36:18 UTC (rev 251163)
@@ -1,3 +1,20 @@
+2019-10-15  Carlos Alberto Lopez Perez  
+
+Import apng testcases from WPT.
+https://bugs.webkit.org/show_bug.cgi?id=202783
+
+Reviewed by Simon Fraser.
+
+Import apng tests from WTP.
+
+* resources/import-expectations.json:
+* web-platform-tests/apng/META.yml: Added.
+* web-platform-tests/apng/animated-png-timeout-expected.html: Added.
+* web-platform-tests/apng/animated-png-timeout.html: Added.
+* web-platform-tests/apng/supported-in-source-type-expected.txt: Added.
+* web-platform-tests/apng/supported-in-source-type.html: Added.
+* web-platform-tests/apng/w3c-import.log: Added.
+
 2019-10-15  Peng Liu  
 
 [Picture-in-Picture Web API] Implement HTMLVideoElement.requestPictureInPicture() / Document.exitPictureInPictu

[webkit-changes] [251164] trunk/Source

Title: [251164] trunk/Source








Revision 251164
Author cdu...@apple.com
Date 2019-10-15 15:43:55 -0700 (Tue, 15 Oct 2019)


Log Message
[macOS] Simplify main thread initialization
https://bugs.webkit.org/show_bug.cgi?id=203001

Reviewed by Geoff Garen.

Source/WebCore:

* bridge/objc/WebScriptObject.mm:
(+[WebScriptObject initialize]):
* platform/cocoa/SharedBufferCocoa.mm:
(+[WebCoreSharedBufferData initialize]):

Source/WebKitLegacy/mac:

* History/WebBackForwardList.mm:
(+[WebBackForwardList initialize]):
* History/WebHistoryItem.mm:
(+[WebHistoryItem initialize]):
* Misc/WebCache.mm:
(+[WebCache initialize]):
* Misc/WebElementDictionary.mm:
(+[WebElementDictionary initialize]):
* Misc/WebIconDatabase.mm:
* Misc/WebStringTruncator.mm:
(+[WebStringTruncator initialize]):
* Plugins/Hosted/WebHostedNetscapePluginView.mm:
(+[WebHostedNetscapePluginView initialize]):
* Plugins/WebBaseNetscapePluginView.mm:
* Plugins/WebBasePluginPackage.mm:
(+[WebBasePluginPackage initialize]):
* Plugins/WebNetscapePluginView.mm:
(+[WebNetscapePluginView initialize]):
* WebCoreSupport/WebEditorClient.mm:
(+[WebUndoStep initialize]):
* WebCoreSupport/WebFrameLoaderClient.mm:
(+[WebFramePolicyListener initialize]):
* WebView/WebArchive.mm:
(+[WebArchivePrivate initialize]):
* WebView/WebDataSource.mm:
(+[WebDataSource initialize]):
* WebView/WebHTMLView.mm:
(+[WebHTMLViewPrivate initialize]):
(+[WebHTMLView initialize]):
* WebView/WebPreferences.mm:
(+[WebPreferences initialize]):
* WebView/WebResource.mm:
(+[WebResourcePrivate initialize]):
* WebView/WebTextIterator.mm:
(+[WebTextIteratorPrivate initialize]):
* WebView/WebView.mm:
(+[WebView initialize]):
* WebView/WebViewData.mm:
(+[WebViewPrivate initialize]):

Source/WTF:

Simplify main thread initialization on macOS by always using pthread main as main thread.
The complexity is now isolated to the USE(WEB_THREAD) code path.

This patch also adds a debug assertion in WTF::initializeWebThreadPlatform() to make sure
it gets called on the actual main thread. In release, it will log a fault message indicating
it was called on the wrong thread.

* wtf/MainThread.cpp:
* wtf/MainThread.h:
* wtf/RefCounted.h:
(WTF::RefCountedBase::RefCountedBase):
(WTF::RefCountedBase::applyRefDerefThreadingCheck const):
* wtf/cocoa/MainThreadCocoa.mm:
(WTF::initializeMainThreadPlatform):
(WTF::scheduleDispatchFunctionsOnMainThread):
(WTF::initializeWebThreadPlatform):
(WTF::canAccessThreadLocalDataForThread):
(WTF::isMainThread):
* wtf/generic/MainThreadGeneric.cpp:
* wtf/text/cf/StringImplCF.cpp:
(WTF::StringImpl::createCFString):
* wtf/win/MainThreadWin.cpp:

Modified Paths

trunk/Source/WTF/ChangeLog
trunk/Source/WTF/wtf/MainThread.cpp
trunk/Source/WTF/wtf/MainThread.h
trunk/Source/WTF/wtf/RefCounted.h
trunk/Source/WTF/wtf/cocoa/MainThreadCocoa.mm
trunk/Source/WTF/wtf/generic/MainThreadGeneric.cpp
trunk/Source/WTF/wtf/text/cf/StringImplCF.cpp
trunk/Source/WTF/wtf/win/MainThreadWin.cpp
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/bridge/objc/WebScriptObject.mm
trunk/Source/WebCore/platform/cocoa/SharedBufferCocoa.mm
trunk/Source/WebKitLegacy/mac/ChangeLog
trunk/Source/WebKitLegacy/mac/History/WebBackForwardList.mm
trunk/Source/WebKitLegacy/mac/History/WebHistoryItem.mm
trunk/Source/WebKitLegacy/mac/Misc/WebCache.mm
trunk/Source/WebKitLegacy/mac/Misc/WebElementDictionary.mm
trunk/Source/WebKitLegacy/mac/Misc/WebIconDatabase.mm
trunk/Source/WebKitLegacy/mac/Misc/WebStringTruncator.mm
trunk/Source/WebKitLegacy/mac/Plugins/Hosted/WebHostedNetscapePluginView.mm
trunk/Source/WebKitLegacy/mac/Plugins/WebBaseNetscapePluginView.mm
trunk/Source/WebKitLegacy/mac/Plugins/WebBasePluginPackage.mm
trunk/Source/WebKitLegacy/mac/Plugins/WebNetscapePluginView.mm
trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebEditorClient.mm
trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebFrameLoaderClient.mm
trunk/Source/WebKitLegacy/mac/WebView/WebArchive.mm
trunk/Source/WebKitLegacy/mac/WebView/WebDataSource.mm
trunk/Source/WebKitLegacy/mac/WebView/WebHTMLView.mm
trunk/Source/WebKitLegacy/mac/WebView/WebPreferences.mm
trunk/Source/WebKitLegacy/mac/WebView/WebResource.mm
trunk/Source/WebKitLegacy/mac/WebView/WebTextIterator.mm
trunk/Source/WebKitLegacy/mac/WebView/WebView.mm
trunk/Source/WebKitLegacy/mac/WebView/WebViewData.mm




Diff

Modified: trunk/Source/WTF/ChangeLog (251163 => 251164)

--- trunk/Source/WTF/ChangeLog	2019-10-15 22:36:18 UTC (rev 251163)
+++ trunk/Source/WTF/ChangeLog	2019-10-15 22:43:55 UTC (rev 251164)
@@ -1,3 +1,33 @@
+2019-10-15  Chris Dumez  
+
+[macOS] Simplify main thread initialization
+https://bugs.webkit.org/show_bug.cgi?id=203001
+
+Reviewed by Geoff Garen.
+
+Simplify main thread initialization on macOS by always using pthread main as main thread.
+The complexity is now isolated to the USE(WEB_THREAD) code path.
+
+This patch also adds a debug assertion in WTF::initializeWebThreadPlatform() to make sure
+it gets called on the

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

2019-10-15 Thread rniwa

Title: [251165] trunk/Source/WebCore








Revision 251165
Author rn...@webkit.org
Date 2019-10-15 15:54:20 -0700 (Tue, 15 Oct 2019)


Log Message
[iOS] Crash in WebCore::DOMWindow::incrementScrollEventListenersCount
https://bugs.webkit.org/show_bug.cgi?id=202878

Unreviewed. Addressed Darin's post-commit review comment.

* dom/Node.cpp:
(WebCore::tryAddEventListener):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/dom/Node.cpp




Diff

Modified: trunk/Source/WebCore/ChangeLog (251164 => 251165)

--- trunk/Source/WebCore/ChangeLog	2019-10-15 22:43:55 UTC (rev 251164)
+++ trunk/Source/WebCore/ChangeLog	2019-10-15 22:54:20 UTC (rev 251165)
@@ -1,3 +1,13 @@
+2019-10-15  Ryosuke Niwa  
+
+[iOS] Crash in WebCore::DOMWindow::incrementScrollEventListenersCount
+https://bugs.webkit.org/show_bug.cgi?id=202878
+
+Unreviewed. Addressed Darin's post-commit review comment.
+
+* dom/Node.cpp:
+(WebCore::tryAddEventListener):
+
 2019-10-15  Chris Dumez  
 
 [macOS] Simplify main thread initialization


Modified: trunk/Source/WebCore/dom/Node.cpp (251164 => 251165)

--- trunk/Source/WebCore/dom/Node.cpp	2019-10-15 22:43:55 UTC (rev 251164)
+++ trunk/Source/WebCore/dom/Node.cpp	2019-10-15 22:54:20 UTC (rev 251165)
@@ -2116,7 +2116,7 @@
 #if PLATFORM(IOS_FAMILY)
 if (targetNode == &targetNode->document() && eventType == eventNames().scrollEvent) {
 if (auto* window = targetNode->document().domWindow())
-targetNode->document().domWindow()->incrementScrollEventListenersCount();
+window->incrementScrollEventListenersCount();
 }
 
 #if ENABLE(TOUCH_EVENTS)






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

[webkit-changes] [251166] trunk/Source/WebKit

Title: [251166] trunk/Source/WebKit








Revision 251166
Author cdu...@apple.com
Date 2019-10-15 16:17:18 -0700 (Tue, 15 Oct 2019)


Log Message
Webview's drawing area may stay frozen on cross-site back/forward navigation
https://bugs.webkit.org/show_bug.cgi?id=203004

Reviewed by Tim Horton.

Whenever the UIScene becomes foreground / background, the WebPageProxy notifies its currently associated
WebPage in the committed WebProcess so that it can freeze / unfreeze its layer tree with the
BackgroundApplication reason. The issue is that if a WebPage gets suspended on cross-site navigation
(because the UIScene is in the background when the load commits), then the suspended WebPage kept its
a BackgroundApplication freeze. When the UIScene becomes foreground, the WebPage only notifies its
committed page so the suspended page keeps its BackgroundApplication freeze still. If the user now
navigates back, it will restore the suspended WebPage and the view will stay frozen.

To address the issue, we now have the WebPage drop its BackgroundApplication freeze reason, whenever
it transitions from committed to suspended.

* UIProcess/ios/WKApplicationStateTrackingView.mm:
(-[WKApplicationStateTrackingView didMoveToWindow]):
Fix logging, [self isBackground] needs to be called *after* _applicationStateTracker has been
initialized, or it will return YES unconditionally.

* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::setIsSuspended):

Modified Paths

trunk/Source/WebKit/ChangeLog
trunk/Source/WebKit/UIProcess/ios/WKApplicationStateTrackingView.mm
trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp




Diff

Modified: trunk/Source/WebKit/ChangeLog (251165 => 251166)

--- trunk/Source/WebKit/ChangeLog	2019-10-15 22:54:20 UTC (rev 251165)
+++ trunk/Source/WebKit/ChangeLog	2019-10-15 23:17:18 UTC (rev 251166)
@@ -1,3 +1,29 @@
+2019-10-15  Chris Dumez  
+
+Webview's drawing area may stay frozen on cross-site back/forward navigation
+https://bugs.webkit.org/show_bug.cgi?id=203004
+
+Reviewed by Tim Horton.
+
+Whenever the UIScene becomes foreground / background, the WebPageProxy notifies its currently associated
+WebPage in the committed WebProcess so that it can freeze / unfreeze its layer tree with the
+BackgroundApplication reason. The issue is that if a WebPage gets suspended on cross-site navigation
+(because the UIScene is in the background when the load commits), then the suspended WebPage kept its
+a BackgroundApplication freeze. When the UIScene becomes foreground, the WebPage only notifies its
+committed page so the suspended page keeps its BackgroundApplication freeze still. If the user now
+navigates back, it will restore the suspended WebPage and the view will stay frozen.
+
+To address the issue, we now have the WebPage drop its BackgroundApplication freeze reason, whenever
+it transitions from committed to suspended.
+
+* UIProcess/ios/WKApplicationStateTrackingView.mm:
+(-[WKApplicationStateTrackingView didMoveToWindow]):
+Fix logging, [self isBackground] needs to be called *after* _applicationStateTracker has been
+initialized, or it will return YES unconditionally.
+
+* WebProcess/WebPage/WebPage.cpp:
+(WebKit::WebPage::setIsSuspended):
+
 2019-10-15  Peng Liu  
 
 [Picture-in-Picture Web API] Implement HTMLVideoElement.requestPictureInPicture() / Document.exitPictureInPicture()


Modified: trunk/Source/WebKit/UIProcess/ios/WKApplicationStateTrackingView.mm (251165 => 251166)

--- trunk/Source/WebKit/UIProcess/ios/WKApplicationStateTrackingView.mm	2019-10-15 22:54:20 UTC (rev 251165)
+++ trunk/Source/WebKit/UIProcess/ios/WKApplicationStateTrackingView.mm	2019-10-15 23:17:18 UTC (rev 251166)
@@ -69,9 +69,9 @@
 return;
 
 auto page = [_webViewToTrack _page];
+_applicationStateTracker = makeUnique(self, @selector(_applicationDidEnterBackground), @selector(_applicationDidFinishSnapshottingAfterEnteringBackground), @selector(_applicationWillEnterForeground));
 RELEASE_LOG(ViewState, "%p - WKApplicationStateTrackingView: View with page [%p, pageProxyID: %" PRIu64 "] was added to a window, _lastObservedStateWasBackground: %d, isNowBackground: %d", self, page, page ? page->identifier().toUInt64() : 0, _lastObservedStateWasBackground, [self isBackground]);
-_applicationStateTracker = makeUnique(self, @selector(_applicationDidEnterBackground), @selector(_applicationDidFinishSnapshottingAfterEnteringBackground), @selector(_applicationWillEnterForeground));
-
+
 if (_lastObservedStateWasBackground && ![self isBackground])
 [self _applicationWillEnterForeground];
 else if (!_lastObservedStateWasBackground && [self isBackground])


Modified: trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp (251165 => 251166)

--- trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp	2019-10-15 22:54:20 UTC (rev 251165)
+++ trunk/Source/WebKit/

[webkit-changes] [251167] trunk/Tools

2019-10-15 Thread aakash_jain

Title: [251167] trunk/Tools








Revision 251167
Author aakash_j...@apple.com
Date 2019-10-15 16:20:55 -0700 (Tue, 15 Oct 2019)


Log Message
Improve summary for WebKitPerl Tests build step
https://bugs.webkit.org/show_bug.cgi?id=203006

Reviewed by Jonathan Bedard.

* BuildSlaveSupport/ews-build/steps.py:
(RunWebKitPerlTests.getResultSummary): Override method to customize summary.
* BuildSlaveSupport/ews-build/steps_unittest.py: Updated unit-tests.

Modified Paths

trunk/Tools/BuildSlaveSupport/ews-build/steps.py
trunk/Tools/BuildSlaveSupport/ews-build/steps_unittest.py
trunk/Tools/ChangeLog




Diff

Modified: trunk/Tools/BuildSlaveSupport/ews-build/steps.py (251166 => 251167)

--- trunk/Tools/BuildSlaveSupport/ews-build/steps.py	2019-10-15 23:17:18 UTC (rev 251166)
+++ trunk/Tools/BuildSlaveSupport/ews-build/steps.py	2019-10-15 23:20:55 UTC (rev 251167)
@@ -603,7 +603,14 @@
 def __init__(self, **kwargs):
 super(RunWebKitPerlTests, self).__init__(timeout=2 * 60, logEnviron=False, **kwargs)
 
+def getResultSummary(self):
+if self.results == SUCCESS:
+message = 'Passed webkitperl tests'
+self.build.buildFinished([message], SUCCESS)
+return {u'step': unicode(message)}
+return {u'step': u'Failed webkitperl tests'}
 
+
 class RunBuildWebKitOrgUnitTests(shell.ShellCommand):
 name = 'build-webkit-org-unit-tests'
 description = ['build-webkit-unit-tests running']


Modified: trunk/Tools/BuildSlaveSupport/ews-build/steps_unittest.py (251166 => 251167)

--- trunk/Tools/BuildSlaveSupport/ews-build/steps_unittest.py	2019-10-15 23:17:18 UTC (rev 251166)
+++ trunk/Tools/BuildSlaveSupport/ews-build/steps_unittest.py	2019-10-15 23:20:55 UTC (rev 251167)
@@ -390,7 +390,7 @@
 )
 + 0,
 )
-self.expectOutcome(result=SUCCESS, state_string='webkitperl-tests')
+self.expectOutcome(result=SUCCESS, state_string='Passed webkitperl tests')
 return self.runStep()
 
 def test_failure(self):
@@ -407,7 +407,7 @@
 Failed 1/40 test programs. 10/630 subtests failed.''')
 + 2,
 )
-self.expectOutcome(result=FAILURE, state_string='webkitperl-tests (failure)')
+self.expectOutcome(result=FAILURE, state_string='Failed webkitperl tests')
 return self.runStep()
 
 


Modified: trunk/Tools/ChangeLog (251166 => 251167)

--- trunk/Tools/ChangeLog	2019-10-15 23:17:18 UTC (rev 251166)
+++ trunk/Tools/ChangeLog	2019-10-15 23:20:55 UTC (rev 251167)
@@ -1,3 +1,14 @@
+2019-10-15  Aakash Jain  
+
+Improve summary for WebKitPerl Tests build step
+https://bugs.webkit.org/show_bug.cgi?id=203006
+
+Reviewed by Jonathan Bedard.
+
+* BuildSlaveSupport/ews-build/steps.py:
+(RunWebKitPerlTests.getResultSummary): Override method to customize summary.
+* BuildSlaveSupport/ews-build/steps_unittest.py: Updated unit-tests.
+
 2019-10-15  Zhifei Fang  
 
 Tool to mark jsc test skip/enable






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

[webkit-changes] [251168] trunk/Source/WebInspectorUI

2019-10-15 Thread nvasilyev

Title: [251168] trunk/Source/WebInspectorUI








Revision 251168
Author nvasil...@apple.com
Date 2019-10-15 16:39:06 -0700 (Tue, 15 Oct 2019)


Log Message
Web Inspector: Convert CSSRule selectorText setter to setSelectorText method because it's asynchronous
https://bugs.webkit.org/show_bug.cgi?id=202840

Reviewed by Matt Baker.

* UserInterface/Models/CSSRule.js:
(WI.CSSRule.prototype.setSelectorText):
(WI.CSSRule.prototype._selectorRejected):
(WI.CSSRule.prototype._selectorResolved):
Remove WI.CSSRule.Event.SelectorChanged event and since it wasn't used anywhere else.

(WI.CSSRule):
(WI.CSSRule.prototype.set selectorText): Deleted.
(WI.CSSRule.prototype.setSelectorText): Added.
(WI.CSSRule.prototype._selectorRejected): Deleted.
(WI.CSSRule.Event.SelectorChanged): Deleted.
Remove `{valid: ...}` object since it wasn't used.

* UserInterface/Views/SpreadsheetCSSStyleDeclarationSection.js:
(WI.SpreadsheetCSSStyleDeclarationSection.prototype.spreadsheetSelectorFieldDidCommit):

Modified Paths

trunk/Source/WebInspectorUI/ChangeLog
trunk/Source/WebInspectorUI/UserInterface/Models/CSSRule.js
trunk/Source/WebInspectorUI/UserInterface/Views/SpreadsheetCSSStyleDeclarationSection.js




Diff

Modified: trunk/Source/WebInspectorUI/ChangeLog (251167 => 251168)

--- trunk/Source/WebInspectorUI/ChangeLog	2019-10-15 23:20:55 UTC (rev 251167)
+++ trunk/Source/WebInspectorUI/ChangeLog	2019-10-15 23:39:06 UTC (rev 251168)
@@ -1,3 +1,26 @@
+2019-10-15  Nikita Vasilyev  
+
+Web Inspector: Convert CSSRule selectorText setter to setSelectorText method because it's asynchronous
+https://bugs.webkit.org/show_bug.cgi?id=202840
+
+Reviewed by Matt Baker.
+
+* UserInterface/Models/CSSRule.js:
+(WI.CSSRule.prototype.setSelectorText):
+(WI.CSSRule.prototype._selectorRejected):
+(WI.CSSRule.prototype._selectorResolved):
+Remove WI.CSSRule.Event.SelectorChanged event and since it wasn't used anywhere else.
+
+(WI.CSSRule):
+(WI.CSSRule.prototype.set selectorText): Deleted.
+(WI.CSSRule.prototype.setSelectorText): Added.
+(WI.CSSRule.prototype._selectorRejected): Deleted.
+(WI.CSSRule.Event.SelectorChanged): Deleted.
+Remove `{valid: ...}` object since it wasn't used.
+
+* UserInterface/Views/SpreadsheetCSSStyleDeclarationSection.js:
+(WI.SpreadsheetCSSStyleDeclarationSection.prototype.spreadsheetSelectorFieldDidCommit):
+
 2019-10-15  Devin Rousso  
 
 Web Inspector: Local Resource Overrides: automatically create an image/font local override when dragging content over a non-overridden resource


Modified: trunk/Source/WebInspectorUI/UserInterface/Models/CSSRule.js (251167 => 251168)

--- trunk/Source/WebInspectorUI/UserInterface/Models/CSSRule.js	2019-10-15 23:20:55 UTC (rev 251167)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/CSSRule.js	2019-10-15 23:39:06 UTC (rev 251168)
@@ -62,13 +62,13 @@
 return this._selectorText;
 }
 
-set selectorText(selectorText)
+setSelectorText(selectorText)
 {
 console.assert(this.editable);
 if (!this.editable)
-return;
+return Promise.reject();
 
-this._nodeStyles.changeRuleSelector(this, selectorText).then(this._selectorResolved.bind(this), this._selectorRejected.bind(this));
+return this._nodeStyles.changeRuleSelector(this, selectorText).then(this._selectorResolved.bind(this));
 }
 
 update(sourceCodeLocation, selectorText, selectors, matchedSelectorIndices, style, groupings)
@@ -111,43 +111,36 @@
 
 // Private
 
-_selectorRejected(error)
-{
-this.dispatchEventToListeners(WI.CSSRule.Event.SelectorChanged, {valid: !error});
-}
-
+// This method only needs to be called for CSS rules that don't match the selected DOM node.
+// CSS rules that match the selected DOM node get updated by WI.DOMNodeStyles.prototype._parseRulePayload.
 _selectorResolved(rulePayload)
 {
-if (rulePayload) {
-let selectorText = rulePayload.selectorList.text;
-if (selectorText !== this._selectorText) {
-let selectors = WI.DOMNodeStyles.parseSelectorListPayload(rulePayload.selectorList);
+if (!rulePayload)
+return;
 
-let sourceCodeLocation = null;
-let sourceRange = rulePayload.selectorList.range;
-if (sourceRange) {
-sourceCodeLocation = WI.DOMNodeStyles.createSourceCodeLocation(rulePayload.sourceURL, {
-line: sourceRange.startLine,
-column: sourceRange.startColumn,
-documentNode: this._nodeStyles.node.ownerDocument,
-});
-}
+let selectorText = rulePayload.selectorList.text;
+if (selectorText === this._selectorText)
+return;
 
-if (this._ownerStyleSheet) {
-

[webkit-changes] [251169] trunk/Source/ThirdParty/ANGLE

2019-10-15 Thread bfulgham

Title: [251169] trunk/Source/ThirdParty/ANGLE








Revision 251169
Author bfulg...@apple.com
Date 2019-10-15 16:40:00 -0700 (Tue, 15 Oct 2019)


Log Message
Unreviewed build fix after r251018


* PlatformFTW.cmake: Add missing dxgi library.

Modified Paths

trunk/Source/ThirdParty/ANGLE/ChangeLog
trunk/Source/ThirdParty/ANGLE/PlatformFTW.cmake




Diff

Modified: trunk/Source/ThirdParty/ANGLE/ChangeLog (251168 => 251169)

--- trunk/Source/ThirdParty/ANGLE/ChangeLog	2019-10-15 23:39:06 UTC (rev 251168)
+++ trunk/Source/ThirdParty/ANGLE/ChangeLog	2019-10-15 23:40:00 UTC (rev 251169)
@@ -1,3 +1,10 @@
+2019-10-15  Brent Fulgham  
+
+Unreviewed build fix after r251018
+
+
+* PlatformFTW.cmake: Add missing dxgi library.
+
 2019-10-12  Stephan Szabo  
 
 Regression (251018): Wincairo build broken: unresolved external symbol


Modified: trunk/Source/ThirdParty/ANGLE/PlatformFTW.cmake (251168 => 251169)

--- trunk/Source/ThirdParty/ANGLE/PlatformFTW.cmake	2019-10-15 23:39:06 UTC (rev 251168)
+++ trunk/Source/ThirdParty/ANGLE/PlatformFTW.cmake	2019-10-15 23:40:00 UTC (rev 251169)
@@ -23,7 +23,7 @@
 ANGLE_ENABLE_D3D11
 )
 
-list(APPEND ANGLEGLESv2_LIBRARIES dxguid)
+list(APPEND ANGLEGLESv2_LIBRARIES dxguid dxgi)
 
 # DirectX 9 support should be optional but ANGLE will not compile without it
 list(APPEND ANGLE_SOURCES ${libangle_d3d9_sources})






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

[webkit-changes] [251170] trunk/Source/WebInspectorUI

2019-10-15 Thread drousso

Title: [251170] trunk/Source/WebInspectorUI








Revision 251170
Author drou...@apple.com
Date 2019-10-15 17:01:35 -0700 (Tue, 15 Oct 2019)


Log Message
Web Inspector: Debugger: prevent source mapped resources from being blackboxed
https://bugs.webkit.org/show_bug.cgi?id=203007

Reviewed by Matt Baker.

Since source mapped resources are entirely a frontend concept, it doesn't make sense to
allow them to be blackboxed.

* UserInterface/Models/SourceMapResource.js:
(WI.SourceMapResource.prototype.get supportsScriptBlackboxing):

Modified Paths

trunk/Source/WebInspectorUI/ChangeLog
trunk/Source/WebInspectorUI/UserInterface/Models/SourceMapResource.js




Diff

Modified: trunk/Source/WebInspectorUI/ChangeLog (251169 => 251170)

--- trunk/Source/WebInspectorUI/ChangeLog	2019-10-15 23:40:00 UTC (rev 251169)
+++ trunk/Source/WebInspectorUI/ChangeLog	2019-10-16 00:01:35 UTC (rev 251170)
@@ -1,3 +1,16 @@
+2019-10-15  Devin Rousso  
+
+Web Inspector: Debugger: prevent source mapped resources from being blackboxed
+https://bugs.webkit.org/show_bug.cgi?id=203007
+
+Reviewed by Matt Baker.
+
+Since source mapped resources are entirely a frontend concept, it doesn't make sense to
+allow them to be blackboxed.
+
+* UserInterface/Models/SourceMapResource.js:
+(WI.SourceMapResource.prototype.get supportsScriptBlackboxing):
+
 2019-10-15  Nikita Vasilyev  
 
 Web Inspector: Convert CSSRule selectorText setter to setSelectorText method because it's asynchronous


Modified: trunk/Source/WebInspectorUI/UserInterface/Models/SourceMapResource.js (251169 => 251170)

--- trunk/Source/WebInspectorUI/UserInterface/Models/SourceMapResource.js	2019-10-15 23:40:00 UTC (rev 251169)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/SourceMapResource.js	2019-10-16 00:01:35 UTC (rev 251170)
@@ -74,6 +74,11 @@
 return resourceURLComponents.path.substring(sourceMappingBasePathURLComponents.path.length, resourceURLComponents.length);
 }
 
+get supportsScriptBlackboxing()
+{
+return false;
+}
+
 requestContentFromBackend()
 {
 // Revert the markAsFinished that was done in the constructor.






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

[webkit-changes] [251171] trunk/Source

Title: [251171] trunk/Source








Revision 251171
Author commit-qu...@webkit.org
Date 2019-10-15 17:27:22 -0700 (Tue, 15 Oct 2019)


Log Message
AX: Make AXIsolatedTree compile again
https://bugs.webkit.org/show_bug.cgi?id=202702


Patch by Andres Gonzalez  on 2019-10-15
Reviewed by Joanmarie Diggs.

Re-submitting r251045 with a fix for internal builds.

Source/WebCore:

* accessibility/AXObjectCache.cpp:
(WebCore::AXObjectCache::remove):
(WebCore::AXObjectCache::createIsolatedAccessibilityTreeHierarchy):
* accessibility/isolatedtree/AXIsolatedTree.cpp:
(WebCore::AXIsolatedTree::treePageCache):
(WebCore::AXIsolatedTree::nodeForID const):
(WebCore::AXIsolatedTree::applyPendingChanges):
(WebCore::AXIsolatedTree::initializePageTreeForID): Deleted.
(WebCore::AXIsolatedTree::setInitialRequestInProgress): Deleted.
* accessibility/isolatedtree/AXIsolatedTree.h:
* accessibility/isolatedtree/AXIsolatedTreeNode.cpp:
(WebCore::AXIsolatedTreeNode::setTreeIdentifier):
(WebCore::AXIsolatedTreeNode::rectAttributeValue const):
* accessibility/isolatedtree/AXIsolatedTreeNode.h:
* accessibility/mac/WebAccessibilityObjectWrapperBase.mm:
(convertToNSArray):
* accessibility/mac/WebAccessibilityObjectWrapperMac.mm:
(-[WebAccessibilityObjectWrapper childrenVectorArray]):

Source/WebKit:

* Platform/spi/mac/AccessibilityPrivSPI.h:
* WebProcess/WebPage/mac/WKAccessibilityWebPageObjectBase.mm:
(-[WKAccessibilityWebPageObjectBase isolatedTreeRootObject]):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/accessibility/AXObjectCache.cpp
trunk/Source/WebCore/accessibility/isolatedtree/AXIsolatedTree.cpp
trunk/Source/WebCore/accessibility/isolatedtree/AXIsolatedTree.h
trunk/Source/WebCore/accessibility/isolatedtree/AXIsolatedTreeNode.cpp
trunk/Source/WebCore/accessibility/isolatedtree/AXIsolatedTreeNode.h
trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperBase.mm
trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm
trunk/Source/WebKit/ChangeLog
trunk/Source/WebKit/Platform/spi/mac/AccessibilityPrivSPI.h
trunk/Source/WebKit/WebProcess/WebPage/mac/WKAccessibilityWebPageObjectBase.mm




Diff

Modified: trunk/Source/WebCore/ChangeLog (251170 => 251171)

--- trunk/Source/WebCore/ChangeLog	2019-10-16 00:01:35 UTC (rev 251170)
+++ trunk/Source/WebCore/ChangeLog	2019-10-16 00:27:22 UTC (rev 251171)
@@ -1,3 +1,32 @@
+2019-10-15  Andres Gonzalez  
+
+AX: Make AXIsolatedTree compile again
+https://bugs.webkit.org/show_bug.cgi?id=202702
+
+
+Reviewed by Joanmarie Diggs.
+
+Re-submitting r251045 with a fix for internal builds.
+
+* accessibility/AXObjectCache.cpp:
+(WebCore::AXObjectCache::remove):
+(WebCore::AXObjectCache::createIsolatedAccessibilityTreeHierarchy):
+* accessibility/isolatedtree/AXIsolatedTree.cpp:
+(WebCore::AXIsolatedTree::treePageCache):
+(WebCore::AXIsolatedTree::nodeForID const):
+(WebCore::AXIsolatedTree::applyPendingChanges):
+(WebCore::AXIsolatedTree::initializePageTreeForID): Deleted.
+(WebCore::AXIsolatedTree::setInitialRequestInProgress): Deleted.
+* accessibility/isolatedtree/AXIsolatedTree.h:
+* accessibility/isolatedtree/AXIsolatedTreeNode.cpp:
+(WebCore::AXIsolatedTreeNode::setTreeIdentifier):
+(WebCore::AXIsolatedTreeNode::rectAttributeValue const):
+* accessibility/isolatedtree/AXIsolatedTreeNode.h:
+* accessibility/mac/WebAccessibilityObjectWrapperBase.mm:
+(convertToNSArray):
+* accessibility/mac/WebAccessibilityObjectWrapperMac.mm:
+(-[WebAccessibilityObjectWrapper childrenVectorArray]):
+
 2019-10-15  Ryosuke Niwa  
 
 [iOS] Crash in WebCore::DOMWindow::incrementScrollEventListenersCount


Modified: trunk/Source/WebCore/accessibility/AXObjectCache.cpp (251170 => 251171)

--- trunk/Source/WebCore/accessibility/AXObjectCache.cpp	2019-10-16 00:01:35 UTC (rev 251170)
+++ trunk/Source/WebCore/accessibility/AXObjectCache.cpp	2019-10-16 00:27:22 UTC (rev 251171)
@@ -730,8 +730,10 @@
 
 m_idsInUse.remove(axID);
 #if ENABLE(ACCESSIBILITY_ISOLATED_TREE)
-if (auto pageID = m_document.pageID())
-AXIsolatedTree::treeForPageID(*pageID)->removeNode(axID);
+if (auto pageID = m_document.pageID()) {
+if (auto tree = AXIsolatedTree::treeForPageID(*pageID))
+tree->removeNode(axID);
+}
 #endif
 
 ASSERT(m_objects.size() >= m_idsInUse.size());
@@ -2946,6 +2948,7 @@
 auto isolatedTreeNode = AXIsolatedTreeNode::create(object);
 nodeChanges.append(isolatedTreeNode.copyRef());
 
+isolatedTreeNode->setTreeIdentifier(tree.treeIdentifier());
 isolatedTreeNode->setParent(parentID);
 associateIsolatedTreeNode(object, isolatedTreeNode, tree.treeIdentifier());
 


Modified: trunk/Source/WebCore/accessibility/isolatedtree/AXIsolatedTree.cpp (251170 => 251171)

--- trunk/Source/WebCore/accessibility/isolatedtree/AXIsolatedTree.cp

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

Title: [251172] trunk/Source/WebCore








Revision 251172
Author simon.fra...@apple.com
Date 2019-10-15 18:04:41 -0700 (Tue, 15 Oct 2019)


Log Message
WheelEventTestMonitor doesn't need to be threadsafe
https://bugs.webkit.org/show_bug.cgi?id=203012

Reviewed by Dean Jackson.

WheelEventTestMonitor is only called on the main thread, so doesn't need a lock to protect
m_deferCompletionReasons, and add main thread assertions.

* page/WheelEventTestMonitor.cpp:
(WebCore::WheelEventTestMonitor::clearAllTestDeferrals):
(WebCore::WheelEventTestMonitor::setTestCallbackAndStartNotificationTimer):
(WebCore::WheelEventTestMonitor::deferForReason):
(WebCore::WheelEventTestMonitor::removeDeferralForReason):
(WebCore::WheelEventTestMonitor::triggerTestTimerFired):
* page/WheelEventTestMonitor.h:

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/page/WheelEventTestMonitor.cpp
trunk/Source/WebCore/page/WheelEventTestMonitor.h




Diff

Modified: trunk/Source/WebCore/ChangeLog (251171 => 251172)

--- trunk/Source/WebCore/ChangeLog	2019-10-16 00:27:22 UTC (rev 251171)
+++ trunk/Source/WebCore/ChangeLog	2019-10-16 01:04:41 UTC (rev 251172)
@@ -1,3 +1,21 @@
+2019-10-15  Simon Fraser  
+
+WheelEventTestMonitor doesn't need to be threadsafe
+https://bugs.webkit.org/show_bug.cgi?id=203012
+
+Reviewed by Dean Jackson.
+
+WheelEventTestMonitor is only called on the main thread, so doesn't need a lock to protect
+m_deferCompletionReasons, and add main thread assertions.
+
+* page/WheelEventTestMonitor.cpp:
+(WebCore::WheelEventTestMonitor::clearAllTestDeferrals):
+(WebCore::WheelEventTestMonitor::setTestCallbackAndStartNotificationTimer):
+(WebCore::WheelEventTestMonitor::deferForReason):
+(WebCore::WheelEventTestMonitor::removeDeferralForReason):
+(WebCore::WheelEventTestMonitor::triggerTestTimerFired):
+* page/WheelEventTestMonitor.h:
+
 2019-10-15  Andres Gonzalez  
 
 AX: Make AXIsolatedTree compile again


Modified: trunk/Source/WebCore/page/WheelEventTestMonitor.cpp (251171 => 251172)

--- trunk/Source/WebCore/page/WheelEventTestMonitor.cpp	2019-10-16 00:27:22 UTC (rev 251171)
+++ trunk/Source/WebCore/page/WheelEventTestMonitor.cpp	2019-10-16 01:04:41 UTC (rev 251172)
@@ -46,7 +46,7 @@
 
 void WheelEventTestMonitor::clearAllTestDeferrals()
 {
-std::lock_guard lock(m_reasonsLock);
+ASSERT(isMainThread());
 m_deferCompletionReasons.clear();
 m_completionCallback = nullptr;
 m_testForCompletionTimer.stop();
@@ -55,10 +55,8 @@
 
 void WheelEventTestMonitor::setTestCallbackAndStartNotificationTimer(WTF::Function&& functionCallback)
 {
-{
-std::lock_guard lock(m_reasonsLock);
-m_completionCallback = WTFMove(functionCallback);
-}
+ASSERT(isMainThread());
+m_completionCallback = WTFMove(functionCallback);
 
 if (!m_testForCompletionTimer.isActive())
 m_testForCompletionTimer.startRepeating(1_s / 60.);
@@ -66,7 +64,7 @@
 
 void WheelEventTestMonitor::deferForReason(ScrollableAreaIdentifier identifier, DeferReason reason)
 {
-std::lock_guard lock(m_reasonsLock);
+ASSERT(isMainThread());
 m_deferCompletionReasons.ensure(identifier, [] {
 return OptionSet();
 }).iterator->value.add(reason);
@@ -76,7 +74,7 @@
 
 void WheelEventTestMonitor::removeDeferralForReason(ScrollableAreaIdentifier identifier, DeferReason reason)
 {
-std::lock_guard lock(m_reasonsLock);
+ASSERT(isMainThread());
 auto it = m_deferCompletionReasons.find(identifier);
 if (it == m_deferCompletionReasons.end())
 return;
@@ -90,18 +88,13 @@
 
 void WheelEventTestMonitor::triggerTestTimerFired()
 {
-WTF::Function functionCallback;
-
-{
-std::lock_guard lock(m_reasonsLock);
-if (!m_deferCompletionReasons.isEmpty()) {
-LOG_WITH_STREAM(WheelEventTestMonitor, stream << "  WheelEventTestMonitor::triggerTestTimerFired - scrolling still active, reasons " << m_deferCompletionReasons);
-return;
-}
-
-functionCallback = WTFMove(m_completionCallback);
+ASSERT(isMainThread());
+if (!m_deferCompletionReasons.isEmpty()) {
+LOG_WITH_STREAM(WheelEventTestMonitor, stream << "  WheelEventTestMonitor::triggerTestTimerFired - scrolling still active, reasons " << m_deferCompletionReasons);
+return;
 }
 
+auto functionCallback = WTFMove(m_completionCallback);
 m_testForCompletionTimer.stop();
 
 LOG_WITH_STREAM(WheelEventTestMonitor, stream << "  WheelEventTestMonitor::triggerTestTimerFired: scrolling is idle, FIRING TEST");


Modified: trunk/Source/WebCore/page/WheelEventTestMonitor.h (251171 => 251172)

--- trunk/Source/WebCore/page/WheelEventTestMonitor.h	2019-10-16 00:27:22 UTC (rev 251171)
+++ trunk/Source/WebCore/page/WheelEventTestMonitor.h	2019-10-16 01:04:41 UTC (rev 251172)
@@ -65,7 +65,6 @@
 WTF::Function m_completionCallback;
 Run

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

Title: [251173] trunk/Source/WebCore








Revision 251173
Author simon.fra...@apple.com
Date 2019-10-15 18:27:33 -0700 (Tue, 15 Oct 2019)


Log Message
ScrollingTreeScrollingNodeDelegateMac::stretchAmount() should not have side effects
https://bugs.webkit.org/show_bug.cgi?id=203009

Reviewed by Dean Jackson.

Calling ScrollingTreeScrollingNodeDelegateMac::stretchAmount() had the side effect of calling
setMainFrameIsRubberBanding() on the scrolling tree.

Remove this badness and replace it by modifying updateMainFramePinState() (which is called every time
the scroll position changes) to also compute if we're rubber-banding.

Also make a bunch of methods on ScrollControllerClient const, which makes it clear that
they don't have side effects.

* page/scrolling/mac/ScrollingTreeFrameScrollingNodeMac.h:
* page/scrolling/mac/ScrollingTreeFrameScrollingNodeMac.mm:
(WebCore::ScrollingTreeFrameScrollingNodeMac::commitStateAfterChildren):
(WebCore::ScrollingTreeFrameScrollingNodeMac::currentScrollPositionChanged):
(WebCore::ScrollingTreeFrameScrollingNodeMac::updateMainFramePinAndRubberbandState):
(WebCore::ScrollingTreeFrameScrollingNodeMac::updateMainFramePinState): Deleted.
* page/scrolling/mac/ScrollingTreeScrollingNodeDelegateMac.h:
* page/scrolling/mac/ScrollingTreeScrollingNodeDelegateMac.mm:
(WebCore::ScrollingTreeScrollingNodeDelegateMac::isAlreadyPinnedInDirectionOfGesture const):
(WebCore::ScrollingTreeScrollingNodeDelegateMac::allowsHorizontalStretching const):
(WebCore::ScrollingTreeScrollingNodeDelegateMac::allowsVerticalStretching const):
(WebCore::ScrollingTreeScrollingNodeDelegateMac::stretchAmount const):
(WebCore::ScrollingTreeScrollingNodeDelegateMac::pinnedInDirection const):
(WebCore::ScrollingTreeScrollingNodeDelegateMac::canScrollHorizontally const):
(WebCore::ScrollingTreeScrollingNodeDelegateMac::canScrollVertically const):
(WebCore::ScrollingTreeScrollingNodeDelegateMac::shouldRubberBandInDirection const):
(WebCore::ScrollingTreeScrollingNodeDelegateMac::isAlreadyPinnedInDirectionOfGesture): Deleted.
(WebCore::ScrollingTreeScrollingNodeDelegateMac::allowsHorizontalStretching): Deleted.
(WebCore::ScrollingTreeScrollingNodeDelegateMac::allowsVerticalStretching): Deleted.
(WebCore::ScrollingTreeScrollingNodeDelegateMac::stretchAmount): Deleted.
(WebCore::ScrollingTreeScrollingNodeDelegateMac::pinnedInDirection): Deleted.
(WebCore::ScrollingTreeScrollingNodeDelegateMac::canScrollHorizontally): Deleted.
(WebCore::ScrollingTreeScrollingNodeDelegateMac::canScrollVertically): Deleted.
(WebCore::ScrollingTreeScrollingNodeDelegateMac::shouldRubberBandInDirection): Deleted.
* platform/cocoa/ScrollController.h:
* platform/mac/ScrollAnimatorMac.h:
* platform/mac/ScrollAnimatorMac.mm:
(WebCore::ScrollAnimatorMac::shouldForwardWheelEventsToParent const):
(WebCore::ScrollAnimatorMac::pinnedInDirection const):
(WebCore::ScrollAnimatorMac::isAlreadyPinnedInDirectionOfGesture const):
(WebCore::ScrollAnimatorMac::allowsVerticalStretching const):
(WebCore::ScrollAnimatorMac::allowsHorizontalStretching const):
(WebCore::ScrollAnimatorMac::stretchAmount const):
(WebCore::ScrollAnimatorMac::canScrollHorizontally const):
(WebCore::ScrollAnimatorMac::canScrollVertically const):
(WebCore::ScrollAnimatorMac::shouldRubberBandInDirection const):
(WebCore::ScrollAnimatorMac::shouldForwardWheelEventsToParent): Deleted.
(WebCore::ScrollAnimatorMac::pinnedInDirection): Deleted.
(WebCore::ScrollAnimatorMac::isAlreadyPinnedInDirectionOfGesture): Deleted.
(WebCore::ScrollAnimatorMac::allowsVerticalStretching): Deleted.
(WebCore::ScrollAnimatorMac::allowsHorizontalStretching): Deleted.
(WebCore::ScrollAnimatorMac::stretchAmount): Deleted.
(WebCore::ScrollAnimatorMac::canScrollHorizontally): Deleted.
(WebCore::ScrollAnimatorMac::canScrollVertically): Deleted.
(WebCore::ScrollAnimatorMac::shouldRubberBandInDirection): Deleted.
* platform/mock/ScrollAnimatorMock.h:

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeFrameScrollingNodeMac.h
trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeFrameScrollingNodeMac.mm
trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeScrollingNodeDelegateMac.h
trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeScrollingNodeDelegateMac.mm
trunk/Source/WebCore/platform/cocoa/ScrollController.h
trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.h
trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.mm
trunk/Source/WebCore/platform/mock/ScrollAnimatorMock.h




Diff

Modified: trunk/Source/WebCore/ChangeLog (251172 => 251173)

--- trunk/Source/WebCore/ChangeLog	2019-10-16 01:04:41 UTC (rev 251172)
+++ trunk/Source/WebCore/ChangeLog	2019-10-16 01:27:33 UTC (rev 251173)
@@ -1,5 +1,68 @@
 2019-10-15  Simon Fraser  
 
+ScrollingTreeScrollingNodeDelegateMac::stretchAmount() should not have side effects
+https://bugs.webkit.org/show_bug.cgi?id=203009
+
+Reviewed by Dean Jackson.
+
+Calling ScrollingTreeScrollingNodeDeleg

[webkit-changes] [251174] trunk/Source/WebKit

Title: [251174] trunk/Source/WebKit








Revision 251174
Author cdu...@apple.com
Date 2019-10-15 18:49:53 -0700 (Tue, 15 Oct 2019)


Log Message
[iOS] Maintain the last Back/Forward cache entry when the application gets suspended
https://bugs.webkit.org/show_bug.cgi?id=203014

Reviewed by Geoffrey Garen.

Previously, we would clear all back/forward cache entries when the application is about to
be suspended. This means that we would lose fast-back when coming back to the application.
To be memory-friendly but maintain the fast-back when coming back to the application, we now
maintain the last back/forward cache entry when the application gets suspended.

* UIProcess/Cocoa/WebProcessPoolCocoa.mm:
(WebKit::WebProcessPool::applicationIsAboutToSuspend):
(WebKit::WebProcessPool::notifyProcessPoolsApplicationIsAboutToSuspend):
* UIProcess/WebBackForwardCache.cpp:
(WebKit::WebBackForwardCache::pruneToSize):
* UIProcess/WebBackForwardCache.h:
* UIProcess/WebProcessPool.h:
* UIProcess/ios/ProcessAssertionIOS.mm:
(-[WKProcessAssertionBackgroundTaskManager init]):
(-[WKProcessAssertionBackgroundTaskManager _releaseBackgroundTask]):

* WebProcess/WebProcess.cpp:
(WebKit::WebProcess::initializeWebProcess):
A WebProcess no longer clears its PageCache on suspension on iOS. We let the UIProcess's
back/forward cache control when PageCache entries should get destroyed. The back/forward
cache will properly wake up a suspended process to clear one of its PageCache entries if
needed.

Modified Paths

trunk/Source/WebKit/ChangeLog
trunk/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm
trunk/Source/WebKit/UIProcess/WebBackForwardCache.cpp
trunk/Source/WebKit/UIProcess/WebBackForwardCache.h
trunk/Source/WebKit/UIProcess/WebProcessPool.h
trunk/Source/WebKit/UIProcess/ios/ProcessAssertionIOS.mm
trunk/Source/WebKit/WebProcess/WebProcess.cpp




Diff

Modified: trunk/Source/WebKit/ChangeLog (251173 => 251174)

--- trunk/Source/WebKit/ChangeLog	2019-10-16 01:27:33 UTC (rev 251173)
+++ trunk/Source/WebKit/ChangeLog	2019-10-16 01:49:53 UTC (rev 251174)
@@ -1,3 +1,33 @@
+2019-10-15  Chris Dumez  
+
+[iOS] Maintain the last Back/Forward cache entry when the application gets suspended
+https://bugs.webkit.org/show_bug.cgi?id=203014
+
+Reviewed by Geoffrey Garen.
+
+Previously, we would clear all back/forward cache entries when the application is about to
+be suspended. This means that we would lose fast-back when coming back to the application.
+To be memory-friendly but maintain the fast-back when coming back to the application, we now
+maintain the last back/forward cache entry when the application gets suspended.
+
+* UIProcess/Cocoa/WebProcessPoolCocoa.mm:
+(WebKit::WebProcessPool::applicationIsAboutToSuspend):
+(WebKit::WebProcessPool::notifyProcessPoolsApplicationIsAboutToSuspend):
+* UIProcess/WebBackForwardCache.cpp:
+(WebKit::WebBackForwardCache::pruneToSize):
+* UIProcess/WebBackForwardCache.h:
+* UIProcess/WebProcessPool.h:
+* UIProcess/ios/ProcessAssertionIOS.mm:
+(-[WKProcessAssertionBackgroundTaskManager init]):
+(-[WKProcessAssertionBackgroundTaskManager _releaseBackgroundTask]):
+
+* WebProcess/WebProcess.cpp:
+(WebKit::WebProcess::initializeWebProcess):
+A WebProcess no longer clears its PageCache on suspension on iOS. We let the UIProcess's
+back/forward cache control when PageCache entries should get destroyed. The back/forward
+cache will properly wake up a suspended process to clear one of its PageCache entries if
+needed.
+
 2019-10-15  Andres Gonzalez  
 
 AX: Make AXIsolatedTree compile again


Modified: trunk/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm (251173 => 251174)

--- trunk/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm	2019-10-16 01:27:33 UTC (rev 251173)
+++ trunk/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm	2019-10-16 01:49:53 UTC (rev 251174)
@@ -37,6 +37,7 @@
 #import "TextChecker.h"
 #import "VersionChecks.h"
 #import "WKBrowsingContextControllerInternal.h"
+#import "WebBackForwardCache.h"
 #import "WebMemoryPressureHandler.h"
 #import "WebPageGroup.h"
 #import "WebPreferencesKeys.h"
@@ -585,11 +586,18 @@
 #if PLATFORM(IOS_FAMILY)
 void WebProcessPool::applicationIsAboutToSuspend()
 {
-RELEASE_LOG(ProcessSuspension, "Application is about to suspend so we simulate memory pressure to terminate non-critical processes");
-// Simulate memory pressure handling so free as much memory as possible before suspending.
-// In particular, this will terminate prewarmed and PageCache processes.
+RELEASE_LOG(ProcessSuspension, "WebProcessPool::applicationIsAboutToSuspend() Terminating non-critical processes");
+
+m_backForwardCache->pruneToSize(1);
+if (m_prewarmedProcess)
+m_prewarmedProcess->shutDown();
+m_webProcessCache->clear();
+}
+
+void WebProcessPool::not

[webkit-changes] [251175] trunk/LayoutTests

Title: [251175] trunk/LayoutTests








Revision 251175
Author wenson_hs...@apple.com
Date 2019-10-15 19:06:01 -0700 (Tue, 15 Oct 2019)


Log Message
editing/async-clipboard/clipboard-item-basic.html is a flaky failure on macOS and iOS
https://bugs.webkit.org/show_bug.cgi?id=203015

Reviewed by Tim Horton.

This test, for the most part, finishes and dumps its final output before a couple of (intentionally) rejected
promises finish and log their uncaught rejections to the console. In the case where we lose this race and the
console messages happen earlier, we end up with a text diff failure.

Avoid this issue by making sure that we catch these promise rejections.

* editing/async-clipboard/clipboard-item-basic.html:

Also give this test a tiny bit more variety, by making one of the promises reject immediately, while the other
still waits for a short delay (50 ms).

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/LayoutTests/editing/async-clipboard/clipboard-item-basic.html




Diff

Modified: trunk/LayoutTests/ChangeLog (251174 => 251175)

--- trunk/LayoutTests/ChangeLog	2019-10-16 01:49:53 UTC (rev 251174)
+++ trunk/LayoutTests/ChangeLog	2019-10-16 02:06:01 UTC (rev 251175)
@@ -1,3 +1,21 @@
+2019-10-15  Wenson Hsieh  
+
+editing/async-clipboard/clipboard-item-basic.html is a flaky failure on macOS and iOS
+https://bugs.webkit.org/show_bug.cgi?id=203015
+
+Reviewed by Tim Horton.
+
+This test, for the most part, finishes and dumps its final output before a couple of (intentionally) rejected
+promises finish and log their uncaught rejections to the console. In the case where we lose this race and the
+console messages happen earlier, we end up with a text diff failure.
+
+Avoid this issue by making sure that we catch these promise rejections.
+
+* editing/async-clipboard/clipboard-item-basic.html:
+
+Also give this test a tiny bit more variety, by making one of the promises reject immediately, while the other
+still waits for a short delay (50 ms).
+
 2019-10-15  Carlos Alberto Lopez Perez  
 
 Import apng testcases from WPT.


Modified: trunk/LayoutTests/editing/async-clipboard/clipboard-item-basic.html (251174 => 251175)

--- trunk/LayoutTests/editing/async-clipboard/clipboard-item-basic.html	2019-10-16 01:49:53 UTC (rev 251174)
+++ trunk/LayoutTests/editing/async-clipboard/clipboard-item-basic.html	2019-10-16 02:06:01 UTC (rev 251175)
@@ -143,8 +143,10 @@
 await (async function() {
 item = tryToCreateClipboardItem({
 "text/plain" : Promise.resolve("謝謝"),
-"text/html" : new Promise((_, reject) => setTimeout(() => reject(imageBlob()), 50)),
-"image/png" : new Promise((_, reject) => setTimeout(() => reject(imageBlob()), 50)),
+"text/html" : new Promise((_, reject) => {
+setTimeout(reject, 50);
+}).catch(() => { }),
+"image/png" : Promise.reject(imageBlob()).catch(() => { }),
 "🤔🤔🤔" : Promise.resolve("מקור השם עברית"),
 "מקור השם עברית" : Promise.resolve("🤔🤔🤔")
 });






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

[webkit-changes] [251176] trunk

Title: [251176] trunk








Revision 251176
Author commit-qu...@webkit.org
Date 2019-10-15 19:08:32 -0700 (Tue, 15 Oct 2019)


Log Message
REGRESSION (~244100) [Mac WK2 Debug] Layout Test http/tests/resourceLoadStatistics/prune-statistics.html is a flaky failure (197285)
https://bugs.webkit.org/show_bug.cgi?id=197285


Patch by Kate Cheney  on 2019-10-15
Reviewed by Chris Dumez.

Source/WebKit:

This patch fixes a flaky failure which was being caused by other
resourceLoadStatistics tests scheduling processing checks which
were called during execution of prune-statistics.html.
Now, any pending processing checks are cancelled between tests.

* NetworkProcess/Classifier/WebResourceLoadStatisticsStore.cpp:
(WebKit::WebResourceLoadStatisticsStore::scheduleClearInMemoryAndPersistent):

LayoutTests:

Remove a "skipped" expectation for a previously flaky test that should
be fixed by this patch.
* platform/mac-wk2/TestExpectations:

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/LayoutTests/platform/mac-wk2/TestExpectations
trunk/Source/WebKit/ChangeLog
trunk/Source/WebKit/NetworkProcess/Classifier/WebResourceLoadStatisticsStore.cpp




Diff

Modified: trunk/LayoutTests/ChangeLog (251175 => 251176)

--- trunk/LayoutTests/ChangeLog	2019-10-16 02:06:01 UTC (rev 251175)
+++ trunk/LayoutTests/ChangeLog	2019-10-16 02:08:32 UTC (rev 251176)
@@ -1,3 +1,15 @@
+2019-10-15  Kate Cheney  
+
+REGRESSION (~244100) [Mac WK2 Debug] Layout Test http/tests/resourceLoadStatistics/prune-statistics.html is a flaky failure (197285)
+https://bugs.webkit.org/show_bug.cgi?id=197285
+
+
+Reviewed by Chris Dumez.
+
+Remove a "skipped" expectation for a previously flaky test that should 
+be fixed by this patch.
+* platform/mac-wk2/TestExpectations:
+
 2019-10-15  Wenson Hsieh  
 
 editing/async-clipboard/clipboard-item-basic.html is a flaky failure on macOS and iOS


Modified: trunk/LayoutTests/platform/mac-wk2/TestExpectations (251175 => 251176)

--- trunk/LayoutTests/platform/mac-wk2/TestExpectations	2019-10-16 02:06:01 UTC (rev 251175)
+++ trunk/LayoutTests/platform/mac-wk2/TestExpectations	2019-10-16 02:08:32 UTC (rev 251176)
@@ -896,8 +896,6 @@
 
 webkit.org/b/197283 fast/css-custom-paint/animate-repaint.html [ Pass Failure ]
 
-webkit.org/b/197285 http/tests/resourceLoadStatistics/prune-statistics.html [ Pass Failure ]
-
 webkit.org/b/197207 http/wpt/resource-timing/rt-resources-per-frame.html [ Pass Failure ]
 
 webkit.org/b/197425 [ Mojave Debug ] scrollingcoordinator/scrolling-tree/scrolling-tree-includes-frame.html [ Pass Failure ]
@@ -932,4 +930,4 @@
 
 webkit.org/b/199089 [ Mojave+ Debug ] plugins/window-open.html [ Skip ]
 
-webkit.org/b/202500 [ Mojave ] crypto/workers/subtle/aes-indexeddb.html [ Timeout ]
\ No newline at end of file
+webkit.org/b/202500 [ Mojave ] crypto/workers/subtle/aes-indexeddb.html [ Timeout ]


Modified: trunk/Source/WebKit/ChangeLog (251175 => 251176)

--- trunk/Source/WebKit/ChangeLog	2019-10-16 02:06:01 UTC (rev 251175)
+++ trunk/Source/WebKit/ChangeLog	2019-10-16 02:08:32 UTC (rev 251176)
@@ -1,3 +1,19 @@
+2019-10-15  Kate Cheney  
+
+REGRESSION (~244100) [Mac WK2 Debug] Layout Test http/tests/resourceLoadStatistics/prune-statistics.html is a flaky failure (197285)
+https://bugs.webkit.org/show_bug.cgi?id=197285
+
+
+Reviewed by Chris Dumez.
+
+This patch fixes a flaky failure which was being caused by other
+resourceLoadStatistics tests scheduling processing checks which
+were called during execution of prune-statistics.html.
+Now, any pending processing checks are cancelled between tests.
+
+* NetworkProcess/Classifier/WebResourceLoadStatisticsStore.cpp:
+(WebKit::WebResourceLoadStatisticsStore::scheduleClearInMemoryAndPersistent):
+
 2019-10-15  Chris Dumez  
 
 [iOS] Maintain the last Back/Forward cache entry when the application gets suspended


Modified: trunk/Source/WebKit/NetworkProcess/Classifier/WebResourceLoadStatisticsStore.cpp (251175 => 251176)

--- trunk/Source/WebKit/NetworkProcess/Classifier/WebResourceLoadStatisticsStore.cpp	2019-10-16 02:06:01 UTC (rev 251175)
+++ trunk/Source/WebKit/NetworkProcess/Classifier/WebResourceLoadStatisticsStore.cpp	2019-10-16 02:08:32 UTC (rev 251176)
@@ -898,6 +898,8 @@
 RELEASE_LOG(ResourceLoadStatistics, "WebResourceLoadStatisticsStore::scheduleClearInMemoryAndPersistent After being cleared, m_statisticsStore is null when trying to grandfather data.");
 }
 });
+
+m_statisticsStore->cancelPendingStatisticsProcessingRequest();
 });
 }
 






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

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

2019-10-15 Thread rniwa

Title: [251177] trunk/Source/WebCore








Revision 251177
Author rn...@webkit.org
Date 2019-10-15 19:32:05 -0700 (Tue, 15 Oct 2019)


Log Message
adoptRef DOMTimer in install instead of its constructor
https://bugs.webkit.org/show_bug.cgi?id=203016

Reviewed by Simon Fraser.

Moved the code to add DOMTimer to ScriptExecutionContext's map to DOMTimer::install
instead of its constructor so that we can adoptRef there instead for clarity & simplicity.

* dom/ScriptExecutionContext.h:
(WebCore::ScriptExecutionContext::addTimeout):
* page/DOMTimer.cpp:
(WebCore::DOMTimer::DOMTimer):
(WebCore::DOMTimer::install):
(WebCore::DOMTimer::fired):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/dom/ScriptExecutionContext.h
trunk/Source/WebCore/page/DOMTimer.cpp




Diff

Modified: trunk/Source/WebCore/ChangeLog (251176 => 251177)

--- trunk/Source/WebCore/ChangeLog	2019-10-16 02:08:32 UTC (rev 251176)
+++ trunk/Source/WebCore/ChangeLog	2019-10-16 02:32:05 UTC (rev 251177)
@@ -1,3 +1,20 @@
+2019-10-15  Ryosuke Niwa  
+
+adoptRef DOMTimer in install instead of its constructor
+https://bugs.webkit.org/show_bug.cgi?id=203016
+
+Reviewed by Simon Fraser.
+
+Moved the code to add DOMTimer to ScriptExecutionContext's map to DOMTimer::install
+instead of its constructor so that we can adoptRef there instead for clarity & simplicity.
+
+* dom/ScriptExecutionContext.h:
+(WebCore::ScriptExecutionContext::addTimeout):
+* page/DOMTimer.cpp:
+(WebCore::DOMTimer::DOMTimer):
+(WebCore::DOMTimer::install):
+(WebCore::DOMTimer::fired):
+
 2019-10-15  Simon Fraser  
 
 ScrollingTreeScrollingNodeDelegateMac::stretchAmount() should not have side effects


Modified: trunk/Source/WebCore/dom/ScriptExecutionContext.h (251176 => 251177)

--- trunk/Source/WebCore/dom/ScriptExecutionContext.h	2019-10-16 02:08:32 UTC (rev 251176)
+++ trunk/Source/WebCore/dom/ScriptExecutionContext.h	2019-10-16 02:32:05 UTC (rev 251177)
@@ -202,7 +202,7 @@
 // Gets the next id in a circular sequence from 1 to 2^31-1.
 int circularSequentialID();
 
-bool addTimeout(int timeoutId, DOMTimer& timer) { return m_timeouts.add(timeoutId, &timer).isNewEntry; }
+bool addTimeout(int timeoutId, DOMTimer& timer) { return m_timeouts.add(timeoutId, timer).isNewEntry; }
 void removeTimeout(int timeoutId) { m_timeouts.remove(timeoutId); }
 DOMTimer* findTimeout(int timeoutId) { return m_timeouts.get(timeoutId); }
 
@@ -307,7 +307,7 @@
 HashSet m_destructionObservers;
 HashSet m_activeDOMObjects;
 
-HashMap> m_timeouts;
+HashMap> m_timeouts;
 
 struct PendingException;
 std::unique_ptr>> m_pendingExceptions;


Modified: trunk/Source/WebCore/page/DOMTimer.cpp (251176 => 251177)

--- trunk/Source/WebCore/page/DOMTimer.cpp	2019-10-16 02:08:32 UTC (rev 251176)
+++ trunk/Source/WebCore/page/DOMTimer.cpp	2019-10-16 02:32:05 UTC (rev 251177)
@@ -169,13 +169,6 @@
 , m_currentTimerInterval(intervalClampedToMinimum())
 , m_userGestureTokenToForward(UserGestureIndicator::currentUserGesture())
 {
-RefPtr reference = adoptRef(this);
-
-// Keep asking for the next id until we're given one that we don't already have.
-do {
-m_timeoutId = context.circularSequentialID();
-} while (!context.addTimeout(m_timeoutId, *this));
-
 if (singleShot)
 startOneShot(m_currentTimerInterval);
 else
@@ -186,22 +179,25 @@
 
 int DOMTimer::install(ScriptExecutionContext& context, std::unique_ptr action, Seconds timeout, bool singleShot)
 {
-// DOMTimer constructor passes ownership of the initial ref on the object to the constructor.
-// This reference will be released automatically when a one-shot timer fires, when the context
-// is destroyed, or if explicitly cancelled by removeById. 
-DOMTimer* timer = new DOMTimer(context, WTFMove(action), timeout, singleShot);
+Ref timer = adoptRef(*new DOMTimer(context, WTFMove(action), timeout, singleShot));
 timer->suspendIfNeeded();
+
+// Keep asking for the next id until we're given one that we don't already have.
+do {
+timer->m_timeoutId = context.circularSequentialID();
+} while (!context.addTimeout(timer->m_timeoutId, timer.get()));
+
 InspectorInstrumentation::didInstallTimer(context, timer->m_timeoutId, timeout, singleShot);
 
 // Keep track of nested timer installs.
 if (NestedTimersMap* nestedTimers = NestedTimersMap::instanceForContext(context))
-nestedTimers->add(timer->m_timeoutId, *timer);
+nestedTimers->add(timer->m_timeoutId, timer.get());
 #if PLATFORM(IOS_FAMILY)
 if (is(context)) {
 auto& document = downcast(context);
-document.contentChangeObserver().didInstallDOMTimer(*timer, timeout, singleShot);
+document.contentChangeObserver().didInstallDOMTimer(timer.get(), timeout, singleShot);
 if (DeferDOMTimersForScope::isDeferring())
-

[webkit-changes] [251178] trunk

2019-10-15 Thread mark . lam

Title: [251178] trunk








Revision 251178
Author mark@apple.com
Date 2019-10-15 21:01:18 -0700 (Tue, 15 Oct 2019)


Log Message
operationSwitchCharWithUnknownKeyType failed to handle OOME when resolving rope string.
https://bugs.webkit.org/show_bug.cgi?id=202312


Reviewed by Yusuke Suzuki.

JSTests:

* stress/operationSwitchCharWithUnknownKeyType-should-avoid-resolving-rope-strings.js: Added.
* stress/operationSwitchCharWithUnknownKeyType-should-avoid-resolving-rope-strings2.js: Added.
* stress/switch-on-char-llint-rope.js:
- Changed this test to make a new rope string for each iterations.  Otherwise,
  the rope will get resolved, and subsequent tiers will not be testing with a rope.

Source/_javascript_Core:

operationSwitchCharWithUnknownKeyType() can only dispatch to a case handler
if the key string is of length 1.  All other cases should dispatch to the default
handler.  This patch also adds the missing OOME check.

Also fixed a bug in SpeculativeJIT::emitSwitchCharStringJump() where the slow
path rope resolution was returning after the length check.  It needs to return to
the point before the length check.

* dfg/DFGSpeculativeJIT.cpp:
(JSC::DFG::SpeculativeJIT::emitSwitchCharStringJump):
* jit/JITOperations.cpp:

Modified Paths

trunk/JSTests/ChangeLog
trunk/JSTests/stress/switch-on-char-llint-rope.js
trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/dfg/DFGSpeculativeJIT.cpp
trunk/Source/_javascript_Core/jit/JITOperations.cpp


Added Paths

trunk/JSTests/stress/operationSwitchCharWithUnknownKeyType-should-avoid-resolving-rope-strings.js
trunk/JSTests/stress/operationSwitchCharWithUnknownKeyType-should-avoid-resolving-rope-strings2.js




Diff

Modified: trunk/JSTests/ChangeLog (251177 => 251178)

--- trunk/JSTests/ChangeLog	2019-10-16 02:32:05 UTC (rev 251177)
+++ trunk/JSTests/ChangeLog	2019-10-16 04:01:18 UTC (rev 251178)
@@ -1,3 +1,17 @@
+2019-10-15  Mark Lam  
+
+operationSwitchCharWithUnknownKeyType failed to handle OOME when resolving rope string.
+https://bugs.webkit.org/show_bug.cgi?id=202312
+
+
+Reviewed by Yusuke Suzuki.
+
+* stress/operationSwitchCharWithUnknownKeyType-should-avoid-resolving-rope-strings.js: Added.
+* stress/operationSwitchCharWithUnknownKeyType-should-avoid-resolving-rope-strings2.js: Added.
+* stress/switch-on-char-llint-rope.js:
+- Changed this test to make a new rope string for each iterations.  Otherwise,
+  the rope will get resolved, and subsequent tiers will not be testing with a rope.
+
 2019-10-14  Yusuke Suzuki  
 
 [JSC] GetterSetter should be JSCell, not JSObject


Added: trunk/JSTests/stress/operationSwitchCharWithUnknownKeyType-should-avoid-resolving-rope-strings.js (0 => 251178)

--- trunk/JSTests/stress/operationSwitchCharWithUnknownKeyType-should-avoid-resolving-rope-strings.js	(rev 0)
+++ trunk/JSTests/stress/operationSwitchCharWithUnknownKeyType-should-avoid-resolving-rope-strings.js	2019-10-16 04:01:18 UTC (rev 251178)
@@ -0,0 +1,17 @@
+//@ if $memoryLimited then skip else runDefault("--useConcurrentJIT=false") end
+//@ slow!
+
+var o = (-1).toLocaleString().padEnd(2 ** 31 - 1, "a");
+
+function f() {
+switch (o) {
+case "t":
+case "s":
+case "u":
+}
+}
+noInline(f);
+
+for (var i = 0; i < 1; i++)
+f();
+


Added: trunk/JSTests/stress/operationSwitchCharWithUnknownKeyType-should-avoid-resolving-rope-strings2.js (0 => 251178)

--- trunk/JSTests/stress/operationSwitchCharWithUnknownKeyType-should-avoid-resolving-rope-strings2.js	(rev 0)
+++ trunk/JSTests/stress/operationSwitchCharWithUnknownKeyType-should-avoid-resolving-rope-strings2.js	2019-10-16 04:01:18 UTC (rev 251178)
@@ -0,0 +1,24 @@
+//@ if $memoryLimited then skip else runDefault("--useConcurrentJIT=false") end
+//@ slow!
+
+function f(o) {
+switch (o) {
+case "t":
+case "s":
+case "u":
+}
+}
+noInline(f);
+
+for (var i = 0; i < 1; i++) {
+let o;
+// This test needs to allocate a large rope string, which is slow.
+// The following is tweaked so that we only use this large string once each to
+// exercise the llint, baseline, DFG, and FTL, so that the test doesn't run too slow.
+if (i == 0 || i == 99 || i == 200 || i == )
+o = (-1).toLocaleString().padEnd(2 ** 31 - 1, "a");
+else
+o = (-1).toLocaleString().padEnd(2, "a");
+f(o);
+}
+


Modified: trunk/JSTests/stress/switch-on-char-llint-rope.js (251177 => 251178)

--- trunk/JSTests/stress/switch-on-char-llint-rope.js	2019-10-16 02:32:05 UTC (rev 251177)
+++ trunk/JSTests/stress/switch-on-char-llint-rope.js	2019-10-16 04:01:18 UTC (rev 251178)
@@ -14,8 +14,8 @@
 }
 noInline(foo);
 
-let str = 'a' + constStr();
 for (let i = 0; i < 1; ++i) {
+let str = 'a' + constStr();
 let result = foo(str);
 if (result !== 2)
 throw new Error("Bad result");


M

[webkit-changes] [251179] trunk/Source/WebKit