[webkit-changes] [225671] trunk/Tools

[zandobersek]

Title: [225671] trunk/Tools








Revision 225671
Author zandober...@gmail.com
Date 2017-12-07 23:47:18 -0800 (Thu, 07 Dec 2017)


Log Message
Unreviewed GTK+ and WPE build fix.

Add TestRunner::installFakeHelvetica(), WTR::installFakeHelvetica()
and WTF::uninstallFakeHelvetica() definitions, filling out the
declarations added in r225641. This fills up missing symbols in the
WKTR's InjectedBundle library, unbreaking layout tests for both
configurations.

* WebKitTestRunner/InjectedBundle/gtk/ActivateFontsGtk.cpp:
(WTR::installFakeHelvetica):
(WTR::uninstallFakeHelvetica):
* WebKitTestRunner/InjectedBundle/gtk/TestRunnerGtk.cpp:
(WTR::TestRunner::inspectorTestStubURL):
(WTR::TestRunner::installFakeHelvetica):
* WebKitTestRunner/InjectedBundle/wpe/ActivateFontsWPE.cpp:
(WTR::installFakeHelvetica):
(WTR::uninstallFakeHelvetica):
* WebKitTestRunner/InjectedBundle/wpe/TestRunnerWPE.cpp:
(WTR::TestRunner::installFakeHelvetica):

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/WebKitTestRunner/InjectedBundle/gtk/ActivateFontsGtk.cpp
trunk/Tools/WebKitTestRunner/InjectedBundle/gtk/TestRunnerGtk.cpp
trunk/Tools/WebKitTestRunner/InjectedBundle/wpe/ActivateFontsWPE.cpp
trunk/Tools/WebKitTestRunner/InjectedBundle/wpe/TestRunnerWPE.cpp




Diff

Modified: trunk/Tools/ChangeLog (225670 => 225671)

--- trunk/Tools/ChangeLog	2017-12-08 04:50:48 UTC (rev 225670)
+++ trunk/Tools/ChangeLog	2017-12-08 07:47:18 UTC (rev 225671)
@@ -1,3 +1,25 @@
+2017-12-07  Zan Dobersek  
+
+Unreviewed GTK+ and WPE build fix.
+
+Add TestRunner::installFakeHelvetica(), WTR::installFakeHelvetica()
+and WTF::uninstallFakeHelvetica() definitions, filling out the
+declarations added in r225641. This fills up missing symbols in the
+WKTR's InjectedBundle library, unbreaking layout tests for both
+configurations.
+
+* WebKitTestRunner/InjectedBundle/gtk/ActivateFontsGtk.cpp:
+(WTR::installFakeHelvetica):
+(WTR::uninstallFakeHelvetica):
+* WebKitTestRunner/InjectedBundle/gtk/TestRunnerGtk.cpp:
+(WTR::TestRunner::inspectorTestStubURL):
+(WTR::TestRunner::installFakeHelvetica):
+* WebKitTestRunner/InjectedBundle/wpe/ActivateFontsWPE.cpp:
+(WTR::installFakeHelvetica):
+(WTR::uninstallFakeHelvetica):
+* WebKitTestRunner/InjectedBundle/wpe/TestRunnerWPE.cpp:
+(WTR::TestRunner::installFakeHelvetica):
+
 2017-12-07  Yusuke Suzuki  
 
 Use StaticLock instead of NeverDestroyed


Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/gtk/ActivateFontsGtk.cpp (225670 => 225671)

--- trunk/Tools/WebKitTestRunner/InjectedBundle/gtk/ActivateFontsGtk.cpp	2017-12-08 04:50:48 UTC (rev 225670)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/gtk/ActivateFontsGtk.cpp	2017-12-08 07:47:18 UTC (rev 225671)
@@ -155,4 +155,12 @@
 initializeFontConfigSetting();
 }
 
+void installFakeHelvetica(WKStringRef)
+{
 }
+
+void uninstallFakeHelvetica()
+{
+}
+
+}


Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/gtk/TestRunnerGtk.cpp (225670 => 225671)

--- trunk/Tools/WebKitTestRunner/InjectedBundle/gtk/TestRunnerGtk.cpp	2017-12-08 04:50:48 UTC (rev 225670)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/gtk/TestRunnerGtk.cpp	2017-12-08 07:47:18 UTC (rev 225671)
@@ -27,6 +27,7 @@
 #include "config.h"
 #include "TestRunner.h"
 
+#include "ActivateFonts.h"
 #include "InjectedBundle.h"
 #include "InjectedBundleUtilities.h"
 #include 
@@ -71,4 +72,9 @@
 return JSStringCreateWithUTF8CString("resource:///org/webkitgtk/inspector/UserInterface/TestStub.html");
 }
 
+void TestRunner::installFakeHelvetica(JSStringRef configuration)
+{
+WTR::installFakeHelvetica(toWK(configuration).get());
+}
+
 } // namespace WTR


Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/wpe/ActivateFontsWPE.cpp (225670 => 225671)

--- trunk/Tools/WebKitTestRunner/InjectedBundle/wpe/ActivateFontsWPE.cpp	2017-12-08 04:50:48 UTC (rev 225670)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/wpe/ActivateFontsWPE.cpp	2017-12-08 07:47:18 UTC (rev 225671)
@@ -142,4 +142,12 @@
 numFonts = FcConfigGetFonts(config, FcSetApplication)->nfont;
 }
 
+void installFakeHelvetica(WKStringRef)
+{
+}
+
+void uninstallFakeHelvetica()
+{
+}
+
 } // namespace WTR


Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/wpe/TestRunnerWPE.cpp (225670 => 225671)

--- trunk/Tools/WebKitTestRunner/InjectedBundle/wpe/TestRunnerWPE.cpp	2017-12-08 04:50:48 UTC (rev 225670)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/wpe/TestRunnerWPE.cpp	2017-12-08 07:47:18 UTC (rev 225671)
@@ -53,5 +53,9 @@
 m_waitToDumpWatchdogTimer.startOneShot(m_timeout / 1000.0);
 }
 
+void TestRunner::installFakeHelvetica(JSStringRef configuration)
+{
+WTR::installFakeHelvetica(toWK(configuration).get());
+}
 
 } // namespace WTR






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

[webkit-changes] [225670] trunk/LayoutTests

[rniwa]

Title: [225670] trunk/LayoutTests








Revision 225670
Author rn...@webkit.org
Date 2017-12-07 20:50:48 -0800 (Thu, 07 Dec 2017)


Log Message
iOS: Many AMP pages hit a release assertion inside Document::updateStyleIfNeeded
https://bugs.webkit.org/show_bug.cgi?id=180550

Reviewed by Simon Fraser.

Add a test for r225647.

* fast/frames/flattening/non-flattening-frame-inside-flattening-iframe-crash-expected.txt: Added.
* fast/frames/flattening/non-flattening-frame-inside-flattening-iframe-crash.html: Added.

Modified Paths

trunk/LayoutTests/ChangeLog


Added Paths

trunk/LayoutTests/fast/frames/flattening/non-flattening-frame-inside-flattening-iframe-crash-expected.txt
trunk/LayoutTests/fast/frames/flattening/non-flattening-frame-inside-flattening-iframe-crash.html




Diff

Modified: trunk/LayoutTests/ChangeLog (225669 => 225670)

--- trunk/LayoutTests/ChangeLog	2017-12-08 04:22:47 UTC (rev 225669)
+++ trunk/LayoutTests/ChangeLog	2017-12-08 04:50:48 UTC (rev 225670)
@@ -1,3 +1,15 @@
+2017-12-07  Ryosuke Niwa  
+
+iOS: Many AMP pages hit a release assertion inside Document::updateStyleIfNeeded
+https://bugs.webkit.org/show_bug.cgi?id=180550
+
+Reviewed by Simon Fraser.
+
+Add a test for r225647.
+
+* fast/frames/flattening/non-flattening-frame-inside-flattening-iframe-crash-expected.txt: Added.
+* fast/frames/flattening/non-flattening-frame-inside-flattening-iframe-crash.html: Added.
+
 2017-12-07  Eric Carlson  
 
 Simplify log channel configuration UI


Added: trunk/LayoutTests/fast/frames/flattening/non-flattening-frame-inside-flattening-iframe-crash-expected.txt (0 => 225670)

--- trunk/LayoutTests/fast/frames/flattening/non-flattening-frame-inside-flattening-iframe-crash-expected.txt	(rev 0)
+++ trunk/LayoutTests/fast/frames/flattening/non-flattening-frame-inside-flattening-iframe-crash-expected.txt	2017-12-08 04:50:48 UTC (rev 225670)
@@ -0,0 +1,3 @@
+This tests that WebKit doesn't crash when there is an non-flattened iframe inside a flattened iframe.
+
+PASS. WebKit did not crash.


Added: trunk/LayoutTests/fast/frames/flattening/non-flattening-frame-inside-flattening-iframe-crash.html (0 => 225670)

--- trunk/LayoutTests/fast/frames/flattening/non-flattening-frame-inside-flattening-iframe-crash.html	(rev 0)
+++ trunk/LayoutTests/fast/frames/flattening/non-flattening-frame-inside-flattening-iframe-crash.html	2017-12-08 04:50:48 UTC (rev 225670)
@@ -0,0 +1,35 @@
+
+
+
+This tests that WebKit doesn't crash when there is an non-flattened iframe inside a flattened iframe.
+
+
+
+if (window.testRunner && window.internals) {
+testRunner.dumpAsText();
+internals.settings.setFrameFlattening("FullyEnabled");
+}
+
+const container = document.getElementById('container');
+const outerIFrame = document.createElement('iframe');
+container.appendChild(outerIFrame);
+
+const innerIFrame = document.createElement('iframe');
+innerIFrame.setAttribute('scrolling', 'no');
+innerIFrame.style.width = '100px';
+innerIFrame.style.height = '100px';
+
+outerIFrame.contentDocument.body.appendChild(innerIFrame);
+
+let content = '';
+for (let i = 0; i < 50; i++)
+content += `some text ${i}
`;
+
+innerIFrame.contentDocument.body.innerHTML = content;
+
+document.body.getBoundingClientRect();
+container.textContent = 'PASS. WebKit did not crash.';
+
+
+
+






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

[webkit-changes] [225669] trunk/Source/WebKitLegacy/mac

[jberlin]

Title: [225669] trunk/Source/WebKitLegacy/mac








Revision 225669
Author jber...@webkit.org
Date 2017-12-07 20:22:47 -0800 (Thu, 07 Dec 2017)


Log Message
Ignore deprecation warnings.

* WebView/WebHTMLView.mm:
(-[NSWindow _web_borderView]):
(-[WebHTMLView _setAsideSubviews]):
* WebView/WebView.mm:
(-[WebView encodeWithCoder:]):

Modified Paths

trunk/Source/WebKitLegacy/mac/ChangeLog
trunk/Source/WebKitLegacy/mac/WebView/WebHTMLView.mm
trunk/Source/WebKitLegacy/mac/WebView/WebView.mm




Diff

Modified: trunk/Source/WebKitLegacy/mac/ChangeLog (225668 => 225669)

--- trunk/Source/WebKitLegacy/mac/ChangeLog	2017-12-08 03:03:19 UTC (rev 225668)
+++ trunk/Source/WebKitLegacy/mac/ChangeLog	2017-12-08 04:22:47 UTC (rev 225669)
@@ -1,3 +1,13 @@
+2017-12-07  Jessie Berlin  
+
+Ignore deprecation warnings.
+
+* WebView/WebHTMLView.mm:
+(-[NSWindow _web_borderView]):
+(-[WebHTMLView _setAsideSubviews]):
+* WebView/WebView.mm:
+(-[WebView encodeWithCoder:]):
+
 2017-12-02  Darin Adler  
 
 Modernize some aspects of text codecs, eliminate WebKit use of strcasecmp


Modified: trunk/Source/WebKitLegacy/mac/WebView/WebHTMLView.mm (225668 => 225669)

--- trunk/Source/WebKitLegacy/mac/WebView/WebHTMLView.mm	2017-12-08 03:03:19 UTC (rev 225668)
+++ trunk/Source/WebKitLegacy/mac/WebView/WebHTMLView.mm	2017-12-08 04:22:47 UTC (rev 225669)
@@ -623,7 +623,10 @@
 
 - (NSView *)_web_borderView
 {
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
 return _borderView;
+#pragma clang diagnostic pop
 }
 
 @end
@@ -1564,13 +1567,19 @@
 #if PLATFORM(MAC)
 ASSERT(!_private->subviewsSetAside);
 ASSERT(_private->savedSubviews == nil);
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
 _private->savedSubviews = _subviews;
+#pragma clang diagnostic pop
 // We need to keep the layer-hosting view in the subviews, otherwise the layers flash.
 if (_private->layerHostingView) {
 NSArray* newSubviews = [[NSArray alloc] initWithObjects:_private->layerHostingView, nil];
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
 _subviews = newSubviews;
 } else
 _subviews = nil;
+#pragma clang diagnostic pop
 _private->subviewsSetAside = YES;
 #endif
  }
@@ -1580,11 +1589,14 @@
 #if PLATFORM(MAC)
 ASSERT(_private->subviewsSetAside);
 if (_private->layerHostingView) {
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
 [_subviews release];
 _subviews = _private->savedSubviews;
 } else {
 ASSERT(_subviews == nil);
 _subviews = _private->savedSubviews;
+#pragma clang diagnostic pop
 }
 _private->savedSubviews = nil;
 _private->subviewsSetAside = NO;


Modified: trunk/Source/WebKitLegacy/mac/WebView/WebView.mm (225668 => 225669)

