[webkit-changes] [219444] trunk/Source/WebCore
Title: [219444] trunk/Source/WebCore
Revision 219444
Author cfleiz...@apple.com
Date 2017-07-13 00:47:11 -0700 (Thu, 13 Jul 2017)
Log Message
AX: WebView crashes app after opening VoiceOver context box menu from modal dialog
https://bugs.webkit.org/show_bug.cgi?id=163999
Reviewed by Joanmarie Diggs.
Protect when m_object goes away.
* accessibility/mac/WebAccessibilityObjectWrapperMac.mm:
(-[WebAccessibilityObjectWrapper accessibilityShowContextMenu]):
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm
Diff
Modified: trunk/Source/WebCore/ChangeLog (219443 => 219444)
--- trunk/Source/WebCore/ChangeLog 2017-07-13 07:11:45 UTC (rev 219443)
+++ trunk/Source/WebCore/ChangeLog 2017-07-13 07:47:11 UTC (rev 219444)
@@ -1,3 +1,16 @@
+2017-07-13 Chris Fleizach
+
+AX: WebView crashes app after opening VoiceOver context box menu from modal dialog
+https://bugs.webkit.org/show_bug.cgi?id=163999
+
+
+Reviewed by Joanmarie Diggs.
+
+Protect when m_object goes away.
+
+* accessibility/mac/WebAccessibilityObjectWrapperMac.mm:
+(-[WebAccessibilityObjectWrapper accessibilityShowContextMenu]):
+
2017-07-12 Said Abou-Hallawa
Async image decoding for large images should be disabled by default
Modified: trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm (219443 => 219444)
--- trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm 2017-07-13 07:11:45 UTC (rev 219443)
+++ trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm 2017-07-13 07:47:11 UTC (rev 219444)
@@ -3461,6 +3461,9 @@
- (void)accessibilityShowContextMenu
{
+if (!m_object)
+return;
+
Page* page = m_object->page();
if (!page)
return;
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [219446] trunk/Source/ThirdParty/ANGLE
Title: [219446] trunk/Source/ThirdParty/ANGLE
Revision 219446
Author ape...@igalia.com
Date 2017-07-13 02:21:52 -0700 (Thu, 13 Jul 2017)
Log Message
eglplatform.h does not support Wayland
https://bugs.webkit.org/show_bug.cgi?id=163482
This makes it possible to build WebKitGTK+ when the target system has only Wayland support,
but no X11 (and therefore the X11 headers are not present).
Reviewed by Alex Christensen.
* include/EGL/eglplatform.h: Add Wayland typedefs when WL_EGL_PLATFORM is defined (for example
by including wayland-egl.h before including EGL/egl.h). Also, include the X11 headers only
when ANGLE_USE_X11 is defined and, for consistency with Mesa's version of the header, when
MESA_EGL_NO_X11_HEADERS is not defined.
Modified Paths
trunk/Source/ThirdParty/ANGLE/ChangeLog
trunk/Source/ThirdParty/ANGLE/changes.diff
trunk/Source/ThirdParty/ANGLE/include/EGL/eglplatform.h
Diff
Modified: trunk/Source/ThirdParty/ANGLE/ChangeLog (219445 => 219446)
--- trunk/Source/ThirdParty/ANGLE/ChangeLog 2017-07-13 08:21:46 UTC (rev 219445)
+++ trunk/Source/ThirdParty/ANGLE/ChangeLog 2017-07-13 09:21:52 UTC (rev 219446)
@@ -1,3 +1,18 @@
+2017-07-13 Adrian Perez de Castro
+
+eglplatform.h does not support Wayland
+https://bugs.webkit.org/show_bug.cgi?id=163482
+
+This makes it possible to build WebKitGTK+ when the target system has only Wayland support,
+but no X11 (and therefore the X11 headers are not present).
+
+Reviewed by Alex Christensen.
+
+* include/EGL/eglplatform.h: Add Wayland typedefs when WL_EGL_PLATFORM is defined (for example
+by including wayland-egl.h before including EGL/egl.h). Also, include the X11 headers only
+when ANGLE_USE_X11 is defined and, for consistency with Mesa's version of the header, when
+MESA_EGL_NO_X11_HEADERS is not defined.
+
2017-07-03 Andy Estes
[Xcode] Add an experimental setting to build with ccache
Modified: trunk/Source/ThirdParty/ANGLE/changes.diff (219445 => 219446)
--- trunk/Source/ThirdParty/ANGLE/changes.diff 2017-07-13 08:21:46 UTC (rev 219445)
+++ trunk/Source/ThirdParty/ANGLE/changes.diff 2017-07-13 09:21:52 UTC (rev 219446)
@@ -558,3 +558,44 @@
if (conversionSet.find(CopyConversion(textureFormatInfo.format,
framebufferFormatInfo.format)) != conversionSet.end())
{
+diff --git a/include/EGL/eglplatform.h b/include/EGL/eglplatform.h
+index 9bb75910ac0..ccaf7e6f343 100644
+--- a/include/EGL/eglplatform.h
b/include/EGL/eglplatform.h
+@@ -89,6 +89,12 @@ typedef int EGLNativeDisplayType;
+ typedef void *EGLNativeWindowType;
+ typedef void *EGLNativePixmapType;
+
++#elif defined(WL_EGL_PLATFORM)
++
++typedef struct wl_display*EGLNativeDisplayType;
++typedef struct wl_egl_pixmap *EGLNativePixmapType;
++typedef struct wl_egl_window *EGLNativeWindowType;
++
+ #elif defined(__ANDROID__) || defined(ANDROID)
+
+ #include
+@@ -107,6 +113,8 @@ typedef intptr_t EGLNativePixmapType;
+
+ #elif defined(__unix__)
+
++#if defined(ANGLE_USE_X11) && !defined(MESA_EGL_NO_X11_HEADERS)
++
+ /* X11 (tentative) */
+ #include
+ #include
+@@ -116,6 +124,14 @@ typedef Pixmap EGLNativePixmapType;
+ typedef Window EGLNativeWindowType;
+
+ #else
++
++typedef void *EGLNativeDisplayType;
++typedef khronos_uintptr_t EGLNativePixmapType;
++typedef khronos_uintptr_t EGLNativeWindowType;
++
++#endif /* ANGLE_USE_X11 && !MESA_EGL_NO_X11_HEADERS */
++
++#else
+ #error "Platform not recognized"
+ #endif
+
Modified: trunk/Source/ThirdParty/ANGLE/include/EGL/eglplatform.h (219445 => 219446)
--- trunk/Source/ThirdParty/ANGLE/include/EGL/eglplatform.h 2017-07-13 08:21:46 UTC (rev 219445)
+++ trunk/Source/ThirdParty/ANGLE/include/EGL/eglplatform.h 2017-07-13 09:21:52 UTC (rev 219446)
@@ -89,6 +89,12 @@
typedef void *EGLNativeWindowType;
typedef void *EGLNativePixmapType;
+#elif defined(WL_EGL_PLATFORM)
+
+typedef struct wl_display*EGLNativeDisplayType;
+typedef struct wl_egl_pixmap *EGLNativePixmapType;
+typedef struct wl_egl_window *EGLNativeWindowType;
+
#elif defined(__ANDROID__) || defined(ANDROID)
#include
@@ -107,6 +113,8 @@
#elif defined(__unix__)
+#if defined(ANGLE_USE_X11) && !defined(MESA_EGL_NO_X11_HEADERS)
+
/* X11 (tentative) */
#include
#include
@@ -116,6 +124,14 @@
typedef Window EGLNativeWindowType;
#else
+
+typedef void *EGLNativeDisplayType;
+typedef khronos_uintptr_t EGLNativePixmapType;
+typedef khronos_uintptr_t EGLNativeWindowType;
+
+#endif /* ANGLE_USE_X11 && !MESA_EGL_NO_X11_HEADERS */
+
+#else
#error "Platform not recognized"
#endif
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [219447] trunk
Title: [219447] trunk
Revision 219447
Author clo...@igalia.com
Date 2017-07-13 02:38:52 -0700 (Thu, 13 Jul 2017)
Log Message
REGRESSION(r219332): [GTK] 9 new failures on fast/forms spinbutton related tests
https://bugs.webkit.org/show_bug.cgi?id=174395
Reviewed by Carlos Garcia Campos.
Source/WebCore:
Covered by existing tests.
Before r219332 the height of the spin button widget was
calculated as the maximum value between the individual button
( the [+] or [-] ) width (33 pixels) and height (16 pixels).
And r219332 caused the height of the widget to be calculated as
the height of the button (16 pixels), which was incorrect as
each button should be first expanded vertically to fit the
preferred size of the widget.
Fix this by making the calculations about the spin button widget
on a new function spinButtonSize() that takes this into account,
and use this values both for adjusting the style of the input
field and the spin button widget itself.
* rendering/RenderThemeGtk.cpp:
(WebCore::spinButtonSize):
(WebCore::RenderThemeGtk::adjustTextFieldStyle):
(WebCore::RenderThemeGtk::adjustInnerSpinButtonStyle):
LayoutTests:
* fast/forms/number/number-spinbutton-in-multi-column.html: Instead of assuming that the width will be 100, calculate a -7 offset dinamically.
* platform/gtk/TestExpectations: Remove expected failures now orking.
* platform/gtk/fast/forms/number/number-size-spinbutton-nocover-expected.png: Rebaseline.
* platform/gtk/fast/forms/number/number-size-spinbutton-nocover-expected.txt: Rebaseline.
Modified Paths
trunk/LayoutTests/ChangeLog
trunk/LayoutTests/fast/forms/number/number-spinbutton-in-multi-column.html
trunk/LayoutTests/platform/gtk/TestExpectations
trunk/LayoutTests/platform/gtk/fast/forms/number/number-size-spinbutton-nocover-expected.png
trunk/LayoutTests/platform/gtk/fast/forms/number/number-size-spinbutton-nocover-expected.txt
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/rendering/RenderThemeGtk.cpp
Diff
Modified: trunk/LayoutTests/ChangeLog (219446 => 219447)
--- trunk/LayoutTests/ChangeLog 2017-07-13 09:21:52 UTC (rev 219446)
+++ trunk/LayoutTests/ChangeLog 2017-07-13 09:38:52 UTC (rev 219447)
@@ -1,3 +1,15 @@
+2017-07-12 Carlos Alberto Lopez Perez
+
+REGRESSION(r219332): [GTK] 9 new failures on fast/forms spinbutton related tests
+https://bugs.webkit.org/show_bug.cgi?id=174395
+
+Reviewed by Carlos Garcia Campos.
+
+* fast/forms/number/number-spinbutton-in-multi-column.html: Instead of assuming that the width will be 100, calculate a -7 offset dinamically.
+* platform/gtk/TestExpectations: Remove expected failures now orking.
+* platform/gtk/fast/forms/number/number-size-spinbutton-nocover-expected.png: Rebaseline.
+* platform/gtk/fast/forms/number/number-size-spinbutton-nocover-expected.txt: Rebaseline.
+
2017-07-13 Caio Lima
[ESnext] Implement Object Spread
Modified: trunk/LayoutTests/fast/forms/number/number-spinbutton-in-multi-column.html (219446 => 219447)
--- trunk/LayoutTests/fast/forms/number/number-spinbutton-in-multi-column.html 2017-07-13 09:21:52 UTC (rev 219446)
+++ trunk/LayoutTests/fast/forms/number/number-spinbutton-in-multi-column.html 2017-07-13 09:38:52 UTC (rev 219447)
@@ -58,7 +58,7 @@
const spinId = "c" + formIndex + colIndex;
const spin = document.getElementById(spinId);
-const clickX = pageX(column) + colWidth * colIndex + ofsX;
+const clickX = pageX(column) + colWidth * colIndex + spin.offsetWidth + ofsX;
const clickY = pageY(column) + Math.floor(spin.offsetHeight / 3) + 2;
eventSender.mouseMoveTo(clickX, clickY);
@@ -92,7 +92,7 @@
for (var formIndex = 0; formIndex < numForms; formIndex++) {
for (var colIndex = 0; colIndex < numCols; colIndex++) {
- testIt(formIndex, colIndex, 93, 10);
+ testIt(formIndex, colIndex, -7, 10);
}
}
}
Modified: trunk/LayoutTests/platform/gtk/TestExpectations (219446 => 219447)
--- trunk/LayoutTests/platform/gtk/TestExpectations 2017-07-13 09:21:52 UTC (rev 219446)
+++ trunk/LayoutTests/platform/gtk/TestExpectations 2017-07-13 09:38:52 UTC (rev 219447)
@@ -1256,17 +1256,6 @@
# GTK port doesn't use the scrolling tree
fast/scrolling/scrolling-tree-includes-frame.html [ Skip ]
-# Regressions on fast/forms spinbutton related tests after r219332
-webkit.org/b/174395 fast/events/touch/touch-before-pressing-spin-button.html [ Failure ]
-webkit.org/b/174395 fast/forms/input-number-click.html [ Failure ]
-webkit.org/b/174395 fast/forms/input-step-as-double.html [ Failure ]
-webkit.org/b/174395 fast/forms/number/number-large-padding.html [ Failure ]
-webkit.org/b/174395 fast/forms/number/number-spinbutton-capturing.html [ Failure ]
-webkit.org/b/174395 fast/forms/number/number-spinbutton-change-and-input-events.html [ Failure ]
-webkit.org/b/174395 fast/forms/number/number-spinbutton-gets-disabled-or-readonly.html [ Failure ]
-webkit.org/b/174395 fa
[webkit-changes] [219448] trunk
Title: [219448] trunk
Revision 219448
Author zandober...@gmail.com
Date 2017-07-13 03:00:24 -0700 (Thu, 13 Jul 2017)
Log Message
[GCrypt] Implement CryptoKeyRSA SPKI imports
https://bugs.webkit.org/show_bug.cgi?id=173694
Reviewed by Jiewen Tan.
Source/WebCore:
Implement the SPKI import operation for RSA keys for platforms that use
libgcrypt.
The passed-in key data is decoded against the `SubjectPublicKeyInfo` ASN.1
structure. We then validate the `algorithm.algorithm` element, ensuring that
the value under that represents a supported object identifier. This check is
for now mostly superficial, only ensuring that the object identifier is either
id-rsaEncryption, id-RSAES-OAEP or id-RSASSA-PSS. This has to be further extended
to also check the id-sha{1,256,384,512}WithRSAEncryption identifiers as well as
decoding the `algorithm.parameters` element against a specific ASN.1 structure,
if necessary (RSASSA-PSS-params or RSAES-OAEP-params), and cross-checking the
specified digest algorithm with the algorithm that's specified through the main
object identifier or the structure contained in `algorithm.parameters`. This is
avoided for now because no test in WebKit or the web-platform-tests suite covers
this detail of the specification.
After the algorithm is identified as supported, we proceed with decoding the
`subjectPublicKey` data against the `RSAPublicKey` ASN.1 structure. From there,
we retrieve the `modulus` and `publicExponent` data from which we can construct
an RSA `public-key` s-_expression_ that can be used through libgcrypt. A new
CryptoKeyRSA object is then created, taking over ownership of the `public-key`
s-_expression_, and returned.
No new tests -- related tests are now passing and are unskipped.
* crypto/gcrypt/CryptoKeyRSAGCrypt.cpp:
(WebCore::supportedAlgorithmIdentifier):
(WebCore::CryptoKeyRSA::importSpki):
LayoutTests:
* platform/gtk/TestExpectations: Unskip the RSA SPKI import tests
that are now passing.
Modified Paths
trunk/LayoutTests/ChangeLog
trunk/LayoutTests/platform/gtk/TestExpectations
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/crypto/gcrypt/CryptoKeyRSAGCrypt.cpp
Diff
Modified: trunk/LayoutTests/ChangeLog (219447 => 219448)
--- trunk/LayoutTests/ChangeLog 2017-07-13 09:38:52 UTC (rev 219447)
+++ trunk/LayoutTests/ChangeLog 2017-07-13 10:00:24 UTC (rev 219448)
@@ -1,3 +1,13 @@
+2017-07-13 Zan Dobersek
+
+[GCrypt] Implement CryptoKeyRSA SPKI imports
+https://bugs.webkit.org/show_bug.cgi?id=173694
+
+Reviewed by Jiewen Tan.
+
+* platform/gtk/TestExpectations: Unskip the RSA SPKI import tests
+that are now passing.
+
2017-07-12 Carlos Alberto Lopez Perez
REGRESSION(r219332): [GTK] 9 new failures on fast/forms spinbutton related tests
Modified: trunk/LayoutTests/platform/gtk/TestExpectations (219447 => 219448)
--- trunk/LayoutTests/platform/gtk/TestExpectations 2017-07-13 09:38:52 UTC (rev 219447)
+++ trunk/LayoutTests/platform/gtk/TestExpectations 2017-07-13 10:00:24 UTC (rev 219448)
@@ -765,9 +765,7 @@
webkit.org/b/133122 crypto/subtle/rsa-import-jwk-key-export-spki-key.html [ Skip ]
webkit.org/b/133122 crypto/subtle/rsa-import-pkcs8-key-export-jwk-key.html [ Skip ]
webkit.org/b/133122 crypto/subtle/rsa-import-pkcs8-key-export-pkcs8-key.html [ Skip ]
-webkit.org/b/133122 crypto/subtle/rsa-import-spki-key-export-jwk-key.html [ Skip ]
webkit.org/b/133122 crypto/subtle/rsa-import-spki-key-export-spki-key.html [ Skip ]
-webkit.org/b/133122 crypto/subtle/rsa-import-spki-small-key.html [ Skip ]
webkit.org/b/133122 crypto/subtle/rsa-indexeddb-non-exportable-private.html [ Skip ]
webkit.org/b/133122 crypto/subtle/rsa-indexeddb-non-exportable.html [ Skip ]
webkit.org/b/133122 crypto/subtle/rsa-indexeddb-private.html [ Skip ]
@@ -775,20 +773,14 @@
webkit.org/b/133122 crypto/subtle/rsa-oaep-generate-export-key-pkcs8.html [ Skip ]
webkit.org/b/133122 crypto/subtle/rsa-oaep-generate-export-key-spki.html [ Skip ]
webkit.org/b/133122 crypto/subtle/rsa-oaep-import-pkcs8-key.html [ Skip ]
-webkit.org/b/133122 crypto/subtle/rsa-oaep-import-spki-key-empty-usages.html [ Skip ]
-webkit.org/b/133122 crypto/subtle/rsa-oaep-import-spki-key.html [ Skip ]
webkit.org/b/133122 crypto/subtle/rsa-pss-generate-export-key-pkcs8.html [ Skip ]
webkit.org/b/133122 crypto/subtle/rsa-pss-generate-export-key-spki.html [ Skip ]
webkit.org/b/133122 crypto/subtle/rsaes-pkcs1-v1_5-generate-export-key-pkcs8.html [ Skip ]
webkit.org/b/133122 crypto/subtle/rsaes-pkcs1-v1_5-generate-export-key-spki.html [ Skip ]
webkit.org/b/133122 crypto/subtle/rsaes-pkcs1-v1_5-import-pkcs8-key.html [ Skip ]
-webkit.org/b/133122 crypto/subtle/rsaes-pkcs1-v1_5-import-spki-key-empty-usages.html [ Skip ]
-webkit.org/b/133122 crypto/subtle/rsaes-pkcs1-v1_5-import-spki-key.html [ Skip ]
webkit.org/b/133122 crypto/subtle/rsassa-pkcs1-v1_5-generate-export-key-pkcs8.html [ Skip ]
webkit.org/b/133122 crypto/subtle/rsassa-pkcs1-v1_5-generate-e
[webkit-changes] [219449] trunk
Title: [219449] trunk Revision 219449 Author zandober...@gmail.com Date 2017-07-13 03:09:00 -0700 (Thu, 13 Jul 2017) Log Message [GCrypt] Implement CryptoKeyRSA SPKI exports https://bugs.webkit.org/show_bug.cgi?id=173695 Reviewed by Jiewen Tan. Source/WebCore: Implement the SPKI export operation for RSA keys for platforms that use libgcrypt. In CryptoKeyRSA::exportSpki(), we bail early with an invalid access exception if this export is not being done for a public key. Otherwise, we start with creating the `RSAPublicKey` ASN.1 structure, filling in the modulus and public exponent data that's retrieved from the `public-key` s-_expression_ in the signed MPI format. We then create the `SubjectPublicKeyInfo` ASN.1 structure and fill it out with the necessary data. The id-rsaEncryption object identifier is written out under the `algorithm.algorithm` element, and a null value is written out under the `algorithm.parameters` element. This doesn't follow the specification at the moment, since id-RSASSA-PSS would have to be written for the RSA-PSS algorithm, and id-RSAES-OAEP for the RSA-OAEP algorithm, along with specific parameter structures. But no test in WebKit or the web-platform-tests suite covers this, so this deviation should be addressed later. Data of the previously-constructed `RSAPublicKey` structure is retrieved and written out under the `subjectPublicKey` element, before finally retrieving data of the `SubjectPublicKeyInfo` structure and returning that to the caller. A helper mpiSignedData() function is added, providing overloads for gcry_mpi_t and gcry_sexp_t parameters. MPI data for that parameter is retrieved and the first byte of that data is tested, inserting an additional 0x00 byte at the beginning of the Vector if that first byte has the first bit set, avoiding this data accidentally being interpreted as a signed integer. No new tests -- related tests are now passing and are unskipped. * crypto/gcrypt/CryptoKeyRSAGCrypt.cpp: (WebCore::CryptoKeyRSA::exportSpki): * crypto/gcrypt/GCryptUtilities.h: (WebCore::mpiSignedData): LayoutTests: * platform/gtk/TestExpectations: Unskip the RSA SPKI export tests that are now passing. Modified Paths trunk/LayoutTests/ChangeLog trunk/LayoutTests/platform/gtk/TestExpectations trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/crypto/gcrypt/CryptoKeyRSAGCrypt.cpp trunk/Source/WebCore/crypto/gcrypt/GCryptUtilities.h Diff Modified: trunk/LayoutTests/ChangeLog (219448 => 219449) --- trunk/LayoutTests/ChangeLog 2017-07-13 10:00:24 UTC (rev 219448) +++ trunk/LayoutTests/ChangeLog 2017-07-13 10:09:00 UTC (rev 219449) @@ -1,5 +1,15 @@ 2017-07-13 Zan Dobersek +[GCrypt] Implement CryptoKeyRSA SPKI exports +https://bugs.webkit.org/show_bug.cgi?id=173695 + +Reviewed by Jiewen Tan. + +* platform/gtk/TestExpectations: Unskip the RSA SPKI export tests +that are now passing. + +2017-07-13 Zan Dobersek + [GCrypt] Implement CryptoKeyRSA SPKI imports https://bugs.webkit.org/show_bug.cgi?id=173694 Modified: trunk/LayoutTests/platform/gtk/TestExpectations (219448 => 219449) --- trunk/LayoutTests/platform/gtk/TestExpectations 2017-07-13 10:00:24 UTC (rev 219448) +++ trunk/LayoutTests/platform/gtk/TestExpectations 2017-07-13 10:09:00 UTC (rev 219449) @@ -762,7 +762,6 @@ webkit.org/b/133122 crypto/subtle/ec-import-pkcs8-key-export-pkcs8-key-p384.html [ Skip ] webkit.org/b/133122 crypto/subtle/rsa-export-key-malformed-parameters.html [ Skip ] webkit.org/b/133122 crypto/subtle/rsa-import-jwk-key-export-pkcs8-key.html [ Skip ] -webkit.org/b/133122 crypto/subtle/rsa-import-jwk-key-export-spki-key.html [ Skip ] webkit.org/b/133122 crypto/subtle/rsa-import-pkcs8-key-export-jwk-key.html [ Skip ] webkit.org/b/133122 crypto/subtle/rsa-import-pkcs8-key-export-pkcs8-key.html [ Skip ] webkit.org/b/133122 crypto/subtle/rsa-import-spki-key-export-spki-key.html [ Skip ] @@ -771,15 +770,11 @@ webkit.org/b/133122 crypto/subtle/rsa-indexeddb-private.html [ Skip ] webkit.org/b/133122 crypto/subtle/rsa-indexeddb.html [ Skip ] webkit.org/b/133122 crypto/subtle/rsa-oaep-generate-export-key-pkcs8.html [ Skip ] -webkit.org/b/133122 crypto/subtle/rsa-oaep-generate-export-key-spki.html [ Skip ] webkit.org/b/133122 crypto/subtle/rsa-oaep-import-pkcs8-key.html [ Skip ] webkit.org/b/133122 crypto/subtle/rsa-pss-generate-export-key-pkcs8.html [ Skip ] -webkit.org/b/133122 crypto/subtle/rsa-pss-generate-export-key-spki.html [ Skip ] webkit.org/b/133122 crypto/subtle/rsaes-pkcs1-v1_5-generate-export-key-pkcs8.html [ Skip ] -webkit.org/b/133122 crypto/subtle/rsaes-pkcs1-v1_5-generate-export-key-spki.html [ Skip ] webkit.org/b/133122 crypto/subtle/rsaes-pkcs1-v1_5-import-pkcs8-key.html [ Skip ] webkit.org/b/133122 crypto/subtle/rsassa-pkcs1-v1_5-generate-export-key-pkcs8.html [ Skip ] -webkit.org/b/133122 crypto/subtle/rsassa-pkcs1-v1_5-generate-export-key-spki.html [ Skip ] webkit.org/b/133122 crypto/su
[webkit-changes] [219451] trunk
Title: [219451] trunk
Revision 219451
Author sbar...@apple.com
Date 2017-07-13 10:03:45 -0700 (Thu, 13 Jul 2017)
Log Message
Missing exception check in JSObject::hasInstance
https://bugs.webkit.org/show_bug.cgi?id=174455
Reviewed by Mark Lam.
JSTests:
* stress/has-instance-exception-check.js: Added.
(assert):
(let.getter.Object.getOwnPropertyDescriptor.get foo):
Source/_javascript_Core:
* runtime/JSObject.cpp:
(JSC::JSObject::hasInstance):
Modified Paths
trunk/JSTests/ChangeLog
trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/runtime/JSObject.cpp
Added Paths
trunk/JSTests/stress/has-instance-exception-check.js
Diff
Modified: trunk/JSTests/ChangeLog (219450 => 219451)
--- trunk/JSTests/ChangeLog 2017-07-13 15:51:57 UTC (rev 219450)
+++ trunk/JSTests/ChangeLog 2017-07-13 17:03:45 UTC (rev 219451)
@@ -1,3 +1,15 @@
+2017-07-13 Saam Barati
+
+Missing exception check in JSObject::hasInstance
+https://bugs.webkit.org/show_bug.cgi?id=174455
+
+
+Reviewed by Mark Lam.
+
+* stress/has-instance-exception-check.js: Added.
+(assert):
+(let.getter.Object.getOwnPropertyDescriptor.get foo):
+
2017-07-13 Caio Lima
[ESnext] Implement Object Spread
Added: trunk/JSTests/stress/has-instance-exception-check.js (0 => 219451)
--- trunk/JSTests/stress/has-instance-exception-check.js (rev 0)
+++ trunk/JSTests/stress/has-instance-exception-check.js 2017-07-13 17:03:45 UTC (rev 219451)
@@ -0,0 +1,17 @@
+function assert(b) {
+if (!b)
+throw new Error("Bad assertion");
+}
+
+let getter = Object.getOwnPropertyDescriptor({get foo(){}}, "foo").get;
+Object.defineProperty(getter, Symbol.hasInstance, {value:undefined});
+let y = {};
+Object.defineProperty(getter, "prototype", {get: Uint8Array});
+let error = null;
+try {
+y instanceof getter;
+} catch(e) {
+error = e;
+}
+assert(!!error);
+assert(error.toString() === "TypeError: calling Uint8Array constructor without new is invalid");
Modified: trunk/Source/_javascript_Core/ChangeLog (219450 => 219451)
--- trunk/Source/_javascript_Core/ChangeLog 2017-07-13 15:51:57 UTC (rev 219450)
+++ trunk/Source/_javascript_Core/ChangeLog 2017-07-13 17:03:45 UTC (rev 219451)
@@ -1,3 +1,14 @@
+2017-07-13 Saam Barati
+
+Missing exception check in JSObject::hasInstance
+https://bugs.webkit.org/show_bug.cgi?id=174455
+
+
+Reviewed by Mark Lam.
+
+* runtime/JSObject.cpp:
+(JSC::JSObject::hasInstance):
+
2017-07-13 Caio Lima
[ESnext] Implement Object Spread
Modified: trunk/Source/_javascript_Core/runtime/JSObject.cpp (219450 => 219451)
--- trunk/Source/_javascript_Core/runtime/JSObject.cpp 2017-07-13 15:51:57 UTC (rev 219450)
+++ trunk/Source/_javascript_Core/runtime/JSObject.cpp 2017-07-13 17:03:45 UTC (rev 219451)
@@ -2042,8 +2042,11 @@
}
TypeInfo info = structure(vm)->typeInfo();
-if (info.implementsDefaultHasInstance())
-return defaultHasInstance(exec, value, get(exec, exec->propertyNames().prototype));
+if (info.implementsDefaultHasInstance()) {
+JSValue prototype = get(exec, exec->propertyNames().prototype);
+RETURN_IF_EXCEPTION(scope, false);
+return defaultHasInstance(exec, value, prototype);
+}
if (info.implementsHasInstance())
return methodTable(vm)->customHasInstance(this, exec, value);
throwException(exec, scope, createInvalidInstanceofParameterErrorNotFunction(exec, this));
@@ -2052,7 +2055,10 @@
bool JSObject::hasInstance(ExecState* exec, JSValue value)
{
+VM& vm = exec->vm();
+auto scope = DECLARE_THROW_SCOPE(vm);
JSValue hasInstanceValue = get(exec, exec->propertyNames().hasInstanceSymbol);
+RETURN_IF_EXCEPTION(scope, false);
return hasInstance(exec, value, hasInstanceValue);
}
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [219452] branches/safari-604.1.31-branch/Source/WebKit2
Title: [219452] branches/safari-604.1.31-branch/Source/WebKit2
Revision 219452
Author jmarc...@apple.com
Date 2017-07-13 10:34:52 -0700 (Thu, 13 Jul 2017)
Log Message
Cherry-pick r219440. rdar://problem/33272627
Modified Paths
branches/safari-604.1.31-branch/Source/WebKit2/ChangeLog
branches/safari-604.1.31-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm
branches/safari-604.1.31-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h
branches/safari-604.1.31-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h
branches/safari-604.1.31-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm
Diff
Modified: branches/safari-604.1.31-branch/Source/WebKit2/ChangeLog (219451 => 219452)
--- branches/safari-604.1.31-branch/Source/WebKit2/ChangeLog 2017-07-13 17:03:45 UTC (rev 219451)
+++ branches/safari-604.1.31-branch/Source/WebKit2/ChangeLog 2017-07-13 17:34:52 UTC (rev 219452)
@@ -1,3 +1,40 @@
+2017-07-13 Jason Marcell
+
+Cherry-pick r219440. rdar://problem/33272627
+
+2017-07-12 Wenson Hsieh
+
+[iOS DnD] [WK2] Add SPI to enable, disable, or follow default behavior for DnD on a WKWebView
+https://bugs.webkit.org/show_bug.cgi?id=174440
+
+
+Reviewed by Beth Dakin.
+
+Adds a new _dragInteractionPolicy property to WKWebView, which an internal client may use to always allow
+dragging out of the web view (_WKDragInteractionPolicyAlwaysEnable), never allow
+(_WKDragInteractionPolicyAlwaysDisable) or just use the default device-dependent behavior
+(_WKDragInteractionPolicyDefault).
+
+Also removes an extraneous class from WKContentViewInteraction.mm that is no longer used anywhere.
+
+* UIProcess/API/Cocoa/WKWebView.mm:
+(-[WKWebView _initializeWithConfiguration:]):
+
+Set _dragInteractionPolicy to _WKDragInteractionPolicyDefault upon initialization.
+
+(-[WKWebView _dragInteractionPolicy]):
+(-[WKWebView _setDragInteractionPolicy:]):
+* UIProcess/API/Cocoa/WKWebViewPrivate.h:
+* UIProcess/ios/WKContentViewInteraction.h:
+* UIProcess/ios/WKContentViewInteraction.mm:
+(shouldEnableDragInteractionForPolicy):
+(-[WKContentView _didChangeDragInteractionPolicy]):
+
+Called by the WKWebView when its _dragInteractionPolicy changes. The content view updates its
+UIDragInteraction's -enabled property here in response.
+
+(-[WKContentView setupDataInteractionDelegates]):
+
2017-06-29 Dean Jackson
Disable some features on this release branch.
Modified: branches/safari-604.1.31-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (219451 => 219452)
--- branches/safari-604.1.31-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2017-07-13 17:03:45 UTC (rev 219451)
+++ branches/safari-604.1.31-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2017-07-13 17:34:52 UTC (rev 219452)
@@ -308,6 +308,10 @@
std::unique_ptr _impl;
RetainPtr _textFinderClient;
#endif
+
+#if PLATFORM(IOS) && ENABLE(DRAG_SUPPORT)
+_WKDragInteractionPolicy _dragInteractionPolicy;
+#endif
}
- (instancetype)initWithFrame:(CGRect)frame
@@ -594,6 +598,10 @@
_page->setURLSchemeHandlerForScheme(WebKit::WebURLSchemeHandlerCocoa::create(handlers[key]), key);
pageToViewMap().add(_page.get(), self);
+
+#if PLATFORM(IOS) && ENABLE(DRAG_SUPPORT)
+_dragInteractionPolicy = _WKDragInteractionPolicyDefault;
+#endif
}
- (void)_setUpSQLiteDatabaseTrackerClient
@@ -1079,6 +1087,24 @@
#if PLATFORM(IOS)
+#if ENABLE(DRAG_SUPPORT)
+
+- (_WKDragInteractionPolicy)_dragInteractionPolicy
+{
+return _dragInteractionPolicy;
+}
+
+- (void)_setDragInteractionPolicy:(_WKDragInteractionPolicy)policy
+{
+if (_dragInteractionPolicy == policy)
+return;
+
+_dragInteractionPolicy = policy;
+[_contentView _didChangeDragInteractionPolicy];
+}
+
+#endif
+
- (void)_populateArchivedSubviews:(NSMutableSet *)encodedViews
{
[super _populateArchivedSubviews:encodedViews];
Modified: branches/safari-604.1.31-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h (219451 => 219452)
--- branches/safari-604.1.31-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h 2017-07-13 17:03:45 UTC (rev 219451)
+++ branches/safari-604.1.31-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h 2017-07-13 17:34:52 UTC (rev 219452)
@@ -59,6 +59,16 @@
_WKCaptureDeviceCamera = 1 << 1,
} WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
+#if TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MIN_REQUIRED >= 11
+
+typedef NS_ENUM(NSUInteger, _WKDragInteractionPolicy) {
+_WKDragInteractionPolicyDefault = 0,
+_WKDragInteractionPolicyAlwaysEnable,
+_WKDragInteractionPolicyAlwaysDisable
+} WK_API_AVAILABLE(ios(WK_IOS_TBA));
+
+#endif
+
#if !TARGET_OS_IPHONE
ty
[webkit-changes] [219453] trunk/Source/WebKit2
Title: [219453] trunk/Source/WebKit2 Revision 219453 Author cdu...@apple.com Date 2017-07-13 10:52:43 -0700 (Thu, 13 Jul 2017) Log Message Moved filesystem code out of WebResourceLoadStatisticsStore class https://bugs.webkit.org/show_bug.cgi?id=174435 Reviewed by Brent Fulgham. Moved filesystem code out of WebResourceLoadStatisticsStore class and into a new ResourceLoadStatisticsPersistentStorage class to decrease complexity. * CMakeLists.txt: * UIProcess/Cocoa/WebResourceLoadStatisticsStoreCocoa.mm: * UIProcess/Storage/ResourceLoadStatisticsPersistentStorage.cpp: Added. (WebKit::hasFileChangedSince): (WebKit::createDecoderForFile): (WebKit::ResourceLoadStatisticsPersistentStorage::ResourceLoadStatisticsPersistentStorage): (WebKit::ResourceLoadStatisticsPersistentStorage::~ResourceLoadStatisticsPersistentStorage): (WebKit::ResourceLoadStatisticsPersistentStorage::storageDirectoryPath): (WebKit::ResourceLoadStatisticsPersistentStorage::resourceLogFilePath): (WebKit::ResourceLoadStatisticsPersistentStorage::startMonitoringDisk): (WebKit::ResourceLoadStatisticsPersistentStorage::stopMonitoringDisk): (WebKit::ResourceLoadStatisticsPersistentStorage::refreshMemoryStoreFromDisk): (WebKit::ResourceLoadStatisticsPersistentStorage::populateMemoryStoreFromDisk): (WebKit::ResourceLoadStatisticsPersistentStorage::writeMemoryStoreToDisk): (WebKit::ResourceLoadStatisticsPersistentStorage::scheduleOrWriteMemoryStore): (WebKit::ResourceLoadStatisticsPersistentStorage::clear): (WebKit::ResourceLoadStatisticsPersistentStorage::finishAllPendingWorkSynchronously): (WebKit::ResourceLoadStatisticsPersistentStorage::excludeFromBackup): * UIProcess/Storage/ResourceLoadStatisticsPersistentStorage.h: Added. * UIProcess/Storage/ios/ResourceLoadStatisticsPersistentStorageIOS.mm: Added. (WebKit::ResourceLoadStatisticsPersistentStorage::excludeFromBackup): * UIProcess/WebResourceLoadStatisticsStore.cpp: (WebKit::WebResourceLoadStatisticsStore::WebResourceLoadStatisticsStore): (WebKit::WebResourceLoadStatisticsStore::processStatisticsAndDataRecords): (WebKit::WebResourceLoadStatisticsStore::grandfatherExistingWebsiteData): (WebKit::WebResourceLoadStatisticsStore::applicationWillTerminate): (WebKit::WebResourceLoadStatisticsStore::scheduleClearInMemoryAndPersistent): (WebKit::WebResourceLoadStatisticsStore::resetDataFromDecoder): * UIProcess/WebResourceLoadStatisticsStore.h: * WebKit2.xcodeproj/project.pbxproj: Modified Paths trunk/Source/WebKit2/CMakeLists.txt trunk/Source/WebKit2/ChangeLog trunk/Source/WebKit2/UIProcess/Cocoa/WebResourceLoadStatisticsStoreCocoa.mm trunk/Source/WebKit2/UIProcess/WebResourceLoadStatisticsStore.cpp trunk/Source/WebKit2/UIProcess/WebResourceLoadStatisticsStore.h trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj Added Paths trunk/Source/WebKit2/UIProcess/Storage/ResourceLoadStatisticsPersistentStorage.cpp trunk/Source/WebKit2/UIProcess/Storage/ResourceLoadStatisticsPersistentStorage.h trunk/Source/WebKit2/UIProcess/Storage/ios/ResourceLoadStatisticsPersistentStorageIOS.mm Diff Modified: trunk/Source/WebKit2/CMakeLists.txt (219452 => 219453) --- trunk/Source/WebKit2/CMakeLists.txt 2017-07-13 17:34:52 UTC (rev 219452) +++ trunk/Source/WebKit2/CMakeLists.txt 2017-07-13 17:52:43 UTC (rev 219453) @@ -434,6 +434,7 @@ UIProcess/Storage/LocalStorageDatabase.cpp UIProcess/Storage/LocalStorageDatabaseTracker.cpp +UIProcess/Storage/ResourceLoadStatisticsPersistentStorage.cpp UIProcess/UserContent/WebScriptMessageHandler.cpp UIProcess/UserContent/WebUserContentControllerProxy.cpp Modified: trunk/Source/WebKit2/ChangeLog (219452 => 219453) --- trunk/Source/WebKit2/ChangeLog 2017-07-13 17:34:52 UTC (rev 219452) +++ trunk/Source/WebKit2/ChangeLog 2017-07-13 17:52:43 UTC (rev 219453) @@ -1,3 +1,44 @@ +2017-07-13 Chris Dumez + +Moved filesystem code out of WebResourceLoadStatisticsStore class +https://bugs.webkit.org/show_bug.cgi?id=174435 + +Reviewed by Brent Fulgham. + +Moved filesystem code out of WebResourceLoadStatisticsStore class and into +a new ResourceLoadStatisticsPersistentStorage class to decrease complexity. + +* CMakeLists.txt: +* UIProcess/Cocoa/WebResourceLoadStatisticsStoreCocoa.mm: +* UIProcess/Storage/ResourceLoadStatisticsPersistentStorage.cpp: Added. +(WebKit::hasFileChangedSince): +(WebKit::createDecoderForFile): +(WebKit::ResourceLoadStatisticsPersistentStorage::ResourceLoadStatisticsPersistentStorage): +(WebKit::ResourceLoadStatisticsPersistentStorage::~ResourceLoadStatisticsPersistentStorage): +(WebKit::ResourceLoadStatisticsPersistentStorage::storageDirectoryPath): +(WebKit::ResourceLoadStatisticsPersistentStorage::resourceLogFilePath): +(WebKit::ResourceLoadStatisticsPersistentStorage::startMonitoringDisk): +(WebKit::ResourceLoadStatisticsPersistentStorage::stopMonitoringDisk): +(WebKit::ResourceLoadSt
[webkit-changes] [219454] trunk/Source
Title: [219454] trunk/Source
Revision 219454
Author commit-qu...@webkit.org
Date 2017-07-13 11:03:27 -0700 (Thu, 13 Jul 2017)
Log Message
Web Inspector: Remove unused and untested Page domain commands
https://bugs.webkit.org/show_bug.cgi?id=174429
Patch by Joseph Pecoraro on 2017-07-13
Reviewed by Timothy Hatcher.
Source/_javascript_Core:
* inspector/protocol/Page.json:
Source/WebCore:
* inspector/InspectorPageAgent.cpp:
(WebCore::InspectorPageAgent::disable):
(WebCore::InspectorPageAgent::didClearWindowObjectInWorld):
(WebCore::InspectorPageAgent::addScriptToEvaluateOnLoad): Deleted.
(WebCore::InspectorPageAgent::removeScriptToEvaluateOnLoad): Deleted.
* inspector/InspectorPageAgent.h:
Source/WebInspectorUI:
* UserInterface/Protocol/Legacy/10.0/InspectorBackendCommands.js:
* UserInterface/Protocol/Legacy/10.3/InspectorBackendCommands.js:
* UserInterface/Protocol/Legacy/11.0/InspectorBackendCommands.js:
* UserInterface/Protocol/Legacy/7.0/InspectorBackendCommands.js:
* UserInterface/Protocol/Legacy/8.0/InspectorBackendCommands.js:
* UserInterface/Protocol/Legacy/9.0/InspectorBackendCommands.js:
* UserInterface/Protocol/Legacy/9.3/InspectorBackendCommands.js:
* Versions/Inspector-iOS-10.0.json:
* Versions/Inspector-iOS-10.3.json:
* Versions/Inspector-iOS-11.0.json:
* Versions/Inspector-iOS-7.0.json:
* Versions/Inspector-iOS-8.0.json:
* Versions/Inspector-iOS-9.0.json:
* Versions/Inspector-iOS-9.3.json:
Modified Paths
trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/inspector/protocol/Page.json
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/inspector/InspectorPageAgent.cpp
trunk/Source/WebCore/inspector/InspectorPageAgent.h
trunk/Source/WebInspectorUI/ChangeLog
trunk/Source/WebInspectorUI/UserInterface/Protocol/Legacy/10.0/InspectorBackendCommands.js
trunk/Source/WebInspectorUI/UserInterface/Protocol/Legacy/10.3/InspectorBackendCommands.js
trunk/Source/WebInspectorUI/UserInterface/Protocol/Legacy/11.0/InspectorBackendCommands.js
trunk/Source/WebInspectorUI/UserInterface/Protocol/Legacy/7.0/InspectorBackendCommands.js
trunk/Source/WebInspectorUI/UserInterface/Protocol/Legacy/8.0/InspectorBackendCommands.js
trunk/Source/WebInspectorUI/UserInterface/Protocol/Legacy/9.0/InspectorBackendCommands.js
trunk/Source/WebInspectorUI/UserInterface/Protocol/Legacy/9.3/InspectorBackendCommands.js
trunk/Source/WebInspectorUI/Versions/Inspector-iOS-10.0.json
trunk/Source/WebInspectorUI/Versions/Inspector-iOS-10.3.json
trunk/Source/WebInspectorUI/Versions/Inspector-iOS-11.0.json
trunk/Source/WebInspectorUI/Versions/Inspector-iOS-7.0.json
trunk/Source/WebInspectorUI/Versions/Inspector-iOS-8.0.json
trunk/Source/WebInspectorUI/Versions/Inspector-iOS-9.0.json
trunk/Source/WebInspectorUI/Versions/Inspector-iOS-9.3.json
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (219453 => 219454)
--- trunk/Source/_javascript_Core/ChangeLog 2017-07-13 17:52:43 UTC (rev 219453)
+++ trunk/Source/_javascript_Core/ChangeLog 2017-07-13 18:03:27 UTC (rev 219454)
@@ -1,3 +1,12 @@
+2017-07-13 Joseph Pecoraro
+
+Web Inspector: Remove unused and untested Page domain commands
+https://bugs.webkit.org/show_bug.cgi?id=174429
+
+Reviewed by Timothy Hatcher.
+
+* inspector/protocol/Page.json:
+
2017-07-13 Saam Barati
Missing exception check in JSObject::hasInstance
Modified: trunk/Source/_javascript_Core/inspector/protocol/Page.json (219453 => 219454)
--- trunk/Source/_javascript_Core/inspector/protocol/Page.json 2017-07-13 17:52:43 UTC (rev 219453)
+++ trunk/Source/_javascript_Core/inspector/protocol/Page.json 2017-07-13 18:03:27 UTC (rev 219454)
@@ -95,21 +95,6 @@
"description": "Disables page domain notifications."
},
{
-"name": "addScriptToEvaluateOnLoad",
-"parameters": [
-{ "name": "scriptSource", "type": "string" }
-],
-"returns": [
-{ "name": "identifier", "$ref": "ScriptIdentifier", "description": "Identifier of the added script." }
-]
-},
-{
-"name": "removeScriptToEvaluateOnLoad",
-"parameters": [
-{ "name": "identifier", "$ref": "ScriptIdentifier" }
-]
-},
-{
"name": "reload",
"description": "Reloads the main frame of the inspected page.",
"parameters": [
Modified: trunk/Source/WebCore/ChangeLog (219453 => 219454)
--- trunk/Source/WebCore/ChangeLog 2017-07-13 17:52:43 UTC (rev 219453)
+++ trunk/Source/WebCore/ChangeLog 2017-07-13 18:03:27 UTC (rev 219454)
@@ -1,3 +1,17 @@
+2017-07-13 Joseph Pecoraro
+
+Web Inspector: Remove unused and untested Page domain commands
+https://bugs.webkit.org/show_bug.cgi?id=174429
+
+Reviewed by Timothy Hatcher.
+
+* inspector/InspectorPageAgent.cpp:
+(WebCore::InspectorPageAgent::disable):
+(WebCore::InspectorP
[webkit-changes] [219455] trunk/Source/WebCore/PAL
Title: [219455] trunk/Source/WebCore/PAL
Revision 219455
Author pvol...@apple.com
Date 2017-07-13 11:17:48 -0700 (Thu, 13 Jul 2017)
Log Message
[Win] Build error when building WebCore from WebCore.proj project file.
https://bugs.webkit.org/show_bug.cgi?id=174462
Reviewed by Brent Fulgham.
Add required include directory to list of include directories.
* pal/CMakeLists.txt:
* pal/PlatformWin.cmake:
Modified Paths
trunk/Source/WebCore/PAL/ChangeLog
trunk/Source/WebCore/PAL/pal/CMakeLists.txt
trunk/Source/WebCore/PAL/pal/PlatformWin.cmake
Diff
Modified: trunk/Source/WebCore/PAL/ChangeLog (219454 => 219455)
--- trunk/Source/WebCore/PAL/ChangeLog 2017-07-13 18:03:27 UTC (rev 219454)
+++ trunk/Source/WebCore/PAL/ChangeLog 2017-07-13 18:17:48 UTC (rev 219455)
@@ -1,3 +1,15 @@
+2017-07-13 Per Arne Vollan
+
+[Win] Build error when building WebCore from WebCore.proj project file.
+https://bugs.webkit.org/show_bug.cgi?id=174462
+
+Reviewed by Brent Fulgham.
+
+Add required include directory to list of include directories.
+
+* pal/CMakeLists.txt:
+* pal/PlatformWin.cmake:
+
2017-07-12 Matt Lewis
Unreviewed, rolling out r219401.
Modified: trunk/Source/WebCore/PAL/pal/CMakeLists.txt (219454 => 219455)
--- trunk/Source/WebCore/PAL/pal/CMakeLists.txt 2017-07-13 18:03:27 UTC (rev 219454)
+++ trunk/Source/WebCore/PAL/pal/CMakeLists.txt 2017-07-13 18:17:48 UTC (rev 219455)
@@ -2,7 +2,6 @@
)
set(PAL_INCLUDE_DIRECTORIES
-"${CMAKE_BINARY_DIR}"
"${PAL_DIR}"
)
Modified: trunk/Source/WebCore/PAL/pal/PlatformWin.cmake (219454 => 219455)
--- trunk/Source/WebCore/PAL/pal/PlatformWin.cmake 2017-07-13 18:03:27 UTC (rev 219454)
+++ trunk/Source/WebCore/PAL/pal/PlatformWin.cmake 2017-07-13 18:17:48 UTC (rev 219455)
@@ -6,6 +6,11 @@
text/KillRingNone.cpp
)
+list(APPEND PAL_INCLUDE_DIRECTORIES
+"${CMAKE_BINARY_DIR}"
+"${CMAKE_BINARY_DIR}/../include/private"
+)
+
set(PAL_OUTPUT_NAME PAL${DEBUG_SUFFIX})
file(MAKE_DIRECTORY ${FORWARDING_HEADERS_DIR}/WebCore/pal)
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [219456] trunk/Source/WebCore
Title: [219456] trunk/Source/WebCore
Revision 219456
Author commit-qu...@webkit.org
Date 2017-07-13 11:19:38 -0700 (Thu, 13 Jul 2017)
Log Message
Fix block style in WebVideoFullscreen classes.
https://bugs.webkit.org/show_bug.cgi?id=174446
Patch by Jeremy Jones on 2017-07-13
Reviewed by Eric Carlson.
No behavior change.
* platform/ios/WebVideoFullscreenControllerAVKit.mm:
(WebVideoFullscreenControllerContext::setVideoLayerFrame):
* platform/ios/WebVideoFullscreenInterfaceAVKit.mm:
(-[WebAVPlayerLayer layoutSublayers]):
(getWebAVPictureInPicturePlayerLayerViewClass):
(getWebAVPlayerLayerViewClass):
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/ios/WebVideoFullscreenControllerAVKit.mm
trunk/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm
Diff
Modified: trunk/Source/WebCore/ChangeLog (219455 => 219456)
--- trunk/Source/WebCore/ChangeLog 2017-07-13 18:17:48 UTC (rev 219455)
+++ trunk/Source/WebCore/ChangeLog 2017-07-13 18:19:38 UTC (rev 219456)
@@ -1,3 +1,19 @@
+2017-07-13 Jeremy Jones
+
+Fix block style in WebVideoFullscreen classes.
+https://bugs.webkit.org/show_bug.cgi?id=174446
+
+Reviewed by Eric Carlson.
+
+No behavior change.
+
+* platform/ios/WebVideoFullscreenControllerAVKit.mm:
+(WebVideoFullscreenControllerContext::setVideoLayerFrame):
+* platform/ios/WebVideoFullscreenInterfaceAVKit.mm:
+(-[WebAVPlayerLayer layoutSublayers]):
+(getWebAVPictureInPicturePlayerLayerViewClass):
+(getWebAVPlayerLayerViewClass):
+
2017-07-13 Joseph Pecoraro
Web Inspector: Remove unused and untested Page domain commands
Modified: trunk/Source/WebCore/platform/ios/WebVideoFullscreenControllerAVKit.mm (219455 => 219456)
--- trunk/Source/WebCore/platform/ios/WebVideoFullscreenControllerAVKit.mm 2017-07-13 18:17:48 UTC (rev 219455)
+++ trunk/Source/WebCore/platform/ios/WebVideoFullscreenControllerAVKit.mm 2017-07-13 18:19:38 UTC (rev 219456)
@@ -493,7 +493,7 @@
[videoFullscreenLayer setSublayerTransform:[videoFullscreenLayer transform]];
-dispatch_async(dispatch_get_main_queue(), ^{
+dispatch_async(dispatch_get_main_queue(), ^ {
WebThreadRun([protectedThis, this, frame, videoFullscreenLayer] {
[CATransaction begin];
[CATransaction setDisableActions:YES];
Modified: trunk/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm (219455 => 219456)
--- trunk/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm 2017-07-13 18:17:48 UTC (rev 219455)
+++ trunk/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm 2017-07-13 18:19:38 UTC (rev 219456)
@@ -272,7 +272,7 @@
[view setTransform:transform];
NSTimeInterval animationDuration = [CATransaction animationDuration];
-dispatch_async(dispatch_get_main_queue(), ^{
+dispatch_async(dispatch_get_main_queue(), ^ {
[NSObject cancelPreviousPerformRequestsWithTarget:self selector:@selector(resolveBounds) object:nil];
[self performSelector:@selector(resolveBounds) withObject:nil afterDelay:animationDuration + 0.1];
@@ -365,7 +365,7 @@
{
static Class theClass = nil;
static dispatch_once_t onceToken;
-dispatch_once(&onceToken, ^{
+dispatch_once(&onceToken, ^ {
theClass = objc_allocateClassPair(getUIViewClass(), "WebAVPictureInPicturePlayerLayerView", 0);
objc_registerClassPair(theClass);
Class metaClass = objc_getMetaClass("WebAVPictureInPicturePlayerLayerView");
@@ -471,7 +471,7 @@
{
static Class theClass = nil;
static dispatch_once_t onceToken;
-dispatch_once(&onceToken, ^{
+dispatch_once(&onceToken, ^ {
theClass = objc_allocateClassPair(get__AVPlayerLayerViewClass(), "WebAVPlayerLayerView", 0);
class_addMethod(theClass, @selector(dealloc), (IMP)WebAVPlayerLayerView_dealloc, "v@:");
class_addMethod(theClass, @selector(setPlayerController:), (IMP)WebAVPlayerLayerView_setPlayerController, "v@:@");
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [219457] trunk/Source
Title: [219457] trunk/Source
Revision 219457
Author commit-qu...@webkit.org
Date 2017-07-13 11:21:33 -0700 (Thu, 13 Jul 2017)
Log Message
Style fix. Replace strongThis with protectedThis.
https://bugs.webkit.org/show_bug.cgi?id=17
Patch by Jeremy Jones on 2017-07-13
Reviewed by Eric Carlson.
Rename, no behavior change.
Source/WebCore:
* Modules/webaudio/AudioScheduledSourceNode.cpp:
(WebCore::AudioScheduledSourceNode::finish):
* platform/graphics/cocoa/WebCoreDecompressionSession.mm:
(WebCore::WebCoreDecompressionSession::maybeBecomeReadyForMoreMediaData):
(WebCore::WebCoreDecompressionSession::enqueueSample):
(WebCore::WebCoreDecompressionSession::handleDecompressionOutput):
(WebCore::WebCoreDecompressionSession::enqueueDecodedSample):
(WebCore::WebCoreDecompressionSession::requestMediaDataWhenReady):
(WebCore::WebCoreDecompressionSession::flush):
Source/WebKit2:
* WebProcess/cocoa/WebVideoFullscreenManager.mm:
(WebKit::WebVideoFullscreenManager::didSetupFullscreen):
(WebKit::WebVideoFullscreenManager::didEnterFullscreen):
(WebKit::WebVideoFullscreenManager::didExitFullscreen):
(WebKit::WebVideoFullscreenManager::didCleanupFullscreen):
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/Modules/webaudio/AudioScheduledSourceNode.cpp
trunk/Source/WebCore/platform/graphics/cocoa/WebCoreDecompressionSession.mm
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/WebProcess/cocoa/WebVideoFullscreenManager.mm
Diff
Modified: trunk/Source/WebCore/ChangeLog (219456 => 219457)
--- trunk/Source/WebCore/ChangeLog 2017-07-13 18:19:38 UTC (rev 219456)
+++ trunk/Source/WebCore/ChangeLog 2017-07-13 18:21:33 UTC (rev 219457)
@@ -1,5 +1,24 @@
2017-07-13 Jeremy Jones
+Style fix. Replace strongThis with protectedThis.
+https://bugs.webkit.org/show_bug.cgi?id=17
+
+Reviewed by Eric Carlson.
+
+Rename, no behavior change.
+
+* Modules/webaudio/AudioScheduledSourceNode.cpp:
+(WebCore::AudioScheduledSourceNode::finish):
+* platform/graphics/cocoa/WebCoreDecompressionSession.mm:
+(WebCore::WebCoreDecompressionSession::maybeBecomeReadyForMoreMediaData):
+(WebCore::WebCoreDecompressionSession::enqueueSample):
+(WebCore::WebCoreDecompressionSession::handleDecompressionOutput):
+(WebCore::WebCoreDecompressionSession::enqueueDecodedSample):
+(WebCore::WebCoreDecompressionSession::requestMediaDataWhenReady):
+(WebCore::WebCoreDecompressionSession::flush):
+
+2017-07-13 Jeremy Jones
+
Fix block style in WebVideoFullscreen classes.
https://bugs.webkit.org/show_bug.cgi?id=174446
Modified: trunk/Source/WebCore/Modules/webaudio/AudioScheduledSourceNode.cpp (219456 => 219457)
--- trunk/Source/WebCore/Modules/webaudio/AudioScheduledSourceNode.cpp 2017-07-13 18:19:38 UTC (rev 219456)
+++ trunk/Source/WebCore/Modules/webaudio/AudioScheduledSourceNode.cpp 2017-07-13 18:21:33 UTC (rev 219457)
@@ -167,8 +167,8 @@
}
if (m_hasEndedListener) {
-callOnMainThread([strongThis = makeRef(*this)] () mutable {
-strongThis->dispatchEvent(Event::create(eventNames().endedEvent, false, false));
+callOnMainThread([protectedThis = makeRef(*this)] () mutable {
+protectedThis->dispatchEvent(Event::create(eventNames().endedEvent, false, false));
});
}
}
Modified: trunk/Source/WebCore/platform/graphics/cocoa/WebCoreDecompressionSession.mm (219456 => 219457)
--- trunk/Source/WebCore/platform/graphics/cocoa/WebCoreDecompressionSession.mm 2017-07-13 18:19:38 UTC (rev 219456)
+++ trunk/Source/WebCore/platform/graphics/cocoa/WebCoreDecompressionSession.mm 2017-07-13 18:21:33 UTC (rev 219457)
@@ -102,10 +102,10 @@
return;
}
-RefPtr strongThis { this };
-dispatch_async(dispatch_get_main_queue(), [strongThis] {
-if (strongThis->m_notificationCallback)
-strongThis->m_notificationCallback();
+RefPtr protectedThis { this };
+dispatch_async(dispatch_get_main_queue(), [protectedThis] {
+if (protectedThis->m_notificationCallback)
+protectedThis->m_notificationCallback();
});
}
@@ -175,8 +175,8 @@
LOG(Media, "WebCoreDecompressionSession::enqueueSample(%p) - framesBeingDecoded(%d)", this, m_framesBeingDecoded);
-dispatch_async(m_decompressionQueue.get(), [strongThis = makeRefPtr(*this), strongBuffer = retainPtr(sampleBuffer), displaying] {
-strongThis->decodeSample(strongBuffer.get(), displaying);
+dispatch_async(m_decompressionQueue.get(), [protectedThis = makeRefPtr(*this), strongBuffer = retainPtr(sampleBuffer), displaying] {
+protectedThis->decodeSample(strongBuffer.get(), displaying);
});
}
@@ -238,11 +238,11 @@
CMSampleBufferRef rawImageSampleBuffer = nullptr;
if (noErr != CMSampleBufferCreateReadyWithImageBuffer(kCFAllocatorDefault, rawImageBuffer, imageBufferDescription.get(), &imageBufferTiming, &
[webkit-changes] [219458] trunk
Title: [219458] trunk
Revision 219458
Author commit-qu...@webkit.org
Date 2017-07-13 11:21:48 -0700 (Thu, 13 Jul 2017)
Log Message
Deleting last URLSearchParams key should remove trailing ? in associated URL
https://bugs.webkit.org/show_bug.cgi?id=174465
Patch by Alex Christensen on 2017-07-13
Reviewed by Chris Dumez.
Source/WebCore:
This makes us match the behavior of Chrome and Firefox, and the spec after https://github.com/whatwg/url/issues/332 is approved.
This will be covered by an upcoming web platform test, and I updated fast/dom/DOMURL/searchparams.html to cover it now.
* platform/URLParser.cpp:
(WebCore::URLParser::serialize):
If there are no tuples, serialize to the null string instead of a non-null empty string.
This makes it so URL::setQuery removes the ?
LayoutTests:
* fast/dom/DOMURL/searchparams-expected.txt:
* fast/dom/DOMURL/searchparams.html:
Modified Paths
trunk/LayoutTests/ChangeLog
trunk/LayoutTests/fast/dom/DOMURL/searchparams-expected.txt
trunk/LayoutTests/fast/dom/DOMURL/searchparams.html
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/URLParser.cpp
Diff
Modified: trunk/LayoutTests/ChangeLog (219457 => 219458)
--- trunk/LayoutTests/ChangeLog 2017-07-13 18:21:33 UTC (rev 219457)
+++ trunk/LayoutTests/ChangeLog 2017-07-13 18:21:48 UTC (rev 219458)
@@ -1,3 +1,13 @@
+2017-07-13 Alex Christensen
+
+Deleting last URLSearchParams key should remove trailing ? in associated URL
+https://bugs.webkit.org/show_bug.cgi?id=174465
+
+Reviewed by Chris Dumez.
+
+* fast/dom/DOMURL/searchparams-expected.txt:
+* fast/dom/DOMURL/searchparams.html:
+
2017-07-13 Miguel Gomez
Unreviewed GTK+ gardening. Update expectations of several tests failing at r219449.
Modified: trunk/LayoutTests/fast/dom/DOMURL/searchparams-expected.txt (219457 => 219458)
--- trunk/LayoutTests/fast/dom/DOMURL/searchparams-expected.txt 2017-07-13 18:21:33 UTC (rev 219457)
+++ trunk/LayoutTests/fast/dom/DOMURL/searchparams-expected.txt 2017-07-13 18:21:48 UTC (rev 219458)
@@ -1,3 +1,5 @@
CONSOLE MESSAGE: line 8: PASS
CONSOLE MESSAGE: line 11: PASS
+CONSOLE MESSAGE: line 15: PASS
+CONSOLE MESSAGE: line 19: PASS
Modified: trunk/LayoutTests/fast/dom/DOMURL/searchparams.html (219457 => 219458)
--- trunk/LayoutTests/fast/dom/DOMURL/searchparams.html 2017-07-13 18:21:33 UTC (rev 219457)
+++ trunk/LayoutTests/fast/dom/DOMURL/searchparams.html 2017-07-13 18:21:48 UTC (rev 219458)
@@ -9,4 +9,13 @@
var x = new URLSearchParams("a=ß");
console.log(x == "a=%C3%83%C5%B8" ? "PASS" : "FAIL");
+
+const a = new URL("http://host/?param");
+a.searchParams.delete("param");
+console.log(a == "http://host/" ? "PASS" : "FAIL");
+
+let b = new URLSearchParams("a=b");
+b.delete("a");
+console.log(b == "" ? "PASS" : "FAIL");
+
Modified: trunk/Source/WebCore/ChangeLog (219457 => 219458)
--- trunk/Source/WebCore/ChangeLog 2017-07-13 18:21:33 UTC (rev 219457)
+++ trunk/Source/WebCore/ChangeLog 2017-07-13 18:21:48 UTC (rev 219458)
@@ -1,3 +1,18 @@
+2017-07-13 Alex Christensen
+
+Deleting last URLSearchParams key should remove trailing ? in associated URL
+https://bugs.webkit.org/show_bug.cgi?id=174465
+
+Reviewed by Chris Dumez.
+
+This makes us match the behavior of Chrome and Firefox, and the spec after https://github.com/whatwg/url/issues/332 is approved.
+This will be covered by an upcoming web platform test, and I updated fast/dom/DOMURL/searchparams.html to cover it now.
+
+* platform/URLParser.cpp:
+(WebCore::URLParser::serialize):
+If there are no tuples, serialize to the null string instead of a non-null empty string.
+This makes it so URL::setQuery removes the ?
+
2017-07-13 Jeremy Jones
Style fix. Replace strongThis with protectedThis.
Modified: trunk/Source/WebCore/platform/URLParser.cpp (219457 => 219458)
--- trunk/Source/WebCore/platform/URLParser.cpp 2017-07-13 18:21:33 UTC (rev 219457)
+++ trunk/Source/WebCore/platform/URLParser.cpp 2017-07-13 18:21:48 UTC (rev 219458)
@@ -2837,6 +2837,9 @@
String URLParser::serialize(const URLEncodedForm& tuples)
{
+if (tuples.isEmpty())
+return { };
+
Vector output;
for (auto& tuple : tuples) {
if (!output.isEmpty())
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [219459] trunk/Source
Title: [219459] trunk/Source Revision 219459 Author commit-qu...@webkit.org Date 2017-07-13 11:41:10 -0700 (Thu, 13 Jul 2017) Log Message Fix style. Use #pragma once in VideoFullscreen and PlaybackSession headers. https://bugs.webkit.org/show_bug.cgi?id=174448 Patch by Jeremy Jones on 2017-07-13 Reviewed by Eric Carlson. No behavior change. Source/WebCore: * platform/cocoa/WebPlaybackSessionInterface.h: * platform/cocoa/WebVideoFullscreenChangeObserver.h: * platform/cocoa/WebVideoFullscreenModel.h: * platform/cocoa/WebVideoFullscreenModelVideoElement.h: * platform/ios/WebPlaybackSessionInterfaceAVKit.h: * platform/ios/WebVideoFullscreenControllerAVKit.h: * platform/ios/WebVideoFullscreenInterfaceAVKit.h: * platform/mac/WebVideoFullscreenInterfaceMac.h: Source/WebKit2: * UIProcess/Cocoa/WebVideoFullscreenManagerProxy.h: * WebProcess/cocoa/WebVideoFullscreenManager.h: Modified Paths trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/platform/cocoa/WebPlaybackSessionInterface.h trunk/Source/WebCore/platform/cocoa/WebVideoFullscreenChangeObserver.h trunk/Source/WebCore/platform/cocoa/WebVideoFullscreenModel.h trunk/Source/WebCore/platform/cocoa/WebVideoFullscreenModelVideoElement.h trunk/Source/WebCore/platform/ios/WebPlaybackSessionInterfaceAVKit.h trunk/Source/WebCore/platform/ios/WebVideoFullscreenControllerAVKit.h trunk/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.h trunk/Source/WebCore/platform/mac/WebVideoFullscreenInterfaceMac.h trunk/Source/WebKit2/ChangeLog trunk/Source/WebKit2/UIProcess/Cocoa/WebVideoFullscreenManagerProxy.h trunk/Source/WebKit2/WebProcess/cocoa/WebVideoFullscreenManager.h Diff Modified: trunk/Source/WebCore/ChangeLog (219458 => 219459) --- trunk/Source/WebCore/ChangeLog 2017-07-13 18:21:48 UTC (rev 219458) +++ trunk/Source/WebCore/ChangeLog 2017-07-13 18:41:10 UTC (rev 219459) @@ -1,3 +1,21 @@ +2017-07-13 Jeremy Jones + +Fix style. Use #pragma once in VideoFullscreen and PlaybackSession headers. +https://bugs.webkit.org/show_bug.cgi?id=174448 + +Reviewed by Eric Carlson. + +No behavior change. + +* platform/cocoa/WebPlaybackSessionInterface.h: +* platform/cocoa/WebVideoFullscreenChangeObserver.h: +* platform/cocoa/WebVideoFullscreenModel.h: +* platform/cocoa/WebVideoFullscreenModelVideoElement.h: +* platform/ios/WebPlaybackSessionInterfaceAVKit.h: +* platform/ios/WebVideoFullscreenControllerAVKit.h: +* platform/ios/WebVideoFullscreenInterfaceAVKit.h: +* platform/mac/WebVideoFullscreenInterfaceMac.h: + 2017-07-13 Alex Christensen Deleting last URLSearchParams key should remove trailing ? in associated URL Modified: trunk/Source/WebCore/platform/cocoa/WebPlaybackSessionInterface.h (219458 => 219459) --- trunk/Source/WebCore/platform/cocoa/WebPlaybackSessionInterface.h 2017-07-13 18:21:48 UTC (rev 219458) +++ trunk/Source/WebCore/platform/cocoa/WebPlaybackSessionInterface.h 2017-07-13 18:41:10 UTC (rev 219459) @@ -23,8 +23,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef WebPlaybackSessionInterface_h -#define WebPlaybackSessionInterface_h +#pragma once #if PLATFORM(IOS) || (PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE)) @@ -48,4 +47,3 @@ #endif // PLATFORM(IOS) || (PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE)) -#endif Modified: trunk/Source/WebCore/platform/cocoa/WebVideoFullscreenChangeObserver.h (219458 => 219459) --- trunk/Source/WebCore/platform/cocoa/WebVideoFullscreenChangeObserver.h 2017-07-13 18:21:48 UTC (rev 219458) +++ trunk/Source/WebCore/platform/cocoa/WebVideoFullscreenChangeObserver.h 2017-07-13 18:41:10 UTC (rev 219459) @@ -24,8 +24,7 @@ */ -#ifndef WebVideoFullscreenChangeObserver_h -#define WebVideoFullscreenChangeObserver_h +#pragma once #if PLATFORM(IOS) || (PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE)) @@ -45,4 +44,3 @@ #endif -#endif Modified: trunk/Source/WebCore/platform/cocoa/WebVideoFullscreenModel.h (219458 => 219459) --- trunk/Source/WebCore/platform/cocoa/WebVideoFullscreenModel.h 2017-07-13 18:21:48 UTC (rev 219458) +++ trunk/Source/WebCore/platform/cocoa/WebVideoFullscreenModel.h 2017-07-13 18:41:10 UTC (rev 219459) @@ -24,8 +24,7 @@ */ -#ifndef WebVideoFullscreenModel_h -#define WebVideoFullscreenModel_h +#pragma once #if PLATFORM(IOS) || (PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE)) @@ -67,4 +66,3 @@ #endif -#endif Modified: trunk/Source/WebCore/platform/cocoa/WebVideoFullscreenModelVideoElement.h (219458 => 219459) --- trunk/Source/WebCore/platform/cocoa/WebVideoFullscreenModelVideoElement.h 2017-07-13 18:21:48 UTC (rev 219458) +++ trunk/Source/WebCore/platform/cocoa/WebVideoFullscreenModelVideoElement.h 2017-07-13 18:41:10 UTC (rev 219459) @@ -24,8 +24,7 @@ */ -#ifndef WebVideoFullscreenModelVideoElement_h -#define WebVideoFullscreenModelVideoElement_h +#pragma once #if PLATFORM(IOS) || (PLATFORM(MAC) && ENABLE(V
[webkit-changes] [219460] trunk/Source/WebCore
Title: [219460] trunk/Source/WebCore
Revision 219460
Author mark@apple.com
Date 2017-07-13 12:16:54 -0700 (Thu, 13 Jul 2017)
Log Message
Implementors of memoryCost() need to be thread-safe.
https://bugs.webkit.org/show_bug.cgi?id=172738
Reviewed by Keith Miller.
No new tests. This patch fixes a race condition bug that can result in random
crashes (and other unpredictable behavior), and is very difficult to test for.
* Modules/webaudio/AudioBuffer.cpp:
(WebCore::AudioBuffer::releaseMemory):
(WebCore::AudioBuffer::memoryCost):
* Modules/webaudio/AudioBuffer.h:
* dom/ChildNodeList.h:
* dom/CollectionIndexCache.h:
(WebCore::CollectionIndexCache::memoryCost):
* dom/LiveNodeList.h:
* html/CachedHTMLCollection.h:
* html/HTMLCanvasElement.cpp:
(WebCore::HTMLCanvasElement::memoryCost):
(WebCore::HTMLCanvasElement::externalMemoryCost):
(WebCore::HTMLCanvasElement::setImageBuffer):
* html/HTMLCanvasElement.h:
* html/HTMLCollection.cpp:
(WebCore::HTMLCollection::invalidateNamedElementCache):
* html/HTMLCollection.h:
(WebCore::CollectionNamedElementCache::memoryCost):
(WebCore::HTMLCollection::memoryCost):
(WebCore::HTMLCollection::setNamedItemCache):
* platform/graphics/ImageBuffer.cpp:
(WebCore::ImageBuffer::memoryCost):
* platform/graphics/cg/ImageBufferCG.cpp:
(WebCore::ImageBuffer::memoryCost):
(WebCore::ImageBuffer::externalMemoryCost):
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/Modules/webaudio/AudioBuffer.cpp
trunk/Source/WebCore/Modules/webaudio/AudioBuffer.h
trunk/Source/WebCore/dom/ChildNodeList.h
trunk/Source/WebCore/dom/CollectionIndexCache.h
trunk/Source/WebCore/dom/LiveNodeList.h
trunk/Source/WebCore/html/CachedHTMLCollection.h
trunk/Source/WebCore/html/HTMLCanvasElement.cpp
trunk/Source/WebCore/html/HTMLCanvasElement.h
trunk/Source/WebCore/html/HTMLCollection.cpp
trunk/Source/WebCore/html/HTMLCollection.h
trunk/Source/WebCore/platform/graphics/ImageBuffer.cpp
trunk/Source/WebCore/platform/graphics/cg/ImageBufferCG.cpp
Diff
Modified: trunk/Source/WebCore/ChangeLog (219459 => 219460)
--- trunk/Source/WebCore/ChangeLog 2017-07-13 18:41:10 UTC (rev 219459)
+++ trunk/Source/WebCore/ChangeLog 2017-07-13 19:16:54 UTC (rev 219460)
@@ -1,3 +1,40 @@
+2017-07-13 Mark Lam
+
+Implementors of memoryCost() need to be thread-safe.
+https://bugs.webkit.org/show_bug.cgi?id=172738
+
+
+Reviewed by Keith Miller.
+
+No new tests. This patch fixes a race condition bug that can result in random
+crashes (and other unpredictable behavior), and is very difficult to test for.
+
+* Modules/webaudio/AudioBuffer.cpp:
+(WebCore::AudioBuffer::releaseMemory):
+(WebCore::AudioBuffer::memoryCost):
+* Modules/webaudio/AudioBuffer.h:
+* dom/ChildNodeList.h:
+* dom/CollectionIndexCache.h:
+(WebCore::CollectionIndexCache::memoryCost):
+* dom/LiveNodeList.h:
+* html/CachedHTMLCollection.h:
+* html/HTMLCanvasElement.cpp:
+(WebCore::HTMLCanvasElement::memoryCost):
+(WebCore::HTMLCanvasElement::externalMemoryCost):
+(WebCore::HTMLCanvasElement::setImageBuffer):
+* html/HTMLCanvasElement.h:
+* html/HTMLCollection.cpp:
+(WebCore::HTMLCollection::invalidateNamedElementCache):
+* html/HTMLCollection.h:
+(WebCore::CollectionNamedElementCache::memoryCost):
+(WebCore::HTMLCollection::memoryCost):
+(WebCore::HTMLCollection::setNamedItemCache):
+* platform/graphics/ImageBuffer.cpp:
+(WebCore::ImageBuffer::memoryCost):
+* platform/graphics/cg/ImageBufferCG.cpp:
+(WebCore::ImageBuffer::memoryCost):
+(WebCore::ImageBuffer::externalMemoryCost):
+
2017-07-13 Jeremy Jones
Fix style. Use #pragma once in VideoFullscreen and PlaybackSession headers.
Modified: trunk/Source/WebCore/Modules/webaudio/AudioBuffer.cpp (219459 => 219460)
--- trunk/Source/WebCore/Modules/webaudio/AudioBuffer.cpp 2017-07-13 18:41:10 UTC (rev 219459)
+++ trunk/Source/WebCore/Modules/webaudio/AudioBuffer.cpp 2017-07-13 19:16:54 UTC (rev 219460)
@@ -1,5 +1,6 @@
/*
* Copyright (C) 2010 Google Inc. All rights reserved.
+ * Copyright (C) 2017 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -105,6 +106,7 @@
void AudioBuffer::releaseMemory()
{
+auto locker = holdLock(m_channelsLock);
m_channels.clear();
}
@@ -133,6 +135,12 @@
size_t AudioBuffer::memoryCost() const
{
+// memoryCost() may be invoked concurrently from a GC thread, and we need to be careful
+// about what data we access here and how. We need to hold a lock to prevent m_channels
+// from being changed while we iterate it, but calling channel->byteLength() is safe
+// because it doesn't involve chasing any pointers that can be nullified while the
+/
[webkit-changes] [219461] trunk/LayoutTests
Title: [219461] trunk/LayoutTests Revision 219461 Author grao...@webkit.org Date 2017-07-13 13:19:10 -0700 (Thu, 13 Jul 2017) Log Message REGRESSION: "visibility:hidden" does not hide play button for video elements https://bugs.webkit.org/show_bug.cgi?id=174258 Unreviewed test gardening. Add a missing expectation file which is designed to be empty and is now just a space. * media/modern-media-controls/css/visibility-hidden-expected.html: Added. Modified Paths trunk/LayoutTests/ChangeLog Added Paths trunk/LayoutTests/media/modern-media-controls/css/visibility-hidden-expected.html Diff Modified: trunk/LayoutTests/ChangeLog (219460 => 219461) --- trunk/LayoutTests/ChangeLog 2017-07-13 19:16:54 UTC (rev 219460) +++ trunk/LayoutTests/ChangeLog 2017-07-13 20:19:10 UTC (rev 219461) @@ -1,3 +1,15 @@ +2017-07-13 Antoine Quint + +REGRESSION: "visibility:hidden" does not hide play button for video elements +https://bugs.webkit.org/show_bug.cgi?id=174258 + + +Unreviewed test gardening. + +Add a missing expectation file which is designed to be empty and is now just a space. + +* media/modern-media-controls/css/visibility-hidden-expected.html: Added. + 2017-07-13 Alex Christensen Deleting last URLSearchParams key should remove trailing ? in associated URL Added: trunk/LayoutTests/media/modern-media-controls/css/visibility-hidden-expected.html (0 => 219461) --- trunk/LayoutTests/media/modern-media-controls/css/visibility-hidden-expected.html (rev 0) +++ trunk/LayoutTests/media/modern-media-controls/css/visibility-hidden-expected.html 2017-07-13 20:19:10 UTC (rev 219461) @@ -0,0 +1 @@ + \ No newline at end of file ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [219462] trunk/Source/JavaScriptCore
Title: [219462] trunk/Source/_javascript_Core Revision 219462 Author mcatanz...@igalia.com Date 2017-07-13 13:39:32 -0700 (Thu, 13 Jul 2017) Log Message Incorrect assertion in JSC::CallLinkInfo::callTypeFor https://bugs.webkit.org/show_bug.cgi?id=174467 Reviewed by Saam Barati. * bytecode/CallLinkInfo.cpp: (JSC::CallLinkInfo::callTypeFor): Modified Paths trunk/Source/_javascript_Core/ChangeLog trunk/Source/_javascript_Core/bytecode/CallLinkInfo.cpp Diff Modified: trunk/Source/_javascript_Core/ChangeLog (219461 => 219462) --- trunk/Source/_javascript_Core/ChangeLog 2017-07-13 20:19:10 UTC (rev 219461) +++ trunk/Source/_javascript_Core/ChangeLog 2017-07-13 20:39:32 UTC (rev 219462) @@ -1,3 +1,13 @@ +2017-07-13 Michael Catanzaro + +Incorrect assertion in JSC::CallLinkInfo::callTypeFor +https://bugs.webkit.org/show_bug.cgi?id=174467 + +Reviewed by Saam Barati. + +* bytecode/CallLinkInfo.cpp: +(JSC::CallLinkInfo::callTypeFor): + 2017-07-13 Joseph Pecoraro Web Inspector: Remove unused and untested Page domain commands Modified: trunk/Source/_javascript_Core/bytecode/CallLinkInfo.cpp (219461 => 219462) --- trunk/Source/_javascript_Core/bytecode/CallLinkInfo.cpp 2017-07-13 20:19:10 UTC (rev 219461) +++ trunk/Source/_javascript_Core/bytecode/CallLinkInfo.cpp 2017-07-13 20:39:32 UTC (rev 219462) @@ -51,7 +51,7 @@ return ConstructVarargs; if (opcodeID == op_tail_call) return TailCall; -ASSERT(opcodeID == op_tail_call_varargs || op_tail_call_forward_arguments); +ASSERT(opcodeID == op_tail_call_varargs || opcodeID == op_tail_call_forward_arguments); return TailCallVarargs; } ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [219463] trunk/LayoutTests
Title: [219463] trunk/LayoutTests Revision 219463 Author jlew...@apple.com Date 2017-07-13 14:02:37 -0700 (Thu, 13 Jul 2017) Log Message Skipping media/video-source-before-src.html. https://bugs.webkit.org/show_bug.cgi?id=174284 Unreviewed test gardening. * TestExpectations: Modified Paths trunk/LayoutTests/ChangeLog trunk/LayoutTests/TestExpectations Diff Modified: trunk/LayoutTests/ChangeLog (219462 => 219463) --- trunk/LayoutTests/ChangeLog 2017-07-13 20:39:32 UTC (rev 219462) +++ trunk/LayoutTests/ChangeLog 2017-07-13 21:02:37 UTC (rev 219463) @@ -1,3 +1,12 @@ +2017-07-13 Matt Lewis + +Skipping media/video-source-before-src.html. +https://bugs.webkit.org/show_bug.cgi?id=174284 + +Unreviewed test gardening. + +* TestExpectations: + 2017-07-13 Antoine Quint REGRESSION: "visibility:hidden" does not hide play button for video elements Modified: trunk/LayoutTests/TestExpectations (219462 => 219463) --- trunk/LayoutTests/TestExpectations 2017-07-13 20:39:32 UTC (rev 219462) +++ trunk/LayoutTests/TestExpectations 2017-07-13 21:02:37 UTC (rev 219463) @@ -1399,3 +1399,5 @@ webkit.org/b/172514 [ Debug ] imported/w3c/web-platform-tests/innerText/getter.html [ Skip ] webkit.org/b/17 imported/w3c/web-platform-tests/dom/nodes/Document-constructor-svg.svg [ Skip ] + +webkit.org/b/174284 media/video-source-before-src.html [ Skip ] ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [219464] branches/safari-604.1.31-branch/Source/WebCore/PAL
Title: [219464] branches/safari-604.1.31-branch/Source/WebCore/PAL
Revision 219464
Author jmarc...@apple.com
Date 2017-07-13 14:16:38 -0700 (Thu, 13 Jul 2017)
Log Message
Cherry-pick r219455. rdar://problem/33288831
Modified Paths
branches/safari-604.1.31-branch/Source/WebCore/PAL/ChangeLog
branches/safari-604.1.31-branch/Source/WebCore/PAL/pal/CMakeLists.txt
branches/safari-604.1.31-branch/Source/WebCore/PAL/pal/PlatformWin.cmake
Diff
Modified: branches/safari-604.1.31-branch/Source/WebCore/PAL/ChangeLog (219463 => 219464)
--- branches/safari-604.1.31-branch/Source/WebCore/PAL/ChangeLog 2017-07-13 21:02:37 UTC (rev 219463)
+++ branches/safari-604.1.31-branch/Source/WebCore/PAL/ChangeLog 2017-07-13 21:16:38 UTC (rev 219464)
@@ -1,3 +1,19 @@
+2017-07-13 Jason Marcell
+
+Cherry-pick r219455. rdar://problem/33288831
+
+2017-07-13 Per Arne Vollan
+
+[Win] Build error when building WebCore from WebCore.proj project file.
+https://bugs.webkit.org/show_bug.cgi?id=174462
+
+Reviewed by Brent Fulgham.
+
+Add required include directory to list of include directories.
+
+* pal/CMakeLists.txt:
+* pal/PlatformWin.cmake:
+
2017-06-29 Dean Jackson
Disable some features on this release branch.
Modified: branches/safari-604.1.31-branch/Source/WebCore/PAL/pal/CMakeLists.txt (219463 => 219464)
--- branches/safari-604.1.31-branch/Source/WebCore/PAL/pal/CMakeLists.txt 2017-07-13 21:02:37 UTC (rev 219463)
+++ branches/safari-604.1.31-branch/Source/WebCore/PAL/pal/CMakeLists.txt 2017-07-13 21:16:38 UTC (rev 219464)
@@ -2,7 +2,6 @@
)
set(PAL_INCLUDE_DIRECTORIES
-"${CMAKE_BINARY_DIR}"
"${PAL_DIR}"
)
Modified: branches/safari-604.1.31-branch/Source/WebCore/PAL/pal/PlatformWin.cmake (219463 => 219464)
--- branches/safari-604.1.31-branch/Source/WebCore/PAL/pal/PlatformWin.cmake 2017-07-13 21:02:37 UTC (rev 219463)
+++ branches/safari-604.1.31-branch/Source/WebCore/PAL/pal/PlatformWin.cmake 2017-07-13 21:16:38 UTC (rev 219464)
@@ -6,6 +6,11 @@
text/KillRingNone.cpp
)
+list(APPEND PAL_INCLUDE_DIRECTORIES
+"${CMAKE_BINARY_DIR}"
+"${CMAKE_BINARY_DIR}/../include/private"
+)
+
set(PAL_OUTPUT_NAME PAL${DEBUG_SUFFIX})
file(MAKE_DIRECTORY ${FORWARDING_HEADERS_DIR}/WebCore/pal)
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [219465] branches/safari-603-branch
Title: [219465] branches/safari-603-branch
Revision 219465
Author jmarc...@apple.com
Date 2017-07-13 14:44:50 -0700 (Thu, 13 Jul 2017)
Log Message
Cherry-pick r215451. rdar://problem/31651319
Modified Paths
branches/safari-603-branch/JSTests/ChangeLog
branches/safari-603-branch/Source/_javascript_Core/ChangeLog
branches/safari-603-branch/Source/_javascript_Core/runtime/JSArray.cpp
Diff
Modified: branches/safari-603-branch/JSTests/ChangeLog (219464 => 219465)
--- branches/safari-603-branch/JSTests/ChangeLog 2017-07-13 21:16:38 UTC (rev 219464)
+++ branches/safari-603-branch/JSTests/ChangeLog 2017-07-13 21:44:50 UTC (rev 219465)
@@ -1,5 +1,19 @@
2017-06-01 Matthew Hanson
+Cherry-pick r215451. rdar://problem/31651319
+
+2017-07-13 Mark Lam
+
+JSArray::appendMemcpy() needs to handle copying from Undecided indexing type too.
+https://bugs.webkit.org/show_bug.cgi?id=170896
+
+
+Reviewed by JF Bastien and Keith Miller.
+
+* stress/regress-170896.js: Added.
+
+2017-06-01 Matthew Hanson
+
Cherry-pick r216459. rdar://problem/32119857
2017-05-08 Mark Lam
Modified: branches/safari-603-branch/Source/_javascript_Core/ChangeLog (219464 => 219465)
--- branches/safari-603-branch/Source/_javascript_Core/ChangeLog 2017-07-13 21:16:38 UTC (rev 219464)
+++ branches/safari-603-branch/Source/_javascript_Core/ChangeLog 2017-07-13 21:44:50 UTC (rev 219465)
@@ -1,3 +1,14 @@
+2017-07-13 Mark Lam
+
+JSArray::appendMemcpy() needs to handle copying from Undecided indexing type too.
+https://bugs.webkit.org/show_bug.cgi?id=170896
+
+
+Reviewed by JF Bastien and Keith Miller.
+
+* runtime/JSArray.cpp:
+(JSC::JSArray::appendMemcpy):
+
2017-06-01 Matthew Hanson
Cherry-pick r216459. rdar://problem/32119857
Modified: branches/safari-603-branch/Source/_javascript_Core/runtime/JSArray.cpp (219464 => 219465)
--- branches/safari-603-branch/Source/_javascript_Core/runtime/JSArray.cpp 2017-07-13 21:16:38 UTC (rev 219464)
+++ branches/safari-603-branch/Source/_javascript_Core/runtime/JSArray.cpp 2017-07-13 21:44:50 UTC (rev 219465)
@@ -481,7 +481,8 @@
return false;
IndexingType type = indexingType();
-IndexingType copyType = mergeIndexingTypeForCopying(otherArray->indexingType());
+IndexingType otherType = otherArray->indexingType();
+IndexingType copyType = mergeIndexingTypeForCopying(otherType);
if (type == ArrayWithUndecided && copyType != NonArray) {
if (copyType == ArrayWithInt32)
convertUndecidedToInt32(vm);
@@ -515,7 +516,16 @@
}
ASSERT(copyType == indexingType());
-if (type == ArrayWithDouble)
+if (UNLIKELY(otherType == ArrayWithUndecided)) {
+auto* butterfly = this->butterfly();
+if (type == ArrayWithDouble) {
+for (unsigned i = startIndex; i < newLength; ++i)
+butterfly->contiguousDouble()[i] = PNaN;
+} else {
+for (unsigned i = startIndex; i < newLength; ++i)
+butterfly->contiguousInt32()[i].setWithoutWriteBarrier(JSValue());
+}
+} else if (type == ArrayWithDouble)
memcpy(butterfly()->contiguousDouble().data() + startIndex, otherArray->butterfly()->contiguousDouble().data(), sizeof(JSValue) * otherLength);
else
memcpy(butterfly()->contiguous().data() + startIndex, otherArray->butterfly()->contiguous().data(), sizeof(JSValue) * otherLength);
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [219466] trunk/LayoutTests
Title: [219466] trunk/LayoutTests Revision 219466 Author jlew...@apple.com Date 2017-07-13 15:02:14 -0700 (Thu, 13 Jul 2017) Log Message Marked imported/w3c/web-platform-tests/IndexedDB/large-nested-cloning.html as flaky on iOS. https://bugs.webkit.org/show_bug.cgi?id=173487 Unreviewed test gardening. * platform/ios-simulator-wk2/TestExpectations: Modified Paths trunk/LayoutTests/ChangeLog trunk/LayoutTests/platform/ios-simulator-wk2/TestExpectations Diff Modified: trunk/LayoutTests/ChangeLog (219465 => 219466) --- trunk/LayoutTests/ChangeLog 2017-07-13 21:44:50 UTC (rev 219465) +++ trunk/LayoutTests/ChangeLog 2017-07-13 22:02:14 UTC (rev 219466) @@ -1,5 +1,14 @@ 2017-07-13 Matt Lewis +Marked imported/w3c/web-platform-tests/IndexedDB/large-nested-cloning.html as flaky on iOS. +https://bugs.webkit.org/show_bug.cgi?id=173487 + +Unreviewed test gardening. + +* platform/ios-simulator-wk2/TestExpectations: + +2017-07-13 Matt Lewis + Skipping media/video-source-before-src.html. https://bugs.webkit.org/show_bug.cgi?id=174284 Modified: trunk/LayoutTests/platform/ios-simulator-wk2/TestExpectations (219465 => 219466) --- trunk/LayoutTests/platform/ios-simulator-wk2/TestExpectations 2017-07-13 21:44:50 UTC (rev 219465) +++ trunk/LayoutTests/platform/ios-simulator-wk2/TestExpectations 2017-07-13 22:02:14 UTC (rev 219466) @@ -38,3 +38,5 @@ webkit.org/b/174183 animations/resume-after-page-cache.html [ Pass Failure ] +webkit.org/b/173487 imported/w3c/web-platform-tests/IndexedDB/large-nested-cloning.html [ Pass Failure ] + ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [219467] trunk/Source/WebKit2
Title: [219467] trunk/Source/WebKit2
Revision 219467
Author cdu...@apple.com
Date 2017-07-13 15:04:05 -0700 (Thu, 13 Jul 2017)
Log Message
Unreviewed, rolling out r219453.
Seems to cause some crashes on the bots
Reverted changeset:
"Moved filesystem code out of WebResourceLoadStatisticsStore
class"
https://bugs.webkit.org/show_bug.cgi?id=174435
http://trac.webkit.org/changeset/219453
Modified Paths
trunk/Source/WebKit2/CMakeLists.txt
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/Cocoa/WebResourceLoadStatisticsStoreCocoa.mm
trunk/Source/WebKit2/UIProcess/WebResourceLoadStatisticsStore.cpp
trunk/Source/WebKit2/UIProcess/WebResourceLoadStatisticsStore.h
trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj
Removed Paths
trunk/Source/WebKit2/UIProcess/Storage/ResourceLoadStatisticsPersistentStorage.cpp
trunk/Source/WebKit2/UIProcess/Storage/ResourceLoadStatisticsPersistentStorage.h
trunk/Source/WebKit2/UIProcess/Storage/ios/ResourceLoadStatisticsPersistentStorageIOS.mm
Diff
Modified: trunk/Source/WebKit2/CMakeLists.txt (219466 => 219467)
--- trunk/Source/WebKit2/CMakeLists.txt 2017-07-13 22:02:14 UTC (rev 219466)
+++ trunk/Source/WebKit2/CMakeLists.txt 2017-07-13 22:04:05 UTC (rev 219467)
@@ -434,7 +434,6 @@
UIProcess/Storage/LocalStorageDatabase.cpp
UIProcess/Storage/LocalStorageDatabaseTracker.cpp
-UIProcess/Storage/ResourceLoadStatisticsPersistentStorage.cpp
UIProcess/UserContent/WebScriptMessageHandler.cpp
UIProcess/UserContent/WebUserContentControllerProxy.cpp
Modified: trunk/Source/WebKit2/ChangeLog (219466 => 219467)
--- trunk/Source/WebKit2/ChangeLog 2017-07-13 22:02:14 UTC (rev 219466)
+++ trunk/Source/WebKit2/ChangeLog 2017-07-13 22:04:05 UTC (rev 219467)
@@ -1,3 +1,16 @@
+2017-07-13 Chris Dumez
+
+Unreviewed, rolling out r219453.
+
+Seems to cause some crashes on the bots
+
+Reverted changeset:
+
+"Moved filesystem code out of WebResourceLoadStatisticsStore
+class"
+https://bugs.webkit.org/show_bug.cgi?id=174435
+http://trac.webkit.org/changeset/219453
+
2017-07-13 Jeremy Jones
Fix style. Use #pragma once in VideoFullscreen and PlaybackSession headers.
Modified: trunk/Source/WebKit2/UIProcess/Cocoa/WebResourceLoadStatisticsStoreCocoa.mm (219466 => 219467)
--- trunk/Source/WebKit2/UIProcess/Cocoa/WebResourceLoadStatisticsStoreCocoa.mm 2017-07-13 22:02:14 UTC (rev 219466)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/WebResourceLoadStatisticsStoreCocoa.mm 2017-07-13 22:04:05 UTC (rev 219467)
@@ -32,6 +32,13 @@
namespace WebKit {
+void WebResourceLoadStatisticsStore::platformExcludeFromBackup() const
+{
+#if PLATFORM(IOS)
+[[NSURL fileURLWithPath:(NSString *)m_statisticsStoragePath] setResourceValue:@YES forKey:NSURLIsExcludedFromBackupKey error:nil];
+#endif
+}
+
void WebResourceLoadStatisticsStore::registerUserDefaultsIfNeeded()
{
static dispatch_once_t initOnce;
Deleted: trunk/Source/WebKit2/UIProcess/Storage/ResourceLoadStatisticsPersistentStorage.cpp (219466 => 219467)
--- trunk/Source/WebKit2/UIProcess/Storage/ResourceLoadStatisticsPersistentStorage.cpp 2017-07-13 22:02:14 UTC (rev 219466)
+++ trunk/Source/WebKit2/UIProcess/Storage/ResourceLoadStatisticsPersistentStorage.cpp 2017-07-13 22:04:05 UTC (rev 219467)
@@ -1,288 +0,0 @@
-/*
- * Copyright (C) 2017 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. AND ITS CONTRIBUTORS ``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 DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "ResourceLoadStatisticsPersistentStorage.h"
-
-#include "Logging.h"
-#include "WebResourceLoadStatisticsStore.h"
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-
-namespace WebKit {
-
-constexpr Se
[webkit-changes] [219468] tags/Safari-604.1.31.2/
Title: [219468] tags/Safari-604.1.31.2/ Revision 219468 Author jmarc...@apple.com Date 2017-07-13 15:22:47 -0700 (Thu, 13 Jul 2017) Log Message Tag Safari-604.1.31.2. Added Paths tags/Safari-604.1.31.2/ Diff ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [219469] branches/safari-604.1.31-branch/Source
Title: [219469] branches/safari-604.1.31-branch/Source Revision 219469 Author jmarc...@apple.com Date 2017-07-13 15:26:59 -0700 (Thu, 13 Jul 2017) Log Message Versioning. Modified Paths branches/safari-604.1.31-branch/Source/_javascript_Core/Configurations/Version.xcconfig branches/safari-604.1.31-branch/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig branches/safari-604.1.31-branch/Source/WebCore/Configurations/Version.xcconfig branches/safari-604.1.31-branch/Source/WebCore/PAL/Configurations/Version.xcconfig branches/safari-604.1.31-branch/Source/WebInspectorUI/Configurations/Version.xcconfig branches/safari-604.1.31-branch/Source/WebKit/mac/Configurations/Version.xcconfig branches/safari-604.1.31-branch/Source/WebKit2/Configurations/Version.xcconfig Diff Modified: branches/safari-604.1.31-branch/Source/_javascript_Core/Configurations/Version.xcconfig (219468 => 219469) --- branches/safari-604.1.31-branch/Source/_javascript_Core/Configurations/Version.xcconfig 2017-07-13 22:22:47 UTC (rev 219468) +++ branches/safari-604.1.31-branch/Source/_javascript_Core/Configurations/Version.xcconfig 2017-07-13 22:26:59 UTC (rev 219469) @@ -24,7 +24,7 @@ MAJOR_VERSION = 604; MINOR_VERSION = 1; TINY_VERSION = 31; -MICRO_VERSION = 2; +MICRO_VERSION = 3; NANO_VERSION = 0; FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION); Modified: branches/safari-604.1.31-branch/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig (219468 => 219469) --- branches/safari-604.1.31-branch/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig 2017-07-13 22:22:47 UTC (rev 219468) +++ branches/safari-604.1.31-branch/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig 2017-07-13 22:26:59 UTC (rev 219469) @@ -24,7 +24,7 @@ MAJOR_VERSION = 604; MINOR_VERSION = 1; TINY_VERSION = 31; -MICRO_VERSION = 2; +MICRO_VERSION = 3; NANO_VERSION = 0; FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION); Modified: branches/safari-604.1.31-branch/Source/WebCore/Configurations/Version.xcconfig (219468 => 219469) --- branches/safari-604.1.31-branch/Source/WebCore/Configurations/Version.xcconfig 2017-07-13 22:22:47 UTC (rev 219468) +++ branches/safari-604.1.31-branch/Source/WebCore/Configurations/Version.xcconfig 2017-07-13 22:26:59 UTC (rev 219469) @@ -24,7 +24,7 @@ MAJOR_VERSION = 604; MINOR_VERSION = 1; TINY_VERSION = 31; -MICRO_VERSION = 2; +MICRO_VERSION = 3; NANO_VERSION = 0; FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION); Modified: branches/safari-604.1.31-branch/Source/WebCore/PAL/Configurations/Version.xcconfig (219468 => 219469) --- branches/safari-604.1.31-branch/Source/WebCore/PAL/Configurations/Version.xcconfig 2017-07-13 22:22:47 UTC (rev 219468) +++ branches/safari-604.1.31-branch/Source/WebCore/PAL/Configurations/Version.xcconfig 2017-07-13 22:26:59 UTC (rev 219469) @@ -24,7 +24,7 @@ MAJOR_VERSION = 604; MINOR_VERSION = 1; TINY_VERSION = 31; -MICRO_VERSION = 2; +MICRO_VERSION = 3; NANO_VERSION = 0; FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION); Modified: branches/safari-604.1.31-branch/Source/WebInspectorUI/Configurations/Version.xcconfig (219468 => 219469) --- branches/safari-604.1.31-branch/Source/WebInspectorUI/Configurations/Version.xcconfig 2017-07-13 22:22:47 UTC (rev 219468) +++ branches/safari-604.1.31-branch/Source/WebInspectorUI/Configurations/Version.xcconfig 2017-07-13 22:26:59 UTC (rev 219469) @@ -1,7 +1,7 @@ MAJOR_VERSION = 604; MINOR_VERSION = 1; TINY_VERSION = 31; -MICRO_VERSION = 2; +MICRO_VERSION = 3; NANO_VERSION = 0; FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION); Modified: branches/safari-604.1.31-branch/Source/WebKit/mac/Configurations/Version.xcconfig (219468 => 219469) --- branches/safari-604.1.31-branch/Source/WebKit/mac/Configurations/Version.xcconfig 2017-07-13 22:22:47 UTC (rev 219468) +++ branches/safari-604.1.31-branch/Source/WebKit/mac/Configurations/Version.xcconfig 2017-07-13 22:26:59 UTC (rev 219469) @@ -24,7 +24,7 @@ MAJOR_VERSION = 604; MINOR_VERSION = 1; TINY_VERSION = 31; -MICRO_VERSION = 2; +MICRO_VERSION = 3; NANO_VERSION = 0; FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION); Modified: branches/safari-604.1.31-branch/Source/WebKit2/Configurations/Version.xcconfig (219468 => 219469) --- branches/safari-604.1.31-branch/Source/WebKit2/Configurations/Version.xcconfig 2017-07-13 22:22:47 UTC (rev 219468) +++ branches/safari-604.1.31-branch/Source/WebKit2/Configurations/Version.xcconfig 2017-07-13 22:26:59 UTC (rev 219469) @@ -24,7 +24,7 @@ MAJOR_VERSION = 604; MINOR_VERSION = 1; TINY_VERSION = 31; -MICRO_VERSION = 2; +MICRO_VERSION = 3; NANO_VERSION = 0; FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION); ___ webkit-chang
[webkit-changes] [219470] tags/Safari-603.3.8/
Title: [219470] tags/Safari-603.3.8/ Revision 219470 Author jmarc...@apple.com Date 2017-07-13 15:40:25 -0700 (Thu, 13 Jul 2017) Log Message Tag Safari-603.3.8. Added Paths tags/Safari-603.3.8/ Diff ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [219471] branches/safari-603-branch/Source
Title: [219471] branches/safari-603-branch/Source Revision 219471 Author jmarc...@apple.com Date 2017-07-13 15:43:43 -0700 (Thu, 13 Jul 2017) Log Message Versioning. Modified Paths branches/safari-603-branch/Source/_javascript_Core/Configurations/Version.xcconfig branches/safari-603-branch/Source/WebCore/Configurations/Version.xcconfig branches/safari-603-branch/Source/WebInspectorUI/Configurations/Version.xcconfig branches/safari-603-branch/Source/WebKit/mac/Configurations/Version.xcconfig branches/safari-603-branch/Source/WebKit2/Configurations/Version.xcconfig Diff Modified: branches/safari-603-branch/Source/_javascript_Core/Configurations/Version.xcconfig (219470 => 219471) --- branches/safari-603-branch/Source/_javascript_Core/Configurations/Version.xcconfig 2017-07-13 22:40:25 UTC (rev 219470) +++ branches/safari-603-branch/Source/_javascript_Core/Configurations/Version.xcconfig 2017-07-13 22:43:43 UTC (rev 219471) @@ -23,7 +23,7 @@ MAJOR_VERSION = 603; MINOR_VERSION = 3; -TINY_VERSION = 8; +TINY_VERSION = 9; MICRO_VERSION = 0; NANO_VERSION = 0; FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION); Modified: branches/safari-603-branch/Source/WebCore/Configurations/Version.xcconfig (219470 => 219471) --- branches/safari-603-branch/Source/WebCore/Configurations/Version.xcconfig 2017-07-13 22:40:25 UTC (rev 219470) +++ branches/safari-603-branch/Source/WebCore/Configurations/Version.xcconfig 2017-07-13 22:43:43 UTC (rev 219471) @@ -23,7 +23,7 @@ MAJOR_VERSION = 603; MINOR_VERSION = 3; -TINY_VERSION = 8; +TINY_VERSION = 9; MICRO_VERSION = 0; NANO_VERSION = 0; FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION); Modified: branches/safari-603-branch/Source/WebInspectorUI/Configurations/Version.xcconfig (219470 => 219471) --- branches/safari-603-branch/Source/WebInspectorUI/Configurations/Version.xcconfig 2017-07-13 22:40:25 UTC (rev 219470) +++ branches/safari-603-branch/Source/WebInspectorUI/Configurations/Version.xcconfig 2017-07-13 22:43:43 UTC (rev 219471) @@ -1,6 +1,6 @@ MAJOR_VERSION = 603; MINOR_VERSION = 3; -TINY_VERSION = 8; +TINY_VERSION = 9; MICRO_VERSION = 0; NANO_VERSION = 0; FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION); Modified: branches/safari-603-branch/Source/WebKit/mac/Configurations/Version.xcconfig (219470 => 219471) --- branches/safari-603-branch/Source/WebKit/mac/Configurations/Version.xcconfig 2017-07-13 22:40:25 UTC (rev 219470) +++ branches/safari-603-branch/Source/WebKit/mac/Configurations/Version.xcconfig 2017-07-13 22:43:43 UTC (rev 219471) @@ -23,7 +23,7 @@ MAJOR_VERSION = 603; MINOR_VERSION = 3; -TINY_VERSION = 8; +TINY_VERSION = 9; MICRO_VERSION = 0; NANO_VERSION = 0; FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION); Modified: branches/safari-603-branch/Source/WebKit2/Configurations/Version.xcconfig (219470 => 219471) --- branches/safari-603-branch/Source/WebKit2/Configurations/Version.xcconfig 2017-07-13 22:40:25 UTC (rev 219470) +++ branches/safari-603-branch/Source/WebKit2/Configurations/Version.xcconfig 2017-07-13 22:43:43 UTC (rev 219471) @@ -23,7 +23,7 @@ MAJOR_VERSION = 603; MINOR_VERSION = 3; -TINY_VERSION = 8; +TINY_VERSION = 9; MICRO_VERSION = 0; NANO_VERSION = 0; FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION); ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [219472] trunk/Source/WebCore
Title: [219472] trunk/Source/WebCore
Revision 219472
Author d...@apple.com
Date 2017-07-13 15:49:52 -0700 (Thu, 13 Jul 2017)
Log Message
Avoid unnecessary copy of framebuffer into WebGL Layer
https://bugs.webkit.org/show_bug.cgi?id=174345
Reviewed by Sam Weinig.
On macOS, we're unnecessarily copying the framebuffer into another
texture before pushing it into the compositing layer. Instead we
should simply render the FBO into the CALayer we use to draw on
the screen.
Covered by the existing WebGL tests.
* platform/graphics/GraphicsContext3D.h:
(WebCore::GraphicsContext3D::platformTexture): Return the FBO texture instead.
* platform/graphics/mac/GraphicsContext3DMac.mm:
(WebCore::GraphicsContext3D::GraphicsContext3D): No need to have a compositing
texture.
(WebCore::GraphicsContext3D::~GraphicsContext3D):
* platform/graphics/opengl/GraphicsContext3DOpenGL.cpp:
(WebCore::GraphicsContext3D::reshapeFBOs):
* platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp:
(WebCore::GraphicsContext3D::prepareTexture): Don't copy the pixels from
the FBO into the compositing texture
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/graphics/GraphicsContext3D.h
trunk/Source/WebCore/platform/graphics/mac/GraphicsContext3DMac.mm
trunk/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp
trunk/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp
Diff
Modified: trunk/Source/WebCore/ChangeLog (219471 => 219472)
--- trunk/Source/WebCore/ChangeLog 2017-07-13 22:43:43 UTC (rev 219471)
+++ trunk/Source/WebCore/ChangeLog 2017-07-13 22:49:52 UTC (rev 219472)
@@ -1,3 +1,30 @@
+2017-07-13 Dean Jackson
+
+Avoid unnecessary copy of framebuffer into WebGL Layer
+https://bugs.webkit.org/show_bug.cgi?id=174345
+
+
+Reviewed by Sam Weinig.
+
+On macOS, we're unnecessarily copying the framebuffer into another
+texture before pushing it into the compositing layer. Instead we
+should simply render the FBO into the CALayer we use to draw on
+the screen.
+
+Covered by the existing WebGL tests.
+
+* platform/graphics/GraphicsContext3D.h:
+(WebCore::GraphicsContext3D::platformTexture): Return the FBO texture instead.
+* platform/graphics/mac/GraphicsContext3DMac.mm:
+(WebCore::GraphicsContext3D::GraphicsContext3D): No need to have a compositing
+texture.
+(WebCore::GraphicsContext3D::~GraphicsContext3D):
+* platform/graphics/opengl/GraphicsContext3DOpenGL.cpp:
+(WebCore::GraphicsContext3D::reshapeFBOs):
+* platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp:
+(WebCore::GraphicsContext3D::prepareTexture): Don't copy the pixels from
+the FBO into the compositing texture
+
2017-07-13 Mark Lam
Implementors of memoryCost() need to be thread-safe.
Modified: trunk/Source/WebCore/platform/graphics/GraphicsContext3D.h (219471 => 219472)
--- trunk/Source/WebCore/platform/graphics/GraphicsContext3D.h 2017-07-13 22:43:43 UTC (rev 219471)
+++ trunk/Source/WebCore/platform/graphics/GraphicsContext3D.h 2017-07-13 22:49:52 UTC (rev 219472)
@@ -747,7 +747,7 @@
#if PLATFORM(COCOA)
PlatformGraphicsContext3D platformGraphicsContext3D() const { return m_contextObj; }
-Platform3DObject platformTexture() const { return m_compositorTexture; }
+Platform3DObject platformTexture() const { return m_fbo; }
CALayer* platformLayer() const { return reinterpret_cast(m_webGLLayer.get()); }
#else
PlatformGraphicsContext3D platformGraphicsContext3D();
@@ -1388,9 +1388,9 @@
Vector> m_vertexArray;
GC3Duint m_texture;
-GC3Duint m_compositorTexture;
GC3Duint m_fbo;
#if USE(COORDINATED_GRAPHICS_THREADED)
+GC3Duint m_compositorTexture;
GC3Duint m_intermediateTexture;
#endif
Modified: trunk/Source/WebCore/platform/graphics/mac/GraphicsContext3DMac.mm (219471 => 219472)
--- trunk/Source/WebCore/platform/graphics/mac/GraphicsContext3DMac.mm 2017-07-13 22:43:43 UTC (rev 219471)
+++ trunk/Source/WebCore/platform/graphics/mac/GraphicsContext3DMac.mm 2017-07-13 22:49:52 UTC (rev 219472)
@@ -395,7 +395,6 @@
#endif
, m_attrs(attrs)
, m_texture(0)
-, m_compositorTexture(0)
, m_fbo(0)
, m_depthStencilBuffer(0)
, m_layerComposited(false)
@@ -506,12 +505,6 @@
::glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
::glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
::glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-::glGenTextures(1, &m_compositorTexture);
-::glBindTexture(GL_TEXTURE_2D, m_compositorTexture);
-::glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-::glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-::glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-::glTexParameteri(GL_TEXTURE_2D, GL
[webkit-changes] [219473] trunk/Source/WebCore
Title: [219473] trunk/Source/WebCore
Revision 219473
Author d...@apple.com
Date 2017-07-13 15:59:50 -0700 (Thu, 13 Jul 2017)
Log Message
Clean-up some things in GraphicsContext3D
https://bugs.webkit.org/show_bug.cgi?id=174452
Reviewed by Simon Fraser.
General clean-up in GC3D.
Covered by existing tests.
* platform/graphics/GraphicsContext3D.h: Use initial values where possible.
(WebCore::GraphicsContext3D::GraphicsContext3DState::GraphicsContext3DState): Deleted.
* platform/graphics/mac/GraphicsContext3DMac.mm:
(WebCore::GraphicsContext3D::GraphicsContext3D): Nearly everything can come from the
initial values now.
(WebCore::GraphicsContext3D::~GraphicsContext3D): Remove code that won't be enabled
on this platform.
* platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp:
(WebCore::GraphicsContext3D::paintRenderingResultsToCanvas): While unlikely to happen,
and possibly harmless in this case, add some checked arithmetic to make sure we don't overflow
when working out how big a buffer to create.
(WebCore::GraphicsContext3D::paintRenderingResultsToImageData): Ditto.
(WebCore::GraphicsContext3D::reshape): Do nothing if we are ever given negative
width or height. Again unlikely.
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/graphics/GraphicsContext3D.h
trunk/Source/WebCore/platform/graphics/mac/GraphicsContext3DMac.mm
trunk/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp
Diff
Modified: trunk/Source/WebCore/ChangeLog (219472 => 219473)
--- trunk/Source/WebCore/ChangeLog 2017-07-13 22:49:52 UTC (rev 219472)
+++ trunk/Source/WebCore/ChangeLog 2017-07-13 22:59:50 UTC (rev 219473)
@@ -1,3 +1,30 @@
+2017-07-12 Dean Jackson
+
+Clean-up some things in GraphicsContext3D
+https://bugs.webkit.org/show_bug.cgi?id=174452
+
+
+Reviewed by Simon Fraser.
+
+General clean-up in GC3D.
+
+Covered by existing tests.
+
+* platform/graphics/GraphicsContext3D.h: Use initial values where possible.
+(WebCore::GraphicsContext3D::GraphicsContext3DState::GraphicsContext3DState): Deleted.
+* platform/graphics/mac/GraphicsContext3DMac.mm:
+(WebCore::GraphicsContext3D::GraphicsContext3D): Nearly everything can come from the
+initial values now.
+(WebCore::GraphicsContext3D::~GraphicsContext3D): Remove code that won't be enabled
+on this platform.
+* platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp:
+(WebCore::GraphicsContext3D::paintRenderingResultsToCanvas): While unlikely to happen,
+and possibly harmless in this case, add some checked arithmetic to make sure we don't overflow
+when working out how big a buffer to create.
+(WebCore::GraphicsContext3D::paintRenderingResultsToImageData): Ditto.
+(WebCore::GraphicsContext3D::reshape): Do nothing if we are ever given negative
+width or height. Again unlikely.
+
2017-07-13 Dean Jackson
Avoid unnecessary copy of framebuffer into WebGL Layer
Modified: trunk/Source/WebCore/platform/graphics/GraphicsContext3D.h (219472 => 219473)
--- trunk/Source/WebCore/platform/graphics/GraphicsContext3D.h 2017-07-13 22:49:52 UTC (rev 219472)
+++ trunk/Source/WebCore/platform/graphics/GraphicsContext3D.h 2017-07-13 22:59:50 UTC (rev 219473)
@@ -1300,11 +1300,12 @@
void resolveMultisamplingIfNecessary(const IntRect& = IntRect());
void attachDepthAndStencilBufferIfNeeded(GLuint internalDepthStencilFormat, int width, int height);
-int m_currentWidth, m_currentHeight;
+int m_currentWidth { 0 };
+int m_currentHeight { 0 };
#if PLATFORM(COCOA)
RetainPtr m_webGLLayer;
-PlatformGraphicsContext3D m_contextObj;
+PlatformGraphicsContext3D m_contextObj { nullptr };
#endif
#if PLATFORM(WIN) && USE(CA)
@@ -1387,11 +1388,11 @@
RenderStyle m_renderStyle;
Vector> m_vertexArray;
-GC3Duint m_texture;
-GC3Duint m_fbo;
+GC3Duint m_texture { 0 };
+GC3Duint m_fbo { 0 };
#if USE(COORDINATED_GRAPHICS_THREADED)
-GC3Duint m_compositorTexture;
-GC3Duint m_intermediateTexture;
+GC3Duint m_compositorTexture { 0 };
+GC3Duint m_intermediateTexture { 0 };
#endif
GC3Duint m_depthBuffer { 0 };
@@ -1398,27 +1399,21 @@
GC3Duint m_stencilBuffer { 0 };
GC3Duint m_depthStencilBuffer { 0 };
-bool m_layerComposited;
-GC3Duint m_internalColorFormat;
+bool m_layerComposited { false };
+GC3Duint m_internalColorFormat { 0 };
struct GraphicsContext3DState {
-GraphicsContext3DState()
-: boundFBO(0)
-, activeTexture(GraphicsContext3D::TEXTURE0)
-, boundTexture0(0)
-{ }
-
-GC3Duint boundFBO;
-GC3Denum activeTexture;
-GC3Duint boundTexture0;
+GC3Duint boundFBO { 0 };
+GC3Denum activeTexture { GraphicsContext3D::TEXTURE0 };
+GC3Duint boundTexture0 { 0 };
};
[webkit-changes] [219474] trunk/Source/WebCore
Title: [219474] trunk/Source/WebCore Revision 219474 Author d...@apple.com Date 2017-07-13 16:04:13 -0700 (Thu, 13 Jul 2017) Log Message Rename GraphicsContext[3D]Mac to Cocoa and move things into graphics/cocoa https://bugs.webkit.org/show_bug.cgi?id=174453 Reviewed by Simon Fraser. Two renames, two moves: graphics/mac/GraphicsContext3DMac.mm -> graphics/cocoa/GraphicsContext3DCocoa.mm graphics/mac/GraphicsContext.mm -> graphics/cocoa/GraphicsContextCocoa.mm graphics/mac/WebGLLayer.h -> graphics/cocoa/WebGLLayer.h graphics/mac/WebGLLayer.mm -> graphics/cocoa/WebGLLayer.mm * PlatformMac.cmake: * WebCore.xcodeproj/project.pbxproj: * platform/graphics/cocoa/GraphicsContext3DCocoa.mm: Renamed from Source/WebCore/platform/graphics/mac/GraphicsContext3DMac.mm. * platform/graphics/cocoa/GraphicsContextCocoa.mm: Renamed from Source/WebCore/platform/graphics/mac/GraphicsContextMac.mm. * platform/graphics/cocoa/WebGLLayer.h: Renamed from Source/WebCore/platform/graphics/mac/WebGLLayer.h. * platform/graphics/cocoa/WebGLLayer.mm: Renamed from Source/WebCore/platform/graphics/mac/WebGLLayer.mm. Modified Paths trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/PlatformMac.cmake trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj Added Paths trunk/Source/WebCore/platform/graphics/cocoa/GraphicsContext3DCocoa.mm trunk/Source/WebCore/platform/graphics/cocoa/GraphicsContextCocoa.mm trunk/Source/WebCore/platform/graphics/cocoa/WebGLLayer.h trunk/Source/WebCore/platform/graphics/cocoa/WebGLLayer.mm Removed Paths trunk/Source/WebCore/platform/graphics/mac/GraphicsContext3DMac.mm trunk/Source/WebCore/platform/graphics/mac/GraphicsContextMac.mm trunk/Source/WebCore/platform/graphics/mac/WebGLLayer.h trunk/Source/WebCore/platform/graphics/mac/WebGLLayer.mm Diff Modified: trunk/Source/WebCore/ChangeLog (219473 => 219474) --- trunk/Source/WebCore/ChangeLog 2017-07-13 22:59:50 UTC (rev 219473) +++ trunk/Source/WebCore/ChangeLog 2017-07-13 23:04:13 UTC (rev 219474) @@ -1,5 +1,26 @@ 2017-07-12 Dean Jackson +Rename GraphicsContext[3D]Mac to Cocoa and move things into graphics/cocoa +https://bugs.webkit.org/show_bug.cgi?id=174453 + + +Reviewed by Simon Fraser. + +Two renames, two moves: +graphics/mac/GraphicsContext3DMac.mm -> graphics/cocoa/GraphicsContext3DCocoa.mm +graphics/mac/GraphicsContext.mm -> graphics/cocoa/GraphicsContextCocoa.mm +graphics/mac/WebGLLayer.h -> graphics/cocoa/WebGLLayer.h +graphics/mac/WebGLLayer.mm -> graphics/cocoa/WebGLLayer.mm + +* PlatformMac.cmake: +* WebCore.xcodeproj/project.pbxproj: +* platform/graphics/cocoa/GraphicsContext3DCocoa.mm: Renamed from Source/WebCore/platform/graphics/mac/GraphicsContext3DMac.mm. +* platform/graphics/cocoa/GraphicsContextCocoa.mm: Renamed from Source/WebCore/platform/graphics/mac/GraphicsContextMac.mm. +* platform/graphics/cocoa/WebGLLayer.h: Renamed from Source/WebCore/platform/graphics/mac/WebGLLayer.h. +* platform/graphics/cocoa/WebGLLayer.mm: Renamed from Source/WebCore/platform/graphics/mac/WebGLLayer.mm. + +2017-07-12 Dean Jackson + Clean-up some things in GraphicsContext3D https://bugs.webkit.org/show_bug.cgi?id=174452 Modified: trunk/Source/WebCore/PlatformMac.cmake (219473 => 219474) --- trunk/Source/WebCore/PlatformMac.cmake 2017-07-13 22:59:50 UTC (rev 219473) +++ trunk/Source/WebCore/PlatformMac.cmake 2017-07-13 23:04:13 UTC (rev 219474) @@ -458,6 +458,8 @@ platform/graphics/cocoa/GPURenderPipelineStateMetal.mm platform/graphics/cocoa/GPUTextureDescriptorMetal.mm platform/graphics/cocoa/GPUTextureMetal.mm +platform/graphics/cocoa/GraphicsContext3DCocoa.mm +platform/graphics/cocoa/GraphicsContextCocoa.mm platform/graphics/cocoa/FontCacheCoreText.cpp platform/graphics/cocoa/FontCascadeCocoa.mm platform/graphics/cocoa/FontCocoa.mm @@ -469,7 +471,9 @@ platform/graphics/cocoa/WebActionDisablingCALayerDelegate.mm platform/graphics/cocoa/WebCoreCALayerExtras.mm platform/graphics/cocoa/WebCoreDecompressionSession.mm +platform/graphics/cocoa/WebGLLayer.mm platform/graphics/cocoa/WebGPULayer.mm +platform/graphics/cocoa/WebLayer.mm platform/graphics/cv/PixelBufferConformerCV.cpp platform/graphics/cv/TextureCacheCV.mm @@ -487,8 +491,6 @@ platform/graphics/mac/FontCacheMac.mm platform/graphics/mac/FontCustomPlatformData.cpp platform/graphics/mac/GlyphPageMac.cpp -platform/graphics/mac/GraphicsContext3DMac.mm -platform/graphics/mac/GraphicsContextMac.mm platform/graphics/mac/IconMac.mm platform/graphics/mac/ImageMac.mm platform/graphics/mac/IntPointMac.mm @@ -498,8 +500,6 @@ platform/graphics/mac/MediaTimeQTKit.mm platform/graphics/mac/PDFDocumentImageMac.mm platform/graphics/mac/SimpleFontDataCoreText.cpp -platform/graphics/mac/WebGLLayer.mm -platf
[webkit-changes] [219475] trunk/Source/WebKit2
Title: [219475] trunk/Source/WebKit2 Revision 219475 Author cdu...@apple.com Date 2017-07-13 16:08:57 -0700 (Thu, 13 Jul 2017) Log Message Moved filesystem code out of WebResourceLoadStatisticsStore class https://bugs.webkit.org/show_bug.cgi?id=174435 Reviewed by Brent Fulgham. Moved filesystem code out of WebResourceLoadStatisticsStore class and into a new ResourceLoadStatisticsPersistentStorage class to decrease complexity. * CMakeLists.txt: * UIProcess/Cocoa/WebResourceLoadStatisticsStoreCocoa.mm: * UIProcess/Storage/ResourceLoadStatisticsPersistentStorage.cpp: Added. (WebKit::hasFileChangedSince): (WebKit::createDecoderForFile): (WebKit::ResourceLoadStatisticsPersistentStorage::ResourceLoadStatisticsPersistentStorage): (WebKit::ResourceLoadStatisticsPersistentStorage::~ResourceLoadStatisticsPersistentStorage): (WebKit::ResourceLoadStatisticsPersistentStorage::storageDirectoryPath): (WebKit::ResourceLoadStatisticsPersistentStorage::resourceLogFilePath): (WebKit::ResourceLoadStatisticsPersistentStorage::startMonitoringDisk): (WebKit::ResourceLoadStatisticsPersistentStorage::stopMonitoringDisk): (WebKit::ResourceLoadStatisticsPersistentStorage::refreshMemoryStoreFromDisk): (WebKit::ResourceLoadStatisticsPersistentStorage::populateMemoryStoreFromDisk): (WebKit::ResourceLoadStatisticsPersistentStorage::writeMemoryStoreToDisk): (WebKit::ResourceLoadStatisticsPersistentStorage::scheduleOrWriteMemoryStore): (WebKit::ResourceLoadStatisticsPersistentStorage::clear): (WebKit::ResourceLoadStatisticsPersistentStorage::finishAllPendingWorkSynchronously): (WebKit::ResourceLoadStatisticsPersistentStorage::excludeFromBackup): * UIProcess/Storage/ResourceLoadStatisticsPersistentStorage.h: Added. * UIProcess/Storage/ios/ResourceLoadStatisticsPersistentStorageIOS.mm: Added. (WebKit::ResourceLoadStatisticsPersistentStorage::excludeFromBackup): * UIProcess/WebResourceLoadStatisticsStore.cpp: (WebKit::WebResourceLoadStatisticsStore::WebResourceLoadStatisticsStore): (WebKit::WebResourceLoadStatisticsStore::processStatisticsAndDataRecords): (WebKit::WebResourceLoadStatisticsStore::grandfatherExistingWebsiteData): (WebKit::WebResourceLoadStatisticsStore::applicationWillTerminate): (WebKit::WebResourceLoadStatisticsStore::scheduleClearInMemoryAndPersistent): (WebKit::WebResourceLoadStatisticsStore::resetDataFromDecoder): * UIProcess/WebResourceLoadStatisticsStore.h: * WebKit2.xcodeproj/project.pbxproj: Modified Paths trunk/Source/WebKit2/CMakeLists.txt trunk/Source/WebKit2/ChangeLog trunk/Source/WebKit2/UIProcess/Cocoa/WebResourceLoadStatisticsStoreCocoa.mm trunk/Source/WebKit2/UIProcess/WebResourceLoadStatisticsStore.cpp trunk/Source/WebKit2/UIProcess/WebResourceLoadStatisticsStore.h trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj Added Paths trunk/Source/WebKit2/UIProcess/Storage/ResourceLoadStatisticsPersistentStorage.cpp trunk/Source/WebKit2/UIProcess/Storage/ResourceLoadStatisticsPersistentStorage.h trunk/Source/WebKit2/UIProcess/Storage/ios/ResourceLoadStatisticsPersistentStorageIOS.mm Diff Modified: trunk/Source/WebKit2/CMakeLists.txt (219474 => 219475) --- trunk/Source/WebKit2/CMakeLists.txt 2017-07-13 23:04:13 UTC (rev 219474) +++ trunk/Source/WebKit2/CMakeLists.txt 2017-07-13 23:08:57 UTC (rev 219475) @@ -434,6 +434,7 @@ UIProcess/Storage/LocalStorageDatabase.cpp UIProcess/Storage/LocalStorageDatabaseTracker.cpp +UIProcess/Storage/ResourceLoadStatisticsPersistentStorage.cpp UIProcess/UserContent/WebScriptMessageHandler.cpp UIProcess/UserContent/WebUserContentControllerProxy.cpp Modified: trunk/Source/WebKit2/ChangeLog (219474 => 219475) --- trunk/Source/WebKit2/ChangeLog 2017-07-13 23:04:13 UTC (rev 219474) +++ trunk/Source/WebKit2/ChangeLog 2017-07-13 23:08:57 UTC (rev 219475) @@ -1,5 +1,46 @@ 2017-07-13 Chris Dumez +Moved filesystem code out of WebResourceLoadStatisticsStore class +https://bugs.webkit.org/show_bug.cgi?id=174435 + +Reviewed by Brent Fulgham. + +Moved filesystem code out of WebResourceLoadStatisticsStore class and into +a new ResourceLoadStatisticsPersistentStorage class to decrease complexity. + +* CMakeLists.txt: +* UIProcess/Cocoa/WebResourceLoadStatisticsStoreCocoa.mm: +* UIProcess/Storage/ResourceLoadStatisticsPersistentStorage.cpp: Added. +(WebKit::hasFileChangedSince): +(WebKit::createDecoderForFile): +(WebKit::ResourceLoadStatisticsPersistentStorage::ResourceLoadStatisticsPersistentStorage): +(WebKit::ResourceLoadStatisticsPersistentStorage::~ResourceLoadStatisticsPersistentStorage): +(WebKit::ResourceLoadStatisticsPersistentStorage::storageDirectoryPath): +(WebKit::ResourceLoadStatisticsPersistentStorage::resourceLogFilePath): +(WebKit::ResourceLoadStatisticsPersistentStorage::startMonitoringDisk): +(WebKit::ResourceLoadStatisticsPersistentStorage::stopMonitoringDisk): +(WebKit::ResourceLoadSt
[webkit-changes] [219476] trunk/Source/WebCore
Title: [219476] trunk/Source/WebCore
Revision 219476
Author d...@apple.com
Date 2017-07-13 16:09:05 -0700 (Thu, 13 Jul 2017)
Log Message
Fix iOS build.
* platform/graphics/GraphicsContext3D.h:
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/graphics/GraphicsContext3D.h
Diff
Modified: trunk/Source/WebCore/ChangeLog (219475 => 219476)
--- trunk/Source/WebCore/ChangeLog 2017-07-13 23:08:57 UTC (rev 219475)
+++ trunk/Source/WebCore/ChangeLog 2017-07-13 23:09:05 UTC (rev 219476)
@@ -1,3 +1,9 @@
+2017-07-13 Dean Jackson
+
+Fix iOS build.
+
+* platform/graphics/GraphicsContext3D.h:
+
2017-07-12 Dean Jackson
Rename GraphicsContext[3D]Mac to Cocoa and move things into graphics/cocoa
Modified: trunk/Source/WebCore/platform/graphics/GraphicsContext3D.h (219475 => 219476)
--- trunk/Source/WebCore/platform/graphics/GraphicsContext3D.h 2017-07-13 23:08:57 UTC (rev 219475)
+++ trunk/Source/WebCore/platform/graphics/GraphicsContext3D.h 2017-07-13 23:09:05 UTC (rev 219476)
@@ -1370,8 +1370,6 @@
String mappedSymbolName(Platform3DObject shaders[2], size_t count, const String& name);
String originalSymbolName(Platform3DObject program, ANGLEShaderSymbolType, const String& name);
-ANGLEWebKitBridge m_compiler;
-
std::unique_ptr nameHashMapForShaders;
#if ((PLATFORM(GTK) || PLATFORM(WIN) || PLATFORM(WPE)) && USE(OPENGL_ES_2))
@@ -1388,6 +1386,8 @@
RenderStyle m_renderStyle;
Vector> m_vertexArray;
+ANGLEWebKitBridge m_compiler;
+
GC3Duint m_texture { 0 };
GC3Duint m_fbo { 0 };
#if USE(COORDINATED_GRAPHICS_THREADED)
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [219477] trunk/Tools
Title: [219477] trunk/Tools
Revision 219477
Author jbed...@apple.com
Date 2017-07-13 17:20:11 -0700 (Thu, 13 Jul 2017)
Log Message
Add script to rebase patches during the WebKit2->WebKit/WebKit->WebKitLegacy transition
https://bugs.webkit.org/show_bug.cgi?id=174438
Reviewed by Aakash Jain.
Given a patch, this will convert the changes from the path to the new directory structure.
* Scripts/rebase-patch-after-webkit-move: Added.
(append_source): Append 'Source' to the provided path.
(is_editable_line): Return true if a line the script expects to modify.
(needs_rebase): Return if a line needs to be rebased based on it's content.
(rebase_line): Rebase the provided line.
(rebase): Rebase a patch given the lines of that patch and a file to output the rebased patch to.
(parse_arguments): Parse the command line arguments and return the patches to be rebased, if they
were provided.
Modified Paths
trunk/Tools/ChangeLog
Added Paths
trunk/Tools/Scripts/rebase-patch-after-webkit-move
Diff
Modified: trunk/Tools/ChangeLog (219476 => 219477)
--- trunk/Tools/ChangeLog 2017-07-13 23:09:05 UTC (rev 219476)
+++ trunk/Tools/ChangeLog 2017-07-14 00:20:11 UTC (rev 219477)
@@ -1,3 +1,22 @@
+2017-07-13 Jonathan Bedard
+
+Add script to rebase patches during the WebKit2->WebKit/WebKit->WebKitLegacy transition
+https://bugs.webkit.org/show_bug.cgi?id=174438
+
+
+Reviewed by Aakash Jain.
+
+Given a patch, this will convert the changes from the path to the new directory structure.
+
+* Scripts/rebase-patch-after-webkit-move: Added.
+(append_source): Append 'Source' to the provided path.
+(is_editable_line): Return true if a line the script expects to modify.
+(needs_rebase): Return if a line needs to be rebased based on it's content.
+(rebase_line): Rebase the provided line.
+(rebase): Rebase a patch given the lines of that patch and a file to output the rebased patch to.
+(parse_arguments): Parse the command line arguments and return the patches to be rebased, if they
+were provided.
+
2017-07-12 Nan Wang
AX: [iOS] Implement a way to retrieve a text marker range with desired text that is closest to a position
Added: trunk/Tools/Scripts/rebase-patch-after-webkit-move (0 => 219477)
--- trunk/Tools/Scripts/rebase-patch-after-webkit-move (rev 0)
+++ trunk/Tools/Scripts/rebase-patch-after-webkit-move 2017-07-14 00:20:11 UTC (rev 219477)
@@ -0,0 +1,148 @@
+#!/usr/bin/env python
+# Copyright (C) 2017 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. AND ITS CONTRIBUTORS ``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
+# DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR
+# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+# OR TORT (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 os
+import sys
+
+REBASE_DICTIONARY = {
+'WebKit2/': 'WebKit/',
+'WebKit/': 'WebKitLegacy/'
+}
+class RebaseStatus:
+DO_NOT_NEED = 0
+MAYBE_NEED = 1
+NEED = 2
+ALREADY = 3
+
+
+def append_source(path):
+return os.path.join('Source', path)
+
+
+def is_editable_line(line):
+editable_prefixes = ('Index: ', '--- ', '+++ ', 'diff --git ')
+return any(map(line.startswith, editable_prefixes))
+
+
+def needs_rebase(line):
+if not is_editable_line(line):
+return RebaseStatus.DO_NOT_NEED
+
+for current_name, rebased_name in REBASE_DICTIONARY.iteritems():
+# Check if we've already rebased. We need to check if the rebased_name is already in the REBASE_DICTIONARY,
+# in this case, we don't know if we've already been rebased.
+if append_source(rebased_name) in line and rebased_name not in REBASE_DICTIONARY:
+return RebaseStatus.ALREADY
+
+# Check if we need to rebase. We need to check if the current name is one of the potential rebase names.
+# In this case, we don't know if
[webkit-changes] [219478] trunk/LayoutTests
Title: [219478] trunk/LayoutTests Revision 219478 Author jlew...@apple.com Date 2017-07-13 17:23:26 -0700 (Thu, 13 Jul 2017) Log Message Skipped multiple http/tests/webrtc/ test on iOS simulator. https://bugs.webkit.org/show_bug.cgi?id=173861 Unreviewed test gardening. * platform/ios-simulator-wk2/TestExpectations: Modified Paths trunk/LayoutTests/ChangeLog trunk/LayoutTests/platform/ios-simulator-wk2/TestExpectations Diff Modified: trunk/LayoutTests/ChangeLog (219477 => 219478) --- trunk/LayoutTests/ChangeLog 2017-07-14 00:20:11 UTC (rev 219477) +++ trunk/LayoutTests/ChangeLog 2017-07-14 00:23:26 UTC (rev 219478) @@ -1,5 +1,13 @@ 2017-07-13 Matt Lewis +Skipped multiple http/tests/webrtc/ test on iOS simulator. +https://bugs.webkit.org/show_bug.cgi?id=173861 + +Unreviewed test gardening. +* platform/ios-simulator-wk2/TestExpectations: + +2017-07-13 Matt Lewis + Marked imported/w3c/web-platform-tests/IndexedDB/large-nested-cloning.html as flaky on iOS. https://bugs.webkit.org/show_bug.cgi?id=173487 Modified: trunk/LayoutTests/platform/ios-simulator-wk2/TestExpectations (219477 => 219478) --- trunk/LayoutTests/platform/ios-simulator-wk2/TestExpectations 2017-07-14 00:20:11 UTC (rev 219477) +++ trunk/LayoutTests/platform/ios-simulator-wk2/TestExpectations 2017-07-14 00:23:26 UTC (rev 219478) @@ -40,3 +40,7 @@ webkit.org/b/173487 imported/w3c/web-platform-tests/IndexedDB/large-nested-cloning.html [ Pass Failure ] +webkit.org/b/173861 http/tests/webrtc/filtering-ice-candidate-same-origin-frame2.html [ Skip ] +webkit.org/b/173861 http/tests/webrtc/filtering-ice-candidate-same-origin-frame.html [ Skip ] +webkit.org/b/173861 http/tests/webrtc/filtering-ice-candidate-cross-origin-frame.html [ Skip ] + ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [219479] trunk/Source/WebCore
Title: [219479] trunk/Source/WebCore Revision 219479 Author mcatanz...@igalia.com Date 2017-07-13 18:38:54 -0700 (Thu, 13 Jul 2017) Log Message Incorrect call to StyledElement::setInlineStyleProperty in ImageDocument::createDocumentStructure https://bugs.webkit.org/show_bug.cgi?id=174470 Reviewed by Darin Adler. * html/ImageDocument.cpp: (WebCore::ImageDocument::createDocumentStructure): Modified Paths trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/html/ImageDocument.cpp Diff Modified: trunk/Source/WebCore/ChangeLog (219478 => 219479) --- trunk/Source/WebCore/ChangeLog 2017-07-14 00:23:26 UTC (rev 219478) +++ trunk/Source/WebCore/ChangeLog 2017-07-14 01:38:54 UTC (rev 219479) @@ -1,3 +1,13 @@ +2017-07-13 Michael Catanzaro + +Incorrect call to StyledElement::setInlineStyleProperty in ImageDocument::createDocumentStructure +https://bugs.webkit.org/show_bug.cgi?id=174470 + +Reviewed by Darin Adler. + +* html/ImageDocument.cpp: +(WebCore::ImageDocument::createDocumentStructure): + 2017-07-13 Dean Jackson Fix iOS build. Modified: trunk/Source/WebCore/html/ImageDocument.cpp (219478 => 219479) --- trunk/Source/WebCore/html/ImageDocument.cpp 2017-07-14 00:23:26 UTC (rev 219478) +++ trunk/Source/WebCore/html/ImageDocument.cpp 2017-07-14 01:38:54 UTC (rev 219479) @@ -223,7 +223,7 @@ auto body = HTMLBodyElement::create(*this); body->setAttribute(styleAttr, "margin: 0px"); if (MIMETypeRegistry::isPDFMIMEType(document().loader()->responseMIMEType())) -body->setInlineStyleProperty(CSSPropertyBackgroundColor, "white", CSSPrimitiveValue::CSS_IDENT); +body->setInlineStyleProperty(CSSPropertyBackgroundColor, "white"); rootElement->appendChild(body); auto imageElement = ImageDocumentElement::create(*this); ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [219480] trunk
Title: [219480] trunk
Revision 219480
Author mcatanz...@igalia.com
Date 2017-07-13 18:48:49 -0700 (Thu, 13 Jul 2017)
Log Message
Fix compiler warnings when building with GCC 7
https://bugs.webkit.org/show_bug.cgi?id=174463
Reviewed by Darin Adler.
.:
* Source/cmake/OptionsCommon.cmake:
Source/_javascript_Core:
* disassembler/udis86/udis86_decode.c:
(decode_operand):
Source/ThirdParty:
* brotli/CMakeLists.txt:
Source/WebCore:
* testing/InternalSettings.cpp:
(WebCore::InternalSettings::setShouldManageAudioSessionCategory):
Source/WebKit2:
* Platform/IPC/unix/ConnectionUnix.cpp:
(IPC::Connection::sendOutputMessage):
Modified Paths
trunk/ChangeLog
trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/disassembler/udis86/udis86_decode.c
trunk/Source/ThirdParty/ChangeLog
trunk/Source/ThirdParty/brotli/CMakeLists.txt
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/testing/InternalSettings.cpp
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/Platform/IPC/unix/ConnectionUnix.cpp
trunk/Source/cmake/OptionsCommon.cmake
Diff
Modified: trunk/ChangeLog (219479 => 219480)
--- trunk/ChangeLog 2017-07-14 01:38:54 UTC (rev 219479)
+++ trunk/ChangeLog 2017-07-14 01:48:49 UTC (rev 219480)
@@ -1,3 +1,12 @@
+2017-07-13 Michael Catanzaro
+
+Fix compiler warnings when building with GCC 7
+https://bugs.webkit.org/show_bug.cgi?id=174463
+
+Reviewed by Darin Adler.
+
+* Source/cmake/OptionsCommon.cmake:
+
2017-07-12 Matt Lewis
Unreviewed, rolling out r219401.
Modified: trunk/Source/_javascript_Core/ChangeLog (219479 => 219480)
--- trunk/Source/_javascript_Core/ChangeLog 2017-07-14 01:38:54 UTC (rev 219479)
+++ trunk/Source/_javascript_Core/ChangeLog 2017-07-14 01:48:49 UTC (rev 219480)
@@ -1,5 +1,15 @@
2017-07-13 Michael Catanzaro
+Fix compiler warnings when building with GCC 7
+https://bugs.webkit.org/show_bug.cgi?id=174463
+
+Reviewed by Darin Adler.
+
+* disassembler/udis86/udis86_decode.c:
+(decode_operand):
+
+2017-07-13 Michael Catanzaro
+
Incorrect assertion in JSC::CallLinkInfo::callTypeFor
https://bugs.webkit.org/show_bug.cgi?id=174467
Modified: trunk/Source/_javascript_Core/disassembler/udis86/udis86_decode.c (219479 => 219480)
--- trunk/Source/_javascript_Core/disassembler/udis86/udis86_decode.c 2017-07-14 01:38:54 UTC (rev 219479)
+++ trunk/Source/_javascript_Core/disassembler/udis86/udis86_decode.c 2017-07-14 01:48:49 UTC (rev 219480)
@@ -749,12 +749,12 @@
break;
case OP_F:
u->br_far = 1;
- /* intended fall through */
+ FALLTHROUGH;
case OP_M:
if (MODRM_MOD(modrm(u)) == 3) {
UDERR(u, "expected modrm.mod != 3\n");
}
- /* intended fall through */
+ FALLTHROUGH;
case OP_E:
decode_modrm_rm(u, operand, REGCLASS_GPR, size);
break;
@@ -773,7 +773,7 @@
if (MODRM_MOD(modrm(u)) != 3) {
UDERR(u, "expected modrm.mod == 3\n");
}
- /* intended fall through */
+ FALLTHROUGH;
case OP_Q:
decode_modrm_rm(u, operand, REGCLASS_MMX, size);
break;
@@ -784,7 +784,7 @@
if (MODRM_MOD(modrm(u)) != 3) {
UDERR(u, "expected modrm.mod == 3\n");
}
- /* intended fall through */
+ FALLTHROUGH;
case OP_W:
decode_modrm_rm(u, operand, REGCLASS_XMM, size);
break;
Modified: trunk/Source/ThirdParty/ChangeLog (219479 => 219480)
--- trunk/Source/ThirdParty/ChangeLog 2017-07-14 01:38:54 UTC (rev 219479)
+++ trunk/Source/ThirdParty/ChangeLog 2017-07-14 01:48:49 UTC (rev 219480)
@@ -1,3 +1,12 @@
+2017-07-13 Michael Catanzaro
+
+Fix compiler warnings when building with GCC 7
+https://bugs.webkit.org/show_bug.cgi?id=174463
+
+Reviewed by Darin Adler.
+
+* brotli/CMakeLists.txt:
+
2017-05-11 Don Olmstead
[CMake] Add HAVE check for regex.h
Modified: trunk/Source/ThirdParty/brotli/CMakeLists.txt (219479 => 219480)
--- trunk/Source/ThirdParty/brotli/CMakeLists.txt 2017-07-14 01:38:54 UTC (rev 219479)
+++ trunk/Source/ThirdParty/brotli/CMakeLists.txt 2017-07-14 01:48:49 UTC (rev 219480)
@@ -17,6 +17,6 @@
add_library(brotli STATIC ${BROTLI_SOURCES})
WEBKIT_SET_EXTRA_COMPILER_FLAGS(brotli)
-if (COMPILER_IS_CLANG)
-ADD_TARGET_PROPERTIES(brotli COMPILE_FLAGS "-Wno-cast-align")
+if (COMPILER_IS_GCC_OR_CLANG)
+ADD_TARGET_PROPERTIES(brotli COMPILE_FLAGS "-Wno-cast-align -Wno-implicit-fallthrough")
endif ()
Modified: trunk/Source/WebCore/ChangeLog (219479 => 219480)
--- trunk/Source/WebCore/ChangeLog 2017-07-14 01:38:54 UTC (rev 219479)
+++ trunk/Source/WebCore/ChangeLog 2017-07-14 01:48:49 UTC (rev 219480)
@@ -1,5 +1,15 @@
2017-07-13 Michael Catanzaro
+Fix compiler warnings when building with GCC 7
+https://bugs.webkit.org/show_bug.cgi?id=174463
+
+Reviewed by Darin Adler.
+
+* testing/InternalSettings.cpp:
[webkit-changes] [219481] trunk/Source
Title: [219481] trunk/Source Revision 219481 Author matthew_han...@apple.com Date 2017-07-13 19:11:40 -0700 (Thu, 13 Jul 2017) Log Message Rename Source/WebKit to Source/WebKitLegacy. Added Paths trunk/Source/WebKitLegacy/ Removed Paths trunk/Source/WebKit/ Diff ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [219482] trunk/Source
Title: [219482] trunk/Source Revision 219482 Author matthew_han...@apple.com Date 2017-07-13 19:12:32 -0700 (Thu, 13 Jul 2017) Log Message Rename Source/WebKit2 to Source/WebKit. Added Paths trunk/Source/WebKit/ Removed Paths trunk/Source/WebKit2/ Diff Index: trunk/Source/WebKit === --- trunk/Source/WebKit2 2017-07-14 02:11:40 UTC (rev 219481) +++ trunk/Source/WebKit 2017-07-14 02:12:32 UTC (rev 219482) Property changes: trunk/Source/WebKit Added: svn:mergeinfo +/trunk/Source/WebKit2:53455 \ No newline at end of property ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [219483] trunk
Title: [219483] trunk
Revision 219483
Author matthew_han...@apple.com
Date 2017-07-13 19:29:11 -0700 (Thu, 13 Jul 2017)
Log Message
Update tools and configurations after renaming Source/WebKit to Source/WebKitLegacy.
https://bugs.webkit.org/show_bug.cgi?id=174162
rdar://problem/33137594
Reviewed by Dan Bernstein.
.:
Mass rename of Source/WebKit to Source/WebKitLegacy in OpenSource cmake files
and Xcode project files.
* Source/cmake/OptionsGTK.cmake:
* Source/cmake/WebKitFS.cmake:
* WebKit.xcworkspace/contents.xcworkspacedata:
* WebKit.xcworkspace/xcshareddata/xcschemes/All Source.xcscheme:
Tools:
Mass rename of Source/WebKit to Source/WebKitLegacy in OpenSource tooling.
* BuildSlaveSupport/build.webkit.org-config/wkbuild_unittest.py:
* DumpRenderTree/mac/InternalHeaders/WebKit/WebTypesInternal.h:
* EWSTools/configure-clang-linux.sh:
* Scripts/build-webkit:
* Scripts/do-file-rename:
* Scripts/do-webcore-rename:
* Scripts/update-webkit-localizable-strings:
* Scripts/webkitpy/common/checkout/checkout_unittest.py:
* Scripts/webkitpy/style/checkers/changelog_unittest.py:
* Scripts/webkitpy/style/checkers/featuredefines.py:
* gtk/manifest.txt.in:
Modified Paths
trunk/ChangeLog
trunk/Source/Makefile
trunk/Source/cmake/OptionsGTK.cmake
trunk/Source/cmake/WebKitFS.cmake
trunk/Tools/BuildSlaveSupport/build.webkit.org-config/wkbuild_unittest.py
trunk/Tools/ChangeLog
trunk/Tools/DumpRenderTree/mac/InternalHeaders/WebKit/WebTypesInternal.h
trunk/Tools/EWSTools/configure-clang-linux.sh
trunk/Tools/Scripts/build-webkit
trunk/Tools/Scripts/do-file-rename
trunk/Tools/Scripts/do-webcore-rename
trunk/Tools/Scripts/update-webkit-localizable-strings
trunk/Tools/Scripts/webkitpy/common/checkout/checkout_unittest.py
trunk/Tools/Scripts/webkitpy/style/checkers/changelog_unittest.py
trunk/Tools/Scripts/webkitpy/style/checkers/featuredefines.py
trunk/Tools/gtk/manifest.txt.in
trunk/WebKit.xcworkspace/contents.xcworkspacedata
trunk/WebKit.xcworkspace/xcshareddata/xcschemes/All Source.xcscheme
Diff
Modified: trunk/ChangeLog (219482 => 219483)
--- trunk/ChangeLog 2017-07-14 02:12:32 UTC (rev 219482)
+++ trunk/ChangeLog 2017-07-14 02:29:11 UTC (rev 219483)
@@ -1,3 +1,19 @@
+2017-07-05 Matthew Hanson
+
+Update tools and configurations after renaming Source/WebKit to Source/WebKitLegacy.
+https://bugs.webkit.org/show_bug.cgi?id=174162
+rdar://problem/33137594
+
+Reviewed by Dan Bernstein.
+
+Mass rename of Source/WebKit to Source/WebKitLegacy in OpenSource cmake files
+and Xcode project files.
+
+* Source/cmake/OptionsGTK.cmake:
+* Source/cmake/WebKitFS.cmake:
+* WebKit.xcworkspace/contents.xcworkspacedata:
+* WebKit.xcworkspace/xcshareddata/xcschemes/All Source.xcscheme:
+
2017-07-13 Michael Catanzaro
Fix compiler warnings when building with GCC 7
Modified: trunk/Source/Makefile (219482 => 219483)
--- trunk/Source/Makefile 2017-07-14 02:12:32 UTC (rev 219482)
+++ trunk/Source/Makefile 2017-07-14 02:29:11 UTC (rev 219483)
@@ -1,8 +1,8 @@
-MODULES = bmalloc WTF _javascript_Core ThirdParty/ANGLE ThirdParty/libwebrtc WebCore WebInspectorUI WebKit WebKit2
+MODULES = bmalloc WTF _javascript_Core ThirdParty/ANGLE ThirdParty/libwebrtc WebCore WebInspectorUI WebKitLegacy WebKit2
ifneq (,$(SDKROOT))
ifeq (,$(findstring macosx,$(SDKROOT)))
- MODULES = bmalloc WTF _javascript_Core ThirdParty/ANGLE ThirdParty/libwebrtc WebCore WebKit WebKit2
+ MODULES = bmalloc WTF _javascript_Core ThirdParty/ANGLE ThirdParty/libwebrtc WebCore WebKitLegacy WebKit2
endif
endif
Modified: trunk/Source/cmake/OptionsGTK.cmake (219482 => 219483)
--- trunk/Source/cmake/OptionsGTK.cmake 2017-07-14 02:12:32 UTC (rev 219482)
+++ trunk/Source/cmake/OptionsGTK.cmake 2017-07-14 02:29:11 UTC (rev 219483)
@@ -439,7 +439,7 @@
set(FORWARDING_HEADERS_WEBKIT2GTK_DIR ${FORWARDING_HEADERS_DIR}/webkit2gtk)
set(FORWARDING_HEADERS_WEBKIT2GTK_EXTENSION_DIR ${FORWARDING_HEADERS_DIR}/webkit2gtk-webextension)
-set(WebKit_PKGCONFIG_FILE ${CMAKE_BINARY_DIR}/Source/WebKit/gtk/webkitgtk-${WEBKITGTK_API_VERSION}.pc)
+set(WebKit_PKGCONFIG_FILE ${CMAKE_BINARY_DIR}/Source/WebKitLegacy/gtk/webkitgtk-${WEBKITGTK_API_VERSION}.pc)
set(WebKit2_PKGCONFIG_FILE ${CMAKE_BINARY_DIR}/Source/WebKit2/webkit2gtk-${WEBKITGTK_API_VERSION}.pc)
set(WebKit2WebExtension_PKGCONFIG_FILE ${CMAKE_BINARY_DIR}/Source/WebKit2/webkit2gtk-web-extension-${WEBKITGTK_API_VERSION}.pc)
Modified: trunk/Source/cmake/WebKitFS.cmake (219482 => 219483)
--- trunk/Source/cmake/WebKitFS.cmake 2017-07-14 02:12:32 UTC (rev 219482)
+++ trunk/Source/cmake/WebKitFS.cmake 2017-07-14 02:29:11 UTC (rev 219483)
@@ -14,7 +14,7 @@
set(PAL_DIR "${CMAKE_SOURCE_DIR}/Source/WebCore/PAL")
endif ()
if (NOT WEBKIT_DIR)
-set(WEBKIT_DIR "${CMAKE_SOURCE_DIR}/Source/WebKit")
+set(WEBKIT_DIR "${CMAKE_SOURCE_DIR}/Source/WebKitLegacy")
endif ()
if (NOT WEBKIT2_DIR)
set(WEBKIT2_DIR "${CMAKE_SOURCE
[webkit-changes] [219485] trunk/Source/WebKitLegacy
Title: [219485] trunk/Source/WebKitLegacy
Revision 219485
Author matthew_han...@apple.com
Date 2017-07-13 19:29:17 -0700 (Thu, 13 Jul 2017)
Log Message
Update the Visual Studio project name from WebKit to WebKitLegacy.
https://bugs.webkit.org/show_bug.cgi?id=174162
rdar://problem/33137594
Reviewed by Dan Bernstein.
Rename WebKit to WebKitLegacy.
* WebKitLegacy.vcxproj/WebKitLegacy.proj: Renamed from Source/WebKitLegacy/WebKit.vcxproj/WebKit.proj.
Modified Paths
trunk/Source/WebKitLegacy/ChangeLog
Added Paths
trunk/Source/WebKitLegacy/WebKitLegacy.vcxproj/
trunk/Source/WebKitLegacy/WebKitLegacy.vcxproj/WebKitLegacy.proj
Removed Paths
trunk/Source/WebKitLegacy/WebKit.vcxproj/WebKit.proj
Diff
Modified: trunk/Source/WebKitLegacy/ChangeLog (219484 => 219485)
--- trunk/Source/WebKitLegacy/ChangeLog 2017-07-14 02:29:15 UTC (rev 219484)
+++ trunk/Source/WebKitLegacy/ChangeLog 2017-07-14 02:29:17 UTC (rev 219485)
@@ -1,5 +1,17 @@
2017-07-05 Matthew Hanson
+Update the Visual Studio project name from WebKit to WebKitLegacy.
+https://bugs.webkit.org/show_bug.cgi?id=174162
+rdar://problem/33137594
+
+Reviewed by Dan Bernstein.
+
+Rename WebKit to WebKitLegacy.
+
+* WebKitLegacy.vcxproj/WebKitLegacy.proj: Renamed from Source/WebKitLegacy/WebKit.vcxproj/WebKit.proj.
+
+2017-07-05 Matthew Hanson
+
Update the Xcode project name from WebKit to WebKitLegacy.
https://bugs.webkit.org/show_bug.cgi?id=174162
rdar://problem/33137594
Deleted: trunk/Source/WebKitLegacy/WebKit.vcxproj/WebKit.proj (219484 => 219485)
--- trunk/Source/WebKitLegacy/WebKit.vcxproj/WebKit.proj 2017-07-14 02:29:15 UTC (rev 219484)
+++ trunk/Source/WebKitLegacy/WebKit.vcxproj/WebKit.proj 2017-07-14 02:29:17 UTC (rev 219485)
@@ -1,128 +0,0 @@
-
-
-
-
-
- Release
-
-
-
-
- Debug
-_debug
--DDEBUG_SUFFIX=_debug
-
-
-
-
-1
-$(SRCROOT)\AppleInternal
-$(DSTROOT)\AppleInternal
-$(AppleInternal)\lib32
-$(AppleInternal)\lib64
-$(AppleInternal)\bin32
-$(AppleInternal)\bin64
-$(AppleInternal)\public32\sym
-$(AppleInternal)\public64\sym
-Program Files (x86)\Common Files\Apple\Apple Application Support
-Program Files\Common Files\Apple\Apple Application Support
-$(OBJROOT)\$(CONFIG)
-$(DSTROOT)
- cmake $(SRCROOT) -DPORT=AppleWin $(DebugSuffixDefinition) -DWEBKIT_LIBRARIES_DIR=$(WebKit_Libraries.Replace('\','/')) -DCMAKE_MODULE_PATH=$(SRCROOT.Replace('\','/'))/AppleInternal/tools/cmake -DCMAKE_BINARY_DIR=$(OBJROOT.Replace('\','/'))/$(CONFIG) -DCMAKE_BUILD_TYPE=$(CONFIGURATION) -DWEBKIT_DIR=$(SRCROOT.Replace('\','/'))
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Copied: trunk/Source/WebKitLegacy/WebKitLegacy.vcxproj/WebKitLegacy.proj (from rev 219484, trunk/Source/WebKitLegacy/WebKit.vcxproj/WebKit.proj) (0 => 219485)
--- trunk/Source/WebKitLegacy/WebKitLegacy.vcxproj/WebKitLegacy.proj (rev 0)
+++ trunk/Source/WebKitLegacy/WebKitLegacy.vcxproj/WebKitLegacy.proj 2017-07-14 02:29:17 UTC (rev 219485)
@@ -0,0 +1,128 @@
+
+
+
+
+
+ Release
+
+
+
+
+ Debug
+_debug
+-DDEBUG_SUFFIX=_debug
+
+
+
+
+1
+$(SRCROOT)\AppleInternal
+$(DSTROOT)\AppleInternal
+$(AppleInternal)\lib32
+$(AppleInternal)\lib64
+$(AppleInternal)\bin32
+$(AppleInternal)\bin64
+$(AppleInternal)\public32\sym
+$(AppleInternal)\public64\sym
+Program Files (x86)\Common Files\Apple\Apple Application Support
+Program Files\Common Files\Apple\Apple Application Support
+$(OBJROOT)\$(CONFIG)
+$(DSTROOT)
+ cmake $(SRCROOT) -DPORT=AppleWin $(DebugSuffixDefinition) -DWEBKIT_LIBRARIES_DIR=$(WebKit_Libraries.Replace('\','/')) -DCMAKE_MODULE_PATH=$(SRCROOT.Replace('\','/'))/AppleInternal/tools/cmake -DCMAKE_BINARY_DIR=$(OBJROOT.Replace('\','/'))/$(CONFIG) -DCMAKE_BUILD_TYPE=$(CONFIGURATION) -DWEBKIT_DIR=$(SRCROOT.Replace('\','/'))
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
[webkit-changes] [219486] trunk
Title: [219486] trunk
Revision 219486
Author matthew_han...@apple.com
Date 2017-07-13 19:29:22 -0700 (Thu, 13 Jul 2017)
Log Message
Update tools and configurations after renaming Source/WebKit2 to Source/WebKit.
https://bugs.webkit.org/show_bug.cgi?id=174164
rdar://problem/33137595
Reviewed by Dan Bernstein.
.:
* Source/Makefile:
* Source/PlatformGTK.cmake:
* Source/cmake/OptionsGTK.cmake:
* Source/cmake/WebKitFS.cmake:
* Source/cmake/WebKitPackaging.cmake:
* WebKit.xcworkspace/contents.xcworkspacedata:
* WebKit.xcworkspace/xcshareddata/xcschemes/All Source.xcscheme:
Source/WebKit:
* PlatformGTK.cmake:
* Shared/API/c/wpe/WebKit.h:
Tools:
* BuildSlaveSupport/build.webkit.org-config/wkbuild_unittest.py:
(ShouldBuildTest):
* DumpRenderTree/mac/Configurations/Base.xcconfig:
* Scripts/build-webkit:
* Scripts/do-file-rename:
* Scripts/do-webcore-rename:
* Scripts/update-webkit-localizable-strings:
* Scripts/webkitpy/common/config/watchlist:
* Scripts/webkitpy/style/checker.py:
* Scripts/webkitpy/style/checkers/featuredefines.py:
* gtk/make-dist.py:
(ensure_version_if_possible):
* gtk/manifest.txt.in:
Modified Paths
trunk/ChangeLog
trunk/Source/Makefile
trunk/Source/PlatformGTK.cmake
trunk/Source/WebKit/ChangeLog
trunk/Source/WebKit/PlatformGTK.cmake
trunk/Source/WebKit/Shared/API/c/wpe/WebKit.h
trunk/Source/cmake/OptionsGTK.cmake
trunk/Source/cmake/WebKitFS.cmake
trunk/Source/cmake/WebKitPackaging.cmake
trunk/Tools/BuildSlaveSupport/build.webkit.org-config/wkbuild_unittest.py
trunk/Tools/ChangeLog
trunk/Tools/DumpRenderTree/mac/Configurations/Base.xcconfig
trunk/Tools/Scripts/build-webkit
trunk/Tools/Scripts/do-file-rename
trunk/Tools/Scripts/do-webcore-rename
trunk/Tools/Scripts/update-webkit-localizable-strings
trunk/Tools/Scripts/webkitpy/common/config/watchlist
trunk/Tools/Scripts/webkitpy/style/checker.py
trunk/Tools/Scripts/webkitpy/style/checkers/featuredefines.py
trunk/Tools/gtk/make-dist.py
trunk/Tools/gtk/manifest.txt.in
trunk/WebKit.xcworkspace/contents.xcworkspacedata
trunk/WebKit.xcworkspace/xcshareddata/xcschemes/All Source.xcscheme
Diff
Modified: trunk/ChangeLog (219485 => 219486)
--- trunk/ChangeLog 2017-07-14 02:29:17 UTC (rev 219485)
+++ trunk/ChangeLog 2017-07-14 02:29:22 UTC (rev 219486)
@@ -1,3 +1,19 @@
+2017-07-13 Matthew Hanson
+
+Update tools and configurations after renaming Source/WebKit2 to Source/WebKit.
+https://bugs.webkit.org/show_bug.cgi?id=174164
+rdar://problem/33137595
+
+Reviewed by Dan Bernstein.
+
+* Source/Makefile:
+* Source/PlatformGTK.cmake:
+* Source/cmake/OptionsGTK.cmake:
+* Source/cmake/WebKitFS.cmake:
+* Source/cmake/WebKitPackaging.cmake:
+* WebKit.xcworkspace/contents.xcworkspacedata:
+* WebKit.xcworkspace/xcshareddata/xcschemes/All Source.xcscheme:
+
2017-07-05 Matthew Hanson
Update the Xcode project name from WebKit to WebKitLegacy.
Modified: trunk/Source/Makefile (219485 => 219486)
--- trunk/Source/Makefile 2017-07-14 02:29:17 UTC (rev 219485)
+++ trunk/Source/Makefile 2017-07-14 02:29:22 UTC (rev 219486)
@@ -1,8 +1,8 @@
-MODULES = bmalloc WTF _javascript_Core ThirdParty/ANGLE ThirdParty/libwebrtc WebCore WebInspectorUI WebKitLegacy WebKit2
+MODULES = bmalloc WTF _javascript_Core ThirdParty/ANGLE ThirdParty/libwebrtc WebCore WebInspectorUI WebKitLegacy WebKit
ifneq (,$(SDKROOT))
ifeq (,$(findstring macosx,$(SDKROOT)))
- MODULES = bmalloc WTF _javascript_Core ThirdParty/ANGLE ThirdParty/libwebrtc WebCore WebKitLegacy WebKit2
+ MODULES = bmalloc WTF _javascript_Core ThirdParty/ANGLE ThirdParty/libwebrtc WebCore WebKitLegacy WebKit
endif
endif
Modified: trunk/Source/PlatformGTK.cmake (219485 => 219486)
--- trunk/Source/PlatformGTK.cmake 2017-07-14 02:29:17 UTC (rev 219485)
+++ trunk/Source/PlatformGTK.cmake 2017-07-14 02:29:22 UTC (rev 219486)
@@ -7,8 +7,8 @@
list(APPEND DocumentationDependencies
WebKit2
-"${CMAKE_SOURCE_DIR}/Source/WebKit2/UIProcess/API/gtk/docs/webkit2gtk-docs.sgml"
-"${CMAKE_SOURCE_DIR}/Source/WebKit2/UIProcess/API/gtk/docs/webkit2gtk-${WEBKITGTK_API_VERSION}-sections.txt"
+"${CMAKE_SOURCE_DIR}/Source/WebKit/UIProcess/API/gtk/docs/webkit2gtk-docs.sgml"
+"${CMAKE_SOURCE_DIR}/Source/WebKit/UIProcess/API/gtk/docs/webkit2gtk-${WEBKITGTK_API_VERSION}-sections.txt"
)
if (ENABLE_GTKDOC)
Modified: trunk/Source/WebKit/ChangeLog (219485 => 219486)
--- trunk/Source/WebKit/ChangeLog 2017-07-14 02:29:17 UTC (rev 219485)
+++ trunk/Source/WebKit/ChangeLog 2017-07-14 02:29:22 UTC (rev 219486)
@@ -1,3 +1,14 @@
+2017-07-13 Matthew Hanson
+
+Update tools and configurations after renaming Source/WebKit2 to Source/WebKit.
+https://bugs.webkit.org/show_bug.cgi?id=174164
+rdar://problem/33137595
+
+Reviewed by Dan Bernstein.
+
+* PlatformGTK.cmake:
+* Shared/API/c/wpe/WebKit.h:
+
2017-07-13 Michael Catanzaro
Fix compiler warn
[webkit-changes] [219488] trunk
Title: [219488] trunk
Revision 219488
Author matthew_han...@apple.com
Date 2017-07-13 19:29:28 -0700 (Thu, 13 Jul 2017)
Log Message
Fix the cMake builds (GTK and WPE.)
https://bugs.webkit.org/show_bug.cgi?id=174164
rdar://problem/33137595
Reviewed by Dan Bernstein.
.:
* Source/CMakeLists.txt:
* Source/cmake/OptionsGTK.cmake:
* Source/cmake/OptionsJSCOnly.cmake:
* Source/cmake/OptionsMac.cmake:
* Source/cmake/OptionsWPE.cmake:
* Source/cmake/WebKitFS.cmake:
* Source/cmake/WebKitPackaging.cmake:
Source/WebCore/platform/gtk/po:
* POTFILES.in:
Source/WebKit:
* Scripts/generate-forwarding-headers.pl:
(collectFrameworkHeaderPaths):
(createForwardingHeadersForFramework):
Modified Paths
trunk/ChangeLog
trunk/Source/CMakeLists.txt
trunk/Source/WebCore/platform/gtk/po/ChangeLog
trunk/Source/WebCore/platform/gtk/po/POTFILES.in
trunk/Source/WebKit/ChangeLog
trunk/Source/WebKit/Scripts/generate-forwarding-headers.pl
trunk/Source/cmake/OptionsGTK.cmake
trunk/Source/cmake/OptionsJSCOnly.cmake
trunk/Source/cmake/OptionsMac.cmake
trunk/Source/cmake/OptionsWPE.cmake
trunk/Source/cmake/WebKitFS.cmake
trunk/Source/cmake/WebKitPackaging.cmake
Diff
Modified: trunk/ChangeLog (219487 => 219488)
--- trunk/ChangeLog 2017-07-14 02:29:25 UTC (rev 219487)
+++ trunk/ChangeLog 2017-07-14 02:29:28 UTC (rev 219488)
@@ -1,5 +1,21 @@
2017-07-13 Matthew Hanson
+Fix the cMake builds (GTK and WPE.)
+https://bugs.webkit.org/show_bug.cgi?id=174164
+rdar://problem/33137595
+
+Reviewed by Dan Bernstein.
+
+* Source/CMakeLists.txt:
+* Source/cmake/OptionsGTK.cmake:
+* Source/cmake/OptionsJSCOnly.cmake:
+* Source/cmake/OptionsMac.cmake:
+* Source/cmake/OptionsWPE.cmake:
+* Source/cmake/WebKitFS.cmake:
+* Source/cmake/WebKitPackaging.cmake:
+
+2017-07-13 Matthew Hanson
+
Rename WebKit2.xcodeproj to WebKit.xcodeproj.
https://bugs.webkit.org/show_bug.cgi?id=174164
rdar://problem/33137595
Modified: trunk/Source/CMakeLists.txt (219487 => 219488)
--- trunk/Source/CMakeLists.txt 2017-07-14 02:29:25 UTC (rev 219487)
+++ trunk/Source/CMakeLists.txt 2017-07-14 02:29:28 UTC (rev 219488)
@@ -30,14 +30,14 @@
add_subdirectory(WebCore)
endif ()
+if (ENABLE_WEBKIT_LEGACY)
+add_subdirectory(WebKitLegacy)
+endif ()
+
if (ENABLE_WEBKIT)
add_subdirectory(WebKit)
endif ()
-if (ENABLE_WEBKIT2)
-add_subdirectory(WebKit2)
-endif ()
-
WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
# -
@@ -56,10 +56,12 @@
WEBKIT_SET_EXTRA_COMPILER_FLAGS(WebCoreDerivedSources ${ADDITIONAL_COMPILER_FLAGS})
endif ()
-if (ENABLE_WEBKIT)
+if (ENABLE_WEBKIT_LEGACY)
+# FIXME: Rename this target to WebKitLegacy.
WEBKIT_SET_EXTRA_COMPILER_FLAGS(WebKit ${ADDITIONAL_COMPILER_FLAGS})
endif ()
-if (ENABLE_WEBKIT2)
+if (ENABLE_WEBKIT)
+# FIXME: Rename this target to WebKit.
WEBKIT_SET_EXTRA_COMPILER_FLAGS(WebKit2 ${ADDITIONAL_COMPILER_FLAGS})
endif ()
Modified: trunk/Source/WebCore/platform/gtk/po/ChangeLog (219487 => 219488)
--- trunk/Source/WebCore/platform/gtk/po/ChangeLog 2017-07-14 02:29:25 UTC (rev 219487)
+++ trunk/Source/WebCore/platform/gtk/po/ChangeLog 2017-07-14 02:29:28 UTC (rev 219488)
@@ -1,3 +1,13 @@
+2017-07-13 Matthew Hanson
+
+Fix the cMake builds (GTK and WPE.)
+https://bugs.webkit.org/show_bug.cgi?id=174164
+rdar://problem/33137595
+
+Reviewed by Dan Bernstein.
+
+* POTFILES.in:
+
2017-06-25 Yuri Chornoivan
[GTK] [l10n] Updated Ukrainian translation of WebKitGTK+
Modified: trunk/Source/WebCore/platform/gtk/po/POTFILES.in (219487 => 219488)
--- trunk/Source/WebCore/platform/gtk/po/POTFILES.in 2017-07-14 02:29:25 UTC (rev 219487)
+++ trunk/Source/WebCore/platform/gtk/po/POTFILES.in 2017-07-14 02:29:28 UTC (rev 219488)
@@ -2,40 +2,40 @@
LocalizedStringsGtk.cpp
../LocalizedStrings.cpp
../network/soup/NetworkStorageSessionSoup.cpp
-../../../WebKit2/Shared/API/glib/WebKitHitTestResult.cpp
-../../../WebKit2/Shared/API/glib/WebKitURIRequest.cpp
-../../../WebKit2/Shared/API/glib/WebKitURIResponse.cpp
-../../../WebKit2/Shared/WebErrors.cpp
-../../../WebKit2/Shared/glib/WebErrorsGlib.cpp
-../../../WebKit2/Shared/gtk/WebErrorsGtk.cpp
-../../../WebKit2/Shared/soup/WebErrorsSoup.cpp
-../../../WebKit2/UIProcess/API/glib/WebKitAutomationSession.cpp
-../../../WebKit2/UIProcess/API/glib/WebKitDownload.cpp
-../../../WebKit2/UIProcess/API/glib/WebKitEditorState.cpp
-../../../WebKit2/UIProcess/API/glib/WebKitFaviconDatabase.cpp
-../../../WebKit2/UIProcess/API/glib/WebKitFileChooserRequest.cpp
-../../../WebKit2/UIProcess/API/glib/WebKitFindController.cpp
-../../../WebKit2/UIProcess/API/glib/WebKitNavigationPolicyDecision.cpp
-../../../WebKit2/UIProcess/API/glib/WebKitNotification.cpp
-../../../WebKit2/UIProcess/API/glib/WebKitResponsePolicyDecision.cpp
-../../../WebK
[webkit-changes] [219489] trunk/Tools
Title: [219489] trunk/Tools
Revision 219489
Author matthew_han...@apple.com
Date 2017-07-13 19:29:31 -0700 (Thu, 13 Jul 2017)
Log Message
Fix TestWebKit API.
https://bugs.webkit.org/show_bug.cgi?id=174164
rdar://problem/33137595
Reviewed by Dan Bernstein.
* TestWebKitAPI/CMakeLists.txt:
* TestWebKitAPI/Configurations/FeatureDefines.xcconfig:
* TestWebKitAPI/PlatformGTK.cmake:
Modified Paths
trunk/Tools/ChangeLog
trunk/Tools/TestWebKitAPI/CMakeLists.txt
trunk/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig
trunk/Tools/TestWebKitAPI/PlatformGTK.cmake
Diff
Modified: trunk/Tools/ChangeLog (219488 => 219489)
--- trunk/Tools/ChangeLog 2017-07-14 02:29:28 UTC (rev 219488)
+++ trunk/Tools/ChangeLog 2017-07-14 02:29:31 UTC (rev 219489)
@@ -1,5 +1,17 @@
2017-07-13 Matthew Hanson
+Fix TestWebKit API.
+https://bugs.webkit.org/show_bug.cgi?id=174164
+rdar://problem/33137595
+
+Reviewed by Dan Bernstein.
+
+* TestWebKitAPI/CMakeLists.txt:
+* TestWebKitAPI/Configurations/FeatureDefines.xcconfig:
+* TestWebKitAPI/PlatformGTK.cmake:
+
+2017-07-13 Matthew Hanson
+
Update tools and configurations after renaming Source/WebKit2 to Source/WebKit.
https://bugs.webkit.org/show_bug.cgi?id=174164
rdar://problem/33137595
Modified: trunk/Tools/TestWebKitAPI/CMakeLists.txt (219488 => 219489)
--- trunk/Tools/TestWebKitAPI/CMakeLists.txt 2017-07-14 02:29:28 UTC (rev 219488)
+++ trunk/Tools/TestWebKitAPI/CMakeLists.txt 2017-07-14 02:29:31 UTC (rev 219489)
@@ -19,15 +19,15 @@
_javascript_Core
TestWebKitAPIBase
WTF
-WebKit2
+WebKit
gtest
)
list(APPEND TestWebKitAPI_LIBRARIES
-WebKit2
+WebKitLegacy
)
else ()
list(APPEND TestWebKitAPI_LIBRARIES
-WebKit${DEBUG_SUFFIX}
+WebKitLegacy${DEBUG_SUFFIX}
)
endif ()
@@ -119,30 +119,30 @@
${TESTWEBKITAPI_DIR}/InjectedBundleController.cpp
${TESTWEBKITAPI_DIR}/InjectedBundleMain.cpp
${TESTWEBKITAPI_DIR}/PlatformUtilities.cpp
-${TESTWEBKITAPI_DIR}/Tests/WebKit2/CanHandleRequest_Bundle.cpp
-${TESTWEBKITAPI_DIR}/Tests/WebKit2/DidAssociateFormControls_Bundle.cpp
-${TESTWEBKITAPI_DIR}/Tests/WebKit2/DOMWindowExtensionBasic_Bundle.cpp
-${TESTWEBKITAPI_DIR}/Tests/WebKit2/DOMWindowExtensionNoCache_Bundle.cpp
-${TESTWEBKITAPI_DIR}/Tests/WebKit2/DocumentStartUserScriptAlertCrash_Bundle.cpp
-${TESTWEBKITAPI_DIR}/Tests/WebKit2/GetInjectedBundleInitializationUserDataCallback_Bundle.cpp
-${TESTWEBKITAPI_DIR}/Tests/WebKit2/HitTestResultNodeHandle_Bundle.cpp
-${TESTWEBKITAPI_DIR}/Tests/WebKit2/InjectedBundleBasic_Bundle.cpp
-${TESTWEBKITAPI_DIR}/Tests/WebKit2/InjectedBundleFrameHitTest_Bundle.cpp
-${TESTWEBKITAPI_DIR}/Tests/WebKit2/InjectedBundleInitializationUserDataCallbackWins_Bundle.cpp
-${TESTWEBKITAPI_DIR}/Tests/WebKit2/LoadCanceledNoServerRedirectCallback_Bundle.cpp
-${TESTWEBKITAPI_DIR}/Tests/WebKit2/MouseMoveAfterCrash_Bundle.cpp
-${TESTWEBKITAPI_DIR}/Tests/WebKit2/NewFirstVisuallyNonEmptyLayoutFails_Bundle.cpp
-${TESTWEBKITAPI_DIR}/Tests/WebKit2/NewFirstVisuallyNonEmptyLayoutForImages_Bundle.cpp
-${TESTWEBKITAPI_DIR}/Tests/WebKit2/NewFirstVisuallyNonEmptyLayoutFrames_Bundle.cpp
-${TESTWEBKITAPI_DIR}/Tests/WebKit2/NewFirstVisuallyNonEmptyLayout_Bundle.cpp
-${TESTWEBKITAPI_DIR}/Tests/WebKit2/ParentFrame_Bundle.cpp
-${TESTWEBKITAPI_DIR}/Tests/WebKit2/ProvisionalURLAfterWillSendRequestCallback_Bundle.cpp
-${TESTWEBKITAPI_DIR}/Tests/WebKit2/ResponsivenessTimerDoesntFireEarly_Bundle.cpp
-${TESTWEBKITAPI_DIR}/Tests/WebKit2/ShouldGoToBackForwardListItem_Bundle.cpp
-${TESTWEBKITAPI_DIR}/Tests/WebKit2/TextFieldDidBeginAndEndEditing_Bundle.cpp
-${TESTWEBKITAPI_DIR}/Tests/WebKit2/UserMessage_Bundle.cpp
-${TESTWEBKITAPI_DIR}/Tests/WebKit2/WillLoad_Bundle.cpp
-${TESTWEBKITAPI_DIR}/Tests/WebKit2/WillSendSubmitEvent_Bundle.cpp
+${TESTWEBKITAPI_DIR}/Tests/WebKit/CanHandleRequest_Bundle.cpp
+${TESTWEBKITAPI_DIR}/Tests/WebKit/DidAssociateFormControls_Bundle.cpp
+${TESTWEBKITAPI_DIR}/Tests/WebKit/DOMWindowExtensionBasic_Bundle.cpp
+${TESTWEBKITAPI_DIR}/Tests/WebKit/DOMWindowExtensionNoCache_Bundle.cpp
+${TESTWEBKITAPI_DIR}/Tests/WebKit/DocumentStartUserScriptAlertCrash_Bundle.cpp
+${TESTWEBKITAPI_DIR}/Tests/WebKit/GetInjectedBundleInitializationUserDataCallback_Bundle.cpp
+${TESTWEBKITAPI_DIR}/Tests/WebKit/HitTestResultNodeHandle_Bundle.cpp
+${TESTWEBKITAPI_DIR}/Tests/WebKit/InjectedBundleBasic_Bundle.cpp
+${TESTWEBKITAPI_DIR}/Tests/WebKit/InjectedBundleFrameHitTest_Bundle.cpp
+${TESTWEBKITAPI_DIR}/Tests/WebKit/InjectedBundleInitializationUserDataCallbackWins_Bundle.cpp
+${TESTWEBKITAPI_DIR}/Tes
[webkit-changes] [219490] trunk/Source
Title: [219490] trunk/Source Revision 219490 Author m...@apple.com Date 2017-07-13 19:39:08 -0700 (Thu, 13 Jul 2017) Log Message Removed empty project directories left behind after the rename Source/WebKit: * WebKit2.xcodeproj: Removed. Source/WebKitLegacy: * WebKit.vcxproj: Removed. * WebKit.xcodeproj: Removed. Modified Paths trunk/Source/WebKit/ChangeLog trunk/Source/WebKitLegacy/ChangeLog Removed Paths trunk/Source/WebKit/WebKit2.xcodeproj/ trunk/Source/WebKitLegacy/WebKit.vcxproj/ trunk/Source/WebKitLegacy/WebKit.xcodeproj/ Diff Modified: trunk/Source/WebKit/ChangeLog (219489 => 219490) --- trunk/Source/WebKit/ChangeLog 2017-07-14 02:29:31 UTC (rev 219489) +++ trunk/Source/WebKit/ChangeLog 2017-07-14 02:39:08 UTC (rev 219490) @@ -1,3 +1,9 @@ +2017-07-13 Dan Bernstein + +Removed empty project directories left behind after the rename + +* WebKit2.xcodeproj: Removed. + 2017-07-13 Matthew Hanson Fix the cMake builds (GTK and WPE.) Modified: trunk/Source/WebKitLegacy/ChangeLog (219489 => 219490) --- trunk/Source/WebKitLegacy/ChangeLog 2017-07-14 02:29:31 UTC (rev 219489) +++ trunk/Source/WebKitLegacy/ChangeLog 2017-07-14 02:39:08 UTC (rev 219490) @@ -1,3 +1,10 @@ +2017-07-13 Dan Bernstein + +Removed empty project directories left behind after the rename + +* WebKit.vcxproj: Removed. +* WebKit.xcodeproj: Removed. + 2017-07-05 Matthew Hanson Update the Visual Studio project name from WebKit to WebKitLegacy. ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [219491] trunk/Source/WTF
Title: [219491] trunk/Source/WTF
Revision 219491
Author utatane@gmail.com
Date 2017-07-13 19:53:24 -0700 (Thu, 13 Jul 2017)
Log Message
Unreviewed, annotate inline for operator==/!= for FastAllocator
https://bugs.webkit.org/show_bug.cgi?id=174366
* wtf/FastMalloc.h:
(WTF::operator==):
(WTF::operator!=):
Modified Paths
trunk/Source/WTF/ChangeLog
trunk/Source/WTF/wtf/FastMalloc.h
Diff
Modified: trunk/Source/WTF/ChangeLog (219490 => 219491)
--- trunk/Source/WTF/ChangeLog 2017-07-14 02:39:08 UTC (rev 219490)
+++ trunk/Source/WTF/ChangeLog 2017-07-14 02:53:24 UTC (rev 219491)
@@ -1,3 +1,12 @@
+2017-07-13 Yusuke Suzuki
+
+Unreviewed, annotate inline for operator==/!= for FastAllocator
+https://bugs.webkit.org/show_bug.cgi?id=174366
+
+* wtf/FastMalloc.h:
+(WTF::operator==):
+(WTF::operator!=):
+
2017-07-12 Commit Queue
Unreviewed, rolling out r219176.
Modified: trunk/Source/WTF/wtf/FastMalloc.h (219490 => 219491)
--- trunk/Source/WTF/wtf/FastMalloc.h 2017-07-14 02:39:08 UTC (rev 219490)
+++ trunk/Source/WTF/wtf/FastMalloc.h 2017-07-14 02:53:24 UTC (rev 219491)
@@ -126,8 +126,8 @@
}
};
-template bool operator==(const FastAllocator&, const FastAllocator&) { return true; }
-template bool operator!=(const FastAllocator&, const FastAllocator&) { return false; }
+template inline bool operator==(const FastAllocator&, const FastAllocator&) { return true; }
+template inline bool operator!=(const FastAllocator&, const FastAllocator&) { return false; }
} // namespace WTF
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [219492] trunk/Tools
Title: [219492] trunk/Tools
Revision 219492
Author matthew_han...@apple.com
Date 2017-07-13 19:56:11 -0700 (Thu, 13 Jul 2017)
Log Message
Use the old WebKit/WebKit2 targets for CMake builds.
Unreviewed build fix.
We can update the target names to match the Framework names in a future patch.
This is a partial revert of r219489.
* TestWebKitAPI/CMakeLists.txt:
WebKitLegacy => WebKit
WebKit => WebKit2
Modified Paths
trunk/Tools/ChangeLog
trunk/Tools/TestWebKitAPI/CMakeLists.txt
Diff
Modified: trunk/Tools/ChangeLog (219491 => 219492)
--- trunk/Tools/ChangeLog 2017-07-14 02:53:24 UTC (rev 219491)
+++ trunk/Tools/ChangeLog 2017-07-14 02:56:11 UTC (rev 219492)
@@ -1,5 +1,18 @@
2017-07-13 Matthew Hanson
+Use the old WebKit/WebKit2 targets for CMake builds.
+
+Unreviewed build fix.
+
+We can update the target names to match the Framework names in a future patch.
+This is a partial revert of r219489.
+
+* TestWebKitAPI/CMakeLists.txt:
+WebKitLegacy => WebKit
+WebKit => WebKit2
+
+2017-07-13 Matthew Hanson
+
Fix TestWebKit API.
https://bugs.webkit.org/show_bug.cgi?id=174164
rdar://problem/33137595
Modified: trunk/Tools/TestWebKitAPI/CMakeLists.txt (219491 => 219492)
--- trunk/Tools/TestWebKitAPI/CMakeLists.txt 2017-07-14 02:53:24 UTC (rev 219491)
+++ trunk/Tools/TestWebKitAPI/CMakeLists.txt 2017-07-14 02:56:11 UTC (rev 219492)
@@ -19,15 +19,15 @@
_javascript_Core
TestWebKitAPIBase
WTF
-WebKit
+WebKit2
gtest
)
list(APPEND TestWebKitAPI_LIBRARIES
-WebKitLegacy
+WebKit
)
else ()
list(APPEND TestWebKitAPI_LIBRARIES
-WebKitLegacy${DEBUG_SUFFIX}
+WebKit${DEBUG_SUFFIX}
)
endif ()
@@ -205,9 +205,9 @@
${TESTWEBKITAPI_DIR}/TestsController.cpp
)
-target_link_libraries(TestWebKitAPIBase _javascript_Core WTF WebKit gtest)
+target_link_libraries(TestWebKitAPIBase _javascript_Core WTF WebKit2 gtest)
-add_dependencies(TestWebKitAPIBase WebKit ${ForwardingHeadersForTestWebKitAPI_NAME} ${ForwardingNetworkHeadersForTestWebKitAPI_NAME})
+add_dependencies(TestWebKitAPIBase WebKit2 ${ForwardingHeadersForTestWebKitAPI_NAME} ${ForwardingNetworkHeadersForTestWebKitAPI_NAME})
foreach (testName ${test_webkit2_api_BINARIES})
get_filename_component(testBaseName ${testName} NAME)
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [219493] trunk/Tools
Title: [219493] trunk/Tools Revision 219493 Author matthew_han...@apple.com Date 2017-07-13 20:09:54 -0700 (Thu, 13 Jul 2017) Log Message Use the old WebKit/WebKit2 targets for CMake builds. (v2) Unreviewed build fix. r219492 missed one hunk from its partial revert of r219489. This patch reverts that hunk. * TestWebKitAPI/CMakeLists.txt: Modified Paths trunk/Tools/ChangeLog trunk/Tools/TestWebKitAPI/CMakeLists.txt Diff Modified: trunk/Tools/ChangeLog (219492 => 219493) --- trunk/Tools/ChangeLog 2017-07-14 02:56:11 UTC (rev 219492) +++ trunk/Tools/ChangeLog 2017-07-14 03:09:54 UTC (rev 219493) @@ -1,5 +1,16 @@ 2017-07-13 Matthew Hanson +Use the old WebKit/WebKit2 targets for CMake builds. (v2) + +Unreviewed build fix. + +r219492 missed one hunk from its partial revert of r219489. +This patch reverts that hunk. + +* TestWebKitAPI/CMakeLists.txt: + +2017-07-13 Matthew Hanson + Use the old WebKit/WebKit2 targets for CMake builds. Unreviewed build fix. Modified: trunk/Tools/TestWebKitAPI/CMakeLists.txt (219492 => 219493) --- trunk/Tools/TestWebKitAPI/CMakeLists.txt 2017-07-14 02:56:11 UTC (rev 219492) +++ trunk/Tools/TestWebKitAPI/CMakeLists.txt 2017-07-14 03:09:54 UTC (rev 219493) @@ -23,7 +23,7 @@ gtest ) list(APPEND TestWebKitAPI_LIBRARIES -WebKit +WebKit2 ) else () list(APPEND TestWebKitAPI_LIBRARIES ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [219494] trunk
Title: [219494] trunk
Revision 219494
Author matthew_han...@apple.com
Date 2017-07-13 20:36:38 -0700 (Thu, 13 Jul 2017)
Log Message
Fix the Mac CMake build.
Unreviewed build fix.
Fix the Mac CMake build after r219488 broke it. r219488 erroneously updated
the variable name DERIVED_SOURCES_WEBKITLEGACY_DIR to DERIVED_SOURCES_WEBKIT_LEGACY_DIR
without updating subsequent users of that variable.
* Source/cmake/WebKitFS.cmake:
Rename DERIVED_SOURCES_WEBKIT_LEGACY_DIR back to DERIVED_SOURCES_WEBKITLEGACY_DIR.
Modified Paths
trunk/ChangeLog
trunk/Source/cmake/WebKitFS.cmake
Diff
Modified: trunk/ChangeLog (219493 => 219494)
--- trunk/ChangeLog 2017-07-14 03:09:54 UTC (rev 219493)
+++ trunk/ChangeLog 2017-07-14 03:36:38 UTC (rev 219494)
@@ -1,5 +1,18 @@
2017-07-13 Matthew Hanson
+Fix the Mac CMake build.
+
+Unreviewed build fix.
+
+Fix the Mac CMake build after r219488 broke it. r219488 erroneously updated
+the variable name DERIVED_SOURCES_WEBKITLEGACY_DIR to DERIVED_SOURCES_WEBKIT_LEGACY_DIR
+without updating subsequent users of that variable.
+
+* Source/cmake/WebKitFS.cmake:
+Rename DERIVED_SOURCES_WEBKIT_LEGACY_DIR back to DERIVED_SOURCES_WEBKITLEGACY_DIR.
+
+2017-07-13 Matthew Hanson
+
Fix the cMake builds (GTK and WPE.)
https://bugs.webkit.org/show_bug.cgi?id=174164
rdar://problem/33137595
Modified: trunk/Source/cmake/WebKitFS.cmake (219493 => 219494)
--- trunk/Source/cmake/WebKitFS.cmake 2017-07-14 03:09:54 UTC (rev 219493)
+++ trunk/Source/cmake/WebKitFS.cmake 2017-07-14 03:36:38 UTC (rev 219494)
@@ -29,7 +29,7 @@
set(DERIVED_SOURCES_DIR "${CMAKE_BINARY_DIR}/DerivedSources")
set(DERIVED_SOURCES_JAVASCRIPTCORE_DIR "${CMAKE_BINARY_DIR}/DerivedSources/_javascript_Core")
set(DERIVED_SOURCES_WEBCORE_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebCore")
-set(DERIVED_SOURCES_WEBKIT_LEGACY_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebKitLegacy")
+set(DERIVED_SOURCES_WEBKITLEGACY_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebKitLegacy")
set(DERIVED_SOURCES_WEBKIT_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebKit")
set(DERIVED_SOURCES_WEBKIT2_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebKit2")
set(DERIVED_SOURCES_WEBINSPECTORUI_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebInspectorUI")
@@ -53,6 +53,6 @@
endif ()
if (ENABLE_WEBKIT_LEGACY)
-file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBKIT_LEGACY_DIR})
+file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBKITLEGACY_DIR})
file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBKIT_DIR})
endif ()
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [219495] trunk
Title: [219495] trunk Revision 219495 Author annu...@yandex.ru Date 2017-07-13 20:45:48 -0700 (Thu, 13 Jul 2017) Log Message Unreviewed, Windows ports should enable WebKitLegacy and disable WebKit. * Source/cmake/OptionsWin.cmake: Modified Paths trunk/ChangeLog trunk/Source/cmake/OptionsWin.cmake Diff Modified: trunk/ChangeLog (219494 => 219495) --- trunk/ChangeLog 2017-07-14 03:36:38 UTC (rev 219494) +++ trunk/ChangeLog 2017-07-14 03:45:48 UTC (rev 219495) @@ -1,3 +1,10 @@ +2017-07-13 Konstantin Tokarev + +Unreviewed, Windows ports should enable WebKitLegacy and disable +WebKit. + +* Source/cmake/OptionsWin.cmake: + 2017-07-13 Matthew Hanson Fix the Mac CMake build. Modified: trunk/Source/cmake/OptionsWin.cmake (219494 => 219495) --- trunk/Source/cmake/OptionsWin.cmake 2017-07-14 03:36:38 UTC (rev 219494) +++ trunk/Source/cmake/OptionsWin.cmake 2017-07-14 03:45:48 UTC (rev 219495) @@ -7,6 +7,9 @@ add_definitions(-DNOMINMAX) add_definitions(-DUNICODE -D_UNICODE) +set(ENABLE_WEBKIT_LEGACY ON) +set(ENABLE_WEBKIT OFF) + WEBKIT_OPTION_BEGIN() WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_3D_TRANSFORMS PUBLIC ON) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ACCELERATED_2D_CANVAS PUBLIC OFF) ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [219496] trunk
Title: [219496] trunk
Revision 219496
Author mcatanz...@igalia.com
Date 2017-07-13 20:53:17 -0700 (Thu, 13 Jul 2017)
Log Message
[GTK][WPE] Avoid setting settings that are set by default
Unreviewed.
* Source/cmake/OptionsGTK.cmake:
* Source/cmake/OptionsWPE.cmake:
Modified Paths
trunk/ChangeLog
trunk/Source/cmake/OptionsGTK.cmake
trunk/Source/cmake/OptionsWPE.cmake
Diff
Modified: trunk/ChangeLog (219495 => 219496)
--- trunk/ChangeLog 2017-07-14 03:45:48 UTC (rev 219495)
+++ trunk/ChangeLog 2017-07-14 03:53:17 UTC (rev 219496)
@@ -1,3 +1,12 @@
+2017-07-13 Michael Catanzaro
+
+[GTK][WPE] Avoid setting settings that are set by default
+
+Unreviewed.
+
+* Source/cmake/OptionsGTK.cmake:
+* Source/cmake/OptionsWPE.cmake:
+
2017-07-13 Konstantin Tokarev
Unreviewed, Windows ports should enable WebKitLegacy and disable
Modified: trunk/Source/cmake/OptionsGTK.cmake (219495 => 219496)
--- trunk/Source/cmake/OptionsGTK.cmake 2017-07-14 03:45:48 UTC (rev 219495)
+++ trunk/Source/cmake/OptionsGTK.cmake 2017-07-14 03:53:17 UTC (rev 219496)
@@ -180,8 +180,6 @@
SET_AND_EXPOSE_TO_BUILD(XP_UNIX 1)
endif ()
-set(ENABLE_WEBKIT_LEGACY OFF)
-set(ENABLE_WEBKIT ON)
set(ENABLE_PLUGIN_PROCESS ${ENABLE_NETSCAPE_PLUGIN_API})
add_definitions(-DBUILDING_GTK__=1)
Modified: trunk/Source/cmake/OptionsWPE.cmake (219495 => 219496)
--- trunk/Source/cmake/OptionsWPE.cmake 2017-07-14 03:45:48 UTC (rev 219495)
+++ trunk/Source/cmake/OptionsWPE.cmake 2017-07-14 03:53:17 UTC (rev 219496)
@@ -50,11 +50,7 @@
SET_AND_EXPOSE_TO_BUILD(ENABLE_DEVELOPER_MODE ${DEVELOPER_MODE})
-set(ENABLE_WEBCORE ON)
-set(ENABLE_WEBKIT_LEGACY OFF)
-set(ENABLE_WEBKIT ON)
set(ENABLE_API_TESTS ${DEVELOPER_MODE})
-set(ENABLE_TOOLS ON)
set(WTF_LIBRARY_TYPE STATIC)
set(_javascript_Core_LIBRARY_TYPE STATIC)
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [219497] trunk/Tools
Title: [219497] trunk/Tools
Revision 219497
Author mcatanz...@igalia.com
Date 2017-07-13 20:56:07 -0700 (Thu, 13 Jul 2017)
Log Message
Fix style checker unit test
Unreviewed WebKit2 => WebKit fixup.
* Scripts/webkitpy/style/checker_unittest.py:
(CheckerDispatcherSkipTest.test_should_skip_with_warning):
Modified Paths
trunk/Tools/ChangeLog
trunk/Tools/Scripts/webkitpy/style/checker_unittest.py
Diff
Modified: trunk/Tools/ChangeLog (219496 => 219497)
--- trunk/Tools/ChangeLog 2017-07-14 03:53:17 UTC (rev 219496)
+++ trunk/Tools/ChangeLog 2017-07-14 03:56:07 UTC (rev 219497)
@@ -1,3 +1,12 @@
+2017-07-13 Michael Catanzaro
+
+Fix style checker unit test
+
+Unreviewed WebKit2 => WebKit fixup.
+
+* Scripts/webkitpy/style/checker_unittest.py:
+(CheckerDispatcherSkipTest.test_should_skip_with_warning):
+
2017-07-13 Matthew Hanson
Use the old WebKit/WebKit2 targets for CMake builds. (v2)
Modified: trunk/Tools/Scripts/webkitpy/style/checker_unittest.py (219496 => 219497)
--- trunk/Tools/Scripts/webkitpy/style/checker_unittest.py 2017-07-14 03:53:17 UTC (rev 219496)
+++ trunk/Tools/Scripts/webkitpy/style/checker_unittest.py 2017-07-14 03:56:07 UTC (rev 219497)
@@ -281,9 +281,9 @@
# Check skipped files.
paths_to_skip = [
os.path.join('Tools', 'TestWebKitAPI', 'Tests', 'WebKitGtk', 'testatk.c'),
- os.path.join('Source', 'WebKit2', 'UIProcess', 'API', 'gtk', 'webkit2.h'),
- os.path.join('Source', 'WebKit2', 'UIProcess', 'API', 'gtk', 'WebKitWebView.h'),
- os.path.join('Source', 'WebKit2', 'UIProcess', 'API', 'gtk', 'WebKitLoader.h'),
+ os.path.join('Source', 'WebKit', 'UIProcess', 'API', 'gtk', 'webkit2.h'),
+ os.path.join('Source', 'WebKit', 'UIProcess', 'API', 'gtk', 'WebKitWebView.h'),
+ os.path.join('Source', 'WebKit', 'UIProcess', 'API', 'gtk', 'WebKitLoader.h'),
]
for path in paths_to_skip:
@@ -293,10 +293,10 @@
# Verify that some files are not skipped.
paths_not_to_skip = [
"foo.txt",
- os.path.join('Source', 'WebKit2', 'UIProcess', 'API', 'gtk', 'HelperClass.cpp'),
- os.path.join('Source', 'WebKit2', 'UIProcess', 'API', 'gtk', 'HelperClass.h'),
- os.path.join('Source', 'WebKit2', 'UIProcess', 'API', 'gtk', 'WebKitWebView.cpp'),
- os.path.join('Source', 'WebKit2', 'UIProcess', 'API', 'gtk', 'WebKitWebViewPrivate.h'),
+ os.path.join('Source', 'WebKit', 'UIProcess', 'API', 'gtk', 'HelperClass.cpp'),
+ os.path.join('Source', 'WebKit', 'UIProcess', 'API', 'gtk', 'HelperClass.h'),
+ os.path.join('Source', 'WebKit', 'UIProcess', 'API', 'gtk', 'WebKitWebView.cpp'),
+ os.path.join('Source', 'WebKit', 'UIProcess', 'API', 'gtk', 'WebKitWebViewPrivate.h'),
os.path.join('Tools', 'TestWebKitAPI', 'Tests', 'WebKit2Gtk', 'WebViewTest.cpp'),
os.path.join('Tools', 'TestWebKitAPI', 'Tests', 'WebKit2Gtk', 'WebViewTest.h'),
]
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [219498] trunk/JSTests
Title: [219498] trunk/JSTests
Revision 219498
Author mark@apple.com
Date 2017-07-13 23:18:15 -0700 (Thu, 13 Jul 2017)
Log Message
Add some additional test cases for bug 170896.
https://bugs.webkit.org/show_bug.cgi?id=174491
Reviewed by Filip Pizlo.
* stress/regress-170896-with-contiguous-shape-profile.js: Copied from JSTests/stress/regress-170896.js.
* stress/regress-170896-with-double-shape-profile.js: Added.
(test):
* stress/regress-170896-with-int32-shape-profile.js: Added.
(test):
* stress/regress-170896.js: Removed.
Modified Paths
trunk/JSTests/ChangeLog
Added Paths
trunk/JSTests/stress/regress-170896-with-contiguous-shape-profile.js
trunk/JSTests/stress/regress-170896-with-double-shape-profile.js
trunk/JSTests/stress/regress-170896-with-int32-shape-profile.js
Removed Paths
trunk/JSTests/stress/regress-170896.js
Diff
Modified: trunk/JSTests/ChangeLog (219497 => 219498)
--- trunk/JSTests/ChangeLog 2017-07-14 03:56:07 UTC (rev 219497)
+++ trunk/JSTests/ChangeLog 2017-07-14 06:18:15 UTC (rev 219498)
@@ -1,3 +1,17 @@
+2017-07-13 Mark Lam
+
+Add some additional test cases for bug 170896.
+https://bugs.webkit.org/show_bug.cgi?id=174491
+
+Reviewed by Filip Pizlo.
+
+* stress/regress-170896-with-contiguous-shape-profile.js: Copied from JSTests/stress/regress-170896.js.
+* stress/regress-170896-with-double-shape-profile.js: Added.
+(test):
+* stress/regress-170896-with-int32-shape-profile.js: Added.
+(test):
+* stress/regress-170896.js: Removed.
+
2017-07-13 Saam Barati
Missing exception check in JSObject::hasInstance
Copied: trunk/JSTests/stress/regress-170896-with-contiguous-shape-profile.js (from rev 219497, trunk/JSTests/stress/regress-170896.js) (0 => 219498)
--- trunk/JSTests/stress/regress-170896-with-contiguous-shape-profile.js (rev 0)
+++ trunk/JSTests/stress/regress-170896-with-contiguous-shape-profile.js 2017-07-14 06:18:15 UTC (rev 219498)
@@ -0,0 +1,13 @@
+function test() {
+let a = [,];
+return a.concat();
+}
+noInline(test);
+
+test()[0] = {}; // Set the ArrayAllocationProfile to ContiguousShape.
+
+for (let i = 0; i < 2; ++i) {
+var result = test();
+if (result[0])
+throw result.toString();
+}
Copied: trunk/JSTests/stress/regress-170896-with-double-shape-profile.js (from rev 219497, trunk/JSTests/stress/regress-170896.js) (0 => 219498)
--- trunk/JSTests/stress/regress-170896-with-double-shape-profile.js (rev 0)
+++ trunk/JSTests/stress/regress-170896-with-double-shape-profile.js 2017-07-14 06:18:15 UTC (rev 219498)
@@ -0,0 +1,13 @@
+function test() {
+let a = [,];
+return a.concat();
+}
+noInline(test);
+
+test()[0] = 1.2345; // Set the ArrayAllocationProfile to DoubleShape.
+
+for (let i = 0; i < 2; ++i) {
+var result = test();
+if (result[0])
+throw result.toString();
+}
Copied: trunk/JSTests/stress/regress-170896-with-int32-shape-profile.js (from rev 219497, trunk/JSTests/stress/regress-170896.js) (0 => 219498)
--- trunk/JSTests/stress/regress-170896-with-int32-shape-profile.js (rev 0)
+++ trunk/JSTests/stress/regress-170896-with-int32-shape-profile.js 2017-07-14 06:18:15 UTC (rev 219498)
@@ -0,0 +1,13 @@
+function test() {
+let a = [,];
+return a.concat();
+}
+noInline(test);
+
+test()[0] = 42; // Set the ArrayAllocationProfile to Int32Shape.
+
+for (let i = 0; i < 2; ++i) {
+var result = test();
+if (result[0])
+throw result.toString();
+}
Deleted: trunk/JSTests/stress/regress-170896.js (219497 => 219498)
--- trunk/JSTests/stress/regress-170896.js 2017-07-14 03:56:07 UTC (rev 219497)
+++ trunk/JSTests/stress/regress-170896.js 2017-07-14 06:18:15 UTC (rev 219498)
@@ -1,13 +0,0 @@
-function test() {
-let a = [,];
-return a.concat();
-}
-noInline(test);
-
-test()[0] = {};
-
-for (let i = 0; i < 2; ++i) {
-var result = test();
-if (result[0])
-throw result.toString();
-}
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [219499] trunk/Source/WebKit
Title: [219499] trunk/Source/WebKit Revision 219499 Author cdu...@apple.com Date 2017-07-13 23:39:08 -0700 (Thu, 13 Jul 2017) Log Message Better deal with changes to the ResourceLoadStatisticsStore file on disk https://bugs.webkit.org/show_bug.cgi?id=174487 Reviewed by Brent Fulgham. Rename WebResourceLoadStatisticsStore's resetDataFromDecoder() to mergeWithDataFromDecoder() and update it so that it actual merges the data from the disk with the one we have in memory, instead of replacing it. This avoid data loss. We leverage the existing WebResourceLoadStatisticsStore::mergeStatistics() to merge the statistics. To faciliate merging the operating dates, they are now represented as OperatingDate objects instead of WallTime objects. OperatingDate only include date precision, no time information. As a result, the merge 2 vectors of OperatingDate objects, we can: 1. Merge the 2 sorted vectors (using std::merge()) 2. Get rid of duplicates (easy because of date-level precision) 3. Drop old dates until the vector has at most 30 items. * UIProcess/Storage/ResourceLoadStatisticsPersistentStorage.cpp: (WebKit::ResourceLoadStatisticsPersistentStorage::refreshMemoryStoreFromDisk): (WebKit::ResourceLoadStatisticsPersistentStorage::populateMemoryStoreFromDisk): * UIProcess/WebResourceLoadStatisticsStore.cpp: (WebKit::OperatingDate::fromWallTime): (WebKit::OperatingDate::today): (WebKit::OperatingDate::secondsSinceEpoch): (WebKit::OperatingDate::operator==): (WebKit::OperatingDate::operator<): (WebKit::OperatingDate::operator<=): (WebKit::OperatingDate::OperatingDate): (WebKit::mergeOperatingDates): (WebKit::WebResourceLoadStatisticsStore::createEncoderFromData): (WebKit::WebResourceLoadStatisticsStore::mergeWithDataFromDecoder): (WebKit::WebResourceLoadStatisticsStore::includeTodayAsOperatingDateIfNecessary): (WebKit::WebResourceLoadStatisticsStore::hasStatisticsExpired): * UIProcess/WebResourceLoadStatisticsStore.h: Modified Paths trunk/Source/WebKit/ChangeLog trunk/Source/WebKit/UIProcess/Storage/ResourceLoadStatisticsPersistentStorage.cpp trunk/Source/WebKit/UIProcess/WebResourceLoadStatisticsStore.cpp trunk/Source/WebKit/UIProcess/WebResourceLoadStatisticsStore.h Diff Modified: trunk/Source/WebKit/ChangeLog (219498 => 219499) --- trunk/Source/WebKit/ChangeLog 2017-07-14 06:18:15 UTC (rev 219498) +++ trunk/Source/WebKit/ChangeLog 2017-07-14 06:39:08 UTC (rev 219499) @@ -1,3 +1,42 @@ +2017-07-13 Chris Dumez + +Better deal with changes to the ResourceLoadStatisticsStore file on disk +https://bugs.webkit.org/show_bug.cgi?id=174487 + +Reviewed by Brent Fulgham. + +Rename WebResourceLoadStatisticsStore's resetDataFromDecoder() to mergeWithDataFromDecoder() +and update it so that it actual merges the data from the disk with the one we have in memory, +instead of replacing it. This avoid data loss. + +We leverage the existing WebResourceLoadStatisticsStore::mergeStatistics() to merge the +statistics. + +To faciliate merging the operating dates, they are now represented as OperatingDate objects +instead of WallTime objects. OperatingDate only include date precision, no time information. +As a result, the merge 2 vectors of OperatingDate objects, we can: +1. Merge the 2 sorted vectors (using std::merge()) +2. Get rid of duplicates (easy because of date-level precision) +3. Drop old dates until the vector has at most 30 items. + +* UIProcess/Storage/ResourceLoadStatisticsPersistentStorage.cpp: +(WebKit::ResourceLoadStatisticsPersistentStorage::refreshMemoryStoreFromDisk): +(WebKit::ResourceLoadStatisticsPersistentStorage::populateMemoryStoreFromDisk): +* UIProcess/WebResourceLoadStatisticsStore.cpp: +(WebKit::OperatingDate::fromWallTime): +(WebKit::OperatingDate::today): +(WebKit::OperatingDate::secondsSinceEpoch): +(WebKit::OperatingDate::operator==): +(WebKit::OperatingDate::operator<): +(WebKit::OperatingDate::operator<=): +(WebKit::OperatingDate::OperatingDate): +(WebKit::mergeOperatingDates): +(WebKit::WebResourceLoadStatisticsStore::createEncoderFromData): +(WebKit::WebResourceLoadStatisticsStore::mergeWithDataFromDecoder): +(WebKit::WebResourceLoadStatisticsStore::includeTodayAsOperatingDateIfNecessary): +(WebKit::WebResourceLoadStatisticsStore::hasStatisticsExpired): +* UIProcess/WebResourceLoadStatisticsStore.h: + 2017-07-13 Dan Bernstein Removed empty project directories left behind after the rename Modified: trunk/Source/WebKit/UIProcess/Storage/ResourceLoadStatisticsPersistentStorage.cpp (219498 => 219499) --- trunk/Source/WebKit/UIProcess/Storage/ResourceLoadStatisticsPersistentStorage.cpp 2017-07-14 06:18:15 UTC (rev 219498) +++ trunk/Source/WebKit/UIProcess/Storage/ResourceLoadStatisticsPersistentStorage.cpp 2017-07-14 06:39:0