--- trunk/Source/WebKitLegacy/mac/WebView/WebView.mm	2017-12-08 03:03:19 UTC (rev 225668)
+++ trunk/Source/WebKitLegacy/mac/WebView/WebView.mm	2017-12-08 04:22:47 UTC (rev 225669)
@@ -5774,15 +5774,21 @@
 
 - (void)encodeWithCoder:(NSCoder *)encoder
 {
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
 // Set asside the subviews before we archive. We don't want to archive any subviews.
 // The subviews will always be created in _commonInitializationFrameName:groupName:.
 id originalSubviews = _subviews;
 _subviews = nil;
+#pragma clang diagnostic pop
 
 [super encodeWithCoder:encoder];
 
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
 // Restore the subviews we set aside.
 _subviews = originalSubviews;
+#pragma clang diagnostic pop
 
 BOOL useBackForwardList = _private->page && static_cast(_private->page->backForward().client())->enabled();
 if ([encoder allowsKeyedCoding]) {






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

[webkit-changes] [225668] trunk/Source/WTF

[commit-queue]

Title: [225668] trunk/Source/WTF








Revision 225668
Author commit-qu...@webkit.org
Date 2017-12-07 19:03:19 -0800 (Thu, 07 Dec 2017)


Log Message
[Win] [64-bit] Resolve Microsoft warning C4319 on BitVector.cpp
https://bugs.webkit.org/show_bug.cgi?id=180490

Patch by Basuke Suzuki  on 2017-12-07
Reviewed by Alex Christensen.

bitsInPointer() returns unsigned which is smaller than size_t.
"~"(negate) operator is applied before extending its size which result filled with zero.
This may be potentially a bug if numBits is greater than max value of unsigned long
(which is not practical).

* wtf/BitVector.cpp:
(WTF::BitVector::OutOfLineBits::create):

Modified Paths

trunk/Source/WTF/ChangeLog
trunk/Source/WTF/wtf/BitVector.cpp




Diff

Modified: trunk/Source/WTF/ChangeLog (225667 => 225668)

--- trunk/Source/WTF/ChangeLog	2017-12-08 03:02:26 UTC (rev 225667)
+++ trunk/Source/WTF/ChangeLog	2017-12-08 03:03:19 UTC (rev 225668)
@@ -1,3 +1,18 @@
+2017-12-07  Basuke Suzuki  
+
+[Win] [64-bit] Resolve Microsoft warning C4319 on BitVector.cpp
+https://bugs.webkit.org/show_bug.cgi?id=180490
+
+Reviewed by Alex Christensen.
+
+bitsInPointer() returns unsigned which is smaller than size_t.
+"~"(negate) operator is applied before extending its size which result filled with zero.
+This may be potentially a bug if numBits is greater than max value of unsigned long
+(which is not practical).
+
+* wtf/BitVector.cpp:
+(WTF::BitVector::OutOfLineBits::create):
+
 2017-12-07  Yusuke Suzuki  
 
 Use WTF Locking primitives in WebThread and drop pthread_xxx use


Modified: trunk/Source/WTF/wtf/BitVector.cpp (225667 => 225668)

--- trunk/Source/WTF/wtf/BitVector.cpp	2017-12-08 03:02:26 UTC (rev 225667)
+++ trunk/Source/WTF/wtf/BitVector.cpp	2017-12-08 03:03:19 UTC (rev 225668)
@@ -74,7 +74,7 @@
 
 BitVector::OutOfLineBits* BitVector::OutOfLineBits::create(size_t numBits)
 {
-numBits = (numBits + bitsInPointer() - 1) & ~(bitsInPointer() - 1);
+numBits = (numBits + bitsInPointer() - 1) & ~(static_cast(bitsInPointer()) - 1);
 size_t size = sizeof(OutOfLineBits) + sizeof(uintptr_t) * (numBits / bitsInPointer());
 OutOfLineBits* result = new (NotNull, fastMalloc(size)) OutOfLineBits(numBits);
 return result;






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

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

[utatane . tea]

Title: [225667] trunk/Source/WebCore








Revision 225667
Author utatane@gmail.com
Date 2017-12-07 19:02:26 -0800 (Thu, 07 Dec 2017)


Log Message
Use WTF::RecursiveLockAdapter instead of using pthread_mutex_t with recursive lock option
https://bugs.webkit.org/show_bug.cgi?id=180449

Reviewed by Mark Lam.

Use WTF::RecursiveLockAdapter instead. We can remove pthread_mutex_xxx,
pthread_once and FontLocker wrapper.

* platform/graphics/FontCache.cpp:
(WebCore::FontCache::getCachedFontPlatformData):
(WebCore::FontCache::fontForPlatformData):
(WebCore::FontCache::purgeInactiveFontData):
(WebCore::FontCache::inactiveFontCount):
(initFontCacheLockOnce): Deleted.
(FontLocker::FontLocker): Deleted.
(FontLocker::~FontLocker): Deleted.

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/graphics/FontCache.cpp




Diff

Modified: trunk/Source/WebCore/ChangeLog (225666 => 225667)

--- trunk/Source/WebCore/ChangeLog	2017-12-08 03:00:42 UTC (rev 225666)
+++ trunk/Source/WebCore/ChangeLog	2017-12-08 03:02:26 UTC (rev 225667)
@@ -1,3 +1,22 @@
+2017-12-07  Yusuke Suzuki  
+
+Use WTF::RecursiveLockAdapter instead of using pthread_mutex_t with recursive lock option
+https://bugs.webkit.org/show_bug.cgi?id=180449
+
+Reviewed by Mark Lam.
+
+Use WTF::RecursiveLockAdapter instead. We can remove pthread_mutex_xxx,
+pthread_once and FontLocker wrapper.
+
+* platform/graphics/FontCache.cpp:
+(WebCore::FontCache::getCachedFontPlatformData):
+(WebCore::FontCache::fontForPlatformData):
+(WebCore::FontCache::purgeInactiveFontData):
+(WebCore::FontCache::inactiveFontCount):
+(initFontCacheLockOnce): Deleted.
+(FontLocker::FontLocker): Deleted.
+(FontLocker::~FontLocker): Deleted.
+
 2017-12-07  Eric Carlson  
 
 Simplify log channel configuration UI


Modified: trunk/Source/WebCore/platform/graphics/FontCache.cpp (225666 => 225667)

--- trunk/Source/WebCore/platform/graphics/FontCache.cpp	2017-12-08 03:00:42 UTC (rev 225666)
+++ trunk/Source/WebCore/platform/graphics/FontCache.cpp	2017-12-08 03:02:26 UTC (rev 225667)
@@ -50,37 +50,12 @@
 #endif
 
 #if PLATFORM(IOS)
-#include 
+#include 
+#include 
 
-// FIXME: We may be able to simplify this code using C++11 threading primitives, including std::call_once().
-static pthread_mutex_t fontLock;
+using RecursiveStaticLock = WTF::RecursiveLockAdapter;
+static RecursiveStaticLock fontLock;
 
-static void initFontCacheLockOnce()
-{
-pthread_mutexattr_t mutexAttribute;
-pthread_mutexattr_init();
-pthread_mutexattr_settype(, PTHREAD_MUTEX_RECURSIVE);
-pthread_mutex_init(, );
-pthread_mutexattr_destroy();
-}
-
-static pthread_once_t initFontLockControl = PTHREAD_ONCE_INIT;
-
-class FontLocker {
-WTF_MAKE_NONCOPYABLE(FontLocker);
-public:
-FontLocker()
-{
-pthread_once(, initFontCacheLockOnce);
-int lockcode = pthread_mutex_lock();
-ASSERT_WITH_MESSAGE_UNUSED(lockcode, !lockcode, "fontLock lock failed with code:%d", lockcode);
-}
-~FontLocker()
-{
-int lockcode = pthread_mutex_unlock();
-ASSERT_WITH_MESSAGE_UNUSED(lockcode, !lockcode, "fontLock unlock failed with code:%d", lockcode);
-}
-};
 #endif // PLATFORM(IOS)
 
 
@@ -232,7 +207,7 @@
 const FontFeatureSettings* fontFaceFeatures, const FontVariantSettings* fontFaceVariantSettings, FontSelectionSpecifiedCapabilities fontFaceCapabilities, bool checkingAlternateName)
 {
 #if PLATFORM(IOS)
-FontLocker fontLocker;
+auto locker = holdLock(fontLock);
 #endif
 
 #if OS(WINDOWS) && ENABLE(OPENTYPE_VERTICAL)
@@ -360,7 +335,7 @@
 Ref FontCache::fontForPlatformData(const FontPlatformData& platformData)
 {
 #if PLATFORM(IOS)
-FontLocker fontLocker;
+auto locker = holdLock(fontLock);
 #endif
 
 auto addResult = cachedFonts().add(platformData, nullptr);
@@ -393,7 +368,7 @@
 pruneSystemFallbackFonts();
 
 #if PLATFORM(IOS)
-FontLocker fontLocker;
+auto locker = holdLock(fontLock);
 #endif
 
 while (purgeCount) {
@@ -437,7 +412,7 @@
 size_t FontCache::inactiveFontCount()
 {
 #if PLATFORM(IOS)
-FontLocker fontLocker;
+auto locker = holdLock(fontLock);
 #endif
 unsigned count = 0;
 for (auto& font : cachedFonts().values()) {






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

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

[commit-queue]

Title: [225666] trunk/Source/WebKit








Revision 225666
Author commit-qu...@webkit.org
Date 2017-12-07 19:00:42 -0800 (Thu, 07 Dec 2017)


Log Message
[WinCairo] Fix ResourceError handling in ArgumentCoder for wincairo webkit
https://bugs.webkit.org/show_bug.cgi?id=180483

Patch by Yousuke Kimoto  on 2017-12-07
Reviewed by Alex Christensen.

* Shared/curl/WebCoreArgumentCodersCurl.cpp:
(IPC::ArgumentCoder::encodePlatformData):
(IPC::ArgumentCoder::decodePlatformData):

Modified Paths

trunk/Source/WebKit/ChangeLog
trunk/Source/WebKit/Shared/curl/WebCoreArgumentCodersCurl.cpp




Diff

Modified: trunk/Source/WebKit/ChangeLog (225665 => 225666)

--- trunk/Source/WebKit/ChangeLog	2017-12-08 02:33:36 UTC (rev 225665)
+++ trunk/Source/WebKit/ChangeLog	2017-12-08 03:00:42 UTC (rev 225666)
@@ -1,3 +1,14 @@
+2017-12-07  Yousuke Kimoto  
+
+[WinCairo] Fix ResourceError handling in ArgumentCoder for wincairo webkit
+https://bugs.webkit.org/show_bug.cgi?id=180483
+
+Reviewed by Alex Christensen.
+
+* Shared/curl/WebCoreArgumentCodersCurl.cpp:
+(IPC::ArgumentCoder::encodePlatformData):
+(IPC::ArgumentCoder::decodePlatformData):
+
 2017-12-07  Youenn Fablet  
 
 StartFetch should take a ServiceWorkerIdentifier


Modified: trunk/Source/WebKit/Shared/curl/WebCoreArgumentCodersCurl.cpp (225665 => 225666)

--- trunk/Source/WebKit/Shared/curl/WebCoreArgumentCodersCurl.cpp	2017-12-08 02:33:36 UTC (rev 225665)
+++ trunk/Source/WebKit/Shared/curl/WebCoreArgumentCodersCurl.cpp	2017-12-08 03:00:42 UTC (rev 225666)
@@ -56,12 +56,52 @@
 return true;
 }
 
-void ArgumentCoder::encodePlatformData(Encoder&, const ResourceError&)
+void ArgumentCoder::encodePlatformData(Encoder& encoder, const ResourceError& resourceError)
 {
+encoder.encodeEnum(resourceError.type());
+if (resourceError.isNull())
+return;
+
+encoder << resourceError.domain();
+encoder << resourceError.errorCode();
+encoder << resourceError.failingURL().string();
+encoder << resourceError.localizedDescription();
+encoder << resourceError.sslErrors();
 }
 
-bool ArgumentCoder::decodePlatformData(Decoder&, ResourceError&)
+bool ArgumentCoder::decodePlatformData(Decoder& decoder, ResourceError& resourceError)
 {
+ResourceErrorBase::Type errorType;
+if (!decoder.decodeEnum(errorType))
+return false;
+if (errorType == ResourceErrorBase::Type::Null) {
+resourceError = { };
+return true;
+}
+
+String domain;
+if (!decoder.decode(domain))
+return false;
+
+int errorCode;
+if (!decoder.decode(errorCode))
+return false;
+
+String failingURL;
+if (!decoder.decode(failingURL))
+return false;
+
+String localizedDescription;
+if (!decoder.decode(localizedDescription))
+return false;
+
+unsigned sslErrors;
+if (!decoder.decode(sslErrors))
+return false;
+
+resourceError = ResourceError(domain, errorCode, URL(URL(), failingURL), localizedDescription, errorType);
+resourceError.setSslErrors(sslErrors);
+
 return true;
 }
 






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

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

[commit-queue]

Title: [225665] trunk/Source/WebKit








Revision 225665
Author commit-qu...@webkit.org
Date 2017-12-07 18:33:36 -0800 (Thu, 07 Dec 2017)


Log Message
StartFetch should take a ServiceWorkerIdentifier
https://bugs.webkit.org/show_bug.cgi?id=180478

Patch by Youenn Fablet  on 2017-12-07
Reviewed by Brady Eidson.

Before the patch, StartFetch was taking an optional ServiceWorkerIdentifier.
Now that every navigation fetch is querying its matching registration, it can no longer be optional.

In the case there is a problem in running the service worker at start fetch time,
answer to the WebProcess to go to network so that the request does not get stalled.

* StorageProcess/ServiceWorker/WebSWServerConnection.cpp:
(WebKit::WebSWServerConnection::startFetch):
* StorageProcess/ServiceWorker/WebSWServerConnection.h:
* StorageProcess/ServiceWorker/WebSWServerConnection.messages.in:
* WebProcess/Storage/WebSWClientConnection.cpp:
(WebKit::WebSWClientConnection::startFetch):
* WebProcess/Storage/WebSWContextManagerConnection.cpp:
(WebKit::WebSWContextManagerConnection::startFetch):
* WebProcess/Storage/WebSWContextManagerConnection.h:
* WebProcess/Storage/WebSWContextManagerConnection.messages.in:

Modified Paths

trunk/Source/WebKit/ChangeLog
trunk/Source/WebKit/StorageProcess/ServiceWorker/WebSWServerConnection.cpp
trunk/Source/WebKit/StorageProcess/ServiceWorker/WebSWServerConnection.h
trunk/Source/WebKit/StorageProcess/ServiceWorker/WebSWServerConnection.messages.in
trunk/Source/WebKit/WebProcess/Storage/WebSWClientConnection.cpp
trunk/Source/WebKit/WebProcess/Storage/WebSWContextManagerConnection.cpp
trunk/Source/WebKit/WebProcess/Storage/WebSWContextManagerConnection.h
trunk/Source/WebKit/WebProcess/Storage/WebSWContextManagerConnection.messages.in




Diff

Modified: trunk/Source/WebKit/ChangeLog (225664 => 225665)

--- trunk/Source/WebKit/ChangeLog	2017-12-08 02:08:03 UTC (rev 225664)
+++ trunk/Source/WebKit/ChangeLog	2017-12-08 02:33:36 UTC (rev 225665)
@@ -1,3 +1,27 @@
+2017-12-07  Youenn Fablet  
+
+StartFetch should take a ServiceWorkerIdentifier
+https://bugs.webkit.org/show_bug.cgi?id=180478
+
+Reviewed by Brady Eidson.
+
+Before the patch, StartFetch was taking an optional ServiceWorkerIdentifier.
+Now that every navigation fetch is querying its matching registration, it can no longer be optional.
+
+In the case there is a problem in running the service worker at start fetch time,
+answer to the WebProcess to go to network so that the request does not get stalled.
+
+* StorageProcess/ServiceWorker/WebSWServerConnection.cpp:
+(WebKit::WebSWServerConnection::startFetch):
+* StorageProcess/ServiceWorker/WebSWServerConnection.h:
+* StorageProcess/ServiceWorker/WebSWServerConnection.messages.in:
+* WebProcess/Storage/WebSWClientConnection.cpp:
+(WebKit::WebSWClientConnection::startFetch):
+* WebProcess/Storage/WebSWContextManagerConnection.cpp:
+(WebKit::WebSWContextManagerConnection::startFetch):
+* WebProcess/Storage/WebSWContextManagerConnection.h:
+* WebProcess/Storage/WebSWContextManagerConnection.messages.in:
+
 2017-12-07  Saam Barati  
 
 We need to grab the JSLock in InjectedBundle::createWebDataFromUint8Array


Modified: trunk/Source/WebKit/StorageProcess/ServiceWorker/WebSWServerConnection.cpp (225664 => 225665)

--- trunk/Source/WebKit/StorageProcess/ServiceWorker/WebSWServerConnection.cpp	2017-12-08 02:08:03 UTC (rev 225664)
+++ trunk/Source/WebKit/StorageProcess/ServiceWorker/WebSWServerConnection.cpp	2017-12-08 02:33:36 UTC (rev 225665)
@@ -116,23 +116,15 @@
 send(Messages::WebSWClientConnection::UpdateWorkerState(worker, state));
 }
 
-void WebSWServerConnection::startFetch(uint64_t fetchIdentifier, std::optional serviceWorkerIdentifier, ResourceRequest&& request, FetchOptions&& options, IPC::FormDataReference&& formData)
+void WebSWServerConnection::startFetch(uint64_t fetchIdentifier, ServiceWorkerIdentifier serviceWorkerIdentifier, ResourceRequest&& request, FetchOptions&& options, IPC::FormDataReference&& formData)
 {
 // It's possible this specific worker cannot be re-run (e.g. its registration has been removed)
-if (serviceWorkerIdentifier) {
-server().runServiceWorkerIfNecessary(*serviceWorkerIdentifier, [contentConnection = m_contentConnection.copyRef(), connectionIdentifier = identifier(), fetchIdentifier, serviceWorkerIdentifier = *serviceWorkerIdentifier, request = WTFMove(request), options = WTFMove(options), formData = WTFMove(formData)](bool success, auto& contextConnection) {
-if (success)
-sendToContextProcess(contextConnection, Messages::WebSWContextManagerConnection::StartFetch { connectionIdentifier, fetchIdentifier, serviceWorkerIdentifier, request, options, formData });
-else
-

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

[sbarati]

Title: [225664] trunk/Source/_javascript_Core








Revision 225664
Author sbar...@apple.com
Date 2017-12-07 18:08:03 -0800 (Thu, 07 Dec 2017)


Log Message
Modify our dollar VM clflush intrinsic to aid in some perf testing
https://bugs.webkit.org/show_bug.cgi?id=180559

Reviewed by Mark Lam.

* tools/JSDollarVM.cpp:
(JSC::functionCpuClflush):
(JSC::functionDeltaBetweenButterflies):
(JSC::JSDollarVM::finishCreation):

Modified Paths

trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/tools/JSDollarVM.cpp




Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (225663 => 225664)

--- trunk/Source/_javascript_Core/ChangeLog	2017-12-08 01:53:31 UTC (rev 225663)
+++ trunk/Source/_javascript_Core/ChangeLog	2017-12-08 02:08:03 UTC (rev 225664)
@@ -1,3 +1,15 @@
+2017-12-07  Saam Barati  
+
+Modify our dollar VM clflush intrinsic to aid in some perf testing
+https://bugs.webkit.org/show_bug.cgi?id=180559
+
+Reviewed by Mark Lam.
+
+* tools/JSDollarVM.cpp:
+(JSC::functionCpuClflush):
+(JSC::functionDeltaBetweenButterflies):
+(JSC::JSDollarVM::finishCreation):
+
 2017-12-07  Eric Carlson  
 
 Simplify log channel configuration UI


Modified: trunk/Source/_javascript_Core/tools/JSDollarVM.cpp (225663 => 225664)

--- trunk/Source/_javascript_Core/tools/JSDollarVM.cpp	2017-12-08 01:53:31 UTC (rev 225663)
+++ trunk/Source/_javascript_Core/tools/JSDollarVM.cpp	2017-12-08 02:08:03 UTC (rev 225664)
@@ -1107,32 +1107,28 @@
 asm volatile ("clflush %0" :: "m"(*ptrToFlush) : "memory");
 };
 
+Vector toFlush;
+
 uint32_t offset = exec->argument(1).asUInt32();
 
-char* ptr = nullptr;
-if (JSArrayBuffer* buffer = jsDynamicCast(vm, exec->argument(0))) {
-if (ArrayBuffer* impl = buffer->impl()) {
-if (offset < impl->byteLength()) {
-clflush(impl);
-ptr = bitwise_cast(impl) + offset;
-}
-}
-} else if (JSArrayBufferView* view = jsDynamicCast(vm, exec->argument(0)))
-ptr = bitwise_cast(view);
+if (JSArrayBufferView* view = jsDynamicCast(vm, exec->argument(0)))
+toFlush.append(bitwise_cast(view->vector()) + offset);
 else if (JSObject* object = jsDynamicCast(vm, exec->argument(0))) {
 switch (object->indexingType()) {
 case ALL_INT32_INDEXING_TYPES:
 case ALL_CONTIGUOUS_INDEXING_TYPES:
 case ALL_DOUBLE_INDEXING_TYPES:
-clflush(object);
-ptr = bitwise_cast(object->butterfly()) + offset;
+toFlush.append(bitwise_cast(object) + JSObject::butterflyOffset());
+toFlush.append(bitwise_cast(object->butterfly()) + Butterfly::offsetOfVectorLength());
+toFlush.append(bitwise_cast(object->butterfly()) + Butterfly::offsetOfPublicLength());
 }
 }
 
-if (!ptr)
+if (!toFlush.size())
 return JSValue::encode(jsBoolean(false));
 
-clflush(ptr);
+for (void* ptr : toFlush)
+clflush(ptr);
 return JSValue::encode(jsBoolean(true));
 #else
 UNUSED_PARAM(exec);
@@ -1698,6 +1694,22 @@
 return JSValue::encode(JSTestCustomGetterSetter::create(vm, globalObject, JSTestCustomGetterSetter::createStructure(vm, globalObject)));
 }
 
+static EncodedJSValue JSC_HOST_CALL functionDeltaBetweenButterflies(ExecState* exec)
+{
+VM& vm = exec->vm();
+JSObject* a = jsDynamicCast(vm, exec->argument(0));
+JSObject* b = jsDynamicCast(vm, exec->argument(1));
+if (!a || !b)
+return JSValue::encode(jsNumber(PNaN));
+
+ptrdiff_t delta = bitwise_cast(a->butterfly()) - bitwise_cast(b->butterfly());
+if (delta < 0)
+return JSValue::encode(jsNumber(PNaN));
+if (delta > std::numeric_limits::max())
+return JSValue::encode(jsNumber(PNaN));
+return JSValue::encode(jsNumber(static_cast(delta)));
+}
+
 void JSDollarVM::finishCreation(VM& vm)
 {
 Base::finishCreation(vm);
@@ -1779,6 +1791,8 @@
 addFunction(vm, "getGetterSetter", functionGetGetterSetter, 2);
 addFunction(vm, "loadGetterFromGetterSetter", functionLoadGetterFromGetterSetter, 1);
 addFunction(vm, "createCustomTestGetterSetter", functionCreateCustomTestGetterSetter, 1);
+
+addFunction(vm, "deltaBetweenButterflies", functionDeltaBetweenButterflies, 2);
 }
 
 void JSDollarVM::addFunction(VM& vm, JSGlobalObject* globalObject, const char* name, NativeFunction function, unsigned arguments)






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

[webkit-changes] [225663] trunk

[eric . carlson]

Title: [225663] trunk








Revision 225663
Author eric.carl...@apple.com
Date 2017-12-07 17:53:31 -0800 (Thu, 07 Dec 2017)


Log Message
Simplify log channel configuration UI
https://bugs.webkit.org/show_bug.cgi?id=180527


Reviewed by Joseph Pecoraro.

Source/_javascript_Core:

* inspector/protocol/Console.json:

Source/WebCore:

No new tests, updated existing test.

* inspector/agents/WebConsoleAgent.cpp:
(WebCore::WebConsoleAgent::getLoggingChannels):
(WebCore::channelConfigurationForString):

Source/WebInspectorUI:

* Localizations/en.lproj/localizedStrings.js:
* UserInterface/Models/LoggingChannel.js:
* UserInterface/Views/SettingsTabContentView.js:
(WI.SettingsTabContentView.prototype._createGeneralSettingsView):

LayoutTests:

* inspector/console/webcore-logging.html: Updated test for new results.

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/LayoutTests/inspector/console/webcore-logging.html
trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/inspector/protocol/Console.json
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/inspector/agents/WebConsoleAgent.cpp
trunk/Source/WebInspectorUI/ChangeLog
trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js
trunk/Source/WebInspectorUI/UserInterface/Models/LoggingChannel.js
trunk/Source/WebInspectorUI/UserInterface/Views/SettingsTabContentView.js




Diff

Modified: trunk/LayoutTests/ChangeLog (225662 => 225663)

--- trunk/LayoutTests/ChangeLog	2017-12-08 01:31:10 UTC (rev 225662)
+++ trunk/LayoutTests/ChangeLog	2017-12-08 01:53:31 UTC (rev 225663)
@@ -1,3 +1,13 @@
+2017-12-07  Eric Carlson  
+
+Simplify log channel configuration UI
+https://bugs.webkit.org/show_bug.cgi?id=180527
+
+
+Reviewed by Joseph Pecoraro.
+
+* inspector/console/webcore-logging.html: Updated test for new results.
+
 2017-12-07  Oleksandr Skachkov  
 
 WebAssembly: sending module to iframe fails


Modified: trunk/LayoutTests/inspector/console/webcore-logging.html (225662 => 225663)

--- trunk/LayoutTests/inspector/console/webcore-logging.html	2017-12-08 01:31:10 UTC (rev 225662)
+++ trunk/LayoutTests/inspector/console/webcore-logging.html	2017-12-08 01:53:31 UTC (rev 225663)
@@ -126,7 +126,7 @@
 let channel = WI.logManager.customLoggingChannels.find(channel => channel.source === WI.ConsoleMessage.MessageSource.Media);
 InspectorTest.expectThat(channel.level === WI.LoggingChannel.Level.Off, "Media logging disabled.");
 
-ConsoleAgent.setLoggingChannelLevel(channel.source, WI.LoggingChannel.Level.Log)
+ConsoleAgent.setLoggingChannelLevel(channel.source, WI.LoggingChannel.Level.Basic)
 ConsoleAgent.getLoggingChannels((error, channels) => {
 if (error) {
 InspectorTest.fail(`ConsoleAgent.getLoggingChannels() failed with error ${error}`);
@@ -134,7 +134,7 @@
 }
 
 let mediaChannel = channels.find(channel => channel.source === WI.ConsoleMessage.MessageSource.Media);
-InspectorTest.expectThat(mediaChannel.level === WI.LoggingChannel.Level.Log, "Media logging has been enabled.");
+InspectorTest.expectThat(mediaChannel.level === WI.LoggingChannel.Level.Basic, "Media logging has been enabled.");
 
 let logListener = WI.logManager.addEventListener(WI.LogManager.Event.MessageAdded, (event) => {
 let message = event.data.message;


Modified: trunk/Source/_javascript_Core/ChangeLog (225662 => 225663)

--- trunk/Source/_javascript_Core/ChangeLog	2017-12-08 01:31:10 UTC (rev 225662)
+++ trunk/Source/_javascript_Core/ChangeLog	2017-12-08 01:53:31 UTC (rev 225663)
@@ -1,3 +1,13 @@
+2017-12-07  Eric Carlson  
+
+Simplify log channel configuration UI
+https://bugs.webkit.org/show_bug.cgi?id=180527
+
+
+Reviewed by Joseph Pecoraro.
+
+* inspector/protocol/Console.json:
+
 2017-12-07  Mark Lam  
 
 Apply poisoning to some native code pointers.


Modified: trunk/Source/_javascript_Core/inspector/protocol/Console.json (225662 => 225663)

--- trunk/Source/_javascript_Core/inspector/protocol/Console.json	2017-12-08 01:31:10 UTC (rev 225662)
+++ trunk/Source/_javascript_Core/inspector/protocol/Console.json	2017-12-08 01:53:31 UTC (rev 225663)
@@ -12,7 +12,7 @@
 {
 "id": "ChannelLevel",
 "type": "string",
-"enum": ["off", "log", "error", "warning", "info", "debug"],
+"enum": ["off", "basic", "verbose"],
 "description": "Level of logging."
 },
 {


Modified: trunk/Source/WebCore/ChangeLog (225662 => 225663)

--- trunk/Source/WebCore/ChangeLog	2017-12-08 01:31:10 UTC (rev 225662)
+++ trunk/Source/WebCore/ChangeLog	2017-12-08 01:53:31 UTC (rev 225663)
@@ -1,3 +1,17 @@
+2017-12-07  Eric Carlson  

[webkit-changes] [225662] trunk

[utatane . tea]

Title: [225662] trunk








Revision 225662
Author utatane@gmail.com
Date 2017-12-07 17:31:10 -0800 (Thu, 07 Dec 2017)


Log Message
Use StaticLock instead of NeverDestroyed
https://bugs.webkit.org/show_bug.cgi?id=180507

Reviewed by Saam Barati.

Source/WebCore:

StaticLock can be used instead of using NeverDestroyed.

No behavior change.

* Modules/webdatabase/Database.cpp:
(WebCore::Database::performOpenAndVerify):
* Modules/webdatabase/DatabaseTracker.cpp:
(WebCore::DatabaseTracker::openDatabaseMutex):
(WebCore::DatabaseTracker::emptyDatabaseFilesRemovalTaskWillBeScheduled):
(WebCore::DatabaseTracker::emptyDatabaseFilesRemovalTaskDidFinish):
(WebCore::DatabaseTracker::scheduleNotifyDatabaseChanged):
(WebCore::DatabaseTracker::scheduleForNotification):
(WebCore::DatabaseTracker::notifyDatabasesChanged):
(WebCore::notificationMutex): Deleted.
* Modules/webdatabase/DatabaseTracker.h:
* platform/URL.cpp:
(WebCore::registerDefaultPortForProtocolForTesting):
(WebCore::clearDefaultPortForProtocolMapForTesting):
(WebCore::defaultPortForProtocol):
(WebCore::defaultPortForProtocolMapForTestingLock): Deleted.
* platform/graphics/MediaPlayer.cpp:
(WebCore::buildMediaEnginesVector):
(WebCore::installedMediaEngines):
(WebCore::MediaPlayer::resetMediaEngines):
(WebCore::mediaEngineVectorLock): Deleted.
* platform/ios/QuickLook.mm:
(WebCore::removeQLPreviewConverterForURL):
(WebCore::addQLPreviewConverterWithFileForURL):
(WebCore::qlPreviewConverterDictionaryMutex): Deleted.
* platform/ios/WebSQLiteDatabaseTrackerClient.mm:
(+[WebDatabaseTransactionBackgroundTaskController startBackgroundTask]):
(+[WebDatabaseTransactionBackgroundTaskController endBackgroundTask]):
(transactionBackgroundTaskIdentifierLock): Deleted.
* platform/network/curl/CurlContext.cpp:
(WebCore::CurlShareHandle::lockCallback):
(WebCore::CurlShareHandle::unlockCallback):
(WebCore::CurlShareHandle::mutexFor):
* platform/network/curl/CurlContext.h:

Source/WebKitLegacy/ios:

* WebCoreSupport/WebFixedPositionContent.mm:
(-[WebFixedPositionContent scrollOrZoomChanged:]):
(-[WebFixedPositionContent overflowScrollPositionForLayer:changedTo:]):
(-[WebFixedPositionContent setViewportConstrainedLayers:stickyContainerMap:]):
(-[WebFixedPositionContent hasFixedOrStickyPositionLayers]):
(WebFixedPositionContentDataLock): Deleted.

Source/WebKitLegacy/win:

* WebLocalizableStrings.cpp:
(findCachedString):
(cacheString):
(mainBundleLocStrings): Deleted.
(frameworkLocStringsMutex): Deleted.

Tools:

* DumpRenderTree/_javascript_Threading.cpp:
(_javascript_Threads):
(runJavaScriptThread):
(startJavaScriptThreads):
(stopJavaScriptThreads):
(_javascript_ThreadsMutex): Deleted.

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/Modules/webdatabase/Database.cpp
trunk/Source/WebCore/Modules/webdatabase/DatabaseTracker.cpp
trunk/Source/WebCore/Modules/webdatabase/DatabaseTracker.h
trunk/Source/WebCore/platform/URL.cpp
trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp
trunk/Source/WebCore/platform/ios/QuickLook.mm
trunk/Source/WebCore/platform/ios/WebSQLiteDatabaseTrackerClient.mm
trunk/Source/WebCore/platform/network/curl/CurlContext.cpp
trunk/Source/WebCore/platform/network/curl/CurlContext.h
trunk/Source/WebKitLegacy/ios/ChangeLog
trunk/Source/WebKitLegacy/ios/WebCoreSupport/WebFixedPositionContent.mm
trunk/Source/WebKitLegacy/win/ChangeLog
trunk/Source/WebKitLegacy/win/WebLocalizableStrings.cpp
trunk/Tools/ChangeLog
trunk/Tools/DumpRenderTree/_javascript_Threading.cpp




Diff

Modified: trunk/Source/WebCore/ChangeLog (225661 => 225662)

--- trunk/Source/WebCore/ChangeLog	2017-12-08 01:27:00 UTC (rev 225661)
+++ trunk/Source/WebCore/ChangeLog	2017-12-08 01:31:10 UTC (rev 225662)
@@ -1,3 +1,49 @@
+2017-12-07  Yusuke Suzuki  
+
+Use StaticLock instead of NeverDestroyed
+https://bugs.webkit.org/show_bug.cgi?id=180507
+
+Reviewed by Saam Barati.
+
+StaticLock can be used instead of using NeverDestroyed.
+
+No behavior change.
+
+* Modules/webdatabase/Database.cpp:
+(WebCore::Database::performOpenAndVerify):
+* Modules/webdatabase/DatabaseTracker.cpp:
+(WebCore::DatabaseTracker::openDatabaseMutex):
+(WebCore::DatabaseTracker::emptyDatabaseFilesRemovalTaskWillBeScheduled):
+(WebCore::DatabaseTracker::emptyDatabaseFilesRemovalTaskDidFinish):
+(WebCore::DatabaseTracker::scheduleNotifyDatabaseChanged):
+(WebCore::DatabaseTracker::scheduleForNotification):
+(WebCore::DatabaseTracker::notifyDatabasesChanged):
+(WebCore::notificationMutex): Deleted.
+* Modules/webdatabase/DatabaseTracker.h:
+* platform/URL.cpp:
+(WebCore::registerDefaultPortForProtocolForTesting):
+(WebCore::clearDefaultPortForProtocolMapForTesting):
+(WebCore::defaultPortForProtocol):
+(WebCore::defaultPortForProtocolMapForTestingLock): Deleted.
+* platform/graphics/MediaPlayer.cpp:
+   

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

[beidson]

Title: [225661] trunk/Source/WebCore








Revision 225661
Author beid...@apple.com
Date 2017-12-07 17:27:00 -0800 (Thu, 07 Dec 2017)


Log Message
Read registrations in from disk.
https://bugs.webkit.org/show_bug.cgi?id=180543

Reviewed by Andy Estes.

No new tests (Not testable quite yet)

On launch, read through the database.

Set up enough objects in the SWServer necessary to cause fetches and postMessages to
go to a worker that has never run before.

* workers/service/ServiceWorkerContextData.cpp:
(WebCore::ServiceWorkerContextData::isolatedCopy const):
* workers/service/ServiceWorkerContextData.h:
(WebCore::ServiceWorkerContextData::encode const):
(WebCore::ServiceWorkerContextData::decode):

* workers/service/ServiceWorkerRegistrationKey.cpp:
(WebCore::ServiceWorkerRegistrationKey::toDatabaseKey const):
(WebCore::ServiceWorkerRegistrationKey::fromDatabaseKey):
* workers/service/ServiceWorkerRegistrationKey.h:

* workers/service/server/RegistrationDatabase.cpp:
(WebCore::stringToUpdateViaCache):
(WebCore::stringToWorkerType):
(WebCore::RegistrationDatabase::doPushChanges):
(WebCore::RegistrationDatabase::importRecords):
(WebCore::RegistrationDatabase::addRegistrationToStore):
* workers/service/server/RegistrationDatabase.h:

* workers/service/server/RegistrationStore.cpp:
(WebCore::RegistrationStore::RegistrationStore):
(WebCore::RegistrationStore::addRegistrationFromDatabase):
* workers/service/server/RegistrationStore.h:

* workers/service/server/SWServer.cpp:
(WebCore::SWServer::addRegistrationFromStore):
(WebCore::SWServer::SWServer):
(WebCore::SWServer::updateWorker):
(WebCore::SWServer::tryInstallContextData):
(WebCore::SWServer::installContextData):
(WebCore::generateServiceWorkerIdentifier): Deleted.
* workers/service/server/SWServer.h:

* workers/service/server/SWServerRegistration.h:

* workers/service/server/SWServerWorker.cpp:
(WebCore::SWServerWorker::contextData const):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/workers/service/ServiceWorkerContextData.cpp
trunk/Source/WebCore/workers/service/ServiceWorkerContextData.h
trunk/Source/WebCore/workers/service/ServiceWorkerRegistrationKey.cpp
trunk/Source/WebCore/workers/service/ServiceWorkerRegistrationKey.h
trunk/Source/WebCore/workers/service/server/RegistrationDatabase.cpp
trunk/Source/WebCore/workers/service/server/RegistrationDatabase.h
trunk/Source/WebCore/workers/service/server/RegistrationStore.cpp
trunk/Source/WebCore/workers/service/server/RegistrationStore.h
trunk/Source/WebCore/workers/service/server/SWServer.cpp
trunk/Source/WebCore/workers/service/server/SWServer.h
trunk/Source/WebCore/workers/service/server/SWServerRegistration.h
trunk/Source/WebCore/workers/service/server/SWServerWorker.cpp




Diff

Modified: trunk/Source/WebCore/ChangeLog (225660 => 225661)

--- trunk/Source/WebCore/ChangeLog	2017-12-08 01:26:27 UTC (rev 225660)
+++ trunk/Source/WebCore/ChangeLog	2017-12-08 01:27:00 UTC (rev 225661)
@@ -1,3 +1,55 @@
+2017-12-07  Brady Eidson  
+
+Read registrations in from disk.
+https://bugs.webkit.org/show_bug.cgi?id=180543
+
+Reviewed by Andy Estes.
+
+No new tests (Not testable quite yet)
+
+On launch, read through the database.
+
+Set up enough objects in the SWServer necessary to cause fetches and postMessages to
+go to a worker that has never run before.
+
+* workers/service/ServiceWorkerContextData.cpp:
+(WebCore::ServiceWorkerContextData::isolatedCopy const):
+* workers/service/ServiceWorkerContextData.h:
+(WebCore::ServiceWorkerContextData::encode const):
+(WebCore::ServiceWorkerContextData::decode):
+
+* workers/service/ServiceWorkerRegistrationKey.cpp:
+(WebCore::ServiceWorkerRegistrationKey::toDatabaseKey const):
+(WebCore::ServiceWorkerRegistrationKey::fromDatabaseKey):
+* workers/service/ServiceWorkerRegistrationKey.h:
+
+* workers/service/server/RegistrationDatabase.cpp:
+(WebCore::stringToUpdateViaCache):
+(WebCore::stringToWorkerType):
+(WebCore::RegistrationDatabase::doPushChanges):
+(WebCore::RegistrationDatabase::importRecords):
+(WebCore::RegistrationDatabase::addRegistrationToStore):
+* workers/service/server/RegistrationDatabase.h:
+
+* workers/service/server/RegistrationStore.cpp:
+(WebCore::RegistrationStore::RegistrationStore):
+(WebCore::RegistrationStore::addRegistrationFromDatabase):
+* workers/service/server/RegistrationStore.h:
+
+* workers/service/server/SWServer.cpp:
+(WebCore::SWServer::addRegistrationFromStore):
+(WebCore::SWServer::SWServer):
+(WebCore::SWServer::updateWorker):
+(WebCore::SWServer::tryInstallContextData):
+(WebCore::SWServer::installContextData):
+(WebCore::generateServiceWorkerIdentifier): Deleted.
+* workers/service/server/SWServer.h:
+
+

[webkit-changes] [225660] trunk/Source

[utatane . tea]

Title: [225660] trunk/Source








Revision 225660
Author utatane@gmail.com
Date 2017-12-07 17:26:27 -0800 (Thu, 07 Dec 2017)


Log Message
Use WTF Locking primitives in WebThread and drop pthread_xxx use
https://bugs.webkit.org/show_bug.cgi?id=180445

Reviewed by Saam Barati.

Source/WebCore:

We remove use of pthread locking primitives from WebThread implementation,
and use WTF Lock and Condition instead.

No behavior change.

* platform/ios/wak/WebCoreThread.mm:
(HandleDelegateSource):
(SendDelegateMessage):
(WebThreadRunOnMainThread):
(WebThreadAdoptAndRelease):
(WebCoreObjCDeallocOnWebThreadImpl):
(WebCoreObjCDeallocWithWebThreadLockImpl):
(HandleWebThreadReleaseSource):
(_WebThreadAutoLock):
(WebRunLoopLockInternal):
(CurrentThreadContext):
Use WTF::ThreadSpecific.

(StartWebThread):
(_WebThreadLock):
Remove `shouldTry` parameter since it is always `false`. We clean up code based on `shouldTry = false`,
and rename it from _WebTryThreadLock to _WebThreadLock since it does not try now.

(_WebThreadLockFromAnyThread):
(WebThreadUnlockFromAnyThread):
(_WebThreadUnlock):
(lockWebCoreReleaseLock): Deleted.
(unlockWebCoreReleaseLock): Deleted.
(WebTimedConditionLock): Deleted.
(_WebTryThreadLock): Deleted.

Source/WTF:

Add initializer form to fill struct with zero if struct does not have any default initializers.

* wtf/ThreadSpecific.h:
(WTF::ThreadSpecific::Data::Data):

Modified Paths

trunk/Source/WTF/ChangeLog
trunk/Source/WTF/wtf/ThreadSpecific.h
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/ios/wak/WebCoreThread.mm




Diff

Modified: trunk/Source/WTF/ChangeLog (225659 => 225660)

--- trunk/Source/WTF/ChangeLog	2017-12-08 01:22:06 UTC (rev 225659)
+++ trunk/Source/WTF/ChangeLog	2017-12-08 01:26:27 UTC (rev 225660)
@@ -1,3 +1,15 @@
+2017-12-07  Yusuke Suzuki  
+
+Use WTF Locking primitives in WebThread and drop pthread_xxx use
+https://bugs.webkit.org/show_bug.cgi?id=180445
+
+Reviewed by Saam Barati.
+
+Add initializer form to fill struct with zero if struct does not have any default initializers.
+
+* wtf/ThreadSpecific.h:
+(WTF::ThreadSpecific::Data::Data):
+
 2017-12-07  Mark Lam  
 
 Apply poisoning to some native code pointers.


Modified: trunk/Source/WTF/wtf/ThreadSpecific.h (225659 => 225660)

--- trunk/Source/WTF/wtf/ThreadSpecific.h	2017-12-08 01:22:06 UTC (rev 225659)
+++ trunk/Source/WTF/wtf/ThreadSpecific.h	2017-12-08 01:26:27 UTC (rev 225660)
@@ -101,7 +101,7 @@
 // Set up thread-specific value's memory pointer before invoking constructor, in case any function it calls
 // needs to access the value, to avoid recursion.
 owner->setInTLS(this);
-new (NotNull, storagePointer()) T;
+new (NotNull, storagePointer()) T();
 }
 
 ~Data()


Modified: trunk/Source/WebCore/ChangeLog (225659 => 225660)

--- trunk/Source/WebCore/ChangeLog	2017-12-08 01:22:06 UTC (rev 225659)
+++ trunk/Source/WebCore/ChangeLog	2017-12-08 01:26:27 UTC (rev 225660)
@@ -1,3 +1,41 @@
+2017-12-07  Yusuke Suzuki  
+
+Use WTF Locking primitives in WebThread and drop pthread_xxx use
+https://bugs.webkit.org/show_bug.cgi?id=180445
+
+Reviewed by Saam Barati.
+
+We remove use of pthread locking primitives from WebThread implementation,
+and use WTF Lock and Condition instead.
+
+No behavior change.
+
+* platform/ios/wak/WebCoreThread.mm:
+(HandleDelegateSource):
+(SendDelegateMessage):
+(WebThreadRunOnMainThread):
+(WebThreadAdoptAndRelease):
+(WebCoreObjCDeallocOnWebThreadImpl):
+(WebCoreObjCDeallocWithWebThreadLockImpl):
+(HandleWebThreadReleaseSource):
+(_WebThreadAutoLock):
+(WebRunLoopLockInternal):
+(CurrentThreadContext):
+Use WTF::ThreadSpecific.
+
+(StartWebThread):
+(_WebThreadLock):
+Remove `shouldTry` parameter since it is always `false`. We clean up code based on `shouldTry = false`,
+and rename it from _WebTryThreadLock to _WebThreadLock since it does not try now.
+
+(_WebThreadLockFromAnyThread):
+(WebThreadUnlockFromAnyThread):
+(_WebThreadUnlock):
+(lockWebCoreReleaseLock): Deleted.
+(unlockWebCoreReleaseLock): Deleted.
+(WebTimedConditionLock): Deleted.
+(_WebTryThreadLock): Deleted.
+
 2017-12-07  Alex Christensen  
 
 Fix API test after r225645.


Modified: trunk/Source/WebCore/platform/ios/wak/WebCoreThread.mm (225659 => 225660)

--- trunk/Source/WebCore/platform/ios/wak/WebCoreThread.mm	2017-12-08 01:22:06 UTC (rev 225659)
+++ trunk/Source/WebCore/platform/ios/wak/WebCoreThread.mm	2017-12-08 01:26:27 UTC (rev 225660)
@@ -42,6 +42,7 @@
 #import 
 #import 
 #import 
+#import 
 #import 
 #import 
 #import 
@@ -56,14 +57,13 @@
 

[webkit-changes] [225659] trunk/Source

[mark . lam]

Title: [225659] trunk/Source








Revision 225659
Author mark@apple.com
Date 2017-12-07 17:22:06 -0800 (Thu, 07 Dec 2017)


Log Message
Apply poisoning to some native code pointers.
https://bugs.webkit.org/show_bug.cgi?id=180541


Reviewed by Filip Pizlo.

Source/_javascript_Core:

Renamed g_classInfoPoison to g_globalDataPoison.
Renamed g_masmPoison to g_jitCodePoison.
Introduced g_nativeCodePoison.
Applied g_nativeCodePoison to poisoning some native code pointers.

Introduced non-random Int32 poison values (in JSCPoison.h) for use with pointers
to malloc allocated data structures (where needed).

* API/JSCallbackFunction.h:
(JSC::JSCallbackFunction::functionCallback):
* _javascript_Core.xcodeproj/project.pbxproj:
* jit/ThunkGenerators.cpp:
(JSC::nativeForGenerator):
* llint/LowLevelInterpreter64.asm:
* runtime/CustomGetterSetter.h:
(JSC::CustomGetterSetter::getter const):
(JSC::CustomGetterSetter::setter const):
* runtime/InternalFunction.cpp:
(JSC::InternalFunction::getCallData):
(JSC::InternalFunction::getConstructData):
* runtime/InternalFunction.h:
(JSC::InternalFunction::nativeFunctionFor):
* runtime/JSCPoison.h: Added.
* runtime/JSCPoisonedPtr.cpp:
(JSC::initializePoison):
* runtime/JSCPoisonedPtr.h:
* runtime/Lookup.h:
* runtime/NativeExecutable.cpp:
(JSC::NativeExecutable::hashFor const):
* runtime/NativeExecutable.h:
* runtime/Structure.cpp:
(JSC::StructureTransitionTable::setSingleTransition):
* runtime/StructureTransitionTable.h:
(JSC::StructureTransitionTable::StructureTransitionTable):
(JSC::StructureTransitionTable::isUsingSingleSlot const):
(JSC::StructureTransitionTable::map const):
(JSC::StructureTransitionTable::weakImpl const):
(JSC::StructureTransitionTable::setMap):

Source/WTF:

Ensure that the resultant poisoned bits still looks like a pointer in that its
bottom bits are 0, just like the alignment bits of a pointer.  This allows the
client to use the bottom bits of the poisoned bits as flag bits just like the
client was previously able to do with pointer values.

Note: we only ensure that the bottom alignment bits of the generated poison
value is 0.  We're not masking out the poisoned bits.  This means that the bottom
bits of the poisoned bits will only be null if the original pointer is aligned.
Hence, if the client applies the poison to an unaligned pointer, we do not lose
any information on the low bits.

Also removed 2 wrong assertions in PoisonedImpl's constructors.  We were
asserting that Poisoned will never be used with a null value, but that's invalid.
We do want to allow a null value so that we don't have to constantly do null
checks in the clients.  This was uncovered by some layout tests.

* wtf/Poisoned.cpp:
(WTF::makePoison):
* wtf/Poisoned.h:
(WTF::PoisonedImpl::PoisonedImpl):

Modified Paths

trunk/Source/_javascript_Core/API/JSCallbackFunction.h
trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj
trunk/Source/_javascript_Core/b3/B3LowerMacros.cpp
trunk/Source/_javascript_Core/b3/testb3.cpp
trunk/Source/_javascript_Core/dfg/DFGSpeculativeJIT.cpp
trunk/Source/_javascript_Core/ftl/FTLLowerDFGToB3.cpp
trunk/Source/_javascript_Core/jit/ThunkGenerators.cpp
trunk/Source/_javascript_Core/llint/LowLevelInterpreter64.asm
trunk/Source/_javascript_Core/runtime/CustomGetterSetter.h
trunk/Source/_javascript_Core/runtime/InternalFunction.cpp
trunk/Source/_javascript_Core/runtime/InternalFunction.h
trunk/Source/_javascript_Core/runtime/JSCPoisonedPtr.cpp
trunk/Source/_javascript_Core/runtime/JSCPoisonedPtr.h
trunk/Source/_javascript_Core/runtime/NativeExecutable.cpp
trunk/Source/_javascript_Core/runtime/NativeExecutable.h
trunk/Source/_javascript_Core/runtime/Structure.cpp
trunk/Source/_javascript_Core/runtime/StructureTransitionTable.h
trunk/Source/WTF/ChangeLog
trunk/Source/WTF/wtf/Poisoned.cpp
trunk/Source/WTF/wtf/Poisoned.h


Added Paths

trunk/Source/_javascript_Core/runtime/JSCPoison.h




Diff

Modified: trunk/Source/_javascript_Core/API/JSCallbackFunction.h (225658 => 225659)

--- trunk/Source/_javascript_Core/API/JSCallbackFunction.h	2017-12-08 01:12:18 UTC (rev 225658)
+++ trunk/Source/_javascript_Core/API/JSCallbackFunction.h	2017-12-08 01:22:06 UTC (rev 225659)
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006, 2008 Apple Inc. All rights reserved.
+ * Copyright (C) 2006-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
@@ -51,9 +51,9 @@
 JSCallbackFunction(VM&, Structure*, JSObjectCallAsFunctionCallback);
 void finishCreation(VM&, const String& name);
 
-JSObjectCallAsFunctionCallback functionCallback() { return m_callback; }
+JSObjectCallAsFunctionCallback functionCallback() { return m_callback.unpoisoned(); }
 
-JSObjectCallAsFunctionCallback m_callback;
+Poisoned m_callback;
 };
 
 } // namespace JSC

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

[sbarati]

Title: [225658] trunk/Source/WebKit








Revision 225658
Author sbar...@apple.com
Date 2017-12-07 17:12:18 -0800 (Thu, 07 Dec 2017)


Log Message
We need to grab the JSLock in InjectedBundle::createWebDataFromUint8Array
https://bugs.webkit.org/show_bug.cgi?id=180492

Reviewed by Alex Christensen.

InjectedBundle::createWebDataFromUint8Array calls into WebCore APIs that allocate
out of the JS heap. It's only legal to allocate out of the JS heap when holding the JS lock.

* WebProcess/InjectedBundle/InjectedBundle.cpp:
(WebKit::InjectedBundle::createWebDataFromUint8Array):

Modified Paths

trunk/Source/WebKit/ChangeLog
trunk/Source/WebKit/WebProcess/InjectedBundle/InjectedBundle.cpp




Diff

Modified: trunk/Source/WebKit/ChangeLog (225657 => 225658)

--- trunk/Source/WebKit/ChangeLog	2017-12-08 00:59:02 UTC (rev 225657)
+++ trunk/Source/WebKit/ChangeLog	2017-12-08 01:12:18 UTC (rev 225658)
@@ -1,3 +1,16 @@
+2017-12-07  Saam Barati  
+
+We need to grab the JSLock in InjectedBundle::createWebDataFromUint8Array
+https://bugs.webkit.org/show_bug.cgi?id=180492
+
+Reviewed by Alex Christensen.
+
+InjectedBundle::createWebDataFromUint8Array calls into WebCore APIs that allocate
+out of the JS heap. It's only legal to allocate out of the JS heap when holding the JS lock.
+
+* WebProcess/InjectedBundle/InjectedBundle.cpp:
+(WebKit::InjectedBundle::createWebDataFromUint8Array):
+
 2017-12-07  Simon Fraser  
 
 Propagate WebKit2Logging channels to the Web Process


Modified: trunk/Source/WebKit/WebProcess/InjectedBundle/InjectedBundle.cpp (225657 => 225658)

--- trunk/Source/WebKit/WebProcess/InjectedBundle/InjectedBundle.cpp	2017-12-08 00:59:02 UTC (rev 225657)
+++ trunk/Source/WebKit/WebProcess/InjectedBundle/InjectedBundle.cpp	2017-12-08 01:12:18 UTC (rev 225658)
@@ -581,6 +581,7 @@
 Ref InjectedBundle::createWebDataFromUint8Array(JSContextRef context, JSValueRef data)
 {
 JSC::ExecState* execState = toJS(context);
+JSLockHolder lock(execState);
 RefPtr arrayData = WebCore::toUnsharedUint8Array(execState->vm(), toJS(execState, data));
 return API::Data::create(static_cast(arrayData->baseAddress()), arrayData->byteLength());
 }






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

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

[achristensen]

Title: [225657] trunk/Source/WebCore








Revision 225657
Author achristen...@apple.com
Date 2017-12-07 16:59:02 -0800 (Thu, 07 Dec 2017)


Log Message
Fix API test after r225645.
https://bugs.webkit.org/show_bug.cgi?id=180544

* loader/FrameLoader.cpp:
(WebCore::FrameLoader::loadURL):
(WebCore::FrameLoader::loadWithDocumentLoader):
The API test WebKitLegacy.FragmentNavigation started failing after r225645.
It does call the completion handler with ignore to cancel fragment navigation.
To make this work and increase compatibility, only synchronously continue with
fragment navigations if we haven't received a synchronous answer to the
decidePolicyForNavigationAction callback.

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/loader/FrameLoader.cpp




Diff

Modified: trunk/Source/WebCore/ChangeLog (225656 => 225657)

--- trunk/Source/WebCore/ChangeLog	2017-12-08 00:56:18 UTC (rev 225656)
+++ trunk/Source/WebCore/ChangeLog	2017-12-08 00:59:02 UTC (rev 225657)
@@ -1,3 +1,17 @@
+2017-12-07  Alex Christensen  
+
+Fix API test after r225645.
+https://bugs.webkit.org/show_bug.cgi?id=180544
+
+* loader/FrameLoader.cpp:
+(WebCore::FrameLoader::loadURL):
+(WebCore::FrameLoader::loadWithDocumentLoader):
+The API test WebKitLegacy.FragmentNavigation started failing after r225645.
+It does call the completion handler with ignore to cancel fragment navigation.
+To make this work and increase compatibility, only synchronously continue with
+fragment navigations if we haven't received a synchronous answer to the
+decidePolicyForNavigationAction callback.
+
 2017-12-07  Oleksandr Skachkov  
 
 WebAssembly: sending module to iframe fails


Modified: trunk/Source/WebCore/loader/FrameLoader.cpp (225656 => 225657)

--- trunk/Source/WebCore/loader/FrameLoader.cpp	2017-12-08 00:56:18 UTC (rev 225656)
+++ trunk/Source/WebCore/loader/FrameLoader.cpp	2017-12-08 00:59:02 UTC (rev 225657)
@@ -1252,6 +1252,10 @@
 return m_pageDismissalEventBeingDispatched == PageDismissalType::None && NavigationDisabler::isNavigationAllowed(m_frame);
 }
 
+struct SharedBool : public RefCounted {
+bool value { false };
+};
+
 void FrameLoader::loadURL(FrameLoadRequest&& frameLoadRequest, const String& referrer, FrameLoadType newLoadType, Event* event, FormState* formState)
 {
 if (m_inStopAllLoaders)
@@ -1315,8 +1319,17 @@
 oldDocumentLoader->setLastCheckedRequest(ResourceRequest());
 policyChecker().stopCheck();
 policyChecker().setLoadType(newLoadType);
-continueFragmentScrollAfterNavigationPolicy(request, true);
-policyChecker().checkNavigationPolicy(WTFMove(request), false /* didReceiveRedirectResponse */, oldDocumentLoader.get(), formState, [] (const ResourceRequest&, FormState*, bool) { });
+auto completionHandlerCalled = adoptRef(*new SharedBool);
+policyChecker().checkNavigationPolicy(ResourceRequest(request), false /* didReceiveRedirectResponse */, oldDocumentLoader.get(), formState, [this, completionHandlerCalled = completionHandlerCalled.copyRef()] (const ResourceRequest& request, FormState*, bool shouldContinue) {
+if (!completionHandlerCalled->value) {
+completionHandlerCalled->value = true;
+continueFragmentScrollAfterNavigationPolicy(request, shouldContinue);
+}
+});
+if (!completionHandlerCalled->value) {
+completionHandlerCalled->value = true;
+continueFragmentScrollAfterNavigationPolicy(WTFMove(request), true);
+}
 return;
 }
 
@@ -1474,8 +1487,17 @@
 oldDocumentLoader->setTriggeringAction(action);
 oldDocumentLoader->setLastCheckedRequest(ResourceRequest());
 policyChecker().stopCheck();
-continueFragmentScrollAfterNavigationPolicy(loader->request(), true);
-policyChecker().checkNavigationPolicy(ResourceRequest(loader->request()), false /* didReceiveRedirectResponse */, oldDocumentLoader.get(), formState, [] (const ResourceRequest&, FormState*, bool) { });
+auto completionHandlerCalled = adoptRef(*new SharedBool);
+policyChecker().checkNavigationPolicy(ResourceRequest(loader->request()), false /* didReceiveRedirectResponse */, oldDocumentLoader.get(), formState, [this, completionHandlerCalled = completionHandlerCalled.copyRef()] (const ResourceRequest& request, FormState*, bool shouldContinue) {
+if (!completionHandlerCalled->value) {
+completionHandlerCalled->value = true;
+continueFragmentScrollAfterNavigationPolicy(request, shouldContinue);
+}
+});
+if (!completionHandlerCalled->value) {
+completionHandlerCalled->value = true;
+continueFragmentScrollAfterNavigationPolicy(loader->request(), true);
+}
 return;
 }
 

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

[simon . fraser]

Title: [225655] trunk/Source/WebKit








Revision 225655
Author simon.fra...@apple.com
Date 2017-12-07 16:54:51 -0800 (Thu, 07 Dec 2017)


Log Message
Propagate WebKit2Logging channels to the Web Process
https://bugs.webkit.org/show_bug.cgi?id=180517

Reviewed by Tim Horton.

If you set WebKit2Logging, you want those channels active in both the UI process and
the web process, but without tricky 'defaults' gyrations, setting them in the web process
was hard.

Instead, send them through to the process via WebProcessCreationParameters, as we do
for WebCoreLogging channels.

* Platform/LogInitialization.h:
* Platform/Logging.cpp:
(WebKit::initializeLogChannelsIfNecessary):
* Shared/WebProcessCreationParameters.cpp:
(WebKit::WebProcessCreationParameters::encode const):
(WebKit::WebProcessCreationParameters::decode):
* Shared/WebProcessCreationParameters.h:
* UIProcess/Cocoa/WebProcessPoolCocoa.mm:
(WebKit::WebProcessPool::platformInitializeWebProcess):
* WebProcess/cocoa/WebProcessCocoa.mm:
(WebKit::WebProcess::platformInitializeWebProcess):

Modified Paths

trunk/Source/WebKit/ChangeLog
trunk/Source/WebKit/Platform/LogInitialization.h
trunk/Source/WebKit/Platform/Logging.cpp
trunk/Source/WebKit/Shared/WebProcessCreationParameters.cpp
trunk/Source/WebKit/Shared/WebProcessCreationParameters.h
trunk/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm
trunk/Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm




Diff

Modified: trunk/Source/WebKit/ChangeLog (225654 => 225655)

--- trunk/Source/WebKit/ChangeLog	2017-12-08 00:22:55 UTC (rev 225654)
+++ trunk/Source/WebKit/ChangeLog	2017-12-08 00:54:51 UTC (rev 225655)
@@ -1,5 +1,31 @@
 2017-12-07  Simon Fraser  
 
+Propagate WebKit2Logging channels to the Web Process
+https://bugs.webkit.org/show_bug.cgi?id=180517
+
+Reviewed by Tim Horton.
+
+If you set WebKit2Logging, you want those channels active in both the UI process and
+the web process, but without tricky 'defaults' gyrations, setting them in the web process
+was hard.
+
+Instead, send them through to the process via WebProcessCreationParameters, as we do
+for WebCoreLogging channels.
+
+* Platform/LogInitialization.h:
+* Platform/Logging.cpp:
+(WebKit::initializeLogChannelsIfNecessary):
+* Shared/WebProcessCreationParameters.cpp:
+(WebKit::WebProcessCreationParameters::encode const):
+(WebKit::WebProcessCreationParameters::decode):
+* Shared/WebProcessCreationParameters.h:
+* UIProcess/Cocoa/WebProcessPoolCocoa.mm:
+(WebKit::WebProcessPool::platformInitializeWebProcess):
+* WebProcess/cocoa/WebProcessCocoa.mm:
+(WebKit::WebProcess::platformInitializeWebProcess):
+
+2017-12-07  Simon Fraser  
+
 Add logging for EditorState in RemoteLayerTree transactions
 https://bugs.webkit.org/show_bug.cgi?id=180515
 


Modified: trunk/Source/WebKit/Platform/LogInitialization.h (225654 => 225655)

--- trunk/Source/WebKit/Platform/LogInitialization.h	2017-12-08 00:22:55 UTC (rev 225654)
+++ trunk/Source/WebKit/Platform/LogInitialization.h	2017-12-08 00:54:51 UTC (rev 225655)
@@ -31,7 +31,7 @@
 
 namespace WebKit {
 
-void initializeLogChannelsIfNecessary(void);
+void initializeLogChannelsIfNecessary(std::optional = std::nullopt);
 String logLevelString();
 
 } // namespace WebKit


Modified: trunk/Source/WebKit/Platform/Logging.cpp (225654 => 225655)

--- trunk/Source/WebKit/Platform/Logging.cpp	2017-12-08 00:22:55 UTC (rev 225654)
+++ trunk/Source/WebKit/Platform/Logging.cpp	2017-12-08 00:54:51 UTC (rev 225655)
@@ -42,15 +42,17 @@
 namespace WebKit {
 
 static const size_t logChannelCount = WTF_ARRAY_LENGTH(logChannels);
+static bool logChannelsNeedInitialization = true;
 
-void initializeLogChannelsIfNecessary()
+void initializeLogChannelsIfNecessary(std::optional logChannelString)
 {
-static bool haveInitializedLoggingChannels = false;
-if (haveInitializedLoggingChannels)
+if (!logChannelsNeedInitialization && !logChannelString)
 return;
-haveInitializedLoggingChannels = true;
-
-WTFInitializeLogChannelStatesFromString(logChannels, logChannelCount, logLevelString().utf8().data());
+
+logChannelsNeedInitialization = false;
+
+String enabledChannelsString = logChannelString ? logChannelString.value() : logLevelString();
+WTFInitializeLogChannelStatesFromString(logChannels, logChannelCount, enabledChannelsString.utf8().data());
 }
 
 } // namespace WebKit


Modified: trunk/Source/WebKit/Shared/WebProcessCreationParameters.cpp (225654 => 225655)

--- trunk/Source/WebKit/Shared/WebProcessCreationParameters.cpp	2017-12-08 00:22:55 UTC (rev 225654)
+++ trunk/Source/WebKit/Shared/WebProcessCreationParameters.cpp	2017-12-08 00:54:51 UTC (rev 225655)
@@ -67,6 +67,7 @@
 #endif
 encoder << mediaKeyStorageDirectory;
 encoder << webCoreLoggingChannels;
+encoder << 

[webkit-changes] [225654] trunk/Source

[commit-queue]

Title: [225654] trunk/Source








Revision 225654
Author commit-qu...@webkit.org
Date 2017-12-07 16:22:55 -0800 (Thu, 07 Dec 2017)


Log Message
Web Inspector: Fix style in remote inspector classes
https://bugs.webkit.org/show_bug.cgi?id=180545

Patch by Joseph Pecoraro  on 2017-12-07
Reviewed by Youenn Fablet.

Source/_javascript_Core:

* inspector/remote/RemoteControllableTarget.h:
* inspector/remote/RemoteInspectionTarget.h:
* runtime/JSGlobalObjectDebuggable.h:

Source/WebCore:

* page/PageDebuggable.h:
* workers/service/context/ServiceWorkerDebuggable.h:

Modified Paths

trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/inspector/remote/RemoteControllableTarget.h
trunk/Source/_javascript_Core/inspector/remote/RemoteInspectionTarget.h
trunk/Source/_javascript_Core/runtime/JSGlobalObjectDebuggable.h
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/page/PageDebuggable.h
trunk/Source/WebCore/workers/service/context/ServiceWorkerDebuggable.h




Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (225653 => 225654)

--- trunk/Source/_javascript_Core/ChangeLog	2017-12-08 00:19:17 UTC (rev 225653)
+++ trunk/Source/_javascript_Core/ChangeLog	2017-12-08 00:22:55 UTC (rev 225654)
@@ -1,3 +1,14 @@
+2017-12-07  Joseph Pecoraro  
+
+Web Inspector: Fix style in remote inspector classes
+https://bugs.webkit.org/show_bug.cgi?id=180545
+
+Reviewed by Youenn Fablet.
+
+* inspector/remote/RemoteControllableTarget.h:
+* inspector/remote/RemoteInspectionTarget.h:
+* runtime/JSGlobalObjectDebuggable.h:
+
 2017-12-07  Per Arne Vollan  
 
 Use fastAlignedFree to free aligned memory.


Modified: trunk/Source/_javascript_Core/inspector/remote/RemoteControllableTarget.h (225653 => 225654)

--- trunk/Source/_javascript_Core/inspector/remote/RemoteControllableTarget.h	2017-12-08 00:19:17 UTC (rev 225653)
+++ trunk/Source/_javascript_Core/inspector/remote/RemoteControllableTarget.h	2017-12-08 00:22:55 UTC (rev 225654)
@@ -58,10 +58,11 @@
 
 #if USE(CF)
 // The dispatch block will be scheduled on a global run loop if null is returned.
-virtual CFRunLoopRef targetRunLoop() { return nullptr; }
+virtual CFRunLoopRef targetRunLoop() const { return nullptr; }
 #endif
+
 private:
-unsigned m_identifier {0};
+unsigned m_identifier { 0 };
 };
 
 } // namespace Inspector


Modified: trunk/Source/_javascript_Core/inspector/remote/RemoteInspectionTarget.h (225653 => 225654)

--- trunk/Source/_javascript_Core/inspector/remote/RemoteInspectionTarget.h	2017-12-08 00:19:17 UTC (rev 225653)
+++ trunk/Source/_javascript_Core/inspector/remote/RemoteInspectionTarget.h	2017-12-08 00:22:55 UTC (rev 225654)
@@ -42,7 +42,7 @@
 void setRemoteDebuggingAllowed(bool);
 
 #if USE(CF)
-CFRunLoopRef targetRunLoop() override { return m_runLoop.get(); }
+CFRunLoopRef targetRunLoop() const final { return m_runLoop.get(); }
 void setTargetRunLoop(CFRunLoopRef runLoop) { m_runLoop = runLoop; }
 #endif
 
@@ -57,9 +57,10 @@
 virtual void unpauseForInitializedInspector();
 
 // RemoteControllableTarget overrides.
-bool remoteControlAllowed() const override;
+bool remoteControlAllowed() const final;
+
 private:
-bool m_allowed {false};
+bool m_allowed { false };
 #if USE(CF)
 RetainPtr m_runLoop;
 #endif


Modified: trunk/Source/_javascript_Core/runtime/JSGlobalObjectDebuggable.h (225653 => 225654)

--- trunk/Source/_javascript_Core/runtime/JSGlobalObjectDebuggable.h	2017-12-08 00:19:17 UTC (rev 225653)
+++ trunk/Source/_javascript_Core/runtime/JSGlobalObjectDebuggable.h	2017-12-08 00:22:55 UTC (rev 225654)
@@ -46,17 +46,17 @@
 JSGlobalObjectDebuggable(JSGlobalObject&);
 ~JSGlobalObjectDebuggable() { }
 
-Inspector::RemoteControllableTarget::Type type() const override { return Inspector::RemoteControllableTarget::Type::_javascript_; }
+Inspector::RemoteControllableTarget::Type type() const final { return Inspector::RemoteControllableTarget::Type::_javascript_; }
 
-String name() const override;
-bool hasLocalDebugger() const override { return false; }
+String name() const final;
+bool hasLocalDebugger() const final { return false; }
 
-void connect(Inspector::FrontendChannel*, bool isAutomaticConnection = false, bool immediatelyPause = false) override;
-void disconnect(Inspector::FrontendChannel*) override;
-void dispatchMessageFromRemote(const String& message) override;
+void connect(Inspector::FrontendChannel*, bool isAutomaticConnection = false, bool immediatelyPause = false) final;
+void disconnect(Inspector::FrontendChannel*) final;
+void dispatchMessageFromRemote(const String& message) final;
 
-bool automaticInspectionAllowed() const override { return true; }
-void pauseWaitingForAutomaticInspection() override;
+bool automaticInspectionAllowed() const final { return true; }
+void 

[webkit-changes] [225653] trunk/LayoutTests

[jlewis3]

Title: [225653] trunk/LayoutTests








Revision 225653
Author jlew...@apple.com
Date 2017-12-07 16:19:17 -0800 (Thu, 07 Dec 2017)


Log Message
Skipped imported/w3c/web-platform-tests/XMLHttpRequest/event-upload-progress-crossorigin.htm on macOS WK1
https://bugs.webkit.org/show_bug.cgi?id=180554
https://bugs.webkit.org/show_bug.cgi?id=180553

Unreviewed test gardening.

* platform/mac-wk1/TestExpectations:

Modified Paths

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




Diff

Modified: trunk/LayoutTests/ChangeLog (225652 => 225653)

--- trunk/LayoutTests/ChangeLog	2017-12-08 00:18:00 UTC (rev 225652)
+++ trunk/LayoutTests/ChangeLog	2017-12-08 00:19:17 UTC (rev 225653)
@@ -1,3 +1,13 @@
+2017-12-07  Matt Lewis  
+
+Skipped imported/w3c/web-platform-tests/XMLHttpRequest/event-upload-progress-crossorigin.htm on macOS WK1
+https://bugs.webkit.org/show_bug.cgi?id=180554
+https://bugs.webkit.org/show_bug.cgi?id=180553
+
+Unreviewed test gardening.
+
+* platform/mac-wk1/TestExpectations:
+
 2017-12-07  Alex Christensen  
 
 Always synchronously continue with fragment navigations


Modified: trunk/LayoutTests/platform/mac-wk1/TestExpectations (225652 => 225653)

--- trunk/LayoutTests/platform/mac-wk1/TestExpectations	2017-12-08 00:18:00 UTC (rev 225652)
+++ trunk/LayoutTests/platform/mac-wk1/TestExpectations	2017-12-08 00:19:17 UTC (rev 225653)
@@ -388,7 +388,7 @@
 
 webkit.org/b/170877 [ Debug ] webgl/1.0.2/conformance/glsl/misc/shader-with-reserved-words.html [ Pass Timeout ]
 
-imported/w3c/web-platform-tests/XMLHttpRequest/event-upload-progress-crossorigin.htm [ Pass Crash ]
+webkit.org/b/180554 imported/w3c/web-platform-tests/XMLHttpRequest/event-upload-progress-crossorigin.htm [ Skip ]
 
 # Beacon is not supported on WK1.
 http/tests/blink/sendbeacon/ [ Skip ]






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

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

[pvollan]

Title: [225652] trunk/Source/_javascript_Core








Revision 225652
Author pvol...@apple.com
Date 2017-12-07 16:18:00 -0800 (Thu, 07 Dec 2017)


Log Message
Use fastAlignedFree to free aligned memory.
https://bugs.webkit.org/show_bug.cgi?id=180540

Reviewed by Saam Barati.

* heap/IsoAlignedMemoryAllocator.cpp:
(JSC::IsoAlignedMemoryAllocator::~IsoAlignedMemoryAllocator):

Modified Paths

trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/heap/IsoAlignedMemoryAllocator.cpp




Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (225651 => 225652)

--- trunk/Source/_javascript_Core/ChangeLog	2017-12-08 00:15:29 UTC (rev 225651)
+++ trunk/Source/_javascript_Core/ChangeLog	2017-12-08 00:18:00 UTC (rev 225652)
@@ -1,3 +1,13 @@
+2017-12-07  Per Arne Vollan  
+
+Use fastAlignedFree to free aligned memory.
+https://bugs.webkit.org/show_bug.cgi?id=180540
+
+Reviewed by Saam Barati.
+
+* heap/IsoAlignedMemoryAllocator.cpp:
+(JSC::IsoAlignedMemoryAllocator::~IsoAlignedMemoryAllocator):
+
 2017-12-07  Matt Lewis  
 
 Unreviewed, rolling out r225634.


Modified: trunk/Source/_javascript_Core/heap/IsoAlignedMemoryAllocator.cpp (225651 => 225652)

--- trunk/Source/_javascript_Core/heap/IsoAlignedMemoryAllocator.cpp	2017-12-08 00:15:29 UTC (rev 225651)
+++ trunk/Source/_javascript_Core/heap/IsoAlignedMemoryAllocator.cpp	2017-12-08 00:18:00 UTC (rev 225652)
@@ -38,7 +38,7 @@
 void* block = m_blocks[i];
 if (!m_committed[i])
 OSAllocator::commit(block, MarkedBlock::blockSize, true, false);
-fastFree(block);
+fastAlignedFree(block);
 }
 }
 






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

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

[simon . fraser]

Title: [225651] trunk/Source/WebKit








Revision 225651
Author simon.fra...@apple.com
Date 2017-12-07 16:15:29 -0800 (Thu, 07 Dec 2017)


Log Message
Add logging for EditorState in RemoteLayerTree transactions
https://bugs.webkit.org/show_bug.cgi?id=180515

Reviewed by Wenson Hsieh.

Make EditorState TextStream-able, and dump it in layer tree transactions.

* Shared/EditorState.cpp:
(WebKit::operator<<):
* Shared/EditorState.h:
* Shared/RemoteLayerTree/RemoteLayerTreeTransaction.mm:
(WebKit::RemoteLayerTreeTransaction::description const):

Modified Paths

trunk/Source/WebKit/ChangeLog
trunk/Source/WebKit/Shared/EditorState.cpp
trunk/Source/WebKit/Shared/EditorState.h
trunk/Source/WebKit/Shared/RemoteLayerTree/RemoteLayerTreeTransaction.mm




Diff

Modified: trunk/Source/WebKit/ChangeLog (225650 => 225651)

--- trunk/Source/WebKit/ChangeLog	2017-12-07 23:58:39 UTC (rev 225650)
+++ trunk/Source/WebKit/ChangeLog	2017-12-08 00:15:29 UTC (rev 225651)
@@ -1,3 +1,18 @@
+2017-12-07  Simon Fraser  
+
+Add logging for EditorState in RemoteLayerTree transactions
+https://bugs.webkit.org/show_bug.cgi?id=180515
+
+Reviewed by Wenson Hsieh.
+   
+Make EditorState TextStream-able, and dump it in layer tree transactions.
+
+* Shared/EditorState.cpp:
+(WebKit::operator<<):
+* Shared/EditorState.h:
+* Shared/RemoteLayerTree/RemoteLayerTreeTransaction.mm:
+(WebKit::RemoteLayerTreeTransaction::description const):
+
 2017-12-07  Youenn Fablet  
 
 CacheStorage Cache should not remove any disk entry when clearing its memory representation


Modified: trunk/Source/WebKit/Shared/EditorState.cpp (225650 => 225651)

--- trunk/Source/WebKit/Shared/EditorState.cpp	2017-12-07 23:58:39 UTC (rev 225650)
+++ trunk/Source/WebKit/Shared/EditorState.cpp	2017-12-08 00:15:29 UTC (rev 225651)
@@ -27,7 +27,10 @@
 #include "EditorState.h"
 
 #include "WebCoreArgumentCoders.h"
+#include 
 
+using namespace WebCore;
+
 namespace WebKit {
 
 void EditorState::encode(IPC::Encoder& encoder) const
@@ -202,4 +205,100 @@
 return true;
 }
 
+TextStream& operator<<(TextStream& ts, const EditorState& editorState)
+{
+#if PLATFORM(IOS)
+if (editorState.firstMarkedRect != IntRect())
+ts.dumpProperty("firstMarkedRect", editorState.firstMarkedRect);
+if (editorState.lastMarkedRect != IntRect())
+ts.dumpProperty("lastMarkedRect", editorState.lastMarkedRect);
+if (editorState.markedText.length())
+ts.dumpProperty("markedText", editorState.markedText);
+#endif
+
+if (editorState.shouldIgnoreSelectionChanges)
+ts.dumpProperty("shouldIgnoreSelectionChanges", editorState.shouldIgnoreSelectionChanges);
+if (!editorState.selectionIsNone)
+ts.dumpProperty("selectionIsNone", editorState.selectionIsNone);
+if (editorState.selectionIsRange)
+ts.dumpProperty("selectionIsRange", editorState.selectionIsRange);
+if (editorState.isContentEditable)
+ts.dumpProperty("isContentEditable", editorState.isContentEditable);
+if (editorState.isContentRichlyEditable)
+ts.dumpProperty("isContentRichlyEditable", editorState.isContentRichlyEditable);
+if (editorState.isInPasswordField)
+ts.dumpProperty("isInPasswordField", editorState.isInPasswordField);
+if (editorState.isInPlugin)
+ts.dumpProperty("isInPlugin", editorState.isInPlugin);
+if (editorState.hasComposition)
+ts.dumpProperty("hasComposition", editorState.hasComposition);
+if (editorState.isMissingPostLayoutData)
+ts.dumpProperty("isMissingPostLayoutData", editorState.isMissingPostLayoutData);
+
+if (editorState.isMissingPostLayoutData)
+return ts;
+
+TextStream::GroupScope scope(ts);
+ts << "postLayoutData";
+if (editorState.postLayoutData().typingAttributes != AttributeNone)
+ts.dumpProperty("typingAttributes", editorState.postLayoutData().typingAttributes);
+#if PLATFORM(IOS) || PLATFORM(GTK)
+if (editorState.postLayoutData().caretRectAtStart != IntRect())
+ts.dumpProperty("caretRectAtStart", editorState.postLayoutData().caretRectAtStart);
+#endif
+#if PLATFORM(IOS) || PLATFORM(MAC)
+if (editorState.postLayoutData().selectionClipRect != IntRect())
+ts.dumpProperty("selectionClipRect", editorState.postLayoutData().selectionClipRect);
+if (editorState.postLayoutData().selectedTextLength)
+ts.dumpProperty("selectedTextLength", editorState.postLayoutData().selectedTextLength);
+if (editorState.postLayoutData().textAlignment != NoAlignment)
+ts.dumpProperty("textAlignment", editorState.postLayoutData().textAlignment);
+if (editorState.postLayoutData().textColor.isValid())
+ts.dumpProperty("textColor", editorState.postLayoutData().textColor);
+if (editorState.postLayoutData().enclosingListType != NoList)
+ts.dumpProperty("enclosingListType", 

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

[antti]

Title: [225650] trunk/Source/WebCore








Revision 225650
Author an...@apple.com
Date 2017-12-07 15:58:39 -0800 (Thu, 07 Dec 2017)


Log Message
Move security origin filtering for getMatchedCSSRules out of StyleResolver
https://bugs.webkit.org/show_bug.cgi?id=180468

Reviewed by Zalan Bujtas.

The non-standard getMatchedCSSRules API should not return rules from stylesheets in different security origins.
To implement this we currently have lots of invasive code in StyleResolver, RuleSets and ElementRuleCollector
basically passing around a bit. This also makes RuleSets document specific blocking optimizations.

This patches replaces the mechanism with a bit in StyleRule which is much simpler.

* css/DocumentRuleSets.cpp:
(WebCore::makeRuleSet):
* css/ElementRuleCollector.cpp:
(WebCore::ElementRuleCollector::collectMatchingRulesForList):
* css/ElementRuleCollector.h:
(WebCore::ElementRuleCollector::setPseudoStyleRequest):
(WebCore::ElementRuleCollector::setSameOriginOnly): Deleted.
* css/RuleFeature.cpp:
(WebCore::RuleFeatureSet::collectFeatures):
* css/RuleFeature.h:
(WebCore::RuleFeature::RuleFeature):
* css/RuleSet.cpp:
(WebCore::RuleData::RuleData):
(WebCore::RuleSet::addRule):
(WebCore::RuleSet::addChildRules):
(WebCore::RuleSet::addRulesFromSheet):
(WebCore::RuleSet::addStyleRule):
* css/RuleSet.h:
(WebCore::RuleData::linkMatchType const):
(WebCore::RuleData::hasDocumentSecurityOrigin const): Deleted.
* css/StyleResolver.cpp:
(WebCore::StyleResolver::pseudoStyleRulesForElement):
* css/StyleResolver.h:
* css/StyleRule.cpp:
(WebCore::StyleRule::StyleRule):
(WebCore::StyleRule::createForSplitting):
(WebCore::StyleRule::splitIntoMultipleRulesWithMaximumSelectorComponentCount const):
(WebCore::StyleRule::create): Deleted.
* css/StyleRule.h:
(WebCore::StyleRuleBase::StyleRuleBase):
(WebCore::StyleRuleBase::hasDocumentSecurityOrigin const):

Add a bit.

* css/parser/CSSParser.cpp:
(WebCore::CSSParserContext::CSSParserContext):

Include hasDocumentSecurityOrigin bit to parser context. This means that a stylesheet data structures
can't be shared between a contexts where this differs. This likely very rare in practice.

(WebCore::operator==):
* css/parser/CSSParserImpl.cpp:
(WebCore::CSSParserImpl::consumeStyleRule):
* css/parser/CSSParserMode.h:
(WebCore::CSSParserContextHash::hash):
* editing/EditingStyle.cpp:
(WebCore::EditingStyle::mergeStyleFromRules):
* page/DOMWindow.cpp:
(WebCore::DOMWindow::getMatchedCSSRules const):

Filter out rules from different security origin after getting them from style resolver.

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/css/DocumentRuleSets.cpp
trunk/Source/WebCore/css/ElementRuleCollector.cpp
trunk/Source/WebCore/css/ElementRuleCollector.h
trunk/Source/WebCore/css/RuleFeature.cpp
trunk/Source/WebCore/css/RuleFeature.h
trunk/Source/WebCore/css/RuleSet.cpp
trunk/Source/WebCore/css/RuleSet.h
trunk/Source/WebCore/css/StyleResolver.cpp
trunk/Source/WebCore/css/StyleResolver.h
trunk/Source/WebCore/css/StyleRule.cpp
trunk/Source/WebCore/css/StyleRule.h
trunk/Source/WebCore/css/parser/CSSParser.cpp
trunk/Source/WebCore/css/parser/CSSParserImpl.cpp
trunk/Source/WebCore/css/parser/CSSParserMode.h
trunk/Source/WebCore/editing/EditingStyle.cpp
trunk/Source/WebCore/page/DOMWindow.cpp




Diff

Modified: trunk/Source/WebCore/ChangeLog (225649 => 225650)

--- trunk/Source/WebCore/ChangeLog	2017-12-07 23:55:42 UTC (rev 225649)
+++ trunk/Source/WebCore/ChangeLog	2017-12-07 23:58:39 UTC (rev 225650)
@@ -1,3 +1,68 @@
+2017-12-07  Antti Koivisto  
+
+Move security origin filtering for getMatchedCSSRules out of StyleResolver
+https://bugs.webkit.org/show_bug.cgi?id=180468
+
+Reviewed by Zalan Bujtas.
+
+The non-standard getMatchedCSSRules API should not return rules from stylesheets in different security origins.
+To implement this we currently have lots of invasive code in StyleResolver, RuleSets and ElementRuleCollector
+basically passing around a bit. This also makes RuleSets document specific blocking optimizations.
+
+This patches replaces the mechanism with a bit in StyleRule which is much simpler.
+
+* css/DocumentRuleSets.cpp:
+(WebCore::makeRuleSet):
+* css/ElementRuleCollector.cpp:
+(WebCore::ElementRuleCollector::collectMatchingRulesForList):
+* css/ElementRuleCollector.h:
+(WebCore::ElementRuleCollector::setPseudoStyleRequest):
+(WebCore::ElementRuleCollector::setSameOriginOnly): Deleted.
+* css/RuleFeature.cpp:
+(WebCore::RuleFeatureSet::collectFeatures):
+* css/RuleFeature.h:
+(WebCore::RuleFeature::RuleFeature):
+* css/RuleSet.cpp:
+(WebCore::RuleData::RuleData):
+(WebCore::RuleSet::addRule):
+(WebCore::RuleSet::addChildRules):
+(WebCore::RuleSet::addRulesFromSheet):
+(WebCore::RuleSet::addStyleRule):
+* css/RuleSet.h:
+ 

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

[zalan]

Title: [225649] trunk/Source/WebCore








Revision 225649
Author za...@apple.com
Date 2017-12-07 15:55:42 -0800 (Thu, 07 Dec 2017)


Log Message
AX: Document::existingAXObjectCache() should always return the existing AXObjectCache.
https://bugs.webkit.org/show_bug.cgi?id=180548


Reviewed by Chris Fleizach.

Currently the AX cache becomes unreachable through Document::existingAXObjectCache soon after the render tree is destroyed.
>From this point, the Node objects can't deregister themselves from the AX cache anymore. In some cases, it's
redundant/not advised to notify the cache about certain changes when the document is being destroyed, but the
callsites should make that decision.

Covered by existing tests.

* dom/Document.cpp:
(WebCore::Document::existingAXObjectCacheSlow const):
* rendering/RenderElement.cpp:
(WebCore::RenderElement::takeChildInternal):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/dom/Document.cpp
trunk/Source/WebCore/rendering/RenderElement.cpp




Diff

Modified: trunk/Source/WebCore/ChangeLog (225648 => 225649)

--- trunk/Source/WebCore/ChangeLog	2017-12-07 23:30:33 UTC (rev 225648)
+++ trunk/Source/WebCore/ChangeLog	2017-12-07 23:55:42 UTC (rev 225649)
@@ -1,3 +1,23 @@
+2017-12-07  Zalan Bujtas  
+
+AX: Document::existingAXObjectCache() should always return the existing AXObjectCache.
+https://bugs.webkit.org/show_bug.cgi?id=180548
+
+
+Reviewed by Chris Fleizach.
+
+Currently the AX cache becomes unreachable through Document::existingAXObjectCache soon after the render tree is destroyed.
+From this point, the Node objects can't deregister themselves from the AX cache anymore. In some cases, it's
+redundant/not advised to notify the cache about certain changes when the document is being destroyed, but the
+callsites should make that decision.
+
+Covered by existing tests.
+
+* dom/Document.cpp:
+(WebCore::Document::existingAXObjectCacheSlow const):
+* rendering/RenderElement.cpp:
+(WebCore::RenderElement::takeChildInternal):
+
 2017-12-07  Youenn Fablet  
 
 Fix erroneous ASSERT in DocumentThreadableLoader::didFail


Modified: trunk/Source/WebCore/dom/Document.cpp (225648 => 225649)

--- trunk/Source/WebCore/dom/Document.cpp	2017-12-07 23:30:33 UTC (rev 225648)
+++ trunk/Source/WebCore/dom/Document.cpp	2017-12-07 23:55:42 UTC (rev 225649)
@@ -2515,10 +2515,7 @@
 AXObjectCache* Document::existingAXObjectCacheSlow() const
 {
 ASSERT(hasEverCreatedAnAXObjectCache);
-Document& topDocument = this->topDocument();
-if (!topDocument.hasLivingRenderTree())
-return nullptr;
-return topDocument.m_axObjectCache.get();
+return topDocument().m_axObjectCache.get();
 }
 
 AXObjectCache* Document::axObjectCache() const


Modified: trunk/Source/WebCore/rendering/RenderElement.cpp (225648 => 225649)

--- trunk/Source/WebCore/rendering/RenderElement.cpp	2017-12-07 23:30:33 UTC (rev 225648)
+++ trunk/Source/WebCore/rendering/RenderElement.cpp	2017-12-07 23:55:42 UTC (rev 225649)
@@ -651,8 +651,10 @@
 if (!renderTreeBeingDestroyed() && is(oldChild))
 RenderCounter::rendererRemovedFromTree(downcast(oldChild));
 
-if (AXObjectCache* cache = document().existingAXObjectCache())
-cache->childrenChanged(this);
+if (!renderTreeBeingDestroyed()) {
+if (AXObjectCache* cache = document().existingAXObjectCache())
+cache->childrenChanged(this);
+}
 
 return RenderPtr();
 }






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

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

[commit-queue]

Title: [225648] trunk/Source/WebCore








Revision 225648
Author commit-qu...@webkit.org
Date 2017-12-07 15:30:33 -0800 (Thu, 07 Dec 2017)


Log Message
Fix erroneous ASSERT in DocumentThreadableLoader::didFail
https://bugs.webkit.org/show_bug.cgi?id=180549

Patch by Youenn Fablet  on 2017-12-07
Reviewed by Alex Christensen.

* loader/DocumentThreadableLoader.cpp:
(WebCore::DocumentThreadableLoader::didFail): ASSERT was checking whether the optional was null.
This could never be the case since we move the value of the optional, not the optional itself.
Ensure that the optional value is null so that we are sure request is being loaded and make the optional null just after that.

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/loader/DocumentThreadableLoader.cpp




Diff

Modified: trunk/Source/WebCore/ChangeLog (225647 => 225648)

--- trunk/Source/WebCore/ChangeLog	2017-12-07 23:25:04 UTC (rev 225647)
+++ trunk/Source/WebCore/ChangeLog	2017-12-07 23:30:33 UTC (rev 225648)
@@ -1,3 +1,15 @@
+2017-12-07  Youenn Fablet  
+
+Fix erroneous ASSERT in DocumentThreadableLoader::didFail
+https://bugs.webkit.org/show_bug.cgi?id=180549
+
+Reviewed by Alex Christensen.
+
+* loader/DocumentThreadableLoader.cpp:
+(WebCore::DocumentThreadableLoader::didFail): ASSERT was checking whether the optional was null.
+This could never be the case since we move the value of the optional, not the optional itself.
+Ensure that the optional value is null so that we are sure request is being loaded and make the optional null just after that.
+
 2017-12-07  Ryosuke Niwa  
 
 iOS: Many AMP pages crash inside Document::updateStyleIfNeeded


Modified: trunk/Source/WebCore/loader/DocumentThreadableLoader.cpp (225647 => 225648)

--- trunk/Source/WebCore/loader/DocumentThreadableLoader.cpp	2017-12-07 23:25:04 UTC (rev 225647)
+++ trunk/Source/WebCore/loader/DocumentThreadableLoader.cpp	2017-12-07 23:30:33 UTC (rev 225648)
@@ -410,7 +410,8 @@
 
 m_options.serviceWorkersMode = ServiceWorkersMode::None;
 makeCrossOriginAccessRequestWithPreflight(WTFMove(m_bypassingPreflightForServiceWorkerRequest.value()));
-ASSERT(!m_bypassingPreflightForServiceWorkerRequest);
+ASSERT(m_bypassingPreflightForServiceWorkerRequest->isNull());
+m_bypassingPreflightForServiceWorkerRequest = std::nullopt;
 return;
 }
 #endif






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

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

[rniwa]

Title: [225647] trunk/Source/WebCore








Revision 225647
Author rn...@webkit.org
Date 2017-12-07 15:25:04 -0800 (Thu, 07 Dec 2017)


Log Message
iOS: Many AMP pages crash inside Document::updateStyleIfNeeded
https://bugs.webkit.org/show_bug.cgi?id=180550


Reviewed by Zalan Bujtas.

The crash was caused when updatign the layout of an non-flattened frame inside a flattened frame.
In those cases, isInChildFrameWithFrameFlattening is false on the inner frame.

No new tests for now.

* dom/NoEventDispatchAssertion.h:
* rendering/RenderFrameBase.cpp:
(WebCore::RenderFrameBase::performLayoutWithFlattening): Disable the assertion temporarily here.
In theory, we should be able to remove the check for isInChildFrameWithFrameFlattening but we err
on the safer side for now.

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/dom/NoEventDispatchAssertion.h
trunk/Source/WebCore/rendering/RenderFrameBase.cpp




Diff

Modified: trunk/Source/WebCore/ChangeLog (225646 => 225647)

--- trunk/Source/WebCore/ChangeLog	2017-12-07 23:17:56 UTC (rev 225646)
+++ trunk/Source/WebCore/ChangeLog	2017-12-07 23:25:04 UTC (rev 225647)
@@ -1,3 +1,22 @@
+2017-12-07  Ryosuke Niwa  
+
+iOS: Many AMP pages crash inside Document::updateStyleIfNeeded
+https://bugs.webkit.org/show_bug.cgi?id=180550
+
+
+Reviewed by Zalan Bujtas.
+
+The crash was caused when updatign the layout of an non-flattened frame inside a flattened frame.
+In those cases, isInChildFrameWithFrameFlattening is false on the inner frame.
+
+No new tests for now.
+
+* dom/NoEventDispatchAssertion.h:
+* rendering/RenderFrameBase.cpp:
+(WebCore::RenderFrameBase::performLayoutWithFlattening): Disable the assertion temporarily here.
+In theory, we should be able to remove the check for isInChildFrameWithFrameFlattening but we err
+on the safer side for now.
+
 2017-12-07  Alex Christensen  
 
 Always synchronously continue with fragment navigations


Modified: trunk/Source/WebCore/dom/NoEventDispatchAssertion.h (225646 => 225647)

--- trunk/Source/WebCore/dom/NoEventDispatchAssertion.h	2017-12-07 23:17:56 UTC (rev 225646)
+++ trunk/Source/WebCore/dom/NoEventDispatchAssertion.h	2017-12-07 23:25:04 UTC (rev 225647)
@@ -129,7 +129,8 @@
 };
 #endif
 
-// FIXME: Remove this class once the sync layout inside SVGImage::draw is removed.
+// FIXME: Remove this class once the sync layout inside SVGImage::draw is removed
+// and refactored the code in RenderFrameBase::performLayoutWithFlattening.
 class DisableAssertionsInScope {
 public:
 DisableAssertionsInScope()


Modified: trunk/Source/WebCore/rendering/RenderFrameBase.cpp (225646 => 225647)

--- trunk/Source/WebCore/rendering/RenderFrameBase.cpp	2017-12-07 23:17:56 UTC (rev 225646)
+++ trunk/Source/WebCore/rendering/RenderFrameBase.cpp	2017-12-07 23:25:04 UTC (rev 225647)
@@ -29,6 +29,7 @@
 #include "Frame.h"
 #include "FrameView.h"
 #include "HTMLFrameElementBase.h"
+#include "NoEventDispatchAssertion.h"
 #include "RenderView.h"
 #include 
 
@@ -73,6 +74,8 @@
 
 void RenderFrameBase::performLayoutWithFlattening(bool hasFixedWidth, bool hasFixedHeight)
 {
+// FIXME: Refactor frame flattening code so that we don't need to disable assertions here.
+NoEventDispatchAssertion::DisableAssertionsInScope scope;
 if (!childRenderView())
 return;
 






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

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

[commit-queue]

Title: [225646] trunk/Source/WebKit








Revision 225646
Author commit-qu...@webkit.org
Date 2017-12-07 15:17:56 -0800 (Thu, 07 Dec 2017)


Log Message
CacheStorage Cache should not remove any disk entry when clearing its memory representation
https://bugs.webkit.org/show_bug.cgi?id=180546

Patch by Youenn Fablet  on 2017-12-07
Reviewed by Brady Eidson.

* NetworkProcess/cache/CacheStorageEngineCache.cpp:
(WebKit::CacheStorage::Cache::clearMemoryRepresentation):

Modified Paths

trunk/Source/WebKit/ChangeLog
trunk/Source/WebKit/NetworkProcess/cache/CacheStorageEngineCache.cpp




Diff

Modified: trunk/Source/WebKit/ChangeLog (225645 => 225646)

--- trunk/Source/WebKit/ChangeLog	2017-12-07 21:59:48 UTC (rev 225645)
+++ trunk/Source/WebKit/ChangeLog	2017-12-07 23:17:56 UTC (rev 225646)
@@ -1,3 +1,13 @@
+2017-12-07  Youenn Fablet  
+
+CacheStorage Cache should not remove any disk entry when clearing its memory representation
+https://bugs.webkit.org/show_bug.cgi?id=180546
+
+Reviewed by Brady Eidson.
+
+* NetworkProcess/cache/CacheStorageEngineCache.cpp:
+(WebKit::CacheStorage::Cache::clearMemoryRepresentation):
+
 2017-12-07  Myles C. Maxfield  
 
 [Cocoa] Add SPI to disallow user-installed fonts


Modified: trunk/Source/WebKit/NetworkProcess/cache/CacheStorageEngineCache.cpp (225645 => 225646)

--- trunk/Source/WebKit/NetworkProcess/cache/CacheStorageEngineCache.cpp	2017-12-07 21:59:48 UTC (rev 225645)
+++ trunk/Source/WebKit/NetworkProcess/cache/CacheStorageEngineCache.cpp	2017-12-07 23:17:56 UTC (rev 225646)
@@ -121,11 +121,6 @@
 
 void Cache::clearMemoryRepresentation()
 {
-for (auto& records : m_records.values()) {
-for (auto& record : records)
-removeRecordFromDisk(record);
-}
-
 m_records = { };
 m_nextRecordIdentifier = 0;
 m_state = State::Uninitialized;






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

[webkit-changes] [225645] trunk

[achristensen]

Title: [225645] trunk








Revision 225645
Author achristen...@apple.com
Date 2017-12-07 13:59:48 -0800 (Thu, 07 Dec 2017)


Log Message
Always synchronously continue with fragment navigations
https://bugs.webkit.org/show_bug.cgi?id=180544
 and 

Reviewed by Geoffrey Garen.

Source/WebCore:

Test: http/tests/dom/document-fragment.html

When a decidePolicyForNavigationAction completionHandler is called asynchronously,
the document's URL has not changed yet when _javascript_ execution continues.  This causes
significant web incompatibility because all browsers change the document's URL immediately
during fragment navigations.  In order to make WebKit applications more web compatible,
we now immediately continue to have the state consistent.  To keep compatibility with any
WebView, UIWebView, or WKWebView applications that use these delegate callbacks to update
state, we still call decidePolicyForNavigationAction.  This would break a theoretical app
that would cancel fragment navigations, but it fixes apps that continue fragment navigations
asynchronously.

* loader/FrameLoader.cpp:
(WebCore::FrameLoader::loadURL):
(WebCore::FrameLoader::loadWithDocumentLoader):

Tools:

* TestWebKitAPI/Tests/WebKitCocoa/DecidePolicyForNavigationAction.mm:
(-[DecidePolicyForNavigationActionFragmentDelegate webView:decidePolicyForNavigationAction:decisionHandler:]):
(TEST):
Add a test that verifies that decidePolicyForNavigationAction is called for fragment navigations.

LayoutTests:

* http/tests/dom/document-fragment-expected.txt: Added.
* http/tests/dom/document-fragment.html: Added.
Add a test that verifies that the fragment of the document is set immediately during a fragment navigation,
even if decidePolicyForNavigationAction is called asynchronously.  Also verify the order of various events
associated with the navigation.

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/loader/FrameLoader.cpp
trunk/Tools/ChangeLog
trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/DecidePolicyForNavigationAction.mm


Added Paths

trunk/LayoutTests/http/tests/dom/document-fragment-expected.txt
trunk/LayoutTests/http/tests/dom/document-fragment.html




Diff

Modified: trunk/LayoutTests/ChangeLog (225644 => 225645)

--- trunk/LayoutTests/ChangeLog	2017-12-07 21:46:11 UTC (rev 225644)
+++ trunk/LayoutTests/ChangeLog	2017-12-07 21:59:48 UTC (rev 225645)
@@ -1,3 +1,17 @@
+2017-12-07  Alex Christensen  
+
+Always synchronously continue with fragment navigations
+https://bugs.webkit.org/show_bug.cgi?id=180544
+ and 
+
+Reviewed by Geoffrey Garen.
+
+* http/tests/dom/document-fragment-expected.txt: Added.
+* http/tests/dom/document-fragment.html: Added.
+Add a test that verifies that the fragment of the document is set immediately during a fragment navigation,
+even if decidePolicyForNavigationAction is called asynchronously.  Also verify the order of various events
+associated with the navigation.
+
 2017-12-07  Youenn Fablet  
 
 Activate IDB and WebSockets in service workers


Added: trunk/LayoutTests/http/tests/dom/document-fragment-expected.txt (0 => 225645)

--- trunk/LayoutTests/http/tests/dom/document-fragment-expected.txt	(rev 0)
+++ trunk/LayoutTests/http/tests/dom/document-fragment-expected.txt	2017-12-07 21:59:48 UTC (rev 225645)
@@ -0,0 +1,2 @@
+ALERT: continuing with correct fragment, promise, popstate, hashchange, timeout
+


Added: trunk/LayoutTests/http/tests/dom/document-fragment.html (0 => 225645)

--- trunk/LayoutTests/http/tests/dom/document-fragment.html	(rev 0)
+++ trunk/LayoutTests/http/tests/dom/document-fragment.html	2017-12-07 21:59:48 UTC (rev 225645)
@@ -0,0 +1,27 @@
+
+
+if (window.testRunner) {
+testRunner.dumpAsText();
+testRunner.waitUntilDone();
+if (testRunner.setShouldDecideNavigationPolicyAfterDelay)
+testRunner.setShouldDecideNavigationPolicyAfterDelay(true);
+}
+
+var events = [];
+function eventHappened(eventName) {
+events.push(eventName);
+if (events.length == 5) {
+alert(events[0] + ", " + events[1] + ", " + events[2] + ", " + events[3] + ", " + events[4]);
+if (window.testRunner)
+testRunner.notifyDone();
+}
+}
+
+window._onhashchange_ = ()=>{ eventHappened("hashchange") }
+window._onpopstate_ = ()=>{ eventHappened("popstate") };
+window.location.href = ""
+Promise.resolve().then(()=>{ eventHappened("promise") });
+setTimeout(()=>{ eventHappened("timeout") }, 0)
+eventHappened("continuing with " + (document.URL.endsWith("#fragment") ? "correct fragment" : "incorrect fragment"));
+
+


Modified: trunk/Source/WebCore/ChangeLog (225644 => 225645)

--- trunk/Source/WebCore/ChangeLog	2017-12-07 21:46:11 UTC (rev 225644)
+++ trunk/Source/WebCore/ChangeLog	2017-12-07 21:59:48 UTC (rev 225645)
@@ -1,3 +1,27 @@
+2017-12-07  Alex 

[webkit-changes] [225644] trunk

[commit-queue]

Title: [225644] trunk








Revision 225644
Author commit-qu...@webkit.org
Date 2017-12-07 13:46:11 -0800 (Thu, 07 Dec 2017)


Log Message
Activate IDB and WebSockets in service workers
https://bugs.webkit.org/show_bug.cgi?id=180534

Patch by Youenn Fablet  on 2017-12-07
Reviewed by Brady Eidson.

LayoutTests/imported/w3c:

* web-platform-tests/service-workers/service-worker/websocket-in-service-worker.https-expected.txt:

Source/WebCore:

Tests: http/tests/workers/service/serviceworker-idb.https.html
   http/tests/workers/service/serviceworker-websocket.https.html

Using the dummy document used for loading to also fuel IDB and WebSocket.

* workers/service/context/ServiceWorkerThread.cpp:
(WebCore::ServiceWorkerThread::ServiceWorkerThread):
* workers/service/context/ServiceWorkerThread.h:
* workers/service/context/ServiceWorkerThreadProxy.cpp:
(WebCore::idbConnectionProxy):
(WebCore::ServiceWorkerThreadProxy::ServiceWorkerThreadProxy):

LayoutTests:

* http/tests/workers/service/resources/serviceworker-idb-worker.js: Added.
* http/tests/workers/service/resources/serviceworker-websocket-worker.js: Added.
* http/tests/workers/service/serviceworker-idb.https-expected.txt: Added.
* http/tests/workers/service/serviceworker-idb.https.html: Added.
* http/tests/workers/service/serviceworker-websocket.https-expected.txt: Added.
* http/tests/workers/service/serviceworker-websocket.https.html: Added.

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/LayoutTests/TestExpectations
trunk/LayoutTests/imported/w3c/ChangeLog
trunk/LayoutTests/imported/w3c/web-platform-tests/service-workers/service-worker/websocket-in-service-worker.https-expected.txt
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/workers/service/context/ServiceWorkerThread.cpp
trunk/Source/WebCore/workers/service/context/ServiceWorkerThread.h
trunk/Source/WebCore/workers/service/context/ServiceWorkerThreadProxy.cpp


Added Paths

trunk/LayoutTests/http/tests/workers/service/resources/serviceworker-idb-worker.js
trunk/LayoutTests/http/tests/workers/service/resources/serviceworker-websocket-worker.js
trunk/LayoutTests/http/tests/workers/service/serviceworker-idb.https-expected.txt
trunk/LayoutTests/http/tests/workers/service/serviceworker-idb.https.html
trunk/LayoutTests/http/tests/workers/service/serviceworker-websocket.https-expected.txt
trunk/LayoutTests/http/tests/workers/service/serviceworker-websocket.https.html




Diff

Modified: trunk/LayoutTests/ChangeLog (225643 => 225644)

--- trunk/LayoutTests/ChangeLog	2017-12-07 21:28:19 UTC (rev 225643)
+++ trunk/LayoutTests/ChangeLog	2017-12-07 21:46:11 UTC (rev 225644)
@@ -1,3 +1,17 @@
+2017-12-07  Youenn Fablet  
+
+Activate IDB and WebSockets in service workers
+https://bugs.webkit.org/show_bug.cgi?id=180534
+
+Reviewed by Brady Eidson.
+
+* http/tests/workers/service/resources/serviceworker-idb-worker.js: Added.
+* http/tests/workers/service/resources/serviceworker-websocket-worker.js: Added.
+* http/tests/workers/service/serviceworker-idb.https-expected.txt: Added.
+* http/tests/workers/service/serviceworker-idb.https.html: Added.
+* http/tests/workers/service/serviceworker-websocket.https-expected.txt: Added.
+* http/tests/workers/service/serviceworker-websocket.https.html: Added.
+
 2017-12-07  Jer Noble  
 
 [EME] Support the 'encrypted' event for FPS encrypted streams


Modified: trunk/LayoutTests/TestExpectations (225643 => 225644)

--- trunk/LayoutTests/TestExpectations	2017-12-07 21:28:19 UTC (rev 225643)
+++ trunk/LayoutTests/TestExpectations	2017-12-07 21:46:11 UTC (rev 225644)
@@ -161,7 +161,6 @@
 imported/w3c/web-platform-tests/service-workers/service-worker/update-after-navigation-fetch-event.https.html [ Skip ]
 imported/w3c/web-platform-tests/service-workers/service-worker/update-after-oneday.https.html [ Skip ]
 imported/w3c/web-platform-tests/service-workers/service-worker/update-recovery.https.html [ Skip ]
-imported/w3c/web-platform-tests/service-workers/service-worker/websocket-in-service-worker.https.html [ Skip ]
 imported/w3c/web-platform-tests/service-workers/service-worker/client-navigate.https.html [ Skip ]
 
 webkit.org/b/179342 http/tests/workers/service/registration-task-queue-scheduling-1.html [ Pass Failure ]


Added: trunk/LayoutTests/http/tests/workers/service/resources/serviceworker-idb-worker.js (0 => 225644)

--- trunk/LayoutTests/http/tests/workers/service/resources/serviceworker-idb-worker.js	(rev 0)
+++ trunk/LayoutTests/http/tests/workers/service/resources/serviceworker-idb-worker.js	2017-12-07 21:46:11 UTC (rev 225644)
@@ -0,0 +1,11 @@
+async function doTest(event)
+{
+if (!event.data.startsWith("TESTIDB")) {
+event.source.postMessage("FAIL: received unexpected message from client");
+return;
+}
+
+event.source.postMessage(!!self.indexedDB ? "PASS" : "FAIL: 

[webkit-changes] [225643] trunk/Source

[jlewis3]

Title: [225643] trunk/Source








Revision 225643
Author jlew...@apple.com
Date 2017-12-07 13:28:19 -0800 (Thu, 07 Dec 2017)


Log Message
Unreviewed, rolling out r225634.

This caused layout tests to time out.

Reverted changeset:

"Simplify log channel configuration UI"
https://bugs.webkit.org/show_bug.cgi?id=180527
https://trac.webkit.org/changeset/225634

Modified Paths

trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/inspector/protocol/Console.json
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/inspector/agents/WebConsoleAgent.cpp
trunk/Source/WebInspectorUI/ChangeLog
trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js
trunk/Source/WebInspectorUI/UserInterface/Models/LoggingChannel.js
trunk/Source/WebInspectorUI/UserInterface/Views/SettingsTabContentView.js




Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (225642 => 225643)

--- trunk/Source/_javascript_Core/ChangeLog	2017-12-07 21:04:21 UTC (rev 225642)
+++ trunk/Source/_javascript_Core/ChangeLog	2017-12-07 21:28:19 UTC (rev 225643)
@@ -1,3 +1,15 @@
+2017-12-07  Matt Lewis  
+
+Unreviewed, rolling out r225634.
+
+This caused layout tests to time out.
+
+Reverted changeset:
+
+"Simplify log channel configuration UI"
+https://bugs.webkit.org/show_bug.cgi?id=180527
+https://trac.webkit.org/changeset/225634
+
 2017-12-07  Eric Carlson  
 
 Simplify log channel configuration UI


Modified: trunk/Source/_javascript_Core/inspector/protocol/Console.json (225642 => 225643)

--- trunk/Source/_javascript_Core/inspector/protocol/Console.json	2017-12-07 21:04:21 UTC (rev 225642)
+++ trunk/Source/_javascript_Core/inspector/protocol/Console.json	2017-12-07 21:28:19 UTC (rev 225643)
@@ -12,7 +12,7 @@
 {
 "id": "ChannelLevel",
 "type": "string",
-"enum": ["off", "basic", "verbose"],
+"enum": ["off", "log", "error", "warning", "info", "debug"],
 "description": "Level of logging."
 },
 {


Modified: trunk/Source/WebCore/ChangeLog (225642 => 225643)

--- trunk/Source/WebCore/ChangeLog	2017-12-07 21:04:21 UTC (rev 225642)
+++ trunk/Source/WebCore/ChangeLog	2017-12-07 21:28:19 UTC (rev 225643)
@@ -1,3 +1,15 @@
+2017-12-07  Matt Lewis  
+
+Unreviewed, rolling out r225634.
+
+This caused layout tests to time out.
+
+Reverted changeset:
+
+"Simplify log channel configuration UI"
+https://bugs.webkit.org/show_bug.cgi?id=180527
+https://trac.webkit.org/changeset/225634
+
 2017-12-07  Jer Noble  
 
 [EME] Support the 'encrypted' event for FPS encrypted streams


Modified: trunk/Source/WebCore/inspector/agents/WebConsoleAgent.cpp (225642 => 225643)

--- trunk/Source/WebCore/inspector/agents/WebConsoleAgent.cpp	2017-12-07 21:04:21 UTC (rev 225642)
+++ trunk/Source/WebCore/inspector/agents/WebConsoleAgent.cpp	2017-12-07 21:28:19 UTC (rev 225643)
@@ -66,17 +66,23 @@
 if (!logChannel)
 return;
 
-auto level = Inspector::Protocol::Console::ChannelLevel::Off;
+Inspector::Protocol::Console::ChannelLevel level = Inspector::Protocol::Console::ChannelLevel::Off;
 if (logChannel->state != WTFLogChannelOff) {
 switch (logChannel->level) {
 case WTFLogLevelAlways:
+level = Inspector::Protocol::Console::ChannelLevel::Log;
+break;
 case WTFLogLevelError:
+level = Inspector::Protocol::Console::ChannelLevel::Error;
+break;
 case WTFLogLevelWarning:
-level = Inspector::Protocol::Console::ChannelLevel::Basic;
+level = Inspector::Protocol::Console::ChannelLevel::Warning;
 break;
 case WTFLogLevelInfo:
+level = Inspector::Protocol::Console::ChannelLevel::Info;
+break;
 case WTFLogLevelDebug:
-level = Inspector::Protocol::Console::ChannelLevel::Verbose;
+level = Inspector::Protocol::Console::ChannelLevel::Debug;
 break;
 }
 }
@@ -99,9 +105,15 @@
 level = WTFLogLevelError;
 } else {
 state = WTFLogChannelOn;
-if (equalIgnoringASCIICase(levelString, "basic"))
+if (equalIgnoringASCIICase(levelString, "log"))
+level = WTFLogLevelAlways;
+else if (equalIgnoringASCIICase(levelString, "error"))
+level = WTFLogLevelError;
+else if (equalIgnoringASCIICase(levelString, "warning"))
 level = WTFLogLevelWarning;
-else if (equalIgnoringASCIICase(levelString, "verbose"))
+else if (equalIgnoringASCIICase(levelString, "info"))
+level = WTFLogLevelInfo;
+else if (equalIgnoringASCIICase(levelString, "debug"))
 level = 

[webkit-changes] [225642] trunk

[jer . noble]

Title: [225642] trunk








Revision 225642
Author jer.no...@apple.com
Date 2017-12-07 13:04:21 -0800 (Thu, 07 Dec 2017)


Log Message
[EME] Support the 'encrypted' event for FPS encrypted streams
https://bugs.webkit.org/show_bug.cgi?id=180480

Reviewed by Eric Carlson.

Source/WebCore:

Test: platform/mac/media/encrypted-media/fps-encrypted-event.html

Pass initData and initDataType up to HTMLMediaElement from SourceBufferPrivateAVFObjC.

Drive-by fix: initialize the initData and initDataType values of MediaEncryptedEvent from
values in its initializer struct.

* html/HTMLMediaElement.cpp:
(WebCore::HTMLMediaElement::mediaPlayerKeyNeeded):
(WebCore::HTMLMediaElement::mediaPlayerInitializationDataEncountered):
* html/MediaEncryptedEvent.cpp:
(WebCore::MediaEncryptedEvent::MediaEncryptedEvent):
(WebCore::MediaEncryptedEvent::initDataType): Deleted.
(WebCore::MediaEncryptedEvent::initData): Deleted.
* html/MediaEncryptedEvent.h:
* platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.h:
* platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm:
(WebCore::MediaPlayerPrivateMediaSourceAVFObjC::cdmInstanceAttached):
* platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm:
(WebCore::SourceBufferPrivateAVFObjC::didProvideContentKeyRequestInitializationDataForTrackID):

LayoutTests:

* platform/mac/TestExpectations:
* platform/mac/media/encrypted-media/content/fps-cbcs.mp4: Added.
* platform/mac/media/encrypted-media/fps-encrypted-event-expected.txt: Added.
* platform/mac/media/encrypted-media/fps-encrypted-event.html: Added.

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/LayoutTests/platform/mac/TestExpectations
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/html/HTMLMediaElement.cpp
trunk/Source/WebCore/html/MediaEncryptedEvent.cpp
trunk/Source/WebCore/html/MediaEncryptedEvent.h
trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.h
trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm
trunk/Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm


Added Paths

trunk/LayoutTests/platform/mac/media/encrypted-media/content/
trunk/LayoutTests/platform/mac/media/encrypted-media/content/fps-cbcs.mp4
trunk/LayoutTests/platform/mac/media/encrypted-media/fps-encrypted-event-expected.txt
trunk/LayoutTests/platform/mac/media/encrypted-media/fps-encrypted-event.html




Diff

Modified: trunk/LayoutTests/ChangeLog (225641 => 225642)

--- trunk/LayoutTests/ChangeLog	2017-12-07 20:29:03 UTC (rev 225641)
+++ trunk/LayoutTests/ChangeLog	2017-12-07 21:04:21 UTC (rev 225642)
@@ -1,3 +1,15 @@
+2017-12-07  Jer Noble  
+
+[EME] Support the 'encrypted' event for FPS encrypted streams
+https://bugs.webkit.org/show_bug.cgi?id=180480
+
+Reviewed by Eric Carlson.
+
+* platform/mac/TestExpectations:
+* platform/mac/media/encrypted-media/content/fps-cbcs.mp4: Added.
+* platform/mac/media/encrypted-media/fps-encrypted-event-expected.txt: Added.
+* platform/mac/media/encrypted-media/fps-encrypted-event.html: Added.
+
 2017-12-07  Myles C. Maxfield  
 
 [Cocoa] Add SPI to disallow user-installed fonts


Modified: trunk/LayoutTests/platform/mac/TestExpectations (225641 => 225642)

--- trunk/LayoutTests/platform/mac/TestExpectations	2017-12-07 20:29:03 UTC (rev 225641)
+++ trunk/LayoutTests/platform/mac/TestExpectations	2017-12-07 21:04:21 UTC (rev 225642)
@@ -1747,6 +1747,7 @@
 [ ElCapitan Sierra ] platform/mac/media/encrypted-media/fps-requestMediaKeySystemAccess.html [ Skip ]
 [ ElCapitan Sierra ] platform/mac/media/encrypted-media/fps-createSession.html [ Skip ]
 [ ElCapitan Sierra ] platform/mac/media/encrypted-media/fps-generateRequest.html [ Skip ]
+[ ElCapitan Sierra ] platform/mac/media/encrypted-media/fps-encrypted-event.html [ Skip ]
 
 # rdar://problem/35395437
 [ HighSierra+ ] imported/w3c/web-platform-tests/media-source/mediasource-play.html [ Failure ]


Added: trunk/LayoutTests/platform/mac/media/encrypted-media/content/fps-cbcs.mp4 (0 => 225642)

--- trunk/LayoutTests/platform/mac/media/encrypted-media/content/fps-cbcs.mp4	(rev 0)
+++ trunk/LayoutTests/platform/mac/media/encrypted-media/content/fps-cbcs.mp4	2017-12-07 21:04:21 UTC (rev 225642)
@@ -0,0 +1,7 @@
+ ftypmp42
mp41mp42isomhlsf*moovlmvhd՝"r՝"r	\xC4



@+trak\tkhd
՝"r՝"r



@
\xA9mdia mdhd՝"r՝"r\xACD\xC71hdlrsounCore Media 

[webkit-changes] [225639] trunk

[commit-queue]

Title: [225639] trunk








Revision 225639
Author commit-qu...@webkit.org
Date 2017-12-07 12:04:37 -0800 (Thu, 07 Dec 2017)


Log Message
[Web App Manifest] Support display-mode media feature
https://bugs.webkit.org/show_bug.cgi?id=180376
rdar://problem/35837993

Patch by David Quesada  on 2017-12-07
Reviewed by Geoffrey Garen.

Source/WebCore:

Tests: applicationmanifest/display-mode-subframe.html
   applicationmanifest/display-mode.html

* Modules/applicationmanifest/ApplicationManifest.h:
(WebCore::ApplicationManifest::encode const):
(WebCore::ApplicationManifest::decode):
* Modules/applicationmanifest/ApplicationManifestParser.cpp:
(WebCore::ApplicationManifestParser::parseManifest):
(WebCore::ApplicationManifestParser::parseDisplay):
* Modules/applicationmanifest/ApplicationManifestParser.h:
Add a 'display' property to ApplicationManifest and have ApplicationManifestParser
populate it by parsing the 'display' property from the raw manifest.

* css/CSSValueKeywords.in:
* css/MediaFeatureNames.h:
* css/MediaQueryEvaluator.cpp:
(WebCore::displayModeEvaluate):
To evaluate whether a display-mode query matches, compare the parameter to the
display mode of the manifest applied to the main frame. If there is no manifest,
use the fallback display mode 'browser' - the spec mandates that display-mode
must be exposed even if there is no applied manifest.
* css/MediaQueryExpression.cpp:
(WebCore::featureWithValidIdent):
(WebCore::isFeatureValidWithoutValue):

Source/WebKit:

* UIProcess/API/Cocoa/_WKApplicationManifest.h:
* UIProcess/API/Cocoa/_WKApplicationManifest.mm:
(-[_WKApplicationManifest initWithCoder:]):
(-[_WKApplicationManifest encodeWithCoder:]):
(-[_WKApplicationManifest displayMode]):

Tools:

* TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj:
* TestWebKitAPI/Tests/WebCore/ApplicationManifestParser.cpp:
(WebCore::operator<<):
(ApplicationManifestParserTest::testDisplay):
(TEST_F):
Add unit tests for the parsing of the 'display' manifest property.

* TestWebKitAPI/Tests/WebKitCocoa/ApplicationManifest.mm:
(TestWebKitAPI::TEST):
* TestWebKitAPI/Tests/WebKitCocoa/display-mode.html: Added.
Update API tests to include _WKApplicationManifest.displayMode.

* WebKitTestRunner/TestController.cpp:
(WTR::parseStringTestHeaderValueAsRelativePath):
(WTR::updateTestOptionsFromTestHeader):
* WebKitTestRunner/TestOptions.h:
(WTR::TestOptions::hasSameInitializationOptions const):
* WebKitTestRunner/cocoa/TestControllerCocoa.mm:
(WTR::TestController::platformCreateWebView):
Teach WKTR to look for and apply an app manifest. A new 
directive 'applicationManifest' can specify a path (relative to the test file itself)
to a JSON app manifest to be applied to the web view before running the test.

LayoutTests:

* applicationmanifest/display-mode-expected.txt: Added.
* applicationmanifest/display-mode-subframe-expected.txt: Added.
* applicationmanifest/display-mode-subframe.html: Added.
* applicationmanifest/display-mode.html: Added.
* applicationmanifest/resources/display-mode-subframe-1.html: Added.
* applicationmanifest/resources/standalone.manifest: Added.

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/Modules/applicationmanifest/ApplicationManifest.h
trunk/Source/WebCore/Modules/applicationmanifest/ApplicationManifestParser.cpp
trunk/Source/WebCore/Modules/applicationmanifest/ApplicationManifestParser.h
trunk/Source/WebCore/css/CSSValueKeywords.in
trunk/Source/WebCore/css/MediaFeatureNames.h
trunk/Source/WebCore/css/MediaQueryEvaluator.cpp
trunk/Source/WebCore/css/MediaQueryExpression.cpp
trunk/Source/WebKit/ChangeLog
trunk/Source/WebKit/UIProcess/API/Cocoa/_WKApplicationManifest.h
trunk/Source/WebKit/UIProcess/API/Cocoa/_WKApplicationManifest.mm
trunk/Tools/ChangeLog
trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj
trunk/Tools/TestWebKitAPI/Tests/WebCore/ApplicationManifestParser.cpp
trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/ApplicationManifest.mm
trunk/Tools/WebKitTestRunner/TestController.cpp
trunk/Tools/WebKitTestRunner/TestOptions.h
trunk/Tools/WebKitTestRunner/cocoa/TestControllerCocoa.mm


Added Paths

trunk/LayoutTests/applicationmanifest/display-mode-expected.txt
trunk/LayoutTests/applicationmanifest/display-mode-no-manifest-expected.txt
trunk/LayoutTests/applicationmanifest/display-mode-no-manifest.html
trunk/LayoutTests/applicationmanifest/display-mode-subframe-expected.txt
trunk/LayoutTests/applicationmanifest/display-mode-subframe.html
trunk/LayoutTests/applicationmanifest/display-mode.html
trunk/LayoutTests/applicationmanifest/resources/display-mode-subframe-1.html
trunk/LayoutTests/applicationmanifest/resources/standalone.manifest
trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/display-mode.html




Diff

Modified: trunk/LayoutTests/ChangeLog (225638 => 225639)

--- trunk/LayoutTests/ChangeLog	2017-12-07 19:56:25 UTC (rev 225638)
+++ 

[webkit-changes] [225637] trunk

[jer . noble]

Title: [225637] trunk








Revision 225637
Author jer.no...@apple.com
Date 2017-12-07 11:46:53 -0800 (Thu, 07 Dec 2017)


Log Message
[EME] Support generateRequest() in CDMFairPlayStreaming
https://bugs.webkit.org/show_bug.cgi?id=179752

Reviewed by Eric Carlson.

Source/WebCore:

Tests: platform/mac/media/encrypted-media/fps-createSession.html
   platform/mac/media/encrypted-media/fps-generateRequest.html

Add support for generating license requests from initialization data in
CDMFairPlayStreaming. To do so, add explicit checks for FairPlay Steraming requirements:
reqests will fail if no server certificate exists, and will fail if no content key id exists
in the initialization data.

* platform/graphics/avfoundation/CDMFairPlayStreaming.cpp:
(WebCore::CDMPrivateFairPlayStreaming::extractKeyIDsSinf):
(WebCore::CDMPrivateFairPlayStreaming::sanitizeSinf):
(WebCore::CDMFactory::platformRegisterFactories):
* platform/graphics/avfoundation/CDMFairPlayStreaming.h:
* platform/graphics/avfoundation/objc/CDMInstanceFairPlayStreamingAVFObjC.mm:
(WebCore::CDMInstanceFairPlayStreamingAVFObjC::requestLicense):
(WebCore::CDMInstanceFairPlayStreamingAVFObjC::didProvideRequest):

LayoutTests:

* platform/mac/TestExpectations:
* platform/mac/media/encrypted-media/fps-createSession-expected.txt: Added.
* platform/mac/media/encrypted-media/fps-createSession.html: Added.
* platform/mac/media/encrypted-media/fps-generateRequest-expected.txt: Added.
* platform/mac/media/encrypted-media/fps-generateRequest.html: Added.

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/LayoutTests/platform/mac/TestExpectations
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/graphics/avfoundation/CDMFairPlayStreaming.cpp
trunk/Source/WebCore/platform/graphics/avfoundation/CDMFairPlayStreaming.h
trunk/Source/WebCore/platform/graphics/avfoundation/objc/CDMInstanceFairPlayStreamingAVFObjC.mm


Added Paths

trunk/LayoutTests/platform/mac/media/encrypted-media/fps-createSession-expected.txt
trunk/LayoutTests/platform/mac/media/encrypted-media/fps-createSession.html
trunk/LayoutTests/platform/mac/media/encrypted-media/fps-generateRequest-expected.txt
trunk/LayoutTests/platform/mac/media/encrypted-media/fps-generateRequest.html




Diff

Modified: trunk/LayoutTests/ChangeLog (225636 => 225637)

--- trunk/LayoutTests/ChangeLog	2017-12-07 19:41:35 UTC (rev 225636)
+++ trunk/LayoutTests/ChangeLog	2017-12-07 19:46:53 UTC (rev 225637)
@@ -1,3 +1,16 @@
+2017-12-07  Jer Noble  
+
+[EME] Support generateRequest() in CDMFairPlayStreaming
+https://bugs.webkit.org/show_bug.cgi?id=179752
+
+Reviewed by Eric Carlson.
+
+* platform/mac/TestExpectations:
+* platform/mac/media/encrypted-media/fps-createSession-expected.txt: Added.
+* platform/mac/media/encrypted-media/fps-createSession.html: Added.
+* platform/mac/media/encrypted-media/fps-generateRequest-expected.txt: Added.
+* platform/mac/media/encrypted-media/fps-generateRequest.html: Added.
+
 2017-12-07  Ryan Haddad  
 
 Unreviewed, rolling out r224931.


Modified: trunk/LayoutTests/platform/mac/TestExpectations (225636 => 225637)

--- trunk/LayoutTests/platform/mac/TestExpectations	2017-12-07 19:41:35 UTC (rev 225636)
+++ trunk/LayoutTests/platform/mac/TestExpectations	2017-12-07 19:46:53 UTC (rev 225637)
@@ -1748,6 +1748,8 @@
 # AVContentKeySession not available pre-High Sierra
 [ ElCapitan Sierra ] platform/mac/media/encrypted-media/fps-createMediaKeys.html [ Skip ]
 [ ElCapitan Sierra ] platform/mac/media/encrypted-media/fps-requestMediaKeySystemAccess.html [ Skip ]
+[ ElCapitan Sierra ] platform/mac/media/encrypted-media/fps-createSession.html [ Skip ]
+[ ElCapitan Sierra ] platform/mac/media/encrypted-media/fps-generateRequest.html [ Skip ]
 
 # rdar://problem/35395437
 [ HighSierra+ ] imported/w3c/web-platform-tests/media-source/mediasource-play.html [ Failure ]


Added: trunk/LayoutTests/platform/mac/media/encrypted-media/fps-createSession-expected.txt (0 => 225637)

--- trunk/LayoutTests/platform/mac/media/encrypted-media/fps-createSession-expected.txt	(rev 0)
+++ trunk/LayoutTests/platform/mac/media/encrypted-media/fps-createSession-expected.txt	2017-12-07 19:46:53 UTC (rev 225637)
@@ -0,0 +1,8 @@
+RUN(promise = navigator.requestMediaKeySystemAccess("com.apple.fps", capabilities))
+Promise resolved OK
+RUN(promise = access.createMediaKeys())
+Promise resolved OK
+RUN(session = keys.createSession())
+EXPECTED (session != 'null') OK
+END OF TEST
+


Added: trunk/LayoutTests/platform/mac/media/encrypted-media/fps-createSession.html (0 => 225637)

--- trunk/LayoutTests/platform/mac/media/encrypted-media/fps-createSession.html	(rev 0)
+++ trunk/LayoutTests/platform/mac/media/encrypted-media/fps-createSession.html	2017-12-07 19:46:53 UTC (rev 225637)
@@ -0,0 +1,43 @@
+
+
+
+fps-requestMediaKeySystemAccess
+
+var 

[webkit-changes] [225636] trunk/Tools

[eric . carlson]

Title: [225636] trunk/Tools








Revision 225636
Author eric.carl...@apple.com
Date 2017-12-07 11:41:35 -0800 (Thu, 07 Dec 2017)


Log Message
Add WebRTC watchlist rule, update MediaStream rule
https://bugs.webkit.org/show_bug.cgi?id=180536


Reviewed by Youenn Fablet.

* Scripts/webkitpy/common/config/watchlist:

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/Scripts/webkitpy/common/config/watchlist




Diff

Modified: trunk/Tools/ChangeLog (225635 => 225636)

--- trunk/Tools/ChangeLog	2017-12-07 19:25:35 UTC (rev 225635)
+++ trunk/Tools/ChangeLog	2017-12-07 19:41:35 UTC (rev 225636)
@@ -1,3 +1,13 @@
+2017-12-07  Eric Carlson  
+
+Add WebRTC watchlist rule, update MediaStream rule
+https://bugs.webkit.org/show_bug.cgi?id=180536
+
+
+Reviewed by Youenn Fablet.
+
+* Scripts/webkitpy/common/config/watchlist:
+
 2017-12-06  Chris Dumez  
 
 We should be able to recover after a Service Worker process crash


Modified: trunk/Tools/Scripts/webkitpy/common/config/watchlist (225635 => 225636)

--- trunk/Tools/Scripts/webkitpy/common/config/watchlist	2017-12-07 19:25:35 UTC (rev 225635)
+++ trunk/Tools/Scripts/webkitpy/common/config/watchlist	2017-12-07 19:41:35 UTC (rev 225636)
@@ -216,7 +216,11 @@
 "MediaStream": {
 "filename": r"Source/WebCore/Modules/mediastream"
 r"|Source/WebCore/platform/mediastream"
-r"|LayoutTests/fast/mediastream",
+r"|LayoutTests/fast/mediastream"
+r"|Source/WebKit/WebProcess/MediaStream/"
+r"|LayoutTests/http/tests/media/media-stream/"
+r"|LayoutTests/fast/mediastream/"
+r"|LayoutTests/imported/w3c/web-platform-tests/mediacapture-streams/",
 },
 "Accessibility": {
 "filename": r"Source/WebCore/accessibility"
@@ -342,6 +346,14 @@
 r"|LayoutTests/crypto/"
 r"|LayoutTests/imported/w3c/web-platform-tests/WebCryptoAPI/",
 },
+"WebRTC": {
+"filename": r"Source/ThirdParty/libwebrtc/"
+r"|Source/WebKit/Shared/*RTC*"
+r"|Source/WebKit/NetworkProcess/webrtc/"
+r"|Source/WebKit/WebProcess/Network/webrtc/"
+r"|LayoutTests/webrtc/"
+r"|LayoutTests/imported/w3c/web-platform-tests/webrtc/",
+},
 },
 "CC_RULES": {
 # Note: All email addresses listed must be registered with bugzilla.
@@ -383,7 +395,7 @@
 "NetworkCache": [ "cgar...@igalia.com", "cdu...@apple.com" ],
 "StreamsAPI": [ "benja...@webkit.org", "calva...@igalia.com", "youe...@gmail.com" ],
 "Track": [ "eric.carl...@apple.com", "phil...@opera.com", "calva...@igalia.com" ],
-"MediaStream": [ "tom...@google.com", "h...@google.com", "sergio.corr...@openbossa.org" ],
+"MediaStream": [ "tom...@google.com", "h...@google.com", "sergio.corr...@openbossa.org", "eric.carl...@apple.com" ],
 "OpenGL" : [ "n...@webkit.org", "d...@apple.com", "kondapallykal...@gmail.com" ],
 "PerformanceTests": [ "rn...@webkit.org", "cdu...@apple.com" ],
 "RegionsDevelopment|RegionsExpectationsMore|RegionsExpectationsLess|RegionsUsage": [ "webkitbugtrac...@adobe.com" ],






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

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

[jer . noble]

Title: [225635] trunk/Source/WebCore








Revision 225635
Author jer.no...@apple.com
Date 2017-12-07 11:25:35 -0800 (Thu, 07 Dec 2017)


Log Message
[EME] Possible deadlock when aborting a SourceBufferPrivateAVFObjC append operation
https://bugs.webkit.org/show_bug.cgi?id=180486

Reviewed by Eric Carlson.

It's possible that an abort() operation which is blocked on the ongoing appendBuffer()
operation completing will deadlock forever, with either the willProvideContentKeyRequest
or didProvideContentKeyRequest callbacks blocking waiting to be run on the main thread
(which is itself blocked waiting for the append operation to complete).

To break this deadlock, add a new abortSemaphore which is signaled in the abort() method
and have the willProvide... and didProvide... methods block both on their own semaphores
as well as the abortSemaphore, allowing them to break out even if their main thread calls
never get a chance to execute.

* platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm:
(-[WebAVStreamDataParserListener streamDataParserWillProvideContentKeyRequestInitializationData:forTrackID:]):
(-[WebAVStreamDataParserListener streamDataParser:didProvideContentKeyRequestInitializationData:forTrackID:]):
(WebCore::SourceBufferPrivateAVFObjC::SourceBufferPrivateAVFObjC):
(WebCore::SourceBufferPrivateAVFObjC::abort):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm




Diff

Modified: trunk/Source/WebCore/ChangeLog (225634 => 225635)

--- trunk/Source/WebCore/ChangeLog	2017-12-07 19:06:17 UTC (rev 225634)
+++ trunk/Source/WebCore/ChangeLog	2017-12-07 19:25:35 UTC (rev 225635)
@@ -1,3 +1,26 @@
+2017-12-07  Jer Noble  
+
+[EME] Possible deadlock when aborting a SourceBufferPrivateAVFObjC append operation
+https://bugs.webkit.org/show_bug.cgi?id=180486
+
+Reviewed by Eric Carlson.
+
+It's possible that an abort() operation which is blocked on the ongoing appendBuffer()
+operation completing will deadlock forever, with either the willProvideContentKeyRequest
+or didProvideContentKeyRequest callbacks blocking waiting to be run on the main thread
+(which is itself blocked waiting for the append operation to complete).
+
+To break this deadlock, add a new abortSemaphore which is signaled in the abort() method
+and have the willProvide... and didProvide... methods block both on their own semaphores
+as well as the abortSemaphore, allowing them to break out even if their main thread calls
+never get a chance to execute.
+
+* platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm:
+(-[WebAVStreamDataParserListener streamDataParserWillProvideContentKeyRequestInitializationData:forTrackID:]):
+(-[WebAVStreamDataParserListener streamDataParser:didProvideContentKeyRequestInitializationData:forTrackID:]):
+(WebCore::SourceBufferPrivateAVFObjC::SourceBufferPrivateAVFObjC):
+(WebCore::SourceBufferPrivateAVFObjC::abort):
+
 2017-12-07  Eric Carlson  
 
 Simplify log channel configuration UI


Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm (225634 => 225635)

--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm	2017-12-07 19:06:17 UTC (rev 225634)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm	2017-12-07 19:25:35 UTC (rev 225635)
@@ -108,9 +108,11 @@
 
 @interface WebAVStreamDataParserListener : NSObject {
 WeakPtr _parent;
+OSObjectPtr _abortSemaphore;
 AVStreamDataParser* _parser;
 }
 @property (assign) WeakPtr parent;
+@property (assign) OSObjectPtr abortSemaphore;
 - (id)initWithParser:(AVStreamDataParser*)parser parent:(WeakPtr)parent;
 @end
 
@@ -129,6 +131,7 @@
 }
 
 @synthesize parent=_parent;
+@synthesize abortSemaphore=_abortSemaphore;
 
 - (void)dealloc
 {
@@ -203,10 +206,22 @@
 
 // We must call synchronously to the main thread, as the AVStreamSession must be associated
 // with the streamDataParser before the delegate method returns.
-dispatch_sync(dispatch_get_main_queue(), [parent = _parent, trackID]() {
+OSObjectPtr respondedSemaphore = adoptOSObject(dispatch_semaphore_create(0));
+callOnMainThread([parent = _parent, trackID, respondedSemaphore]() {
 if (parent)
 parent->willProvideContentKeyRequestInitializationDataForTrackID(trackID);
+dispatch_semaphore_signal(respondedSemaphore.get());
 });
+
+while (true) {
+if (!dispatch_semaphore_wait(respondedSemaphore.get(), dispatch_time(DISPATCH_TIME_NOW, NSEC_PER_MSEC * 100)))
+return;
+
+if (!dispatch_semaphore_wait(_abortSemaphore.get(), dispatch_time(DISPATCH_TIME_NOW, NSEC_PER_MSEC * 100))) {
+

[webkit-changes] [225634] trunk/Source

[eric . carlson]

Title: [225634] trunk/Source








Revision 225634
Author eric.carl...@apple.com
Date 2017-12-07 11:06:17 -0800 (Thu, 07 Dec 2017)


Log Message
Simplify log channel configuration UI
https://bugs.webkit.org/show_bug.cgi?id=180527


Reviewed by Joseph Pecoraro.

Source/_javascript_Core:

* inspector/protocol/Console.json:

Source/WebCore:

No new tests -- no change in functionality.

* inspector/agents/WebConsoleAgent.cpp:
(WebCore::WebConsoleAgent::getLoggingChannels):
(WebCore::channelConfigurationForString):

Source/WebInspectorUI:

* Localizations/en.lproj/localizedStrings.js:
* UserInterface/Models/LoggingChannel.js:
* UserInterface/Views/SettingsTabContentView.js:
(WI.SettingsTabContentView.prototype._createGeneralSettingsView):

Modified Paths

trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/inspector/protocol/Console.json
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/inspector/agents/WebConsoleAgent.cpp
trunk/Source/WebInspectorUI/ChangeLog
trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js
trunk/Source/WebInspectorUI/UserInterface/Models/LoggingChannel.js
trunk/Source/WebInspectorUI/UserInterface/Views/SettingsTabContentView.js




Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (225633 => 225634)

--- trunk/Source/_javascript_Core/ChangeLog	2017-12-07 18:54:42 UTC (rev 225633)
+++ trunk/Source/_javascript_Core/ChangeLog	2017-12-07 19:06:17 UTC (rev 225634)
@@ -1,3 +1,13 @@
+2017-12-07  Eric Carlson  
+
+Simplify log channel configuration UI
+https://bugs.webkit.org/show_bug.cgi?id=180527
+
+
+Reviewed by Joseph Pecoraro.
+
+* inspector/protocol/Console.json:
+
 2017-12-07  Mark Lam  
 
 [Re-landing r225620] Refactoring: Rename ScrambledPtr to Poisoned.


Modified: trunk/Source/_javascript_Core/inspector/protocol/Console.json (225633 => 225634)

--- trunk/Source/_javascript_Core/inspector/protocol/Console.json	2017-12-07 18:54:42 UTC (rev 225633)
+++ trunk/Source/_javascript_Core/inspector/protocol/Console.json	2017-12-07 19:06:17 UTC (rev 225634)
@@ -12,7 +12,7 @@
 {
 "id": "ChannelLevel",
 "type": "string",
-"enum": ["off", "log", "error", "warning", "info", "debug"],
+"enum": ["off", "basic", "verbose"],
 "description": "Level of logging."
 },
 {


Modified: trunk/Source/WebCore/ChangeLog (225633 => 225634)

--- trunk/Source/WebCore/ChangeLog	2017-12-07 18:54:42 UTC (rev 225633)
+++ trunk/Source/WebCore/ChangeLog	2017-12-07 19:06:17 UTC (rev 225634)
@@ -1,3 +1,17 @@
+2017-12-07  Eric Carlson  
+
+Simplify log channel configuration UI
+https://bugs.webkit.org/show_bug.cgi?id=180527
+
+
+Reviewed by Joseph Pecoraro.
+
+No new tests -- no change in functionality.
+
+* inspector/agents/WebConsoleAgent.cpp:
+(WebCore::WebConsoleAgent::getLoggingChannels):
+(WebCore::channelConfigurationForString):
+
 2017-12-07  Joseph Pecoraro  
 
 ServiceWorker Inspector: Use the SW's scope url for the remote inspection target metadata


Modified: trunk/Source/WebCore/inspector/agents/WebConsoleAgent.cpp (225633 => 225634)

--- trunk/Source/WebCore/inspector/agents/WebConsoleAgent.cpp	2017-12-07 18:54:42 UTC (rev 225633)
+++ trunk/Source/WebCore/inspector/agents/WebConsoleAgent.cpp	2017-12-07 19:06:17 UTC (rev 225634)
@@ -66,23 +66,17 @@
 if (!logChannel)
 return;
 
-Inspector::Protocol::Console::ChannelLevel level = Inspector::Protocol::Console::ChannelLevel::Off;
+auto level = Inspector::Protocol::Console::ChannelLevel::Off;
 if (logChannel->state != WTFLogChannelOff) {
 switch (logChannel->level) {
 case WTFLogLevelAlways:
-level = Inspector::Protocol::Console::ChannelLevel::Log;
-break;
 case WTFLogLevelError:
-level = Inspector::Protocol::Console::ChannelLevel::Error;
-break;
 case WTFLogLevelWarning:
-level = Inspector::Protocol::Console::ChannelLevel::Warning;
+level = Inspector::Protocol::Console::ChannelLevel::Basic;
 break;
 case WTFLogLevelInfo:
-level = Inspector::Protocol::Console::ChannelLevel::Info;
-break;
 case WTFLogLevelDebug:
-level = Inspector::Protocol::Console::ChannelLevel::Debug;
+level = Inspector::Protocol::Console::ChannelLevel::Verbose;
 break;
 }
 }
@@ -105,15 +99,9 @@
 level = WTFLogLevelError;
 } else {
 state = WTFLogChannelOn;
-if (equalIgnoringASCIICase(levelString, "log"))
-level = WTFLogLevelAlways;
-else if (equalIgnoringASCIICase(levelString, "error"))
-   

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

[joepeck]

Title: [225633] trunk/Source/WebCore








Revision 225633
Author joep...@webkit.org
Date 2017-12-07 10:54:42 -0800 (Thu, 07 Dec 2017)


Log Message
ServiceWorker Inspector: Use the SW's scope url for the remote inspection target metadata
https://bugs.webkit.org/show_bug.cgi?id=180519

Reviewed by Youenn Fablet.

* workers/service/context/ServiceWorkerDebuggable.cpp:
(WebCore::ServiceWorkerDebuggable::ServiceWorkerDebuggable):
* workers/service/context/ServiceWorkerDebuggable.h:
Switch to the scope URL for the remote inspector target info.

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/workers/service/context/ServiceWorkerDebuggable.cpp
trunk/Source/WebCore/workers/service/context/ServiceWorkerDebuggable.h




Diff

Modified: trunk/Source/WebCore/ChangeLog (225632 => 225633)

--- trunk/Source/WebCore/ChangeLog	2017-12-07 18:49:51 UTC (rev 225632)
+++ trunk/Source/WebCore/ChangeLog	2017-12-07 18:54:42 UTC (rev 225633)
@@ -1,3 +1,15 @@
+2017-12-07  Joseph Pecoraro  
+
+ServiceWorker Inspector: Use the SW's scope url for the remote inspection target metadata
+https://bugs.webkit.org/show_bug.cgi?id=180519
+
+Reviewed by Youenn Fablet.
+
+* workers/service/context/ServiceWorkerDebuggable.cpp:
+(WebCore::ServiceWorkerDebuggable::ServiceWorkerDebuggable):
+* workers/service/context/ServiceWorkerDebuggable.h:
+Switch to the scope URL for the remote inspector target info.
+
 2017-12-07  Per Arne Vollan  
 
 Unreviewed Windows build fix.


Modified: trunk/Source/WebCore/workers/service/context/ServiceWorkerDebuggable.cpp (225632 => 225633)

--- trunk/Source/WebCore/workers/service/context/ServiceWorkerDebuggable.cpp	2017-12-07 18:49:51 UTC (rev 225632)
+++ trunk/Source/WebCore/workers/service/context/ServiceWorkerDebuggable.cpp	2017-12-07 18:54:42 UTC (rev 225633)
@@ -38,7 +38,7 @@
 
 ServiceWorkerDebuggable::ServiceWorkerDebuggable(ServiceWorkerThreadProxy& serviceWorkerThreadProxy, const ServiceWorkerContextData& data)
 : m_serviceWorkerThreadProxy(serviceWorkerThreadProxy)
-, m_scriptURL(data.scriptURL)
+, m_scopeURL(data.registration.scopeURL)
 {
 }
 


Modified: trunk/Source/WebCore/workers/service/context/ServiceWorkerDebuggable.h (225632 => 225633)

--- trunk/Source/WebCore/workers/service/context/ServiceWorkerDebuggable.h	2017-12-07 18:49:51 UTC (rev 225632)
+++ trunk/Source/WebCore/workers/service/context/ServiceWorkerDebuggable.h	2017-12-07 18:54:42 UTC (rev 225633)
@@ -46,7 +46,7 @@
 Inspector::RemoteControllableTarget::Type type() const override { return Inspector::RemoteControllableTarget::Type::ServiceWorker; }
 
 String name() const override { return ASCIILiteral("ServiceWorker"); }
-String url() const override { return m_scriptURL; }
+String url() const override { return m_scopeURL; }
 bool hasLocalDebugger() const override { return false; }
 
 void connect(Inspector::FrontendChannel*, bool isAutomaticConnection = false, bool immediatelyPause = false) override;
@@ -55,7 +55,7 @@
 
 private:
 ServiceWorkerThreadProxy& m_serviceWorkerThreadProxy;
-String m_scriptURL;
+String m_scopeURL;
 };
 
 } // namespace WebCore






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

[webkit-changes] [225632] trunk/Source

[mark . lam]

Title: [225632] trunk/Source








Revision 225632
Author mark@apple.com
Date 2017-12-07 10:49:51 -0800 (Thu, 07 Dec 2017)


Log Message
[Re-landing r225620] Refactoring: Rename ScrambledPtr to Poisoned.
https://bugs.webkit.org/show_bug.cgi?id=180514

Reviewed by Saam Barati and JF Bastien.

Re-landing r225620 with speculative build fix for GCC 7.

Source/_javascript_Core:

* API/JSCallbackObject.h:
* API/JSObjectRef.cpp:
(classInfoPrivate):
* _javascript_Core.xcodeproj/project.pbxproj:
* Sources.txt:
* assembler/MacroAssemblerCodeRef.h:
(JSC::FunctionPtr::FunctionPtr):
(JSC::FunctionPtr::value const):
(JSC::FunctionPtr::executableAddress const):
(JSC::ReturnAddressPtr::ReturnAddressPtr):
(JSC::ReturnAddressPtr::value const):
(JSC::MacroAssemblerCodePtr::MacroAssemblerCodePtr):
(JSC::MacroAssemblerCodePtr::createFromExecutableAddress):
(JSC::MacroAssemblerCodePtr::poisonedPtr const):
(JSC::MacroAssemblerCodePtr:: const):
(JSC::MacroAssemblerCodePtr::operator! const):
(JSC::MacroAssemblerCodePtr::operator== const):
(JSC::MacroAssemblerCodePtr::emptyValue):
(JSC::MacroAssemblerCodePtr::deletedValue):
(JSC::MacroAssemblerCodePtr::scrambledPtr const): Deleted.
* b3/B3LowerMacros.cpp:
* b3/testb3.cpp:
(JSC::B3::testInterpreter):
* dfg/DFGSpeculativeJIT.cpp:
(JSC::DFG::SpeculativeJIT::checkArray):
(JSC::DFG::SpeculativeJIT::compileCheckSubClass):
(JSC::DFG::SpeculativeJIT::compileNewStringObject):
(JSC::DFG::SpeculativeJIT::emitSwitchIntJump):
* ftl/FTLLowerDFGToB3.cpp:
(JSC::FTL::DFG::LowerDFGToB3::compileNewStringObject):
(JSC::FTL::DFG::LowerDFGToB3::compileCheckSubClass):
* jit/AssemblyHelpers.h:
(JSC::AssemblyHelpers::emitAllocateDestructibleObject):
* jit/SpecializedThunkJIT.h:
(JSC::SpecializedThunkJIT::loadArgumentWithSpecificClass):
* jit/ThunkGenerators.cpp:
(JSC::virtualThunkFor):
(JSC::boundThisNoArgsFunctionCallGenerator):
* llint/LLIntSlowPaths.cpp:
(JSC::LLInt::handleHostCall):
(JSC::LLInt::setUpCall):
* llint/LowLevelInterpreter64.asm:
* runtime/InitializeThreading.cpp:
(JSC::initializeThreading):
* runtime/JSCPoisonedPtr.cpp: Copied from Source/_javascript_Core/runtime/JSCScrambledPtr.cpp.
(JSC::initializePoison):
(JSC::initializeScrambledPtrKeys): Deleted.
* runtime/JSCPoisonedPtr.h: Copied from Source/_javascript_Core/runtime/JSCScrambledPtr.h.
* runtime/JSCScrambledPtr.cpp: Removed.
* runtime/JSCScrambledPtr.h: Removed.
* runtime/JSDestructibleObject.h:
(JSC::JSDestructibleObject::classInfo const):
* runtime/JSSegmentedVariableObject.h:
(JSC::JSSegmentedVariableObject::classInfo const):
* runtime/Structure.h:
* runtime/VM.h:

Source/WTF:

* WTF.xcodeproj/project.pbxproj:
* wtf/CMakeLists.txt:
* wtf/Poisoned.cpp: Copied from Source/WTF/wtf/ScrambledPtr.cpp.
(WTF::makePoison):
(WTF::makeScrambledPtrKey): Deleted.
* wtf/Poisoned.h: Copied from Source/WTF/wtf/ScrambledPtr.h.
(WTF::PoisonedImpl::PoisonedImpl):
(WTF::PoisonedImpl::assertIsPoisoned const):
(WTF::PoisonedImpl::assertIsNotPoisoned const):
(WTF::PoisonedImpl::unpoisoned const):
(WTF::PoisonedImpl::operator-> const):
(WTF::PoisonedImpl::bits const):
(WTF::PoisonedImpl::operator! const):
(WTF::PoisonedImpl::operator bool const):
(WTF::PoisonedImpl::operator== const):
(WTF::PoisonedImpl::operator==):
(WTF::PoisonedImpl::operator=):
(WTF::PoisonedImpl::poison):
(WTF::PoisonedImpl::unpoison):
(WTF::ScrambledPtr::ScrambledPtr): Deleted.
(WTF::ScrambledPtr::assertIsScrambled const): Deleted.
(WTF::ScrambledPtr::assertIsNotScrambled const): Deleted.
(WTF::ScrambledPtr::descrambled const): Deleted.
(WTF::ScrambledPtr::operator-> const): Deleted.
(WTF::ScrambledPtr::bits const): Deleted.
(WTF::ScrambledPtr::operator! const): Deleted.
(WTF::ScrambledPtr::operator bool const): Deleted.
(WTF::ScrambledPtr::operator== const): Deleted.
(WTF::ScrambledPtr::operator==): Deleted.
(WTF::ScrambledPtr::operator=): Deleted.
(WTF::ScrambledPtr::scramble): Deleted.
(WTF::ScrambledPtr::descramble): Deleted.
* wtf/ScrambledPtr.cpp: Removed.
* wtf/ScrambledPtr.h: Removed.

Modified Paths

trunk/Source/_javascript_Core/API/JSCallbackObject.h
trunk/Source/_javascript_Core/API/JSObjectRef.cpp
trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj
trunk/Source/_javascript_Core/Sources.txt
trunk/Source/_javascript_Core/assembler/MacroAssemblerCodeRef.h
trunk/Source/_javascript_Core/b3/B3LowerMacros.cpp
trunk/Source/_javascript_Core/b3/testb3.cpp
trunk/Source/_javascript_Core/dfg/DFGSpeculativeJIT.cpp
trunk/Source/_javascript_Core/ftl/FTLLowerDFGToB3.cpp
trunk/Source/_javascript_Core/jit/AssemblyHelpers.h
trunk/Source/_javascript_Core/jit/SpecializedThunkJIT.h
trunk/Source/_javascript_Core/jit/ThunkGenerators.cpp
trunk/Source/_javascript_Core/llint/LLIntSlowPaths.cpp
trunk/Source/_javascript_Core/llint/LowLevelInterpreter64.asm
trunk/Source/_javascript_Core/runtime/InitializeThreading.cpp
trunk/Source/_javascript_Core/runtime/JSDestructibleObject.h

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

[pvollan]

Title: [225631] trunk/Source/WebCore








Revision 225631
Author pvol...@apple.com
Date 2017-12-07 10:15:32 -0800 (Thu, 07 Dec 2017)


Log Message
Unreviewed Windows build fix.

* PlatformWin.cmake:

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/PlatformWin.cmake




Diff

Modified: trunk/Source/WebCore/ChangeLog (225630 => 225631)

--- trunk/Source/WebCore/ChangeLog	2017-12-07 17:13:04 UTC (rev 225630)
+++ trunk/Source/WebCore/ChangeLog	2017-12-07 18:15:32 UTC (rev 225631)
@@ -1,3 +1,9 @@
+2017-12-07  Per Arne Vollan  
+
+Unreviewed Windows build fix.
+
+* PlatformWin.cmake:
+
 2017-12-07  Michael Catanzaro  
 
 [WPE][GTK] Freeze WebKit version in user agent


Modified: trunk/Source/WebCore/PlatformWin.cmake (225630 => 225631)

--- trunk/Source/WebCore/PlatformWin.cmake	2017-12-07 17:13:04 UTC (rev 225630)
+++ trunk/Source/WebCore/PlatformWin.cmake	2017-12-07 18:15:32 UTC (rev 225631)
@@ -236,6 +236,8 @@
 svg/properties
 
 svg/graphics/filters
+
+workers/service
 )
 
 if (USE_CF)






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

[webkit-changes] [225630] trunk/LayoutTests

[ryanhaddad]

Title: [225630] trunk/LayoutTests








Revision 225630
Author ryanhad...@apple.com
Date 2017-12-07 09:13:04 -0800 (Thu, 07 Dec 2017)


Log Message
Unreviewed, rolling out r224931.

This test is no longer in the tree.

Reverted changeset:

"imported/w3c/web-platform-tests/2dcontext/the-canvas-
state/canvas_state_restore_001.htm is an ImageOnlyFailure"
https://bugs.webkit.org/show_bug.cgi?id=179786
https://trac.webkit.org/changeset/224931

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/LayoutTests/TestExpectations




Diff

Modified: trunk/LayoutTests/ChangeLog (225629 => 225630)

--- trunk/LayoutTests/ChangeLog	2017-12-07 16:32:42 UTC (rev 225629)
+++ trunk/LayoutTests/ChangeLog	2017-12-07 17:13:04 UTC (rev 225630)
@@ -1,3 +1,16 @@
+2017-12-07  Ryan Haddad  
+
+Unreviewed, rolling out r224931.
+
+This test is no longer in the tree.
+
+Reverted changeset:
+
+"imported/w3c/web-platform-tests/2dcontext/the-canvas-
+state/canvas_state_restore_001.htm is an ImageOnlyFailure"
+https://bugs.webkit.org/show_bug.cgi?id=179786
+https://trac.webkit.org/changeset/224931
+
 2017-12-07  Ms2ger  
 
 Update imported/w3c/web-platform-tests/css/css-pseudo-4/marker-font-properties.html from upstream.


Modified: trunk/LayoutTests/TestExpectations (225629 => 225630)

--- trunk/LayoutTests/TestExpectations	2017-12-07 16:32:42 UTC (rev 225629)
+++ trunk/LayoutTests/TestExpectations	2017-12-07 17:13:04 UTC (rev 225630)
@@ -224,7 +224,6 @@
 http/tests/inspector/paymentrequest [ Skip ]
 imported/w3c/web-platform-tests/payment-request [ Skip ]
 
-webkit.org/b/179786 imported/w3c/web-platform-tests/2dcontext/the-canvas-state/canvas_state_restore_001.htm [ ImageOnlyFailure ]
 imported/w3c/web-platform-tests/2dcontext/transformations/canvas_transformations_reset_001.html [ ImageOnlyFailure ]
 webkit.org/b/179607 imported/w3c/web-platform-tests/XMLHttpRequest/access-control-and-redirects-async.htm [ Pass Failure ]
 webkit.org/b/179607 imported/w3c/web-platform-tests/XMLHttpRequest/access-control-and-redirects-async-same-origin.htm [ Pass Failure ]






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

[webkit-changes] [225629] trunk/Source

[mcatanzaro]

Title: [225629] trunk/Source








Revision 225629
Author mcatanz...@igalia.com
Date 2017-12-07 08:32:42 -0800 (Thu, 07 Dec 2017)


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


It broke the build with GCC 7, and I don't know how to fix it.

Source/_javascript_Core:

* API/JSCallbackObject.h:
* API/JSObjectRef.cpp:
(classInfoPrivate):
* _javascript_Core.xcodeproj/project.pbxproj:
* Sources.txt:
* assembler/MacroAssemblerCodeRef.h:
(JSC::FunctionPtr::FunctionPtr):
(JSC::FunctionPtr::value const):
(JSC::FunctionPtr::executableAddress const):
(JSC::ReturnAddressPtr::ReturnAddressPtr):
(JSC::ReturnAddressPtr::value const):
(JSC::MacroAssemblerCodePtr::MacroAssemblerCodePtr):
(JSC::MacroAssemblerCodePtr::createFromExecutableAddress):
(JSC::MacroAssemblerCodePtr::scrambledPtr const):
(JSC::MacroAssemblerCodePtr:: const):
(JSC::MacroAssemblerCodePtr::operator! const):
(JSC::MacroAssemblerCodePtr::operator== const):
(JSC::MacroAssemblerCodePtr::emptyValue):
(JSC::MacroAssemblerCodePtr::deletedValue):
(JSC::MacroAssemblerCodePtr::poisonedPtr const): Deleted.
* b3/B3LowerMacros.cpp:
* b3/testb3.cpp:
(JSC::B3::testInterpreter):
* dfg/DFGSpeculativeJIT.cpp:
(JSC::DFG::SpeculativeJIT::checkArray):
(JSC::DFG::SpeculativeJIT::compileCheckSubClass):
(JSC::DFG::SpeculativeJIT::compileNewStringObject):
(JSC::DFG::SpeculativeJIT::emitSwitchIntJump):
* ftl/FTLLowerDFGToB3.cpp:
(JSC::FTL::DFG::LowerDFGToB3::compileNewStringObject):
(JSC::FTL::DFG::LowerDFGToB3::compileCheckSubClass):
* jit/AssemblyHelpers.h:
(JSC::AssemblyHelpers::emitAllocateDestructibleObject):
* jit/SpecializedThunkJIT.h:
(JSC::SpecializedThunkJIT::loadArgumentWithSpecificClass):
* jit/ThunkGenerators.cpp:
(JSC::virtualThunkFor):
(JSC::boundThisNoArgsFunctionCallGenerator):
* llint/LLIntSlowPaths.cpp:
(JSC::LLInt::handleHostCall):
(JSC::LLInt::setUpCall):
* llint/LowLevelInterpreter64.asm:
* runtime/InitializeThreading.cpp:
(JSC::initializeThreading):
* runtime/JSCScrambledPtr.cpp: Renamed from Source/_javascript_Core/runtime/JSCPoisonedPtr.cpp.
(JSC::initializeScrambledPtrKeys):
* runtime/JSCScrambledPtr.h: Renamed from Source/_javascript_Core/runtime/JSCPoisonedPtr.h.
* runtime/JSDestructibleObject.h:
(JSC::JSDestructibleObject::classInfo const):
* runtime/JSSegmentedVariableObject.h:
(JSC::JSSegmentedVariableObject::classInfo const):
* runtime/Structure.h:
* runtime/VM.h:

Source/WTF:

* WTF.xcodeproj/project.pbxproj:
* wtf/CMakeLists.txt:
* wtf/Poisoned.h: Removed.
* wtf/ScrambledPtr.cpp: Renamed from Source/WTF/wtf/Poisoned.cpp.
(WTF::makeScrambledPtrKey):
* wtf/ScrambledPtr.h: Added.
(WTF::ScrambledPtr::ScrambledPtr):
(WTF::ScrambledPtr::assertIsScrambled const):
(WTF::ScrambledPtr::assertIsNotScrambled const):
(WTF::ScrambledPtr::descrambled const):
(WTF::ScrambledPtr::operator-> const):
(WTF::ScrambledPtr::bits const):
(WTF::ScrambledPtr::operator! const):
(WTF::ScrambledPtr::operator bool const):
(WTF::ScrambledPtr::operator== const):
(WTF::ScrambledPtr::operator==):
(WTF::ScrambledPtr::operator=):
(WTF::ScrambledPtr::scramble):
(WTF::ScrambledPtr::descramble):

Modified Paths

trunk/Source/_javascript_Core/API/JSCallbackObject.h
trunk/Source/_javascript_Core/API/JSObjectRef.cpp
trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj
trunk/Source/_javascript_Core/Sources.txt
trunk/Source/_javascript_Core/assembler/MacroAssemblerCodeRef.h
trunk/Source/_javascript_Core/b3/B3LowerMacros.cpp
trunk/Source/_javascript_Core/b3/testb3.cpp
trunk/Source/_javascript_Core/dfg/DFGSpeculativeJIT.cpp
trunk/Source/_javascript_Core/ftl/FTLLowerDFGToB3.cpp
trunk/Source/_javascript_Core/jit/AssemblyHelpers.h
trunk/Source/_javascript_Core/jit/SpecializedThunkJIT.h
trunk/Source/_javascript_Core/jit/ThunkGenerators.cpp
trunk/Source/_javascript_Core/llint/LLIntSlowPaths.cpp
trunk/Source/_javascript_Core/llint/LowLevelInterpreter64.asm
trunk/Source/_javascript_Core/runtime/InitializeThreading.cpp
trunk/Source/_javascript_Core/runtime/JSDestructibleObject.h
trunk/Source/_javascript_Core/runtime/JSSegmentedVariableObject.h
trunk/Source/_javascript_Core/runtime/Structure.h
trunk/Source/_javascript_Core/runtime/VM.h
trunk/Source/WTF/ChangeLog
trunk/Source/WTF/WTF.xcodeproj/project.pbxproj
trunk/Source/WTF/wtf/CMakeLists.txt


Added Paths

trunk/Source/_javascript_Core/runtime/JSCScrambledPtr.cpp
trunk/Source/_javascript_Core/runtime/JSCScrambledPtr.h
trunk/Source/WTF/wtf/ScrambledPtr.cpp
trunk/Source/WTF/wtf/ScrambledPtr.h


Removed Paths

trunk/Source/_javascript_Core/runtime/JSCPoisonedPtr.cpp
trunk/Source/_javascript_Core/runtime/JSCPoisonedPtr.h
trunk/Source/WTF/wtf/Poisoned.cpp
trunk/Source/WTF/wtf/Poisoned.h




Diff

Modified: trunk/Source/_javascript_Core/API/JSCallbackObject.h (225628 => 225629)

--- trunk/Source/_javascript_Core/API/JSCallbackObject.h	2017-12-07 16:11:13 UTC (rev 225628)
+++ trunk/Source/_javascript_Core/API/JSCallbackObject.h	2017-12-07 

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

[cdumez]

Title: [225628] trunk/Source/WebKit








Revision 225628
Author cdu...@apple.com
Date 2017-12-07 08:11:13 -0800 (Thu, 07 Dec 2017)


Log Message
Unreviewed build fix after r225622.

* StorageProcess/ServiceWorker/WebSWServerConnection.cpp:
(WebKit::WebSWServerConnection::postMessageToServiceWorkerFromServiceWorker):

Modified Paths

trunk/Source/WebKit/ChangeLog
trunk/Source/WebKit/StorageProcess/ServiceWorker/WebSWServerConnection.cpp




Diff

Modified: trunk/Source/WebKit/ChangeLog (225627 => 225628)

--- trunk/Source/WebKit/ChangeLog	2017-12-07 15:59:29 UTC (rev 225627)
+++ trunk/Source/WebKit/ChangeLog	2017-12-07 16:11:13 UTC (rev 225628)
@@ -1,3 +1,10 @@
+2017-12-07  Chris Dumez  
+
+Unreviewed build fix after r225622.
+
+* StorageProcess/ServiceWorker/WebSWServerConnection.cpp:
+(WebKit::WebSWServerConnection::postMessageToServiceWorkerFromServiceWorker):
+
 2017-12-06  Chris Dumez  
 
 We should be able to recover after a Service Worker process crash


Modified: trunk/Source/WebKit/StorageProcess/ServiceWorker/WebSWServerConnection.cpp (225627 => 225628)

--- trunk/Source/WebKit/StorageProcess/ServiceWorker/WebSWServerConnection.cpp	2017-12-07 15:59:29 UTC (rev 225627)
+++ trunk/Source/WebKit/StorageProcess/ServiceWorker/WebSWServerConnection.cpp	2017-12-07 16:11:13 UTC (rev 225628)
@@ -151,7 +151,7 @@
 return;
 
 // It's possible this specific worker cannot be re-run (e.g. its registration has been removed)
-server().runServiceWorkerIfNecessary(destinationIdentifier, [destinationIdentifier, message = WTFMove(message), sourceIdentifier, sourceData = sourceWorker->data()](bool success, auto& contextConnection) mutable {
+server().runServiceWorkerIfNecessary(destinationIdentifier, [destinationIdentifier, message = WTFMove(message), sourceData = sourceWorker->data()](bool success, auto& contextConnection) mutable {
 if (!success)
 return;
 






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

[webkit-changes] [225627] trunk

[mcatanzaro]

Title: [225627] trunk








Revision 225627
Author mcatanz...@igalia.com
Date 2017-12-07 07:59:29 -0800 (Thu, 07 Dec 2017)


Log Message
[WPE][GTK] Freeze WebKit version in user agent
https://bugs.webkit.org/show_bug.cgi?id=180475

Reviewed by Carlos Garcia Campos.

.:

* Source/cmake/OptionsGTK.cmake:
* Source/cmake/OptionsWPE.cmake:

Source/WebCore:

Apple has frozen the WebKit version in its user agent, so we should too, at the same point.

* platform/glib/UserAgentGLib.cpp:
(WebCore::versionForUAString):

Modified Paths

trunk/ChangeLog
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/glib/UserAgentGLib.cpp
trunk/Source/cmake/OptionsGTK.cmake
trunk/Source/cmake/OptionsWPE.cmake




Diff

Modified: trunk/ChangeLog (225626 => 225627)

--- trunk/ChangeLog	2017-12-07 15:36:37 UTC (rev 225626)
+++ trunk/ChangeLog	2017-12-07 15:59:29 UTC (rev 225627)
@@ -1,3 +1,13 @@
+2017-12-07  Michael Catanzaro  
+
+[WPE][GTK] Freeze WebKit version in user agent
+https://bugs.webkit.org/show_bug.cgi?id=180475
+
+Reviewed by Carlos Garcia Campos.
+
+* Source/cmake/OptionsGTK.cmake:
+* Source/cmake/OptionsWPE.cmake:
+
 2017-12-05  Stephan Szabo  
 
 Switch windows build to Visual Studio 2017


Modified: trunk/Source/WebCore/ChangeLog (225626 => 225627)

--- trunk/Source/WebCore/ChangeLog	2017-12-07 15:36:37 UTC (rev 225626)
+++ trunk/Source/WebCore/ChangeLog	2017-12-07 15:59:29 UTC (rev 225627)
@@ -1,5 +1,17 @@
 2017-12-07  Michael Catanzaro  
 
+[WPE][GTK] Freeze WebKit version in user agent
+https://bugs.webkit.org/show_bug.cgi?id=180475
+
+Reviewed by Carlos Garcia Campos.
+
+Apple has frozen the WebKit version in its user agent, so we should too, at the same point.
+
+* platform/glib/UserAgentGLib.cpp:
+(WebCore::versionForUAString):
+
+2017-12-07  Michael Catanzaro  
+
 [WPE][GTK] Update user agent quirk version strings
 https://bugs.webkit.org/show_bug.cgi?id=180474
 


Modified: trunk/Source/WebCore/platform/glib/UserAgentGLib.cpp (225626 => 225627)

--- trunk/Source/WebCore/platform/glib/UserAgentGLib.cpp	2017-12-07 15:36:37 UTC (rev 225626)
+++ trunk/Source/WebCore/platform/glib/UserAgentGLib.cpp	2017-12-07 15:59:29 UTC (rev 225627)
@@ -69,9 +69,10 @@
 #endif
 }
 
-static const char* versionForUAString()
+static inline const char* versionForUAString()
 {
-return USER_AGENT_MAJOR_VERSION "." USER_AGENT_MINOR_VERSION;
+// https://bugs.webkit.org/show_bug.cgi?id=180365
+return "605.1.15";
 }
 
 static String buildUserAgentString(const UserAgentQuirks& quirks)


Modified: trunk/Source/cmake/OptionsGTK.cmake (225626 => 225627)

--- trunk/Source/cmake/OptionsGTK.cmake	2017-12-07 15:36:37 UTC (rev 225626)
+++ trunk/Source/cmake/OptionsGTK.cmake	2017-12-07 15:59:29 UTC (rev 225627)
@@ -169,8 +169,6 @@
 add_definitions(-DBUILDING_GTK__=1)
 add_definitions(-DGETTEXT_PACKAGE="WebKit2GTK-${WEBKITGTK_API_VERSION}")
 add_definitions(-DDATA_DIR="${CMAKE_INSTALL_DATADIR}")
-add_definitions(-DUSER_AGENT_MAJOR_VERSION="605")
-add_definitions(-DUSER_AGENT_MINOR_VERSION="1")
 add_definitions(-DWEBKITGTK_API_VERSION_STRING="${WEBKITGTK_API_VERSION}")
 
 set(GTK_LIBRARIES ${GTK3_LIBRARIES})


Modified: trunk/Source/cmake/OptionsWPE.cmake (225626 => 225627)

--- trunk/Source/cmake/OptionsWPE.cmake	2017-12-07 15:36:37 UTC (rev 225626)
+++ trunk/Source/cmake/OptionsWPE.cmake	2017-12-07 15:59:29 UTC (rev 225627)
@@ -82,8 +82,6 @@
 add_definitions(-DBUILDING_WPE__=1)
 add_definitions(-DGETTEXT_PACKAGE="WPE")
 add_definitions(-DDATA_DIR="${CMAKE_INSTALL_DATADIR}")
-add_definitions(-DUSER_AGENT_MAJOR_VERSION="605")
-add_definitions(-DUSER_AGENT_MINOR_VERSION="1")
 
 SET_AND_EXPOSE_TO_BUILD(USE_CAIRO TRUE)
 SET_AND_EXPOSE_TO_BUILD(USE_EGL TRUE)






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

[webkit-changes] [225626] trunk/LayoutTests

[Ms2ger]

Title: [225626] trunk/LayoutTests








Revision 225626
Author ms2...@igalia.com
Date 2017-12-07 07:36:37 -0800 (Thu, 07 Dec 2017)


Log Message
Update imported/w3c/web-platform-tests/css/css-pseudo-4/marker-font-properties.html from upstream.
https://bugs.webkit.org/show_bug.cgi?id=177362

Unreviewed test gardening.

LayoutTests/imported/w3c:


* web-platform-tests/css/css-pseudo-4/marker-font-properties-expected.html:
* web-platform-tests/css/css-pseudo-4/marker-font-properties.html:

LayoutTests:

This makes it pass on GTK and WPE (at least locally).


* platform/gtk/TestExpectations:
* platform/wpe/TestExpectations:

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/LayoutTests/imported/w3c/ChangeLog
trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-pseudo-4/marker-font-properties-expected.html
trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-pseudo-4/marker-font-properties.html
trunk/LayoutTests/platform/gtk/TestExpectations
trunk/LayoutTests/platform/wpe/TestExpectations




Diff

Modified: trunk/LayoutTests/ChangeLog (225625 => 225626)

--- trunk/LayoutTests/ChangeLog	2017-12-07 13:27:53 UTC (rev 225625)
+++ trunk/LayoutTests/ChangeLog	2017-12-07 15:36:37 UTC (rev 225626)
@@ -1,5 +1,17 @@
 2017-12-07  Ms2ger  
 
+Update imported/w3c/web-platform-tests/css/css-pseudo-4/marker-font-properties.html from upstream.
+https://bugs.webkit.org/show_bug.cgi?id=177362
+
+Unreviewed test gardening.
+
+This makes it pass on GTK and WPE (at least locally).
+
+* platform/gtk/TestExpectations:
+* platform/wpe/TestExpectations:
+
+2017-12-07  Ms2ger  
+
 [GTK] Enable imported/w3c/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-api-texttracks.html.
 https://bugs.webkit.org/show_bug.cgi?id=168799
 


Modified: trunk/LayoutTests/imported/w3c/ChangeLog (225625 => 225626)

--- trunk/LayoutTests/imported/w3c/ChangeLog	2017-12-07 13:27:53 UTC (rev 225625)
+++ trunk/LayoutTests/imported/w3c/ChangeLog	2017-12-07 15:36:37 UTC (rev 225626)
@@ -1,3 +1,13 @@
+2017-12-07  Ms2ger  
+
+Update imported/w3c/web-platform-tests/css/css-pseudo-4/marker-font-properties.html from upstream.
+https://bugs.webkit.org/show_bug.cgi?id=177362
+
+Unreviewed test gardening.
+
+* web-platform-tests/css/css-pseudo-4/marker-font-properties-expected.html:
+* web-platform-tests/css/css-pseudo-4/marker-font-properties.html:
+
 2017-12-06  Youenn Fablet  
 
 Import WPT workers test suite


Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-pseudo-4/marker-font-properties-expected.html (225625 => 225626)

--- trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-pseudo-4/marker-font-properties-expected.html	2017-12-07 13:27:53 UTC (rev 225625)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-pseudo-4/marker-font-properties-expected.html	2017-12-07 15:36:37 UTC (rev 225626)
@@ -5,6 +5,10 @@
 CSS Test: ::marker formatting with font properties reference file
  

[webkit-changes] [225625] trunk/LayoutTests

[Ms2ger]

Title: [225625] trunk/LayoutTests








Revision 225625
Author ms2...@igalia.com
Date 2017-12-07 05:27:53 -0800 (Thu, 07 Dec 2017)


Log Message
[GTK] Enable imported/w3c/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-api-texttracks.html.
https://bugs.webkit.org/show_bug.cgi?id=168799

Unreviewed test gardening.

It hasn't failed in half a year (last failure was on r216594). I don't know
what fixed it, but there doesn't seem to be a reason to keep the flaky
annotation.


* platform/gtk/TestExpectations:

Modified Paths

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




Diff

Modified: trunk/LayoutTests/ChangeLog (225624 => 225625)

--- trunk/LayoutTests/ChangeLog	2017-12-07 11:54:36 UTC (rev 225624)
+++ trunk/LayoutTests/ChangeLog	2017-12-07 13:27:53 UTC (rev 225625)
@@ -1,3 +1,16 @@
+2017-12-07  Ms2ger  
+
+[GTK] Enable imported/w3c/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-api-texttracks.html.
+https://bugs.webkit.org/show_bug.cgi?id=168799
+
+Unreviewed test gardening.
+
+It hasn't failed in half a year (last failure was on r216594). I don't know
+what fixed it, but there doesn't seem to be a reason to keep the flaky
+annotation.
+
+* platform/gtk/TestExpectations:
+
 2017-12-07  Manuel Rego Casasnovas  
 
 [css-grid] Remove duplicated tests that are now present in WPT


Modified: trunk/LayoutTests/platform/gtk/TestExpectations (225624 => 225625)

--- trunk/LayoutTests/platform/gtk/TestExpectations	2017-12-07 11:54:36 UTC (rev 225624)
+++ trunk/LayoutTests/platform/gtk/TestExpectations	2017-12-07 13:27:53 UTC (rev 225625)
@@ -1805,7 +1805,6 @@
 webkit.org/b/153941 fast/text/control-characters/visible-control-characters-3.xhtml [ ImageOnlyFailure Pass ]
 
 webkit.org/b/160129 imported/w3c/web-platform-tests/html/semantics/embedded-content/media-elements/event_timeupdate_noautoplay.html [ Timeout Pass ]
-webkit.org/b/168799 imported/w3c/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-api-texttracks.html [ Failure Pass ]
 
 webkit.org/b/160130 imported/w3c/web-platform-tests/html/dom/elements/global-attributes/dir_auto-contained-textarea-L.html [ ImageOnlyFailure Pass ]
 






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

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

[mcatanzaro]

Title: [225623] trunk/Source/WebCore








Revision 225623
Author mcatanz...@igalia.com
Date 2017-12-07 01:32:53 -0800 (Thu, 07 Dec 2017)


Log Message
[WPE][GTK] Update user agent quirk version strings
https://bugs.webkit.org/show_bug.cgi?id=180474

Reviewed by Carlos Garcia Campos.

* platform/UserAgentQuirks.cpp:
(WebCore::UserAgentQuirks::stringForQuirk):
* platform/glib/UserAgentGLib.cpp:
(WebCore::platformVersionForUAString):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/UserAgentQuirks.cpp
trunk/Source/WebCore/platform/glib/UserAgentGLib.cpp




Diff

Modified: trunk/Source/WebCore/ChangeLog (225622 => 225623)

--- trunk/Source/WebCore/ChangeLog	2017-12-07 07:37:50 UTC (rev 225622)
+++ trunk/Source/WebCore/ChangeLog	2017-12-07 09:32:53 UTC (rev 225623)
@@ -1,3 +1,15 @@
+2017-12-07  Michael Catanzaro  
+
+[WPE][GTK] Update user agent quirk version strings
+https://bugs.webkit.org/show_bug.cgi?id=180474
+
+Reviewed by Carlos Garcia Campos.
+
+* platform/UserAgentQuirks.cpp:
+(WebCore::UserAgentQuirks::stringForQuirk):
+* platform/glib/UserAgentGLib.cpp:
+(WebCore::platformVersionForUAString):
+
 2017-12-06  Chris Dumez  
 
 We should be able to recover after a Service Worker process crash


Modified: trunk/Source/WebCore/platform/UserAgentQuirks.cpp (225622 => 225623)

--- trunk/Source/WebCore/platform/UserAgentQuirks.cpp	2017-12-07 07:37:50 UTC (rev 225622)
+++ trunk/Source/WebCore/platform/UserAgentQuirks.cpp	2017-12-07 09:32:53 UTC (rev 225623)
@@ -118,7 +118,8 @@
 // Get versions from https://chromium.googlesource.com/chromium/src.git
 return ASCIILiteral("Chrome/58.0.3029.81");
 case NeedsMacintoshPlatform:
-return ASCIILiteral("Macintosh; Intel Mac OS X 10_12");
+// Frozen per https://bugs.webkit.org/show_bug.cgi?id=180365
+return ASCIILiteral("Macintosh; Intel Mac OS X 10_13_4");
 case NeedsLinuxDesktopPlatform:
 return ASCIILiteral("X11; Linux x86_64");
 case NumUserAgentQuirks:


Modified: trunk/Source/WebCore/platform/glib/UserAgentGLib.cpp (225622 => 225623)

--- trunk/Source/WebCore/platform/glib/UserAgentGLib.cpp	2017-12-07 07:37:50 UTC (rev 225622)
+++ trunk/Source/WebCore/platform/glib/UserAgentGLib.cpp	2017-12-07 09:32:53 UTC (rev 225623)
@@ -63,9 +63,8 @@
 #else
 // We will always claim to be Safari in Intel Mac OS X, since Safari without
 // OS X or anything on ARM triggers mobile versions of some websites.
-//
-// FIXME: The final result should include OS version, e.g. "Intel Mac OS X 10_8_4".
-static NeverDestroyed uaOSVersion(MAKE_STATIC_STRING_IMPL("Intel Mac OS X"));
+// Version is frozen per https://bugs.webkit.org/show_bug.cgi?id=180365
+static NeverDestroyed uaOSVersion(MAKE_STATIC_STRING_IMPL("Intel Mac OS X 10_13_4"));
 return uaOSVersion;
 #endif
 }






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