[webkit-changes] [226172] trunk

2017-12-19 Thread mmaxfield
Title: [226172] trunk








Revision 226172
Author mmaxfi...@apple.com
Date 2017-12-19 19:24:15 -0800 (Tue, 19 Dec 2017)


Log Message
Refactor user-installed font setting for clarity
https://bugs.webkit.org/show_bug.cgi?id=181013

Reviewed by Simon Fraser.

Source/WebCore:

Pave the way for https://bugs.webkit.org/show_bug.cgi?id=180951.

This patch renames the Setting to not have so many grammatical negatives, and moves
some CoreText-specific FontCache function signatures into a new FontCacheCoreText.h
header file. It also uses the AllowUserInstalledFonts enum class in more places instead
of the old boolean we were using, and puts this enum class in the common TextFlags.h
header.

No new tests because there is no behavior change.

* WebCore.xcodeproj/project.pbxproj:
* css/CSSFontFaceSet.cpp:
(WebCore::CSSFontFaceSet::ensureLocalFontFacesForFamilyRegistered):
* css/StyleResolver.cpp:
(WebCore::StyleResolver::initializeFontStyle):
* page/Settings.yaml:
* platform/graphics/FontCache.h:
(WebCore::SynthesisPair::SynthesisPair): Deleted.
(WebCore::SynthesisPair::boldObliquePair const): Deleted.
* platform/graphics/FontDescription.cpp:
(WebCore::m_shouldAllowUserInstalledFonts):
(WebCore::m_mayRepresentUserInstalledFont): Deleted.
* platform/graphics/FontDescription.h:
(WebCore::FontDescription::shouldAllowUserInstalledFonts const):
(WebCore::FontDescription::setShouldAllowUserInstalledFonts):
(WebCore::FontDescription::operator== const):
(WebCore::FontDescription::mayRepresentUserInstalledFont const): Deleted.
(WebCore::FontDescription::setMayRepresentUserInstalledFont): Deleted.
* platform/graphics/cocoa/FontCacheCoreText.cpp:
(WebCore::FontDatabase::singleton):
(WebCore::FontDatabase::singletonAllowingUserInstalledFonts):
(WebCore::FontDatabase::singletonDisallowingUserInstalledFonts):
(WebCore::FontDatabase::FontDatabase):
(WebCore::platformFontLookupWithFamily):
(WebCore::fontWithFamily):
* platform/graphics/cocoa/FontCacheCoreText.h: Added.
(WebCore::SynthesisPair::SynthesisPair):
(WebCore::SynthesisPair::boldObliquePair const):
* platform/text/TextFlags.h:
* style/StyleResolveForDocument.cpp:
(WebCore::Style::resolveForDocument):

Source/WebKit:

There are no clients of this SPI yet, so we can rename it to remove the
grammatical negative.

* Shared/WebPreferences.yaml:
* UIProcess/API/C/WKPreferences.cpp:
(WKPreferencesSetShouldAllowUserInstalledFonts):
(WKPreferencesGetShouldAllowUserInstalledFonts):
(WKPreferencesSetShouldDisallowUserInstalledFonts): Deleted.
(WKPreferencesGetShouldDisallowUserInstalledFonts): Deleted.
* UIProcess/API/C/WKPreferencesRefPrivate.h:
* UIProcess/API/Cocoa/WKPreferences.mm:
(-[WKPreferences _shouldAllowUserInstalledFonts]):
(-[WKPreferences _setShouldAllowUserInstalledFonts:]):
(-[WKPreferences _shouldDisallowUserInstalledFonts]): Deleted.
(-[WKPreferences _setShouldDisallowUserInstalledFonts:]): Deleted.
* UIProcess/API/Cocoa/WKPreferencesPrivate.h:

LayoutTests:

* fast/text/user-installed-fonts/disable.html:
* fast/text/user-installed-fonts/shadow-disable.html:
* fast/text/user-installed-fonts/shadow-family-disable.html:
* fast/text/user-installed-fonts/shadow-postscript-disable.html:
* fast/text/user-installed-fonts/shadow-postscript-family-disable.html:

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/LayoutTests/fast/text/user-installed-fonts/disable.html
trunk/LayoutTests/fast/text/user-installed-fonts/shadow-disable.html
trunk/LayoutTests/fast/text/user-installed-fonts/shadow-family-disable.html
trunk/LayoutTests/fast/text/user-installed-fonts/shadow-postscript-disable.html
trunk/LayoutTests/fast/text/user-installed-fonts/shadow-postscript-family-disable.html
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj
trunk/Source/WebCore/css/CSSFontFaceSet.cpp
trunk/Source/WebCore/css/StyleResolver.cpp
trunk/Source/WebCore/page/Settings.yaml
trunk/Source/WebCore/platform/graphics/FontCache.h
trunk/Source/WebCore/platform/graphics/FontDescription.cpp
trunk/Source/WebCore/platform/graphics/FontDescription.h
trunk/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp
trunk/Source/WebCore/platform/text/TextFlags.h
trunk/Source/WebCore/style/StyleResolveForDocument.cpp
trunk/Source/WebKit/ChangeLog
trunk/Source/WebKit/Shared/WebPreferences.yaml
trunk/Source/WebKit/UIProcess/API/C/WKPreferences.cpp
trunk/Source/WebKit/UIProcess/API/C/WKPreferencesRefPrivate.h
trunk/Source/WebKit/UIProcess/API/Cocoa/WKPreferences.mm
trunk/Source/WebKit/UIProcess/API/Cocoa/WKPreferencesPrivate.h


Added Paths

trunk/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.h




Diff

Modified: trunk/LayoutTests/ChangeLog (226171 => 226172)

--- trunk/LayoutTests/ChangeLog	2017-12-20 03:17:24 UTC (rev 226171)
+++ trunk/LayoutTests/ChangeLog	2017-12-20 03:24:15 UTC (rev 226172)
@@ -1,3 +1,16 @@
+2017-12-19  Myles C. Maxfield  
+
+Refactor user-installed font setting for clarity
+https://bugs.webkit.org/show_bug.cgi?id=181013
+
+Re

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

2017-12-19 Thread commit-queue
Title: [226171] trunk/Source/WebCore








Revision 226171
Author commit-qu...@webkit.org
Date 2017-12-19 19:17:24 -0800 (Tue, 19 Dec 2017)


Log Message
UserMediaRequest should stop a request when Document is being stopped
https://bugs.webkit.org/show_bug.cgi?id=180962

Patch by Youenn Fablet  on 2017-12-19
Reviewed by Eric Carlson.

Covered by fast/mediastream/destroy-document-while-enumerating-devices.html not crashing anymore under guardmalloc.
Stopping to wait for the media stream to be active whenDocument goes away.

* Modules/mediastream/UserMediaRequest.cpp:
(WebCore::UserMediaRequest::UserMediaRequest):
(WebCore::UserMediaRequest::stop):
(WebCore::UserMediaRequest::activeDOMObjectName const):
(WebCore::UserMediaRequest::canSuspendForDocumentSuspension const):
(WebCore::UserMediaRequest::contextDestroyed): Deleted.
* Modules/mediastream/UserMediaRequest.h:

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/Modules/mediastream/UserMediaRequest.cpp
trunk/Source/WebCore/Modules/mediastream/UserMediaRequest.h




Diff

Modified: trunk/Source/WebCore/ChangeLog (226170 => 226171)

--- trunk/Source/WebCore/ChangeLog	2017-12-20 01:58:41 UTC (rev 226170)
+++ trunk/Source/WebCore/ChangeLog	2017-12-20 03:17:24 UTC (rev 226171)
@@ -1,3 +1,21 @@
+2017-12-19  Youenn Fablet  
+
+UserMediaRequest should stop a request when Document is being stopped
+https://bugs.webkit.org/show_bug.cgi?id=180962
+
+Reviewed by Eric Carlson.
+
+Covered by fast/mediastream/destroy-document-while-enumerating-devices.html not crashing anymore under guardmalloc.
+Stopping to wait for the media stream to be active whenDocument goes away.
+
+* Modules/mediastream/UserMediaRequest.cpp:
+(WebCore::UserMediaRequest::UserMediaRequest):
+(WebCore::UserMediaRequest::stop):
+(WebCore::UserMediaRequest::activeDOMObjectName const):
+(WebCore::UserMediaRequest::canSuspendForDocumentSuspension const):
+(WebCore::UserMediaRequest::contextDestroyed): Deleted.
+* Modules/mediastream/UserMediaRequest.h:
+
 2017-12-19  Antti Koivisto  
 
 Move first-letter building code to RenderTreeBuilder


Modified: trunk/Source/WebCore/Modules/mediastream/UserMediaRequest.cpp (226170 => 226171)

--- trunk/Source/WebCore/Modules/mediastream/UserMediaRequest.cpp	2017-12-20 01:58:41 UTC (rev 226170)
+++ trunk/Source/WebCore/Modules/mediastream/UserMediaRequest.cpp	2017-12-20 03:17:24 UTC (rev 226171)
@@ -60,10 +60,11 @@
 }
 
 UserMediaRequest::UserMediaRequest(Document& document, MediaStreamRequest&& request, DOMPromiseDeferred>&& promise)
-: ContextDestructionObserver(&document)
+: ActiveDOMObject(&document)
 , m_promise(WTFMove(promise))
 , m_request(WTFMove(request))
 {
+suspendIfNeeded();
 }
 
 UserMediaRequest::~UserMediaRequest() = default;
@@ -203,7 +204,7 @@
 {
 RELEASE_LOG(MediaStream, "UserMediaRequest::allow %s %s", audioDevice ? audioDevice.persistentId().utf8().data() : "", videoDevice ? videoDevice.persistentId().utf8().data() : "");
 
-auto callback = [this, protectedThis = makeRef(*this)](RefPtr&& privateStream) mutable {
+auto callback = [this, protector = makePendingActivity(*this)](RefPtr&& privateStream) mutable {
 if (!m_scriptExecutionContext)
 return;
 
@@ -219,7 +220,7 @@
 return;
 }
 
-m_pendingActivationMediaStream = PendingActivationMediaStream::create(WTFMove(protectedThis), WTFMove(stream));
+m_pendingActivationMediaStream = PendingActivationMediaStream::create(WTFMove(protector), *this, WTFMove(stream));
 };
 
 m_request.audioConstraints.deviceIDHashSalt = deviceIdentifierHashSalt;
@@ -274,11 +275,8 @@
 }
 }
 
-void UserMediaRequest::contextDestroyed()
+void UserMediaRequest::stop()
 {
-if (!m_scriptExecutionContext)
-return;
-
 auto& document = downcast(*m_scriptExecutionContext);
 auto* controller = UserMediaController::from(document.page());
 
@@ -290,13 +288,24 @@
 controller->cancelUserMediaAccessRequest(*this);
 }
 
+const char* UserMediaRequest::activeDOMObjectName() const
+{
+return "UserMediaRequest";
+}
+
+bool UserMediaRequest::canSuspendForDocumentSuspension() const
+{
+return !hasPendingActivity();
+}
+
 Document* UserMediaRequest::document() const
 {
 return downcast(m_scriptExecutionContext);
 }
 
-UserMediaRequest::PendingActivationMediaStream::PendingActivationMediaStream(Ref&& request, Ref&& stream)
-: m_userMediaRequest(WTFMove(request))
+UserMediaRequest::PendingActivationMediaStream::PendingActivationMediaStream(Ref>&& protectingUserMediaRequest, UserMediaRequest& userMediaRequest, Ref&& stream)
+: m_protectingUserMediaRequest(WTFMove(protectingUserMediaRequest))
+, m_userMediaRequest(userMediaRequest)
 , m_mediaStream(WTFMove(stream))
 {
 m_mediaStream->privateStream().addObserver(*this);
@@ -311,7 +320,7 @@
 void UserMediaRequest::PendingActi

[webkit-changes] [226170] branches/safari-604.5.100-branch/Source

2017-12-19 Thread jmarcell
Title: [226170] branches/safari-604.5.100-branch/Source








Revision 226170
Author jmarc...@apple.com
Date 2017-12-19 17:58:41 -0800 (Tue, 19 Dec 2017)


Log Message
Versioning.

Modified Paths

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




Diff

Modified: branches/safari-604.5.100-branch/Source/_javascript_Core/Configurations/Version.xcconfig (226169 => 226170)

--- branches/safari-604.5.100-branch/Source/_javascript_Core/Configurations/Version.xcconfig	2017-12-20 01:52:29 UTC (rev 226169)
+++ branches/safari-604.5.100-branch/Source/_javascript_Core/Configurations/Version.xcconfig	2017-12-20 01:58:41 UTC (rev 226170)
@@ -24,7 +24,7 @@
 MAJOR_VERSION = 604;
 MINOR_VERSION = 5;
 TINY_VERSION = 100;
-MICRO_VERSION = 3;
+MICRO_VERSION = 4;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION);
 


Modified: branches/safari-604.5.100-branch/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig (226169 => 226170)

--- branches/safari-604.5.100-branch/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig	2017-12-20 01:52:29 UTC (rev 226169)
+++ branches/safari-604.5.100-branch/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig	2017-12-20 01:58:41 UTC (rev 226170)
@@ -24,7 +24,7 @@
 MAJOR_VERSION = 604;
 MINOR_VERSION = 5;
 TINY_VERSION = 100;
-MICRO_VERSION = 3;
+MICRO_VERSION = 4;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION);
 


Modified: branches/safari-604.5.100-branch/Source/WebCore/Configurations/Version.xcconfig (226169 => 226170)

--- branches/safari-604.5.100-branch/Source/WebCore/Configurations/Version.xcconfig	2017-12-20 01:52:29 UTC (rev 226169)
+++ branches/safari-604.5.100-branch/Source/WebCore/Configurations/Version.xcconfig	2017-12-20 01:58:41 UTC (rev 226170)
@@ -24,7 +24,7 @@
 MAJOR_VERSION = 604;
 MINOR_VERSION = 5;
 TINY_VERSION = 100;
-MICRO_VERSION = 3;
+MICRO_VERSION = 4;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION);
 


Modified: branches/safari-604.5.100-branch/Source/WebCore/PAL/Configurations/Version.xcconfig (226169 => 226170)

--- branches/safari-604.5.100-branch/Source/WebCore/PAL/Configurations/Version.xcconfig	2017-12-20 01:52:29 UTC (rev 226169)
+++ branches/safari-604.5.100-branch/Source/WebCore/PAL/Configurations/Version.xcconfig	2017-12-20 01:58:41 UTC (rev 226170)
@@ -24,7 +24,7 @@
 MAJOR_VERSION = 604;
 MINOR_VERSION = 5;
 TINY_VERSION = 100;
-MICRO_VERSION = 3;
+MICRO_VERSION = 4;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION);
 


Modified: branches/safari-604.5.100-branch/Source/WebInspectorUI/Configurations/Version.xcconfig (226169 => 226170)

--- branches/safari-604.5.100-branch/Source/WebInspectorUI/Configurations/Version.xcconfig	2017-12-20 01:52:29 UTC (rev 226169)
+++ branches/safari-604.5.100-branch/Source/WebInspectorUI/Configurations/Version.xcconfig	2017-12-20 01:58:41 UTC (rev 226170)
@@ -1,7 +1,7 @@
 MAJOR_VERSION = 604;
 MINOR_VERSION = 5;
 TINY_VERSION = 100;
-MICRO_VERSION = 3;
+MICRO_VERSION = 4;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION);
 


Modified: branches/safari-604.5.100-branch/Source/WebKit/Configurations/Version.xcconfig (226169 => 226170)

--- branches/safari-604.5.100-branch/Source/WebKit/Configurations/Version.xcconfig	2017-12-20 01:52:29 UTC (rev 226169)
+++ branches/safari-604.5.100-branch/Source/WebKit/Configurations/Version.xcconfig	2017-12-20 01:58:41 UTC (rev 226170)
@@ -24,7 +24,7 @@
 MAJOR_VERSION = 604;
 MINOR_VERSION = 5;
 TINY_VERSION = 100;
-MICRO_VERSION = 3;
+MICRO_VERSION = 4;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION);
 


Modified: branches/safari-604.5.100-branch/Source/WebKitLegacy/mac/Configurations/Version.xcconfig (226169 => 226170)

--- branches/safari-604.5.100-branch/Source/WebKitLegacy/mac/Configurations/Version.xcconfig	2017-12-20 01:52:29 UTC (rev 226169)
+++ branches/safari-604.5.100-branch/Source/WebKitLegacy/mac/Configurations/Version.xcconfig	2017-12-20 01:58:41 UTC (rev 226170)
@@ -24,7 +24,7 @@
 MAJOR_VERSION = 604;
 MINOR_VERSION = 5;
 TINY_VERSION = 100;
-MICRO_VERSION = 3;
+MICRO_VERSION = 4;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION);
 







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

2017-12-19 Thread jmarcell
Title: [226169] branches/safari-604-branch/Source








Revision 226169
Author jmarc...@apple.com
Date 2017-12-19 17:52:29 -0800 (Tue, 19 Dec 2017)


Log Message
Versioning.

Modified Paths

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




Diff

Modified: branches/safari-604-branch/Source/_javascript_Core/Configurations/Version.xcconfig (226168 => 226169)

--- branches/safari-604-branch/Source/_javascript_Core/Configurations/Version.xcconfig	2017-12-20 01:44:37 UTC (rev 226168)
+++ branches/safari-604-branch/Source/_javascript_Core/Configurations/Version.xcconfig	2017-12-20 01:52:29 UTC (rev 226169)
@@ -23,7 +23,7 @@
 
 MAJOR_VERSION = 604;
 MINOR_VERSION = 5;
-TINY_VERSION = 3;
+TINY_VERSION = 4;
 MICRO_VERSION = 0;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION);


Modified: branches/safari-604-branch/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig (226168 => 226169)

--- branches/safari-604-branch/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig	2017-12-20 01:44:37 UTC (rev 226168)
+++ branches/safari-604-branch/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig	2017-12-20 01:52:29 UTC (rev 226169)
@@ -23,7 +23,7 @@
 
 MAJOR_VERSION = 604;
 MINOR_VERSION = 5;
-TINY_VERSION = 3;
+TINY_VERSION = 4;
 MICRO_VERSION = 0;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION);


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

--- branches/safari-604-branch/Source/WebCore/Configurations/Version.xcconfig	2017-12-20 01:44:37 UTC (rev 226168)
+++ branches/safari-604-branch/Source/WebCore/Configurations/Version.xcconfig	2017-12-20 01:52:29 UTC (rev 226169)
@@ -23,7 +23,7 @@
 
 MAJOR_VERSION = 604;
 MINOR_VERSION = 5;
-TINY_VERSION = 3;
+TINY_VERSION = 4;
 MICRO_VERSION = 0;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION);


Modified: branches/safari-604-branch/Source/WebCore/PAL/Configurations/Version.xcconfig (226168 => 226169)

--- branches/safari-604-branch/Source/WebCore/PAL/Configurations/Version.xcconfig	2017-12-20 01:44:37 UTC (rev 226168)
+++ branches/safari-604-branch/Source/WebCore/PAL/Configurations/Version.xcconfig	2017-12-20 01:52:29 UTC (rev 226169)
@@ -23,7 +23,7 @@
 
 MAJOR_VERSION = 604;
 MINOR_VERSION = 5;
-TINY_VERSION = 3;
+TINY_VERSION = 4;
 MICRO_VERSION = 0;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION);


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

--- branches/safari-604-branch/Source/WebInspectorUI/Configurations/Version.xcconfig	2017-12-20 01:44:37 UTC (rev 226168)
+++ branches/safari-604-branch/Source/WebInspectorUI/Configurations/Version.xcconfig	2017-12-20 01:52:29 UTC (rev 226169)
@@ -1,6 +1,6 @@
 MAJOR_VERSION = 604;
 MINOR_VERSION = 5;
-TINY_VERSION = 3;
+TINY_VERSION = 4;
 MICRO_VERSION = 0;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION);


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

--- branches/safari-604-branch/Source/WebKit/Configurations/Version.xcconfig	2017-12-20 01:44:37 UTC (rev 226168)
+++ branches/safari-604-branch/Source/WebKit/Configurations/Version.xcconfig	2017-12-20 01:52:29 UTC (rev 226169)
@@ -23,7 +23,7 @@
 
 MAJOR_VERSION = 604;
 MINOR_VERSION = 5;
-TINY_VERSION = 3;
+TINY_VERSION = 4;
 MICRO_VERSION = 0;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION);


Modified: branches/safari-604-branch/Source/WebKitLegacy/mac/Configurations/Version.xcconfig (226168 => 226169)

--- branches/safari-604-branch/Source/WebKitLegacy/mac/Configurations/Version.xcconfig	2017-12-20 01:44:37 UTC (rev 226168)
+++ branches/safari-604-branch/Source/WebKitLegacy/mac/Configurations/Version.xcconfig	2017-12-20 01:52:29 UTC (rev 226169)
@@ -23,7 +23,7 @@
 
 MAJOR_VERSION = 604;
 MINOR_VERSION = 5;
-TINY_VERSION = 3;
+TINY_VERSION = 4;
 MICRO_VERSION = 0;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION);






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


[webkit-changes] [226167] tags/Safari-604.5.3/

2017-12-19 Thread jmarcell
Title: [226167] tags/Safari-604.5.3/








Revision 226167
Author jmarc...@apple.com
Date 2017-12-19 17:44:07 -0800 (Tue, 19 Dec 2017)


Log Message
Tag Safari-604.5.3.

Added Paths

tags/Safari-604.5.3/




Diff




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


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

2017-12-19 Thread antti
Title: [226168] trunk/Source/WebCore








Revision 226168
Author an...@apple.com
Date 2017-12-19 17:44:37 -0800 (Tue, 19 Dec 2017)


Log Message
Move first-letter building code to RenderTreeBuilder
https://bugs.webkit.org/show_bug.cgi?id=180992

Reviewed by Zalan Bujtas.

All special case tree building logic should go to RenderTreeBuilder.

- RenderTreeUpdater::FirstLetter -> RenderTreeBuilder::FirstLetter
- Make the builder non-static and stop using RenderTreeBuilder::current() there.

* Sources.txt:
* WebCore.xcodeproj/project.pbxproj:
* rendering/TextAutoSizing.cpp:
(WebCore::TextAutoSizingValue::adjustTextNodeSizes):
* rendering/updating/RenderTreeBuilder.cpp:
(WebCore::RenderTreeBuilder::RenderTreeBuilder):
(WebCore::RenderTreeBuilder::insertChild):
(WebCore::RenderTreeBuilder::updateAfterDescendants):
* rendering/updating/RenderTreeBuilder.h:
(WebCore::RenderTreeBuilder::firstLetterBuilder):
(WebCore::RenderTreeBuilder::tableBuilder):
* rendering/updating/RenderTreeBuilderFirstLetter.cpp: Copied from rendering/updating/RenderTreeUpdaterFirstLetter.cpp.
(WebCore::supportsFirstLetter):
(WebCore::RenderTreeBuilder::FirstLetter::FirstLetter):
(WebCore::RenderTreeBuilder::FirstLetter::updateAfterDescendants):
(WebCore::RenderTreeBuilder::FirstLetter::updateStyle):
(WebCore::RenderTreeBuilder::FirstLetter::createRenderers):
(WebCore::updateFirstLetterStyle): Deleted.
(WebCore::createFirstLetterRenderer): Deleted.
(WebCore::RenderTreeUpdater::FirstLetter::update): Deleted.
* rendering/updating/RenderTreeBuilderFirstLetter.h: Copied from rendering/updating/RenderTreeUpdaterFirstLetter.h.
* rendering/updating/RenderTreeUpdater.cpp:
(WebCore::RenderTreeUpdater::updateAfterDescendants):
* rendering/updating/RenderTreeUpdater.h:
* rendering/updating/RenderTreeUpdaterFirstLetter.cpp: Removed.
* rendering/updating/RenderTreeUpdaterFirstLetter.h: Removed.

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/Sources.txt
trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj
trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj.orig
trunk/Source/WebCore/rendering/TextAutoSizing.cpp
trunk/Source/WebCore/rendering/updating/RenderTreeBuilder.cpp
trunk/Source/WebCore/rendering/updating/RenderTreeBuilder.h
trunk/Source/WebCore/rendering/updating/RenderTreeUpdater.cpp
trunk/Source/WebCore/rendering/updating/RenderTreeUpdater.h


Added Paths

trunk/Source/WebCore/rendering/updating/RenderTreeBuilderFirstLetter.cpp
trunk/Source/WebCore/rendering/updating/RenderTreeBuilderFirstLetter.h


Removed Paths

trunk/Source/WebCore/rendering/updating/RenderTreeUpdaterFirstLetter.cpp
trunk/Source/WebCore/rendering/updating/RenderTreeUpdaterFirstLetter.h




Diff

Modified: trunk/Source/WebCore/ChangeLog (226167 => 226168)

--- trunk/Source/WebCore/ChangeLog	2017-12-20 01:44:07 UTC (rev 226167)
+++ trunk/Source/WebCore/ChangeLog	2017-12-20 01:44:37 UTC (rev 226168)
@@ -1,3 +1,42 @@
+2017-12-19  Antti Koivisto  
+
+Move first-letter building code to RenderTreeBuilder
+https://bugs.webkit.org/show_bug.cgi?id=180992
+
+Reviewed by Zalan Bujtas.
+
+All special case tree building logic should go to RenderTreeBuilder.
+
+- RenderTreeUpdater::FirstLetter -> RenderTreeBuilder::FirstLetter
+- Make the builder non-static and stop using RenderTreeBuilder::current() there.
+
+* Sources.txt:
+* WebCore.xcodeproj/project.pbxproj:
+* rendering/TextAutoSizing.cpp:
+(WebCore::TextAutoSizingValue::adjustTextNodeSizes):
+* rendering/updating/RenderTreeBuilder.cpp:
+(WebCore::RenderTreeBuilder::RenderTreeBuilder):
+(WebCore::RenderTreeBuilder::insertChild):
+(WebCore::RenderTreeBuilder::updateAfterDescendants):
+* rendering/updating/RenderTreeBuilder.h:
+(WebCore::RenderTreeBuilder::firstLetterBuilder):
+(WebCore::RenderTreeBuilder::tableBuilder):
+* rendering/updating/RenderTreeBuilderFirstLetter.cpp: Copied from rendering/updating/RenderTreeUpdaterFirstLetter.cpp.
+(WebCore::supportsFirstLetter):
+(WebCore::RenderTreeBuilder::FirstLetter::FirstLetter):
+(WebCore::RenderTreeBuilder::FirstLetter::updateAfterDescendants):
+(WebCore::RenderTreeBuilder::FirstLetter::updateStyle):
+(WebCore::RenderTreeBuilder::FirstLetter::createRenderers):
+(WebCore::updateFirstLetterStyle): Deleted.
+(WebCore::createFirstLetterRenderer): Deleted.
+(WebCore::RenderTreeUpdater::FirstLetter::update): Deleted.
+* rendering/updating/RenderTreeBuilderFirstLetter.h: Copied from rendering/updating/RenderTreeUpdaterFirstLetter.h.
+* rendering/updating/RenderTreeUpdater.cpp:
+(WebCore::RenderTreeUpdater::updateAfterDescendants):
+* rendering/updating/RenderTreeUpdater.h:
+* rendering/updating/RenderTreeUpdaterFirstLetter.cpp: Removed.
+* rendering/updating/RenderTreeUpdaterFirstLetter.h: Removed.
+
 2017-12-19  Ch

[webkit-changes] [226166] tags/Safari-604.5.100.3/

2017-12-19 Thread jmarcell
Title: [226166] tags/Safari-604.5.100.3/








Revision 226166
Author jmarc...@apple.com
Date 2017-12-19 17:43:45 -0800 (Tue, 19 Dec 2017)


Log Message
Tag Safari-604.5.100.3.

Added Paths

tags/Safari-604.5.100.3/




Diff




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


[webkit-changes] [226165] trunk/Tools

2017-12-19 Thread dbates
Title: [226165] trunk/Tools








Revision 226165
Author dba...@webkit.org
Date 2017-12-19 17:33:46 -0800 (Tue, 19 Dec 2017)


Log Message
MarkerSubrange.SubdivideGrammarAndSelectionOverlap{Frontmost, FrontmostWithLongestEffectiveRange} are failing
https://bugs.webkit.org/show_bug.cgi?id=181014

Temporarily disable tests while I investigate offline.

* TestWebKitAPI/Tests/WebCore/MarkerSubrange.cpp:
(TestWebKitAPI::TEST):

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/TestWebKitAPI/Tests/WebCore/MarkerSubrange.cpp




Diff

Modified: trunk/Tools/ChangeLog (226164 => 226165)

--- trunk/Tools/ChangeLog	2017-12-20 01:31:21 UTC (rev 226164)
+++ trunk/Tools/ChangeLog	2017-12-20 01:33:46 UTC (rev 226165)
@@ -1,3 +1,13 @@
+2017-12-19  Daniel Bates  
+
+MarkerSubrange.SubdivideGrammarAndSelectionOverlap{Frontmost, FrontmostWithLongestEffectiveRange} are failing
+https://bugs.webkit.org/show_bug.cgi?id=181014
+
+Temporarily disable tests while I investigate offline.
+
+* TestWebKitAPI/Tests/WebCore/MarkerSubrange.cpp:
+(TestWebKitAPI::TEST):
+
 2017-12-19  Wenson Hsieh  
 
 Unreviewed, rebaseline an API test result for El Capitan and Sierra.


Modified: trunk/Tools/TestWebKitAPI/Tests/WebCore/MarkerSubrange.cpp (226164 => 226165)

--- trunk/Tools/TestWebKitAPI/Tests/WebCore/MarkerSubrange.cpp	2017-12-20 01:31:21 UTC (rev 226164)
+++ trunk/Tools/TestWebKitAPI/Tests/WebCore/MarkerSubrange.cpp	2017-12-20 01:33:46 UTC (rev 226165)
@@ -174,7 +174,7 @@
 EXPECT_EQ(expectedSubranges[i], results[i]);
 }
 
-TEST(MarkerSubrange, SubdivideGrammarAndSelectionOverlapFrontmost)
+TEST(MarkerSubrange, DISABLED_SubdivideGrammarAndSelectionOverlapFrontmost)
 {
 Vector subranges {
 MarkerSubrange { 0, 40, MarkerSubrange::GrammarError },
@@ -193,7 +193,7 @@
 EXPECT_EQ(expectedSubranges[i], results[i]);
 }
 
-TEST(MarkerSubrange, SubdivideGrammarAndSelectionOverlapFrontmostWithLongestEffectiveRange)
+TEST(MarkerSubrange, DISABLED_SubdivideGrammarAndSelectionOverlapFrontmostWithLongestEffectiveRange)
 {
 Vector subranges {
 MarkerSubrange { 0, 40, MarkerSubrange::GrammarError },






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


[webkit-changes] [226164] trunk/Tools

2017-12-19 Thread wenson_hsieh
Title: [226164] trunk/Tools








Revision 226164
Author wenson_hs...@apple.com
Date 2017-12-19 17:31:21 -0800 (Tue, 19 Dec 2017)


Log Message
Unreviewed, rebaseline an API test result for El Capitan and Sierra.

* TestWebKitAPI/Tests/WebKitCocoa/WKAttachmentTests.mm:
(TestWebKitAPI::TEST):

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/WKAttachmentTests.mm




Diff

Modified: trunk/Tools/ChangeLog (226163 => 226164)

--- trunk/Tools/ChangeLog	2017-12-20 01:29:57 UTC (rev 226163)
+++ trunk/Tools/ChangeLog	2017-12-20 01:31:21 UTC (rev 226164)
@@ -1,3 +1,10 @@
+2017-12-19  Wenson Hsieh  
+
+Unreviewed, rebaseline an API test result for El Capitan and Sierra.
+
+* TestWebKitAPI/Tests/WebKitCocoa/WKAttachmentTests.mm:
+(TestWebKitAPI::TEST):
+
 2017-12-19  Ryosuke Niwa  
 
 Don't convert pasted content to use blob URL in WebKit1


Modified: trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/WKAttachmentTests.mm (226163 => 226164)

--- trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/WKAttachmentTests.mm	2017-12-20 01:29:57 UTC (rev 226163)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/WKAttachmentTests.mm	2017-12-20 01:31:21 UTC (rev 226164)
@@ -38,6 +38,8 @@
 #import 
 #endif
 
+#define USES_MODERN_ATTRIBUTED_STRING_CONVERSION ((PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 11) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300))
+
 #if WK_API_ENABLED
 
 @interface AttachmentUpdateObserver : NSObject 
@@ -871,8 +873,14 @@
 EXPECT_EQ(3, [webView stringByEvaluatingJavaScript:@"document.querySelectorAll('attachment').length"].integerValue);
 EXPECT_WK_STREQ("image/png", [webView stringByEvaluatingJavaScript:@"document.querySelectorAll('attachment')[0].getAttribute('type')"]);
 EXPECT_WK_STREQ("application/pdf", [webView stringByEvaluatingJavaScript:@"document.querySelectorAll('attachment')[1].getAttribute('type')"]);
-EXPECT_WK_STREQ("application/zip", [webView stringByEvaluatingJavaScript:@"document.querySelectorAll('attachment')[2].getAttribute('type')"]);
 
+NSString *zipAttachmentType = [webView stringByEvaluatingJavaScript:@"document.querySelectorAll('attachment')[2].getAttribute('type')"];
+#if USES_MODERN_ATTRIBUTED_STRING_CONVERSION
+EXPECT_WK_STREQ("application/zip", zipAttachmentType);
+#else
+EXPECT_WK_STREQ("application/octet-stream", zipAttachmentType);
+#endif
+
 {
 ObserveAttachmentUpdatesForScope observer(webView.get());
 [webView _synchronouslyExecuteEditCommand:@"SelectAll" argument:nil];






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


[webkit-changes] [226163] trunk

2017-12-19 Thread bburg
Title: [226163] trunk








Revision 226163
Author bb...@apple.com
Date 2017-12-19 17:29:57 -0800 (Tue, 19 Dec 2017)


Log Message
Web Inspector: InspectorTest.evaluateInPage should return a rejection if an error was thrown
https://bugs.webkit.org/show_bug.cgi?id=180956

Reviewed by Joseph Pecoraro.

Source/WebInspectorUI:

* UserInterface/Test/FrontendTestHarness.js:
(FrontendTestHarness.prototype.evaluateInPage.translateResult): Renamed.
(FrontendTestHarness.prototype.evaluateInPage):
If the result was thrown, then reject with the error.
Rename the helper method to match the same one in RemoteObject.prototype.fetchProperties.

LayoutTests:

* inspector/unit-tests/test-harness-evaluate-in-page-expected.txt:
* inspector/unit-tests/test-harness-evaluate-in-page.html:
Update test case to expect an exception when an error was thrown in our evaluation.

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/LayoutTests/inspector/unit-tests/test-harness-evaluate-in-page-expected.txt
trunk/LayoutTests/inspector/unit-tests/test-harness-evaluate-in-page.html
trunk/Source/WebInspectorUI/ChangeLog
trunk/Source/WebInspectorUI/UserInterface/Test/FrontendTestHarness.js




Diff

Modified: trunk/LayoutTests/ChangeLog (226162 => 226163)

--- trunk/LayoutTests/ChangeLog	2017-12-20 01:15:58 UTC (rev 226162)
+++ trunk/LayoutTests/ChangeLog	2017-12-20 01:29:57 UTC (rev 226163)
@@ -1,3 +1,14 @@
+2017-12-19  Brian Burg  
+
+Web Inspector: InspectorTest.evaluateInPage should return a rejection if an error was thrown
+https://bugs.webkit.org/show_bug.cgi?id=180956
+
+Reviewed by Joseph Pecoraro.
+
+* inspector/unit-tests/test-harness-evaluate-in-page-expected.txt:
+* inspector/unit-tests/test-harness-evaluate-in-page.html:
+Update test case to expect an exception when an error was thrown in our evaluation.
+
 2017-12-19  Eric Carlson  
 
 [MediaStream] Clean up RealtimeMediaSource interfaces


Modified: trunk/LayoutTests/inspector/unit-tests/test-harness-evaluate-in-page-expected.txt (226162 => 226163)

--- trunk/LayoutTests/inspector/unit-tests/test-harness-evaluate-in-page-expected.txt	2017-12-20 01:15:58 UTC (rev 226162)
+++ trunk/LayoutTests/inspector/unit-tests/test-harness-evaluate-in-page-expected.txt	2017-12-20 01:29:57 UTC (rev 226163)
@@ -142,9 +142,7 @@
 PASS: Subtype of evaluation result should be 'error'.
 
 Checking result of evaluating string: throw new Error(42)
-PASS: Returned result should be a WI.RemoteObject.
-PASS: Non-primitive evaluation results should not have a marshalled value.
-PASS: Type of evaluation result should be 'object'.
-PASS: Subtype of evaluation result should be 'error'.
+PASS: Should produce an exception.
+Error: Error: 42
 
 


Modified: trunk/LayoutTests/inspector/unit-tests/test-harness-evaluate-in-page.html (226162 => 226163)

--- trunk/LayoutTests/inspector/unit-tests/test-harness-evaluate-in-page.html	2017-12-20 01:15:58 UTC (rev 226162)
+++ trunk/LayoutTests/inspector/unit-tests/test-harness-evaluate-in-page.html	2017-12-20 01:29:57 UTC (rev 226163)
@@ -104,6 +104,7 @@
 input: `throw new Error(42)`,
 type: "object",
 subtype: "error",
+thrown: true,
 },
 ];
 
@@ -139,12 +140,20 @@
 name: "evaluateInPage.RemoteObjects",
 async test() {
 for (let {input, type, subtype, thrown} of complexCases) {
-let result = await InspectorTest.evaluateInPage(input);
 InspectorTest.log(`Checking result of evaluating string: ${input}`);
-InspectorTest.expectThat(result instanceof WI.RemoteObject, "Returned result should be a WI.RemoteObject.");
-InspectorTest.expectFalse(result.hasValue(), "Non-primitive evaluation results should not have a marshalled value.");
-InspectorTest.expectEqual(result.type, type, `Type of evaluation result should be '${type}'.`);
-InspectorTest.expectEqual(result.subtype, subtype, `Subtype of evaluation result should be '${subtype}'.`);
+
+if (thrown) {
+await InspectorTest.expectException(async () => {
+await InspectorTest.evaluateInPage(input);
+});
+} else {
+let result = await InspectorTest.evaluateInPage(input);
+InspectorTest.expectThat(result instanceof WI.RemoteObject, "Returned result should be a WI.RemoteObject.");
+InspectorTest.expectFalse(result.hasValue(), "Non-primitive evaluation results should not have a marshalled value.");
+InspectorTest.expectEqual(result.type, type, `Type of evaluation result should be '${type}'.`);
+InspectorTest.expectEqual(result.subtype, subtype, `Subtype of evaluation result should be '${subtype}'.`);
+}
+
 InspectorTest.log("");
 }
 }


Modified: trunk/Sou

[webkit-changes] [226162] trunk

2017-12-19 Thread cdumez
Title: [226162] trunk








Revision 226162
Author cdu...@apple.com
Date 2017-12-19 17:15:58 -0800 (Tue, 19 Dec 2017)


Log Message
[Fetch] Extracting a body of type Blob should not set Content-Type to the empty string
https://bugs.webkit.org/show_bug.cgi?id=180991

Reviewed by Youenn Fablet.

LayoutTests/imported/w3c:

Rebaseline WPT test now that it is passing.

* web-platform-tests/service-workers/service-worker/invalid-blobtype.https-expected.txt:

Source/WebCore:

Extracting a body of type Blob should not set Content-Type to the empty string as per:
- https://fetch.spec.whatwg.org/#concept-bodyinit-extract

No new tests, rebaselined existing test.

* Modules/fetch/FetchBody.cpp:
(WebCore::FetchBody::extract):

Modified Paths

trunk/LayoutTests/http/wpt/fetch/fetch-as-blob.js
trunk/LayoutTests/imported/w3c/ChangeLog
trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/request-headers.any-expected.txt
trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/request-headers.any.worker-expected.txt
trunk/LayoutTests/imported/w3c/web-platform-tests/service-workers/service-worker/invalid-blobtype.https-expected.txt
trunk/LayoutTests/platform/mac/imported/w3c/web-platform-tests/fetch/api/basic/request-headers.any-expected.txt
trunk/LayoutTests/platform/mac/imported/w3c/web-platform-tests/fetch/api/basic/request-headers.any.worker-expected.txt
trunk/LayoutTests/platform/mac-sierra/imported/w3c/web-platform-tests/fetch/api/basic/request-headers.any-expected.txt
trunk/LayoutTests/platform/mac-sierra/imported/w3c/web-platform-tests/fetch/api/basic/request-headers.any.worker-expected.txt
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/Modules/fetch/FetchBody.cpp




Diff

Modified: trunk/LayoutTests/http/wpt/fetch/fetch-as-blob.js (226161 => 226162)

--- trunk/LayoutTests/http/wpt/fetch/fetch-as-blob.js	2017-12-20 01:10:11 UTC (rev 226161)
+++ trunk/LayoutTests/http/wpt/fetch/fetch-as-blob.js	2017-12-20 01:15:58 UTC (rev 226162)
@@ -29,7 +29,7 @@
 return req.blob()
   .then(function(blob) {
   assert_equals(blob.type, '');
-  assert_equals(req.headers.get('Content-Type'), '');
+  assert_equals(req.headers.get('Content-Type'), null);
 });
   }, 'MIME type for Blob');
 


Modified: trunk/LayoutTests/imported/w3c/ChangeLog (226161 => 226162)

--- trunk/LayoutTests/imported/w3c/ChangeLog	2017-12-20 01:10:11 UTC (rev 226161)
+++ trunk/LayoutTests/imported/w3c/ChangeLog	2017-12-20 01:15:58 UTC (rev 226162)
@@ -1,5 +1,16 @@
 2017-12-19  Chris Dumez  
 
+[Fetch] Extracting a body of type Blob should not set Content-Type to the empty string
+https://bugs.webkit.org/show_bug.cgi?id=180991
+
+Reviewed by Youenn Fablet.
+
+Rebaseline WPT test now that it is passing.
+
+* web-platform-tests/service-workers/service-worker/invalid-blobtype.https-expected.txt:
+
+2017-12-19  Chris Dumez  
+
 scopeURL should start with the provided scriptURL
 https://bugs.webkit.org/show_bug.cgi?id=180983
 


Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/request-headers.any-expected.txt (226161 => 226162)

--- trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/request-headers.any-expected.txt	2017-12-20 01:10:11 UTC (rev 226161)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/request-headers.any-expected.txt	2017-12-20 01:15:58 UTC (rev 226162)
@@ -7,7 +7,7 @@
 PASS Fetch with POST with text body 
 PASS Fetch with POST with FormData body 
 PASS Fetch with POST with URLSearchParams body 
-FAIL Fetch with POST with Blob body assert_equals: Request should have header content-type: null expected (object) null but got (string) ""
+FAIL Fetch with POST with Blob body assert_equals: Request should have header content-type: null expected (object) null but got (string) "application/x-www-form-urlencoded"
 FAIL Fetch with POST with ArrayBuffer body assert_equals: Request should have header content-type: null expected (object) null but got (string) "application/x-www-form-urlencoded"
 FAIL Fetch with POST with Uint8Array body assert_equals: Request should have header content-type: null expected (object) null but got (string) "application/x-www-form-urlencoded"
 FAIL Fetch with POST with Int8Array body assert_equals: Request should have header content-type: null expected (object) null but got (string) "application/x-www-form-urlencoded"


Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/request-headers.any.worker-expected.txt (226161 => 226162)

--- trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/request-headers.any.worker-expected.txt	2017-12-20 01:10:11 UTC (rev 226161)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/request-headers.any.worker-expected.txt	2017-12-20 01:15:58 UTC (rev 226162)
@@ -7,7 +7,7 @@
 PASS Fetch with POST with text body 
 FAIL Fetch with POST with FormData body Can't find variab

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

2017-12-19 Thread commit-queue
Title: [226161] trunk/Source/WebCore








Revision 226161
Author commit-qu...@webkit.org
Date 2017-12-19 17:10:11 -0800 (Tue, 19 Dec 2017)


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

No longer needed to build without error. (Requested by xenon
on #webkit).

Reverted changeset:

"[GTK][WPE] Conditionalize libTASN1 use behind
ENABLE_SUBTLE_CRYPTO in the CMake files"
https://bugs.webkit.org/show_bug.cgi?id=180949
https://trac.webkit.org/changeset/226094

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/PlatformGTK.cmake
trunk/Source/WebCore/PlatformWPE.cmake




Diff

Modified: trunk/Source/WebCore/ChangeLog (226160 => 226161)

--- trunk/Source/WebCore/ChangeLog	2017-12-20 01:08:40 UTC (rev 226160)
+++ trunk/Source/WebCore/ChangeLog	2017-12-20 01:10:11 UTC (rev 226161)
@@ -1,3 +1,18 @@
+2017-12-19  Commit Queue  
+
+Unreviewed, rolling out r226094.
+https://bugs.webkit.org/show_bug.cgi?id=181012
+
+No longer needed to build without error. (Requested by xenon
+on #webkit).
+
+Reverted changeset:
+
+"[GTK][WPE] Conditionalize libTASN1 use behind
+ENABLE_SUBTLE_CRYPTO in the CMake files"
+https://bugs.webkit.org/show_bug.cgi?id=180949
+https://trac.webkit.org/changeset/226094
+
 2017-12-19  Eric Carlson  
 
 [MediaStream] Clean up RealtimeMediaSource interfaces


Modified: trunk/Source/WebCore/PlatformGTK.cmake (226160 => 226161)

--- trunk/Source/WebCore/PlatformGTK.cmake	2017-12-20 01:08:40 UTC (rev 226160)
+++ trunk/Source/WebCore/PlatformGTK.cmake	2017-12-20 01:10:11 UTC (rev 226161)
@@ -104,6 +104,7 @@
 ${GLIB_LIBRARIES}
 ${LIBSECRET_LIBRARIES}
 ${LIBSOUP_LIBRARIES}
+${LIBTASN1_LIBRARIES}
 ${HYPHEN_LIBRARIES}
 ${UPOWERGLIB_LIBRARIES}
 ${X11_X11_LIB}
@@ -125,6 +126,7 @@
 ${GLIB_INCLUDE_DIRS}
 ${LIBSECRET_INCLUDE_DIRS}
 ${LIBSOUP_INCLUDE_DIRS}
+${LIBTASN1_INCLUDE_DIRS}
 ${UPOWERGLIB_INCLUDE_DIRS}
 ${ZLIB_INCLUDE_DIRS}
 )
@@ -170,15 +172,6 @@
 )
 endif ()
 
-if (ENABLE_SUBTLE_CRYPTO)
-list(APPEND WebCore_SYSTEM_INCLUDE_DIRECTORIES
-${LIBTASN1_INCLUDE_DIRS}
-)
-list(APPEND WebCore_LIBRARIES
-${LIBTASN1_LIBRARIES}
-)
-endif ()
-
 if (ENABLE_WAYLAND_TARGET)
 list(APPEND WebCore_SYSTEM_INCLUDE_DIRECTORIES
 ${WAYLAND_INCLUDE_DIRS}


Modified: trunk/Source/WebCore/PlatformWPE.cmake (226160 => 226161)

--- trunk/Source/WebCore/PlatformWPE.cmake	2017-12-20 01:08:40 UTC (rev 226160)
+++ trunk/Source/WebCore/PlatformWPE.cmake	2017-12-20 01:10:11 UTC (rev 226161)
@@ -71,6 +71,7 @@
 ${GLIB_LIBRARIES}
 ${ICU_LIBRARIES}
 ${LIBSOUP_LIBRARIES}
+${LIBTASN1_LIBRARIES}
 ${UPOWERGLIB_LIBRARIES}
 ${WPE_LIBRARIES}
 )
@@ -81,15 +82,7 @@
 ${GLIB_INCLUDE_DIRS}
 ${ICU_INCLUDE_DIRS}
 ${LIBSOUP_INCLUDE_DIRS}
+${LIBTASN1_INCLUDE_DIRS}
 ${UPOWERGLIB_INCLUDE_DIRS}
 ${WPE_INCLUDE_DIRS}
 )
-
-if (ENABLE_SUBTLE_CRYPTO)
-list(APPEND WebCore_SYSTEM_INCLUDE_DIRECTORIES
-${LIBTASN1_INCLUDE_DIRS}
-)
-list(APPEND WebCore_LIBRARIES
-${LIBTASN1_LIBRARIES}
-)
-endif ()






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


[webkit-changes] [226159] trunk/LayoutTests

2017-12-19 Thread jlewis3
Title: [226159] trunk/LayoutTests








Revision 226159
Author jlew...@apple.com
Date 2017-12-19 16:59:16 -0800 (Tue, 19 Dec 2017)


Log Message
Marked http/tests/images/image-supports-video.html as flaky on macOS WK1.
https://bugs.webkit.org/show_bug.cgi?id=181008

Unreviewed test gardening.

* platform/mac-wk1/TestExpectations:

Modified Paths

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




Diff

Modified: trunk/LayoutTests/ChangeLog (226158 => 226159)

--- trunk/LayoutTests/ChangeLog	2017-12-20 00:56:31 UTC (rev 226158)
+++ trunk/LayoutTests/ChangeLog	2017-12-20 00:59:16 UTC (rev 226159)
@@ -1,3 +1,12 @@
+2017-12-19  Matt Lewis  
+
+Marked http/tests/images/image-supports-video.html as flaky on macOS WK1.
+https://bugs.webkit.org/show_bug.cgi?id=181008
+
+Unreviewed test gardening.
+
+* platform/mac-wk1/TestExpectations:
+
 2017-12-19  Brian Burg  
 
 Web Inspector: add TestPage.debug() to inspect evaluations being sent to Inspector page


Modified: trunk/LayoutTests/platform/mac-wk1/TestExpectations (226158 => 226159)

--- trunk/LayoutTests/platform/mac-wk1/TestExpectations	2017-12-20 00:56:31 UTC (rev 226158)
+++ trunk/LayoutTests/platform/mac-wk1/TestExpectations	2017-12-20 00:59:16 UTC (rev 226159)
@@ -479,3 +479,6 @@
 
 # User-installed fonts test infrastructure is not present in WK1
 webkit.org/b/180062 fast/text/user-installed-fonts [ ImageOnlyFailure ]
+
+webkit.org/b/181008 http/tests/images/image-supports-video.html [ Pass Failure ]
+






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


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

2017-12-19 Thread joepeck
Title: [226158] trunk/Source/WebInspectorUI








Revision 226158
Author joep...@webkit.org
Date 2017-12-19 16:56:31 -0800 (Tue, 19 Dec 2017)


Log Message
Web Inspector: Network Table - Redesign the waterfall popover showing timing data
https://bugs.webkit.org/show_bug.cgi?id=180996


Reviewed by Matt Baker.

* Localizations/en.lproj/localizedStrings.js:
* UserInterface/Main.html:
New strings and files.

* UserInterface/Views/NetworkTableContentView.js:
(WI.NetworkTableContentView.prototype._waterfallPopoverContentForResource):
(WI.NetworkTableContentView.prototype._handleMousedownWaterfall):
Use the ResourceTimingBreakdownView with a fixed width size.

* UserInterface/Views/ResourceTimingContentView.css: Removed.
* UserInterface/Views/ResourceTimingContentView.js:
(WI.ResourceTimingContentView.prototype.initialLayout):
(WI.ResourceTimingContentView.prototype._refreshTimingSection):
(WI.ResourceTimingContentView.prototype._refreshTimingSection.createBlock): Deleted.
(WI.ResourceTimingContentView.prototype._refreshTimingSection.createTimeLabel): Deleted.
(WI.ResourceTimingContentView.prototype._refreshTimingSection.createRow): Deleted.
Use the ResourceTimingBreakdownView with a flexible size.
Also changed the loading indicator and empty message to match
normal ContentView loading indicator and message only UI.

* UserInterface/Views/ResourceTimingBreakdownView.css:
(.waterfall-popover .resource-timing-breakdown):
(.resource-timing-breakdown > table > tr > td.label):
(.resource-timing-breakdown > table > tr > td.graph):
(.resource-timing-breakdown > table > tr > td.time):
(.resource-timing-breakdown > table > tr.empty):
(.resource-timing-breakdown > table > tr.header:not(.total-row) > td):
(.resource-timing-breakdown > table hr):
(.resource-timing-breakdown .waterfall .block):
(.resource-timing-breakdown): Deleted.
(.resource-timing-breakdown > .waterfall): Deleted.
(.resource-timing-breakdown > .waterfall .block): Deleted.
(.resource-timing-breakdown ul): Deleted.
(.resource-timing-breakdown ul > li): Deleted.
(.resource-timing-breakdown ul > li > .row-label): Deleted.
(body[dir=ltr] .resource-timing-breakdown ul > li > .row-label): Deleted.
(body[dir=rtl] .resource-timing-breakdown ul > li > .row-label): Deleted.
(.resource-timing-breakdown ul > li > .section-label): Deleted.
(.resource-timing-breakdown ul > li > .time-label): Deleted.
(.resource-timing-breakdown .time-section): Deleted.
(.resource-timing-breakdown ul > li > .time-section > .label): Deleted.
(.resource-timing-breakdown ul > li.total .block): Deleted.
(.resource-timing-breakdown ul > li.total .time-label): Deleted.
* UserInterface/Views/ResourceTimingBreakdownView.js:
(WI.ResourceTimingBreakdownView):
(WI.ResourceTimingBreakdownView.prototype._appendEmptyRow):
(WI.ResourceTimingBreakdownView.prototype._appendHeaderRow):
(WI.ResourceTimingBreakdownView.prototype._appendRow):
(WI.ResourceTimingBreakdownView.prototype.initialLayout):
(WI.ResourceTimingBreakdownView.prototype.initialLayout.createBlock): Deleted.
(WI.ResourceTimingBreakdownView.prototype.initialLayout.createSectionLabel): Deleted.
(WI.ResourceTimingBreakdownView.prototype.initialLayout.createTimeLabel): Deleted.
(WI.ResourceTimingBreakdownView.prototype.initialLayout.createTimeSection): Deleted.
(WI.ResourceTimingBreakdownView.prototype.initialLayout.createRow): Deleted.
(WI.ResourceTimingBreakdownView.prototype.initialLayout.emptyRow): Deleted.
(WI.ResourceTimingBreakdownView.prototype.initialLayout.appendGraphRow): Deleted.
(WI.ResourceTimingBreakdownView.prototype.initialLayout.appendEmptyRow): Deleted.
(WI.ResourceTimingBreakdownView.prototype.initialLayout.getCurrentSectionMetrics): Deleted.
Redesign the breakdown view.

Modified Paths

trunk/Source/WebInspectorUI/ChangeLog
trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js
trunk/Source/WebInspectorUI/UserInterface/Main.html
trunk/Source/WebInspectorUI/UserInterface/Views/NetworkTableContentView.js
trunk/Source/WebInspectorUI/UserInterface/Views/ResourceTimingBreakdownView.css
trunk/Source/WebInspectorUI/UserInterface/Views/ResourceTimingBreakdownView.js
trunk/Source/WebInspectorUI/UserInterface/Views/ResourceTimingContentView.js


Removed Paths

trunk/Source/WebInspectorUI/UserInterface/Views/ResourceTimingContentView.css




Diff

Modified: trunk/Source/WebInspectorUI/ChangeLog (226157 => 226158)

--- trunk/Source/WebInspectorUI/ChangeLog	2017-12-20 00:12:38 UTC (rev 226157)
+++ trunk/Source/WebInspectorUI/ChangeLog	2017-12-20 00:56:31 UTC (rev 226158)
@@ -1,3 +1,71 @@
+2017-12-19  Joseph Pecoraro  
+
+Web Inspector: Network Table - Redesign the waterfall popover showing timing data
+https://bugs.webkit.org/show_bug.cgi?id=180996
+
+
+Reviewed by Matt Baker.
+
+* Localizations/en.lproj/localizedStrings.js:
+* UserInterface/Main.html:
+New strings and files.
+
+* UserInterface/Views/NetworkTableContentView.js:
+(WI.NetworkTableCo

[webkit-changes] [226157] branches/safari-604-branch/Source/JavaScriptCore/offlineasm

2017-12-19 Thread jmarcell
Title: [226157] branches/safari-604-branch/Source/_javascript_Core/offlineasm








Revision 226157
Author jmarc...@apple.com
Date 2017-12-19 16:12:38 -0800 (Tue, 19 Dec 2017)


Log Message
Apply patch. rdar://problem/36111999

Fix build failure for iOS. Partial cherry-pick r223239 (offlineasm portion of that change).

Modified Paths

branches/safari-604-branch/Source/_javascript_Core/offlineasm/arm64.rb
branches/safari-604-branch/Source/_javascript_Core/offlineasm/asm.rb
branches/safari-604-branch/Source/_javascript_Core/offlineasm/instructions.rb




Diff

Modified: branches/safari-604-branch/Source/_javascript_Core/offlineasm/arm64.rb (226156 => 226157)

--- branches/safari-604-branch/Source/_javascript_Core/offlineasm/arm64.rb	2017-12-20 00:07:31 UTC (rev 226156)
+++ branches/safari-604-branch/Source/_javascript_Core/offlineasm/arm64.rb	2017-12-20 00:12:38 UTC (rev 226157)
@@ -260,6 +260,31 @@
 newList
 end
 
+def arm64LowerLabelReferences(list)
+newList = []
+list.each {
+| node |
+if node.is_a? Instruction
+case node.opcode
+when "loadi", "loadis", "loadp", "loadq", "loadb", "loadbs", "loadh", "loadhs"
+labelRef = node.operands[0]
+if labelRef.is_a? LabelReference
+tmp = Tmp.new(node.codeOrigin, :gpr)
+newList << Instruction.new(codeOrigin, "globaladdr", [LabelReference.new(node.codeOrigin, labelRef.label), tmp])
+newList << Instruction.new(codeOrigin, node.opcode, [Address.new(node.codeOrigin, tmp, Immediate.new(node.codeOrigin, labelRef.offset)), node.operands[1]])
+else
+newList << node
+end
+else
+newList << node
+end
+else
+newList << node
+end
+}
+newList
+end
+
 # Workaround for Cortex-A53 erratum (835769)
 def arm64CortexA53Fix835769(list)
 newList = []
@@ -296,6 +321,7 @@
 result = riscLowerHardBranchOps64(result)
 result = riscLowerShiftOps(result)
 result = arm64LowerMalformedLoadStoreAddresses(result)
+result = arm64LowerLabelReferences(result)
 result = riscLowerMalformedAddresses(result) {
 | node, address |
 case node.opcode
@@ -904,6 +930,15 @@
 $asm.putStr("#if CPU(ARM64_CORTEXA53)")
 $asm.puts "nop"
 $asm.putStr("#endif")
+when "globaladdr"
+uid = $asm.newUID
+$asm.puts "L_offlineasm_loh_adrp_#{uid}:"
+$asm.puts "adrp #{operands[1].arm64Operand(:ptr)}, #{operands[0].asmLabel}@GOTPAGE"
+$asm.puts "L_offlineasm_loh_ldr_#{uid}:"
+$asm.puts "ldr #{operands[1].arm64Operand(:ptr)}, [#{operands[1].arm64Operand(:ptr)}, #{operands[0].asmLabel}@GOTPAGEOFF]"
+$asm.deferAction {
+$asm.puts ".loh AdrpLdrGot L_offlineasm_loh_adrp_#{uid}, L_offlineasm_loh_ldr_#{uid}"
+}
 else
 lowerDefault
 end


Modified: branches/safari-604-branch/Source/_javascript_Core/offlineasm/asm.rb (226156 => 226157)

--- branches/safari-604-branch/Source/_javascript_Core/offlineasm/asm.rb	2017-12-20 00:07:31 UTC (rev 226156)
+++ branches/safari-604-branch/Source/_javascript_Core/offlineasm/asm.rb	2017-12-20 00:12:38 UTC (rev 226157)
@@ -46,6 +46,8 @@
 @codeOrigin = nil
 @numLocalLabels = 0
 @numGlobalLabels = 0
+@deferredActions = []
+@count = 0
 
 @newlineSpacerState = :none
 @lastlabel = ""
@@ -73,10 +75,23 @@
 putsProcEndIfNeeded
 end
 putsLastComment
+@deferredActions.each {
+| action |
+action.call()
+}
 @outp.puts "OFFLINE_ASM_END" if !$emitWinAsm
 @state = :cpp
 end
 
+def deferAction(&proc)
+@deferredActions << proc
+end
+
+def newUID
+@count += 1
+@count
+end
+
 def inAsm
 enterAsm
 yield


Modified: branches/safari-604-branch/Source/_javascript_Core/offlineasm/instructions.rb (226156 => 226157)

--- branches/safari-604-branch/Source/_javascript_Core/offlineasm/instructions.rb	2017-12-20 00:07:31 UTC (rev 226156)
+++ branches/safari-604-branch/Source/_javascript_Core/offlineasm/instructions.rb	2017-12-20 00:12:38 UTC (rev 226157)
@@ -267,7 +267,8 @@
 ARM64_INSTRUCTIONS =
 [
  "pcrtoaddr",   # Address from PC relative offset - adr instruction
- "nopFixCortexA53Err835769" # nop on Cortex-A53 (nothing otherwise)
+ "nopFixCortexA53Err835769", # nop on Cortex-A53 (nothing otherwise)
+ "globaladdr"
 ]
 
 RISC_INSTRUCTIONS =






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


[webkit-changes] [226156] trunk

2017-12-19 Thread rniwa
Title: [226156] trunk








Revision 226156
Author rn...@webkit.org
Date 2017-12-19 16:07:31 -0800 (Tue, 19 Dec 2017)


Log Message
Don't convert pasted content to use blob URL in WebKit1
https://bugs.webkit.org/show_bug.cgi?id=180969

Reviewed by Wenson Hsieh.

Source/WebCore:

Turns out that some WebKit1 clients are relying on being able to see the original URLs of the pasted content;
e.g. not storing content referenced by HTTP/HTTPS protocol as opposed to local files.

This patch restores the behavior prior to r223440 and r222839 for WebKit1 clients by overriding resources in
DocumentLoader instead of converting URLs used in the pasted contents by blob URLs. In addition, this patch
disables the pasteboard sanitization and custom data transfer types for WebKit1 clients as the feature poses
a compatibility concern for WebKit1 clients.

Tests: WebKitLegacy.AccessingImageInPastedRTFD
   WebKitLegacy.AccessingImageInPastedWebArchive

* editing/cocoa/WebContentReaderCocoa.mm:
(WebCore::createFragmentAndAddResources):
(WebCore::WebContentReader::readWebArchive):
* page/DeprecatedGlobalSettings.cpp:
(WebCore::DeprecatedGlobalSettings::defaultCustomPasteboardDataEnabled):

Tools:

Added API tests to make sure we can access the images in the pasted content.

* TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj:
* TestWebKitAPI/Tests/WebKitCocoa/paste-rtfd.html:
* TestWebKitAPI/Tests/WebKitLegacy/mac: Added.
* TestWebKitAPI/Tests/WebKitLegacy/mac/AccessingPastedImage.mm: Added.
(writeRTFDToPasteboard):
(-[SubresourceForBlobURLFrameLoadDelegate webView:didFinishLoadForFrame:]):
(-[SubresourceForBlobURLFrameLoadDelegate webView:runJavaScriptAlertPanelWithMessage:initiatedByFrame:]):
(TestWebKitAPI::TEST):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/editing/cocoa/WebContentReaderCocoa.mm
trunk/Source/WebCore/page/DeprecatedGlobalSettings.cpp
trunk/Tools/ChangeLog
trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj
trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/paste-rtfd.html


Added Paths

trunk/Tools/TestWebKitAPI/Tests/WebKitLegacy/mac/
trunk/Tools/TestWebKitAPI/Tests/WebKitLegacy/mac/AccessingPastedImage.mm




Diff

Modified: trunk/Source/WebCore/ChangeLog (226155 => 226156)

--- trunk/Source/WebCore/ChangeLog	2017-12-20 00:06:43 UTC (rev 226155)
+++ trunk/Source/WebCore/ChangeLog	2017-12-20 00:07:31 UTC (rev 226156)
@@ -1,3 +1,27 @@
+2017-12-19  Ryosuke Niwa  
+
+Don't convert pasted content to use blob URL in WebKit1
+https://bugs.webkit.org/show_bug.cgi?id=180969
+
+Reviewed by Wenson Hsieh.
+
+Turns out that some WebKit1 clients are relying on being able to see the original URLs of the pasted content;
+e.g. not storing content referenced by HTTP/HTTPS protocol as opposed to local files.
+
+This patch restores the behavior prior to r223440 and r222839 for WebKit1 clients by overriding resources in
+DocumentLoader instead of converting URLs used in the pasted contents by blob URLs. In addition, this patch
+disables the pasteboard sanitization and custom data transfer types for WebKit1 clients as the feature poses
+a compatibility concern for WebKit1 clients.
+
+Tests: WebKitLegacy.AccessingImageInPastedRTFD
+   WebKitLegacy.AccessingImageInPastedWebArchive
+
+* editing/cocoa/WebContentReaderCocoa.mm:
+(WebCore::createFragmentAndAddResources):
+(WebCore::WebContentReader::readWebArchive):
+* page/DeprecatedGlobalSettings.cpp:
+(WebCore::DeprecatedGlobalSettings::defaultCustomPasteboardDataEnabled):
+
 2017-12-19  Jer Noble  
 
 Playing media elements which call "pause(); play()" will have the play promise rejected.


Modified: trunk/Source/WebCore/editing/cocoa/WebContentReaderCocoa.mm (226155 => 226156)

--- trunk/Source/WebCore/editing/cocoa/WebContentReaderCocoa.mm	2017-12-20 00:06:43 UTC (rev 226155)
+++ trunk/Source/WebCore/editing/cocoa/WebContentReaderCocoa.mm	2017-12-20 00:07:31 UTC (rev 226156)
@@ -31,6 +31,7 @@
 #import "BlobURL.h"
 #import "CachedResourceLoader.h"
 #import "DOMURL.h"
+#import "DeprecatedGlobalSettings.h"
 #import "Document.h"
 #import "DocumentFragment.h"
 #import "DocumentLoader.h"
@@ -265,6 +266,14 @@
 if (!fragmentAndResources.fragment)
 return nullptr;
 
+if (!DeprecatedGlobalSettings::customPasteboardDataEnabled()) {
+if (DocumentLoader* loader = frame.loader().documentLoader()) {
+for (auto& resource : fragmentAndResources.resources)
+loader->addArchiveResource(resource.copyRef());
+}
+return WTFMove(fragmentAndResources.fragment);
+}
+
 HashMap blobURLMap;
 for (const Ref& subresource : fragmentAndResources.resources) {
 auto blob = Blob::create(subresource->data(), subresource->mimeType());
@@ -366,6 +375,13 @@
 });
 if (!result)
 return false;
+
+if (!DeprecatedGlobalSettings::custom

[webkit-changes] [226155] trunk/LayoutTests

2017-12-19 Thread bburg
Title: [226155] trunk/LayoutTests








Revision 226155
Author bb...@apple.com
Date 2017-12-19 16:06:43 -0800 (Tue, 19 Dec 2017)


Log Message
Web Inspector: add TestPage.debug() to inspect evaluations being sent to Inspector page
https://bugs.webkit.org/show_bug.cgi?id=181005

Reviewed by Joseph Pecoraro.

When TestPage.debug() is called, dump out all code that is sent to be evaluated in
the inspector page. This is useful for debugging initialization and InspectorTest.awaitEvent.

* http/tests/inspector/resources/inspector-test.js:
(runTest):
(TestPage.debug):
(TestPage.evaluateInWebInspector):
(TestPage.dispatchEventToFrontend):

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/LayoutTests/http/tests/inspector/resources/inspector-test.js




Diff

Modified: trunk/LayoutTests/ChangeLog (226154 => 226155)

--- trunk/LayoutTests/ChangeLog	2017-12-20 00:03:55 UTC (rev 226154)
+++ trunk/LayoutTests/ChangeLog	2017-12-20 00:06:43 UTC (rev 226155)
@@ -1,3 +1,19 @@
+2017-12-19  Brian Burg  
+
+Web Inspector: add TestPage.debug() to inspect evaluations being sent to Inspector page
+https://bugs.webkit.org/show_bug.cgi?id=181005
+
+Reviewed by Joseph Pecoraro.
+
+When TestPage.debug() is called, dump out all code that is sent to be evaluated in
+the inspector page. This is useful for debugging initialization and InspectorTest.awaitEvent.
+
+* http/tests/inspector/resources/inspector-test.js:
+(runTest):
+(TestPage.debug):
+(TestPage.evaluateInWebInspector):
+(TestPage.dispatchEventToFrontend):
+
 2017-12-19  Youenn Fablet  
 
 Layout Test imported/w3c/web-platform-tests/service-workers/service-worker/getregistrations.https.html is flaky


Modified: trunk/LayoutTests/http/tests/inspector/resources/inspector-test.js (226154 => 226155)

--- trunk/LayoutTests/http/tests/inspector/resources/inspector-test.js	2017-12-20 00:03:55 UTC (rev 226154)
+++ trunk/LayoutTests/http/tests/inspector/resources/inspector-test.js	2017-12-20 00:06:43 UTC (rev 226155)
@@ -97,8 +97,8 @@
 let initializationCodeString = `(${runInitializationMethodsInFrontend.toString()})([${TestPage._initializers}]);`;
 let testFunctionCodeString = `(${runTestMethodInFrontend.toString()})(${testFunction.toString()});`;
 
-testRunner.evaluateInWebInspector(initializationCodeString);
-testRunner.evaluateInWebInspector(testFunctionCodeString);
+TestPage.evaluateInWebInspector(initializationCodeString);
+TestPage.evaluateInWebInspector(testFunctionCodeString);
 }
 
 function runTestHTTPS()
@@ -139,6 +139,20 @@
 window.alert(message);
 }
 
+// Use this to dump evaluations that are sent from the TestPage to the InspectorTest page.
+TestPage.debug = function()
+{
+this.dumpInspectorPageEvaluations = true;
+}
+
+TestPage.evaluateInWebInspector = function(code)
+{
+if (this.dumpInspectorPageEvaluations)
+this.debugLog(code);
+
+testRunner.evaluateInWebInspector(code);
+}
+
 // Add and clear test output from the results window.
 TestPage.addResult = function(text)
 {
@@ -162,7 +176,7 @@
 TestPage.dispatchEventToFrontend = function(eventName, data)
 {
 let dispatchEventCodeString = `InspectorTest.dispatchEventToListeners(${JSON.stringify(eventName)}, ${JSON.stringify(data)});`;
-testRunner.evaluateInWebInspector(dispatchEventCodeString);
+this.evaluateInWebInspector(dispatchEventCodeString);
 };
 
 TestPage.allowUncaughtExceptions = false;






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


[webkit-changes] [226154] trunk/LayoutTests

2017-12-19 Thread commit-queue
Title: [226154] trunk/LayoutTests








Revision 226154
Author commit-qu...@webkit.org
Date 2017-12-19 16:03:55 -0800 (Tue, 19 Dec 2017)


Log Message
Layout Test imported/w3c/web-platform-tests/service-workers/service-worker/getregistrations.https.html is flaky
https://bugs.webkit.org/show_bug.cgi?id=180497


Unreviewed.

Patch by Youenn Fablet  on 2017-12-19

* TestExpectations: Marking test as slow on Debug.

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/LayoutTests/TestExpectations




Diff

Modified: trunk/LayoutTests/ChangeLog (226153 => 226154)

--- trunk/LayoutTests/ChangeLog	2017-12-19 23:53:02 UTC (rev 226153)
+++ trunk/LayoutTests/ChangeLog	2017-12-20 00:03:55 UTC (rev 226154)
@@ -1,3 +1,13 @@
+2017-12-19  Youenn Fablet  
+
+Layout Test imported/w3c/web-platform-tests/service-workers/service-worker/getregistrations.https.html is flaky
+https://bugs.webkit.org/show_bug.cgi?id=180497
+
+
+Unreviewed.
+
+* TestExpectations: Marking test as slow on Debug.
+
 2017-12-19  Brian Burg  
 
 Web Inspector: InspectorTest.expectException does not handle implicitly resolved async functions correctly


Modified: trunk/LayoutTests/TestExpectations (226153 => 226154)

--- trunk/LayoutTests/TestExpectations	2017-12-19 23:53:02 UTC (rev 226153)
+++ trunk/LayoutTests/TestExpectations	2017-12-20 00:03:55 UTC (rev 226154)
@@ -189,6 +189,7 @@
 
 imported/w3c/web-platform-tests/service-workers/service-worker/fetch-canvas-tainting.https.html [ DumpJSConsoleLogInStdErr ]
 imported/w3c/web-platform-tests/service-workers/service-worker/fetch-response-taint.https.html [ DumpJSConsoleLogInStdErr ]
+[ Debug ] imported/w3c/web-platform-tests/service-workers/service-worker/getregistrations.https.html [ Slow ]
 
 # Skip workers tests that are timing out or are SharedWorker related only
 imported/w3c/web-platform-tests/workers/constructors/Worker/same-origin.html [ Skip ]






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


[webkit-changes] [226153] trunk

2017-12-19 Thread bburg
Title: [226153] trunk








Revision 226153
Author bb...@apple.com
Date 2017-12-19 15:53:02 -0800 (Tue, 19 Dec 2017)


Log Message
Web Inspector: InspectorTest.expectException does not handle implicitly resolved async functions correctly
https://bugs.webkit.org/show_bug.cgi?id=180944

Reviewed by Joseph Pecoraro.

Source/WebInspectorUI:

* UserInterface/Test/TestHarness.js:
(TestHarness.prototype.expectException):
Don't chain .catch after we might have just returned a rejected promise.

LayoutTests:

Add a new test case for implicitly resolved async functions passed to expectException.
Rebaseline one existing test that had a failing assertion that progresses with
this change. I didn't notice it because the assertion just prior is expected to fail.

* inspector/unit-tests/test-harness-expect-functions-async-expected.txt:
* inspector/unit-tests/test-harness-expect-functions-async.html:

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/LayoutTests/inspector/unit-tests/test-harness-expect-functions-async-expected.txt
trunk/LayoutTests/inspector/unit-tests/test-harness-expect-functions-async.html
trunk/Source/WebInspectorUI/ChangeLog
trunk/Source/WebInspectorUI/UserInterface/Test/TestHarness.js




Diff

Modified: trunk/LayoutTests/ChangeLog (226152 => 226153)

--- trunk/LayoutTests/ChangeLog	2017-12-19 23:50:04 UTC (rev 226152)
+++ trunk/LayoutTests/ChangeLog	2017-12-19 23:53:02 UTC (rev 226153)
@@ -1,3 +1,17 @@
+2017-12-19  Brian Burg  
+
+Web Inspector: InspectorTest.expectException does not handle implicitly resolved async functions correctly
+https://bugs.webkit.org/show_bug.cgi?id=180944
+
+Reviewed by Joseph Pecoraro.
+
+Add a new test case for implicitly resolved async functions passed to expectException.
+Rebaseline one existing test that had a failing assertion that progresses with
+this change. I didn't notice it because the assertion just prior is expected to fail.
+
+* inspector/unit-tests/test-harness-expect-functions-async-expected.txt:
+* inspector/unit-tests/test-harness-expect-functions-async.html:
+
 2017-12-19  Jer Noble  
 
 Playing media elements which call "pause(); play()" will have the play promise rejected.


Modified: trunk/LayoutTests/inspector/unit-tests/test-harness-expect-functions-async-expected.txt (226152 => 226153)

--- trunk/LayoutTests/inspector/unit-tests/test-harness-expect-functions-async-expected.txt	2017-12-19 23:50:04 UTC (rev 226152)
+++ trunk/LayoutTests/inspector/unit-tests/test-harness-expect-functions-async-expected.txt	2017-12-19 23:53:02 UTC (rev 226153)
@@ -30,7 +30,12 @@
 FAIL: Should produce an exception.
 Expected: not null
 Actual: null
-PASS: Should produce an exception.
-42
-FAIL: The returned promise should not resolve since an expected exception was not raised.
+PASS: Rejected value should be the returned value.
 
+-- Running test case: expectException.AsyncWorkThatResolvesImplicitly
+The following assertion is expected to fail.
+FAIL: Should produce an exception.
+Expected: not null
+Actual: null
+PASS: Implicitly resolved value should be undefined.
+


Modified: trunk/LayoutTests/inspector/unit-tests/test-harness-expect-functions-async.html (226152 => 226153)

--- trunk/LayoutTests/inspector/unit-tests/test-harness-expect-functions-async.html	2017-12-19 23:50:04 UTC (rev 226152)
+++ trunk/LayoutTests/inspector/unit-tests/test-harness-expect-functions-async.html	2017-12-19 23:53:02 UTC (rev 226153)
@@ -80,6 +80,22 @@
 }
 });
 
+suite.addTestCase({
+name: "expectException.AsyncWorkThatResolvesImplicitly",
+async test() {
+InspectorTest.log("The following assertion is expected to fail.");
+
+let returnValue = 42;
+await InspectorTest.expectException(async () => {
+1 + 1;
+}).then(() => {
+InspectorTest.fail("The returned promise should not resolve since an expected exception was not raised.");
+}).catch((resolvedValue) => {
+InspectorTest.expectEqual(resolvedValue, undefined, "Implicitly resolved value should be undefined.");
+});
+}
+});
+
 suite.runTestCasesAndFinish();
 }
 


Modified: trunk/Source/WebInspectorUI/ChangeLog (226152 => 226153)

--- trunk/Source/WebInspectorUI/ChangeLog	2017-12-19 23:50:04 UTC (rev 226152)
+++ trunk/Source/WebInspectorUI/ChangeLog	2017-12-19 23:53:02 UTC (rev 226153)
@@ -1,3 +1,14 @@
+2017-12-19  Brian Burg  
+
+Web Inspector: InspectorTest.expectException does not handle implicitly resolved async functions correctly
+https://bugs.webkit.org/show_bug.cgi?id=180944
+
+Reviewed by Joseph Pecoraro.
+
+* UserInterface/Test/TestHarness.js:
+(TestHarness.prototype.expectException):
+Don't chain .catch after we might have just returned a rejected promise.
+
 2017-12-19  Joseph Pecoraro  
 
 Web Inspector: Network Table

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

2017-12-19 Thread bburg
Title: [226152] trunk/Source/WTF








Revision 226152
Author bb...@apple.com
Date 2017-12-19 15:50:04 -0800 (Tue, 19 Dec 2017)


Log Message
SLEEP_THREAD_FOR_DEBUGGER() macro should try to print out the PID of the affected process
https://bugs.webkit.org/show_bug.cgi?id=180947

Reviewed by Joseph Pecoraro.

* wtf/DebugUtilities.h:
- Use sleep() from CurrentTime.h as it is more cross-platform.
- Print a message with the process PID to simplify attaching to sleeping thread.
- Include source location in case multiple such macros are being used.

Modified Paths

trunk/Source/WTF/ChangeLog
trunk/Source/WTF/wtf/DebugUtilities.h




Diff

Modified: trunk/Source/WTF/ChangeLog (226151 => 226152)

--- trunk/Source/WTF/ChangeLog	2017-12-19 23:40:16 UTC (rev 226151)
+++ trunk/Source/WTF/ChangeLog	2017-12-19 23:50:04 UTC (rev 226152)
@@ -1,3 +1,15 @@
+2017-12-19  Brian Burg  
+
+SLEEP_THREAD_FOR_DEBUGGER() macro should try to print out the PID of the affected process
+https://bugs.webkit.org/show_bug.cgi?id=180947
+
+Reviewed by Joseph Pecoraro.
+
+* wtf/DebugUtilities.h:
+- Use sleep() from CurrentTime.h as it is more cross-platform.
+- Print a message with the process PID to simplify attaching to sleeping thread.
+- Include source location in case multiple such macros are being used.
+
 2017-12-18  Daniel Bates  
 
 Conditionally forward declare NSMapTable SPI


Modified: trunk/Source/WTF/wtf/DebugUtilities.h (226151 => 226152)

--- trunk/Source/WTF/wtf/DebugUtilities.h	2017-12-19 23:40:16 UTC (rev 226151)
+++ trunk/Source/WTF/wtf/DebugUtilities.h	2017-12-19 23:50:04 UTC (rev 226152)
@@ -27,14 +27,17 @@
 #define WTF_DebugUtilities_h
 
 #include 
+#include 
+#include 
 
 #define SLEEP_THREAD_FOR_DEBUGGER() \
 do { \
 do { \
-sleep(1); \
+sleep(1.0); \
 if (WTFIsDebuggerAttached()) \
 break; \
 } while (1); \
+WTFReportError(__FILE__, __LINE__, WTF_PRETTY_FUNCTION, "Sleeping thread for debugger; attach to process (PID: %d) to unsleep the thread.", getCurrentProcessID()); \
 WTFBreakpointTrap(); \
 } while (0)
 






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


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

2017-12-19 Thread joepeck
Title: [226151] trunk/Source/WebInspectorUI








Revision 226151
Author joep...@webkit.org
Date 2017-12-19 15:40:16 -0800 (Tue, 19 Dec 2017)


Log Message
Web Inspector: Network Table - Update the Time column to include the total duration not just the download duration
https://bugs.webkit.org/show_bug.cgi?id=180998


Reviewed by Matt Baker.

* UserInterface/Models/Resource.js:
(WI.Resource.prototype.get totalDuration):
(WI.Resource.prototype.get duration): Deleted.
Rename and group getters to be clearer.

* UserInterface/Views/NetworkTableContentView.js:
(WI.NetworkTableContentView.prototype._entryForResource):
Use the totalDuration for the network table time column.

* UserInterface/Views/ResourceTimelineDataGridNode.js:
(WI.ResourceTimelineDataGridNode.prototype._mouseoverRecordBar graphDataSource.get secondsPerPixel):
Using the download duration was incorrect here.

Modified Paths

trunk/Source/WebInspectorUI/ChangeLog
trunk/Source/WebInspectorUI/UserInterface/Models/Resource.js
trunk/Source/WebInspectorUI/UserInterface/Views/NetworkTableContentView.js
trunk/Source/WebInspectorUI/UserInterface/Views/ResourceTimelineDataGridNode.js




Diff

Modified: trunk/Source/WebInspectorUI/ChangeLog (226150 => 226151)

--- trunk/Source/WebInspectorUI/ChangeLog	2017-12-19 23:16:09 UTC (rev 226150)
+++ trunk/Source/WebInspectorUI/ChangeLog	2017-12-19 23:40:16 UTC (rev 226151)
@@ -1,3 +1,24 @@
+2017-12-19  Joseph Pecoraro  
+
+Web Inspector: Network Table - Update the Time column to include the total duration not just the download duration
+https://bugs.webkit.org/show_bug.cgi?id=180998
+
+
+Reviewed by Matt Baker.
+
+* UserInterface/Models/Resource.js:
+(WI.Resource.prototype.get totalDuration):
+(WI.Resource.prototype.get duration): Deleted.
+Rename and group getters to be clearer.
+
+* UserInterface/Views/NetworkTableContentView.js:
+(WI.NetworkTableContentView.prototype._entryForResource):
+Use the totalDuration for the network table time column.
+
+* UserInterface/Views/ResourceTimelineDataGridNode.js:
+(WI.ResourceTimelineDataGridNode.prototype._mouseoverRecordBar graphDataSource.get secondsPerPixel):
+Using the download duration was incorrect here.
+
 2017-12-19  Devin Rousso  
 
 Web Inspector: Styles Redesign: Typing semicolon at the end of value should move to the next property


Modified: trunk/Source/WebInspectorUI/UserInterface/Models/Resource.js (226150 => 226151)

--- trunk/Source/WebInspectorUI/UserInterface/Models/Resource.js	2017-12-19 23:16:09 UTC (rev 226150)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/Resource.js	2017-12-19 23:40:16 UTC (rev 226151)
@@ -532,11 +532,6 @@
 return this.timingData.responseEnd || this.lastDataReceivedTimestamp || this.responseReceivedTimestamp || this.lastRedirectReceivedTimestamp || this.requestSentTimestamp;
 }
 
-get duration()
-{
-return this.timingData.responseEnd - this.timingData.requestStart;
-}
-
 get latency()
 {
 return this.timingData.responseStart - this.timingData.requestStart;
@@ -547,6 +542,11 @@
 return this.timingData.responseEnd - this.timingData.responseStart;
 }
 
+get totalDuration()
+{
+return this.timingData.responseEnd - this.timingData.startTime;
+}
+
 get cached()
 {
 return this._cached;


Modified: trunk/Source/WebInspectorUI/UserInterface/Views/NetworkTableContentView.js (226150 => 226151)

--- trunk/Source/WebInspectorUI/UserInterface/Views/NetworkTableContentView.js	2017-12-19 23:16:09 UTC (rev 226150)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/NetworkTableContentView.js	2017-12-19 23:40:16 UTC (rev 226151)
@@ -1196,7 +1196,7 @@
 cached: resource.cached,
 resourceSize: resource.size,
 transferSize: !isNaN(resource.networkTotalTransferSize) ? resource.networkTotalTransferSize : resource.estimatedTotalTransferSize,
-time: resource.duration,
+time: resource.totalDuration,
 protocol: resource.protocol,
 priority: resource.priority,
 remoteAddress: resource.remoteAddress,


Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ResourceTimelineDataGridNode.js (226150 => 226151)

--- trunk/Source/WebInspectorUI/UserInterface/Views/ResourceTimelineDataGridNode.js	2017-12-19 23:16:09 UTC (rev 226150)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ResourceTimelineDataGridNode.js	2017-12-19 23:40:16 UTC (rev 226151)
@@ -384,7 +384,7 @@
 popoverContentElement.appendChild(popoverDataGrid.element);
 
 let graphDataSource = {
-get secondsPerPixel() { return resource.duration / WI.ResourceTimelineDataGridNode.PopoverGraphColumnWidthPixels; },
+get secondsPerPixel() { return resource.totalDuration / WI.ResourceTimelineDataGridNode.PopoverGraphColumnWidthPixels; },

[webkit-changes] [226150] trunk

2017-12-19 Thread jer . noble
Title: [226150] trunk








Revision 226150
Author jer.no...@apple.com
Date 2017-12-19 15:16:09 -0800 (Tue, 19 Dec 2017)


Log Message
Playing media elements which call "pause(); play()" will have the play promise rejected.
https://bugs.webkit.org/show_bug.cgi?id=180781


Reviewed by Eric Carlson.

Source/WebCore:

Follow-up to address failing iOS API tests. Rather than skipping the call to
prepareForLoad() in the case where media elements are not allowed to load data,
unconditionally call prepareForLoad(), but conditionally call selectMediaResource() inside
that function only if the media elemnet is allowed to load. This ensures that the
MediaPlayer is created when play(), pause(), or load() are called during a user gesture
later, and selectMediaResource() (which depends on having a non-null m_player) is called.

* html/HTMLMediaElement.cpp:
(WebCore::HTMLMediaElement::parseAttribute):
(WebCore::HTMLMediaElement::insertedIntoAncestor):
(WebCore::HTMLMediaElement::load):
(WebCore::HTMLMediaElement::prepareForLoad):
(WebCore::HTMLMediaElement::playInternal):

Source/WebKit:

shouldRequireUserGestureToLoadVideo() should default to false on Mac.

* UIProcess/API/Cocoa/WKWebView.mm:
(shouldRequireUserGestureToLoadVideo):

Source/WebKitLegacy/mac:

shouldRequireUserGestureToLoadVideo() should default to false on Mac.

* WebView/WebView.mm:
(shouldRequireUserGestureToLoadVideo):

LayoutTests:

* media/video-load-require-user-gesture.html:

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/LayoutTests/media/video-load-require-user-gesture.html
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/html/HTMLMediaElement.cpp
trunk/Source/WebCore/page/SettingsDefaultValues.h
trunk/Source/WebKit/ChangeLog
trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm
trunk/Source/WebKitLegacy/mac/ChangeLog
trunk/Source/WebKitLegacy/mac/WebView/WebView.mm




Diff

Modified: trunk/LayoutTests/ChangeLog (226149 => 226150)

--- trunk/LayoutTests/ChangeLog	2017-12-19 23:13:05 UTC (rev 226149)
+++ trunk/LayoutTests/ChangeLog	2017-12-19 23:16:09 UTC (rev 226150)
@@ -1,3 +1,13 @@
+2017-12-19  Jer Noble  
+
+Playing media elements which call "pause(); play()" will have the play promise rejected.
+https://bugs.webkit.org/show_bug.cgi?id=180781
+
+
+Reviewed by Eric Carlson.
+
+* media/video-load-require-user-gesture.html:
+
 2017-12-19  Chris Dumez  
 
 scopeURL should start with the provided scriptURL


Modified: trunk/LayoutTests/media/video-load-require-user-gesture.html (226149 => 226150)

--- trunk/LayoutTests/media/video-load-require-user-gesture.html	2017-12-19 23:13:05 UTC (rev 226149)
+++ trunk/LayoutTests/media/video-load-require-user-gesture.html	2017-12-19 23:16:09 UTC (rev 226150)
@@ -6,8 +6,10 @@
 var state = 0;
 var userGestureInitiated = 0;
 
-if (window.internals) 
+if (window.internals) {
 window.internals.settings.setVideoPlaybackRequiresUserGesture(true);
+window.internals.settings.setRequiresUserGestureToLoadVideo(true);
+}
 
 function finishTest(success)
 {


Modified: trunk/Source/WebCore/ChangeLog (226149 => 226150)

--- trunk/Source/WebCore/ChangeLog	2017-12-19 23:13:05 UTC (rev 226149)
+++ trunk/Source/WebCore/ChangeLog	2017-12-19 23:16:09 UTC (rev 226150)
@@ -1,3 +1,25 @@
+2017-12-19  Jer Noble  
+
+Playing media elements which call "pause(); play()" will have the play promise rejected.
+https://bugs.webkit.org/show_bug.cgi?id=180781
+
+
+Reviewed by Eric Carlson.
+
+Follow-up to address failing iOS API tests. Rather than skipping the call to
+prepareForLoad() in the case where media elements are not allowed to load data,
+unconditionally call prepareForLoad(), but conditionally call selectMediaResource() inside
+that function only if the media elemnet is allowed to load. This ensures that the
+MediaPlayer is created when play(), pause(), or load() are called during a user gesture
+later, and selectMediaResource() (which depends on having a non-null m_player) is called.
+
+* html/HTMLMediaElement.cpp:
+(WebCore::HTMLMediaElement::parseAttribute):
+(WebCore::HTMLMediaElement::insertedIntoAncestor):
+(WebCore::HTMLMediaElement::load):
+(WebCore::HTMLMediaElement::prepareForLoad):
+(WebCore::HTMLMediaElement::playInternal):
+
 2017-12-19  Timothy Hatcher  
 
 Build failure in WebGL2 when Video feature is disabled


Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (226149 => 226150)

--- trunk/Source/WebCore/html/HTMLMediaElement.cpp	2017-12-19 23:13:05 UTC (rev 226149)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp	2017-12-19 23:16:09 UTC (rev 226150)
@@ -835,13 +835,7 @@
 
 // If a src attribute of a media element is set or changed, the user
 // agent must invoke the media element's media e

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

2017-12-19 Thread wenson_hsieh
Title: [226148] trunk/Source/WebKitLegacy/mac








Revision 226148
Author wenson_hs...@apple.com
Date 2017-12-19 15:12:00 -0800 (Tue, 19 Dec 2017)


Log Message
API test WKAttachmentTests.InsertPastedAttributedStringContainingMultipleAttachments is failing on El Capitan and Sierra
https://bugs.webkit.org/show_bug.cgi?id=180977

Reviewed by Tim Horton.

Fixes a failing API test by updating markup deserialization codepaths in WebKitLegacy to behave like the modern
WebCore counterpart. When determining element tags to exclude when generating markup from an attributed string,
don't add "object" as an element to exclude if the attachment element runtime feature is enabled.

* WebCoreSupport/WebEditorClient.mm:
(attributesForAttributedStringConversion):
* WebView/WebHTMLView.mm:
(+[WebHTMLView _excludedElementsForAttributedStringConversion]):

Modified Paths

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




Diff

Modified: trunk/Source/WebKitLegacy/mac/ChangeLog (226147 => 226148)

--- trunk/Source/WebKitLegacy/mac/ChangeLog	2017-12-19 23:01:30 UTC (rev 226147)
+++ trunk/Source/WebKitLegacy/mac/ChangeLog	2017-12-19 23:12:00 UTC (rev 226148)
@@ -1,3 +1,19 @@
+2017-12-19  Wenson Hsieh  
+
+API test WKAttachmentTests.InsertPastedAttributedStringContainingMultipleAttachments is failing on El Capitan and Sierra
+https://bugs.webkit.org/show_bug.cgi?id=180977
+
+Reviewed by Tim Horton.
+
+Fixes a failing API test by updating markup deserialization codepaths in WebKitLegacy to behave like the modern
+WebCore counterpart. When determining element tags to exclude when generating markup from an attributed string,
+don't add "object" as an element to exclude if the attachment element runtime feature is enabled.
+
+* WebCoreSupport/WebEditorClient.mm:
+(attributesForAttributedStringConversion):
+* WebView/WebHTMLView.mm:
+(+[WebHTMLView _excludedElementsForAttributedStringConversion]):
+
 2017-12-18  David Kilzer  
 
 BUILD FIX: Ignore NSWindow deprecation warnings from the mysterious future


Modified: trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebEditorClient.mm (226147 => 226148)

--- trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebEditorClient.mm	2017-12-19 23:01:30 UTC (rev 226147)
+++ trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebEditorClient.mm	2017-12-19 23:12:00 UTC (rev 226148)
@@ -68,6 +68,7 @@
 #import 
 #import 
 #import 
+#import 
 #import 
 #import 
 #import 
@@ -433,7 +434,7 @@
 static NSDictionary *attributesForAttributedStringConversion()
 {
 // This function needs to be kept in sync with identically named one in WebCore, which is used on newer OS versions.
-NSArray *excludedElements = [[NSArray alloc] initWithObjects:
+NSMutableArray *excludedElements = [[NSMutableArray alloc] initWithObjects:
 // Omit style since we want style to be inline so the fragment can be easily inserted.
 @"style",
 // Omit xml so the result is not XHTML.
@@ -442,9 +443,17 @@
 @"doctype", @"html", @"head", @"body", 
 // Omit deprecated tags.
 @"applet", @"basefont", @"center", @"dir", @"font", @"menu", @"s", @"strike", @"u",
+#if !ENABLE(ATTACHMENT_ELEMENT)
 // Omit object so no file attachments are part of the fragment.
-@"object", nil];
+@"object",
+#endif
+nil];
 
+#if ENABLE(ATTACHMENT_ELEMENT)
+if (!RuntimeEnabledFeatures::sharedFeatures().attachmentElementEnabled())
+[excludedElements addObject:@"object"];
+#endif
+
 #if PLATFORM(IOS)
 static NSString * const NSExcludedElementsDocumentAttribute = @"ExcludedElements";
 #endif


Modified: trunk/Source/WebKitLegacy/mac/WebView/WebHTMLView.mm (226147 => 226148)

--- trunk/Source/WebKitLegacy/mac/WebView/WebHTMLView.mm	2017-12-19 23:01:30 UTC (rev 226147)
+++ trunk/Source/WebKitLegacy/mac/WebView/WebHTMLView.mm	2017-12-19 23:12:00 UTC (rev 226148)
@@ -114,6 +114,7 @@
 #import 
 #import 
 #import 
+#import 
 #import 
 #import 
 #import 
@@ -1115,7 +1116,7 @@
 
 + (NSArray *)_excludedElementsForAttributedStringConversion
 {
-static NSArray *elements = [[NSArray alloc] initWithObjects:
+NSMutableArray *elements = [[NSMutableArray alloc] initWithObjects:
 // Omit style since we want style to be inline so the fragment can be easily inserted.
 @"style",
 // Omit xml so the result is not XHTML.
@@ -1125,8 +1126,18 @@
 // Omit deprecated tags.
 @"applet", @"basefont", @"center", @"dir", @"font", @"menu", @"s", @"strike", @"u",
 // Omit object so no file attachments are part of the fragment.
-@"object", nil];
-return elements;
+#if !ENABLE(ATTACHMENT_ELEMENT)
+// Omit object so no file attachments are part of the fragment.
+@"object",
+#endif
+nil];
+
+#if ENABLE(ATTACHMENT_ELEMENT)
+

[webkit-changes] [226145] branches/safari-604.5.100-branch/Source

2017-12-19 Thread jmarcell
Title: [226145] branches/safari-604.5.100-branch/Source








Revision 226145
Author jmarc...@apple.com
Date 2017-12-19 15:01:00 -0800 (Tue, 19 Dec 2017)


Log Message
Apply patch. rdar://problem/36112003

Modified Paths

branches/safari-604.5.100-branch/Source/_javascript_Core/ChangeLog
branches/safari-604.5.100-branch/Source/_javascript_Core/b3/B3LowerToAir.cpp
branches/safari-604.5.100-branch/Source/_javascript_Core/b3/B3Validate.cpp
branches/safari-604.5.100-branch/Source/_javascript_Core/b3/B3WasmBoundsCheckValue.cpp
branches/safari-604.5.100-branch/Source/_javascript_Core/b3/B3WasmBoundsCheckValue.h
branches/safari-604.5.100-branch/Source/_javascript_Core/b3/air/AirCustom.h
branches/safari-604.5.100-branch/Source/_javascript_Core/b3/testb3.cpp
branches/safari-604.5.100-branch/Source/_javascript_Core/dfg/DFGSpeculativeJIT.cpp
branches/safari-604.5.100-branch/Source/_javascript_Core/dfg/DFGSpeculativeJIT.h
branches/safari-604.5.100-branch/Source/_javascript_Core/dfg/DFGSpeculativeJIT64.cpp
branches/safari-604.5.100-branch/Source/_javascript_Core/ftl/FTLAbstractHeapRepository.h
branches/safari-604.5.100-branch/Source/_javascript_Core/ftl/FTLLowerDFGToB3.cpp
branches/safari-604.5.100-branch/Source/_javascript_Core/jit/AssemblyHelpers.h
branches/safari-604.5.100-branch/Source/_javascript_Core/runtime/Butterfly.h
branches/safari-604.5.100-branch/Source/_javascript_Core/runtime/JSArrayBufferView.cpp
branches/safari-604.5.100-branch/Source/_javascript_Core/runtime/JSArrayBufferView.h
branches/safari-604.5.100-branch/Source/_javascript_Core/wasm/WasmB3IRGenerator.cpp
branches/safari-604.5.100-branch/Source/_javascript_Core/wasm/WasmBinding.cpp
branches/safari-604.5.100-branch/Source/_javascript_Core/wasm/WasmMemory.cpp
branches/safari-604.5.100-branch/Source/_javascript_Core/wasm/WasmMemory.h
branches/safari-604.5.100-branch/Source/_javascript_Core/wasm/WasmMemoryInformation.cpp
branches/safari-604.5.100-branch/Source/_javascript_Core/wasm/WasmMemoryInformation.h
branches/safari-604.5.100-branch/Source/_javascript_Core/wasm/js/JSWebAssemblyMemory.cpp
branches/safari-604.5.100-branch/Source/_javascript_Core/wasm/js/JSWebAssemblyMemory.h
branches/safari-604.5.100-branch/Source/WTF/ChangeLog
branches/safari-604.5.100-branch/Source/WTF/wtf/MathExtras.h
branches/safari-604.5.100-branch/Source/WTF/wtf/StdLibExtras.h




Diff

Modified: branches/safari-604.5.100-branch/Source/_javascript_Core/ChangeLog (226144 => 226145)

--- branches/safari-604.5.100-branch/Source/_javascript_Core/ChangeLog	2017-12-19 23:00:51 UTC (rev 226144)
+++ branches/safari-604.5.100-branch/Source/_javascript_Core/ChangeLog	2017-12-19 23:01:00 UTC (rev 226145)
@@ -1,5 +1,77 @@
 2017-12-18  Jason Marcell  
 
+Apply patch. rdar://problem/36112003
+
+2017-12-17  Keith Miller  
+
+Use index masking for TypedArrays and and Wasm.
+https://bugs.webkit.org/show_bug.cgi?id=180920
+
+Reviewed by Filip Pizlo.
+
+We should have index masking for our TypedArray code in the
+DFG/FTL and for Wasm when doing bounds checking. Index masking for
+Wasm is added to the WasmBoundsCheckValue. Since we don't CSE any
+WasmBoundsCheckValues we don't need to worry about combining a
+bounds check for a load and a store. I went with fusing the
+pointer masking in the WasmBoundsCheckValue since it should reduce
+additional compiler overhead.
+
+* b3/B3LowerToAir.cpp:
+* b3/B3Validate.cpp:
+* b3/B3WasmBoundsCheckValue.cpp:
+(JSC::B3::WasmBoundsCheckValue::WasmBoundsCheckValue):
+(JSC::B3::WasmBoundsCheckValue::dumpMeta const):
+* b3/B3WasmBoundsCheckValue.h:
+(JSC::B3::WasmBoundsCheckValue::pinnedIndexingMask const):
+* b3/air/AirCustom.h:
+(JSC::B3::Air::WasmBoundsCheckCustom::generate):
+* b3/testb3.cpp:
+(JSC::B3::testWasmBoundsCheck):
+* dfg/DFGSpeculativeJIT.cpp:
+(JSC::DFG::SpeculativeJIT::loadFromIntTypedArray):
+(JSC::DFG::SpeculativeJIT::compileGetByValOnIntTypedArray):
+(JSC::DFG::SpeculativeJIT::compileGetByValOnFloatTypedArray):
+(JSC::DFG::SpeculativeJIT::compileNewTypedArray):
+* dfg/DFGSpeculativeJIT.h:
+* dfg/DFGSpeculativeJIT64.cpp:
+(JSC::DFG::SpeculativeJIT::compile):
+* ftl/FTLAbstractHeapRepository.h:
+* ftl/FTLLowerDFGToB3.cpp:
+(JSC::FTL::DFG::LowerDFGToB3::compileAtomicsReadModifyWrite):
+(JSC::FTL::DFG::LowerDFGToB3::compileGetByVal):
+(JSC::FTL::DFG::LowerDFGToB3::compileNewTypedArray):
+(JSC::FTL::DFG::LowerDFGToB3::pointerIntoTypedArray):
+* jit/AssemblyHelpers.h:
+(JSC::AssemblyHelpers::emitComputeButterflyIndexingMask):
+* runtime/Butterfly.h:
+* runtime/JSArrayBufferVie

[webkit-changes] [226144] branches/safari-604.5.100-branch/Source

2017-12-19 Thread jmarcell
Title: [226144] branches/safari-604.5.100-branch/Source








Revision 226144
Author jmarc...@apple.com
Date 2017-12-19 15:00:51 -0800 (Tue, 19 Dec 2017)


Log Message
Cherry-pick r226068. rdar://problem/36112028

Modified Paths

branches/safari-604.5.100-branch/Source/_javascript_Core/ChangeLog
branches/safari-604.5.100-branch/Source/_javascript_Core/dfg/DFGSpeculativeJIT.cpp
branches/safari-604.5.100-branch/Source/_javascript_Core/ftl/FTLAbstractHeapRepository.h
branches/safari-604.5.100-branch/Source/_javascript_Core/ftl/FTLLowerDFGToB3.cpp
branches/safari-604.5.100-branch/Source/_javascript_Core/jit/ThunkGenerators.cpp
branches/safari-604.5.100-branch/Source/WTF/ChangeLog
branches/safari-604.5.100-branch/Source/WTF/wtf/MathExtras.h
branches/safari-604.5.100-branch/Source/WTF/wtf/SizeLimits.cpp
branches/safari-604.5.100-branch/Source/WTF/wtf/Vector.h
branches/safari-604.5.100-branch/Source/WTF/wtf/text/StringImpl.cpp
branches/safari-604.5.100-branch/Source/WTF/wtf/text/StringImpl.h
branches/safari-604.5.100-branch/Source/WTF/wtf/text/StringView.h
branches/safari-604.5.100-branch/Source/WTF/wtf/text/WTFString.h




Diff

Modified: branches/safari-604.5.100-branch/Source/_javascript_Core/ChangeLog (226143 => 226144)

--- branches/safari-604.5.100-branch/Source/_javascript_Core/ChangeLog	2017-12-19 23:00:41 UTC (rev 226143)
+++ branches/safari-604.5.100-branch/Source/_javascript_Core/ChangeLog	2017-12-19 23:00:51 UTC (rev 226144)
@@ -1,3 +1,26 @@
+2017-12-18  Jason Marcell  
+
+Cherry-pick r226068. rdar://problem/36112028
+
+2017-12-16  Filip Pizlo  
+
+Vector index masking
+https://bugs.webkit.org/show_bug.cgi?id=180909
+
+Reviewed by Keith Miller.
+
+Adopt index masking for strings.
+
+* dfg/DFGSpeculativeJIT.cpp:
+(JSC::DFG::SpeculativeJIT::compileGetCharCodeAt):
+(JSC::DFG::SpeculativeJIT::compileGetByValOnString):
+* ftl/FTLAbstractHeapRepository.h:
+* ftl/FTLLowerDFGToB3.cpp:
+(JSC::FTL::DFG::LowerDFGToB3::compileStringCharAt):
+(JSC::FTL::DFG::LowerDFGToB3::compileStringCharCodeAt):
+* jit/ThunkGenerators.cpp:
+(JSC::stringCharLoad):
+
 2017-12-04  Jason Marcell  
 
 Cherry-pick r225273. rdar://problem/35838163


Modified: branches/safari-604.5.100-branch/Source/_javascript_Core/dfg/DFGSpeculativeJIT.cpp (226143 => 226144)

--- branches/safari-604.5.100-branch/Source/_javascript_Core/dfg/DFGSpeculativeJIT.cpp	2017-12-19 23:00:41 UTC (rev 226143)
+++ branches/safari-604.5.100-branch/Source/_javascript_Core/dfg/DFGSpeculativeJIT.cpp	2017-12-19 23:00:51 UTC (rev 226144)
@@ -1994,6 +1994,7 @@
 GPRReg scratchReg = scratch.gpr();
 
 m_jit.loadPtr(MacroAssembler::Address(stringReg, JSString::offsetOfValue()), scratchReg);
+m_jit.and32(MacroAssembler::Address(scratchReg, StringImpl::maskOffset()), indexReg);
 
 // Load the character into scratchReg
 JITCompiler::Jump is16Bit = m_jit.branchTest32(MacroAssembler::Zero, MacroAssembler::Address(scratchReg, StringImpl::flagsOffset()), TrustedImm32(StringImpl::flagIs8Bit()));
@@ -2041,6 +2042,7 @@
 speculationCheck(OutOfBounds, JSValueRegs(), 0, outOfBounds);
 
 m_jit.loadPtr(MacroAssembler::Address(baseReg, JSString::offsetOfValue()), scratchReg);
+m_jit.and32(MacroAssembler::Address(scratchReg, StringImpl::maskOffset()), propertyReg);
 
 // Load the character into scratchReg
 JITCompiler::Jump is16Bit = m_jit.branchTest32(MacroAssembler::Zero, MacroAssembler::Address(scratchReg, StringImpl::flagsOffset()), TrustedImm32(StringImpl::flagIs8Bit()));


Modified: branches/safari-604.5.100-branch/Source/_javascript_Core/ftl/FTLAbstractHeapRepository.h (226143 => 226144)

--- branches/safari-604.5.100-branch/Source/_javascript_Core/ftl/FTLAbstractHeapRepository.h	2017-12-19 23:00:41 UTC (rev 226143)
+++ branches/safari-604.5.100-branch/Source/_javascript_Core/ftl/FTLAbstractHeapRepository.h	2017-12-19 23:00:51 UTC (rev 226144)
@@ -105,6 +105,7 @@
 macro(StringImpl_data, StringImpl::dataOffset()) \
 macro(StringImpl_hashAndFlags, StringImpl::flagsOffset()) \
 macro(StringImpl_length, StringImpl::lengthMemoryOffset()) \
+macro(StringImpl_mask, StringImpl::maskOffset()) \
 macro(Structure_classInfo, Structure::classInfoOffset()) \
 macro(Structure_globalObject, Structure::globalObjectOffset()) \
 macro(Structure_prototype, Structure::prototypeOffset()) \


Modified: branches/safari-604.5.100-branch/Source/_javascript_Core/ftl/FTLLowerDFGToB3.cpp (226143 => 226144)

--- branches/safari-604.5.100-branch/Source/_javascript_Core/ftl/FTLLowerDFGToB3.cpp	2017-12-19 23:00:41 UTC (rev 226143)
+++ branches/safari-604.5.100-branch/Source/_javascript_Core/ftl/FTLLowerDFGToB3.cpp	2017-12-19 23:00:51 UTC (rev 226144)
@@ -5413,6 +5413,7 @@
 LBasicBlock lastNext = m_out.appendTo(fastPath, slowPath);
 
 LValue str

[webkit-changes] [226147] branches/safari-604.5.100-branch/Source/JavaScriptCore

2017-12-19 Thread jmarcell
Title: [226147] branches/safari-604.5.100-branch/Source/_javascript_Core








Revision 226147
Author jmarc...@apple.com
Date 2017-12-19 15:01:30 -0800 (Tue, 19 Dec 2017)


Log Message
Apply patch. rdar://problem/36112003

32-bit fix.

Modified Paths

branches/safari-604.5.100-branch/Source/_javascript_Core/assembler/MacroAssembler.h
branches/safari-604.5.100-branch/Source/_javascript_Core/jit/AssemblyHelpers.h




Diff

Modified: branches/safari-604.5.100-branch/Source/_javascript_Core/assembler/MacroAssembler.h (226146 => 226147)

--- branches/safari-604.5.100-branch/Source/_javascript_Core/assembler/MacroAssembler.h	2017-12-19 23:01:25 UTC (rev 226146)
+++ branches/safari-604.5.100-branch/Source/_javascript_Core/assembler/MacroAssembler.h	2017-12-19 23:01:30 UTC (rev 226147)
@@ -593,6 +593,11 @@
 urshift32(trustedImm32ForShift(imm), srcDest);
 }
 
+void urshiftPtr(RegisterID shiftAmmount, RegisterID srcDest)
+{
+urshift32(shiftAmmount, srcDest);
+}
+
 void negPtr(RegisterID dest)
 {
 neg32(dest);
@@ -902,6 +907,11 @@
 urshift64(trustedImm32ForShift(imm), srcDest);
 }
 
+void urshiftPtr(RegisterID shiftAmmount, RegisterID srcDest)
+{
+urshift64(shiftAmmount, srcDest);
+}
+
 void negPtr(RegisterID dest)
 {
 neg64(dest);


Modified: branches/safari-604.5.100-branch/Source/_javascript_Core/jit/AssemblyHelpers.h (226146 => 226147)

--- branches/safari-604.5.100-branch/Source/_javascript_Core/jit/AssemblyHelpers.h	2017-12-19 23:01:25 UTC (rev 226146)
+++ branches/safari-604.5.100-branch/Source/_javascript_Core/jit/AssemblyHelpers.h	2017-12-19 23:01:30 UTC (rev 226147)
@@ -1442,10 +1442,20 @@
 
 void emitComputeButterflyIndexingMask(GPRReg vectorLengthGPR, GPRReg scratchGPR, GPRReg resultGPR)
 {
+ASSERT(scratchGPR != resultGPR);
+Jump done;
+if (isX86() && !isX86_64()) {
+Jump nonZero = branchTest32(NonZero, vectorLengthGPR);
+move(TrustedImm32(0), resultGPR);
+done = jump();
+nonZero.link(this);
+}
 // If vectorLength == 0 then clz will return 32 on both ARM and x86. On 64-bit systems, we can then do a 64-bit right shift on a 32-bit -1 to get a 0 mask for zero vectorLength. On 32-bit ARM, shift masks with 0xff, which means it will still create a 0 mask.
 countLeadingZeros32(vectorLengthGPR, scratchGPR);
 move(TrustedImm32(-1), resultGPR);
-urshift64(scratchGPR, resultGPR);
+urshiftPtr(scratchGPR, resultGPR);
+if (done.isSet())
+done.link(this);
 }
 
 // Call this if you know that the value held in allocatorGPR is non-null. This DOES NOT mean






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


[webkit-changes] [226143] branches/safari-604.5.100-branch

2017-12-19 Thread jmarcell
Title: [226143] branches/safari-604.5.100-branch








Revision 226143
Author jmarc...@apple.com
Date 2017-12-19 15:00:41 -0800 (Tue, 19 Dec 2017)


Log Message
Cherry-pick r226065. rdar://problem/36080415

Modified Paths

branches/safari-604.5.100-branch/LayoutTests/ChangeLog
branches/safari-604.5.100-branch/Source/WebCore/ChangeLog
branches/safari-604.5.100-branch/Source/WebCore/svg/SVGAnimatedTypeAnimator.h
branches/safari-604.5.100-branch/Source/WebCore/svg/properties/SVGAnimatedPropertyTearOff.h
branches/safari-604.5.100-branch/Source/WebCore/svg/properties/SVGAnimatedStaticPropertyTearOff.h


Added Paths

branches/safari-604.5.100-branch/LayoutTests/svg/animations/crash-when-animation-is-running-while-getting-value-expected.txt
branches/safari-604.5.100-branch/LayoutTests/svg/animations/crash-when-animation-is-running-while-getting-value.html




Diff

Modified: branches/safari-604.5.100-branch/LayoutTests/ChangeLog (226142 => 226143)

--- branches/safari-604.5.100-branch/LayoutTests/ChangeLog	2017-12-19 22:36:21 UTC (rev 226142)
+++ branches/safari-604.5.100-branch/LayoutTests/ChangeLog	2017-12-19 23:00:41 UTC (rev 226143)
@@ -1,3 +1,18 @@
+2017-12-18  Jason Marcell  
+
+Cherry-pick r226065. rdar://problem/36080415
+
+2017-12-18  Zalan Bujtas  
+
+[SVG] Detach list wrappers before resetting the base value.
+https://bugs.webkit.org/show_bug.cgi?id=180912
+
+
+Reviewed by Simon Fraser.
+
+* svg/animations/crash-when-animation-is-running-while-getting-value-expected.txt: Added.
+* svg/animations/crash-when-animation-is-running-while-getting-value.html: Added.
+
 2017-12-04  Jason Marcell  
 
 Cherry-pick r225381. rdar://problem/35839452


Added: branches/safari-604.5.100-branch/LayoutTests/svg/animations/crash-when-animation-is-running-while-getting-value-expected.txt (0 => 226143)

--- branches/safari-604.5.100-branch/LayoutTests/svg/animations/crash-when-animation-is-running-while-getting-value-expected.txt	(rev 0)
+++ branches/safari-604.5.100-branch/LayoutTests/svg/animations/crash-when-animation-is-running-while-getting-value-expected.txt	2017-12-19 23:00:41 UTC (rev 226143)
@@ -0,0 +1,2 @@
+PASS if no crash. 
+


Added: branches/safari-604.5.100-branch/LayoutTests/svg/animations/crash-when-animation-is-running-while-getting-value.html (0 => 226143)

--- branches/safari-604.5.100-branch/LayoutTests/svg/animations/crash-when-animation-is-running-while-getting-value.html	(rev 0)
+++ branches/safari-604.5.100-branch/LayoutTests/svg/animations/crash-when-animation-is-running-while-getting-value.html	2017-12-19 23:00:41 UTC (rev 226143)
@@ -0,0 +1,16 @@
+PASS if no crash.
+
+
+
+
+
+if (window.testRunner) {
+testRunner.dumpAsText();
+testRunner.waitUntilDone();
+}
+setTimeout(function() {
+textElement.x.animVal.getItem(0);
+if (window.testRunner)
+testRunner.notifyDone();
+}, 0);
+


Modified: branches/safari-604.5.100-branch/Source/WebCore/ChangeLog (226142 => 226143)

--- branches/safari-604.5.100-branch/Source/WebCore/ChangeLog	2017-12-19 22:36:21 UTC (rev 226142)
+++ branches/safari-604.5.100-branch/Source/WebCore/ChangeLog	2017-12-19 23:00:41 UTC (rev 226143)
@@ -1,3 +1,27 @@
+2017-12-18  Jason Marcell  
+
+Cherry-pick r226065. rdar://problem/36080415
+
+2017-12-18  Zalan Bujtas  
+
+[SVG] Detach list wrappers before resetting the base value.
+https://bugs.webkit.org/show_bug.cgi?id=180912
+
+
+Reviewed by Simon Fraser.
+
+Before resetting the animation value (and destroying the assigned SVG object -SVGLengthValue in this case),
+we need to check if there's an associated tear off wrapper for the said SVG object and make a copy of it.
+This is currently done in the wrong order through animValDidChange.
+
+Test: svg/animations/crash-when-animation-is-running-while-getting-value.html
+
+* svg/SVGAnimatedTypeAnimator.h:
+(WebCore::SVGAnimatedTypeAnimator::resetFromBaseValue):
+* svg/properties/SVGAnimatedPropertyTearOff.h:
+* svg/properties/SVGAnimatedStaticPropertyTearOff.h:
+(WebCore::SVGAnimatedStaticPropertyTearOff::synchronizeWrappersIfNeeded):
+
 2017-12-05  Jason Marcell  
 
 Cherry-pick r225528. rdar://problem/35839452


Modified: branches/safari-604.5.100-branch/Source/WebCore/svg/SVGAnimatedTypeAnimator.h (226142 => 226143)

--- branches/safari-604.5.100-branch/Source/WebCore/svg/SVGAnimatedTypeAnimator.h	2017-12-19 22:36:21 UTC (rev 226142)
+++ branches/safari-604.5.100-branch/Source/WebCore/svg/SVGAnimatedTypeAnimator.h	2017-12-19 23:00:41 UTC (rev 226143)
@@ -78,8 +78,11 @@
 {
 ASSERT(animatedTypes[0].properties.size() == 1);
 ASSERT(type.type() == m_type);
+auto* property = castAnimatedPropertyToActualType(animatedTypes[0].p

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

2017-12-19 Thread timothy
Title: [226142] trunk/Source/WebCore








Revision 226142
Author timo...@hatcher.name
Date 2017-12-19 14:36:21 -0800 (Tue, 19 Dec 2017)


Log Message
Build failure in WebGL2 when Video feature is disabled
https://bugs.webkit.org/show_bug.cgi?id=180946

Reviewed by Brian Burg.

* html/canvas/WebGL2RenderingContext.h: Make TexImageSource conditional on ENABLE(VIDEO).
* html/canvas/WebGL2RenderingContext.idl: Ditto.

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/html/canvas/WebGL2RenderingContext.h
trunk/Source/WebCore/html/canvas/WebGL2RenderingContext.idl




Diff

Modified: trunk/Source/WebCore/ChangeLog (226141 => 226142)

--- trunk/Source/WebCore/ChangeLog	2017-12-19 22:32:40 UTC (rev 226141)
+++ trunk/Source/WebCore/ChangeLog	2017-12-19 22:36:21 UTC (rev 226142)
@@ -1,3 +1,13 @@
+2017-12-19  Timothy Hatcher  
+
+Build failure in WebGL2 when Video feature is disabled
+https://bugs.webkit.org/show_bug.cgi?id=180946
+
+Reviewed by Brian Burg.
+
+* html/canvas/WebGL2RenderingContext.h: Make TexImageSource conditional on ENABLE(VIDEO).
+* html/canvas/WebGL2RenderingContext.idl: Ditto.
+
 2017-12-19  Chris Dumez  
 
 scopeURL should start with the provided scriptURL


Modified: trunk/Source/WebCore/html/canvas/WebGL2RenderingContext.h (226141 => 226142)

--- trunk/Source/WebCore/html/canvas/WebGL2RenderingContext.h	2017-12-19 22:32:40 UTC (rev 226141)
+++ trunk/Source/WebCore/html/canvas/WebGL2RenderingContext.h	2017-12-19 22:36:21 UTC (rev 226142)
@@ -66,6 +66,12 @@
 void texStorage2D(GC3Denum target, GC3Dsizei levels, GC3Denum internalFormat, GC3Dsizei width, GC3Dsizei height);
 void texStorage3D(GC3Denum target, GC3Dsizei levels, GC3Denum internalFormat, GC3Dsizei width, GC3Dsizei height, GC3Dsizei depth);
 
+#if ENABLE(VIDEO)
+using TexImageSource = WTF::Variant, RefPtr, RefPtr, RefPtr>;
+#else
+using TexImageSource = WTF::Variant, RefPtr, RefPtr>;
+#endif
+
 using WebGLRenderingContextBase::texImage2D;
 void texImage2D(GC3Denum target, GC3Dint level, GC3Dint internalformat, GC3Dsizei width, GC3Dsizei height, GC3Dint border, GC3Denum format, GC3Denum type, GC3Dint64 pboOffset);
 void texImage2D(GC3Denum target, GC3Dint level, GC3Dint internalformat, GC3Dsizei width, GC3Dsizei height, GC3Dint border, GC3Denum format, GC3Denum type, TexImageSource&&);
@@ -83,7 +89,6 @@
 
 void texSubImage3D(GC3Denum target, GC3Dint level, GC3Dint xoffset, GC3Dint yoffset, GC3Dint zoffset, GC3Dsizei width, GC3Dsizei height, GC3Dsizei depth, GC3Denum format, GC3Denum type, GC3Dint64 pboOffset);
 void texSubImage3D(GC3Denum target, GC3Dint level, GC3Dint xoffset, GC3Dint yoffset, GC3Dint zoffset, GC3Dsizei width, GC3Dsizei height, GC3Dsizei depth, GC3Denum format, GC3Denum type, RefPtr&& pixels, GC3Duint srcOffset);
-using TexImageSource = WTF::Variant, RefPtr, RefPtr, RefPtr>;
 void texSubImage3D(GC3Denum target, GC3Dint level, GC3Dint xoffset, GC3Dint yoffset, GC3Dint zoffset, GC3Dsizei width, GC3Dsizei height, GC3Dsizei depth, GC3Denum format, GC3Denum type, TexImageSource&&);
 
 void copyTexSubImage3D(GC3Denum target, GC3Dint level, GC3Dint xoffset, GC3Dint yoffset, GC3Dint zoffset, GC3Dint x, GC3Dint y, GC3Dsizei width, GC3Dsizei height);


Modified: trunk/Source/WebCore/html/canvas/WebGL2RenderingContext.idl (226141 => 226142)

--- trunk/Source/WebCore/html/canvas/WebGL2RenderingContext.idl	2017-12-19 22:32:40 UTC (rev 226141)
+++ trunk/Source/WebCore/html/canvas/WebGL2RenderingContext.idl	2017-12-19 22:36:21 UTC (rev 226142)
@@ -45,7 +45,11 @@
 typedef (Uint32Array or sequence) Uint32List;
 
 // FIXME: Should allow ImageBitmap too.
+#ifdef ENABLE_VIDEO
 typedef (ImageData or HTMLImageElement or HTMLCanvasElement or HTMLVideoElement) TexImageSource;
+#else
+typedef (ImageData or HTMLImageElement or HTMLCanvasElement) TexImageSource;
+#endif
 
 [
 Conditional=WEBGL2,






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


[webkit-changes] [226141] trunk

2017-12-19 Thread cdumez
Title: [226141] trunk








Revision 226141
Author cdu...@apple.com
Date 2017-12-19 14:32:40 -0800 (Tue, 19 Dec 2017)


Log Message
scopeURL should start with the provided scriptURL
https://bugs.webkit.org/show_bug.cgi?id=180983

Reviewed by Youenn Fablet.

LayoutTests/imported/w3c:

Rebaseline WPT tests now that more checks are passing.

* web-platform-tests/service-workers/service-worker/register-default-scope.https-expected.txt:
* web-platform-tests/service-workers/service-worker/registration-iframe.https-expected.txt:
* web-platform-tests/service-workers/service-worker/registration-security-error.https-expected.txt:

Source/WebCore:

scopeURL should start with the provided scriptURL, as per:
- https://w3c.github.io/ServiceWorker/#update (steps 7.8 to 7.18)

No new tests, rebaselined existing tests.

* platform/network/HTTPHeaderNames.in:
* workers/service/ServiceWorkerJob.cpp:
(WebCore::ServiceWorkerJob::didReceiveResponse):

LayoutTests:

Update WebKit tests due to new restrictions.

* http/tests/workers/service/basic-unregister.https-expected.txt:
* http/tests/workers/service/controller-change.html:
* http/tests/workers/service/resources/ServiceWorkerGlobalScope_getRegistration-worker.js:
(async.runTest):
* http/tests/workers/service/resources/ServiceWorkerGlobalScope_register-worker.js:
(async.runTest):
* http/tests/workers/service/resources/basic-fetch.js:
(async.test):
* http/tests/workers/service/resources/basic-register.js:
(async.test):
* http/tests/workers/service/resources/basic-unregister.js:
(async.test):
* http/tests/workers/service/resources/service-worker-fetch.js:
(async.test):
* http/tests/workers/service/resources/service-worker-getRegistration.js:
(async.test):
* http/tests/workers/service/resources/service-worker-importScript.js:
(async.test):
* http/tests/workers/service/resources/shift-reload-navigation.js:
(async.test):
* http/tests/workers/service/service-worker-clear.html:
* http/tests/workers/service/service-worker-crossorigin-fetch.html:
* http/tests/workers/service/service-worker-getRegistration-expected.txt:
* http/tests/workers/service/service-worker-request-with-body.https.html:
* http/tests/workers/service/serviceworker-idb.https.html:
* http/tests/workers/service/serviceworker-websocket.https.html:
* http/tests/workers/service/serviceworkerclients-get.https.html:

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/LayoutTests/http/tests/inspector/network/resource-response-service-worker.html
trunk/LayoutTests/http/tests/workers/service/basic-unregister.https-expected.txt
trunk/LayoutTests/http/tests/workers/service/controller-change.html
trunk/LayoutTests/http/tests/workers/service/resources/ServiceWorkerGlobalScope_getRegistration-worker.js
trunk/LayoutTests/http/tests/workers/service/resources/ServiceWorkerGlobalScope_register-worker.js
trunk/LayoutTests/http/tests/workers/service/resources/basic-fetch.js
trunk/LayoutTests/http/tests/workers/service/resources/basic-register.js
trunk/LayoutTests/http/tests/workers/service/resources/basic-unregister.js
trunk/LayoutTests/http/tests/workers/service/resources/service-worker-fetch.js
trunk/LayoutTests/http/tests/workers/service/resources/service-worker-getRegistration.js
trunk/LayoutTests/http/tests/workers/service/resources/service-worker-importScript.js
trunk/LayoutTests/http/tests/workers/service/resources/shift-reload-navigation.js
trunk/LayoutTests/http/tests/workers/service/service-worker-clear.html
trunk/LayoutTests/http/tests/workers/service/service-worker-crossorigin-fetch.html
trunk/LayoutTests/http/tests/workers/service/service-worker-getRegistration-expected.txt
trunk/LayoutTests/http/tests/workers/service/service-worker-request-with-body.https.html
trunk/LayoutTests/http/tests/workers/service/serviceworker-idb.https.html
trunk/LayoutTests/http/tests/workers/service/serviceworker-websocket.https.html
trunk/LayoutTests/http/tests/workers/service/serviceworkerclients-get.https.html
trunk/LayoutTests/http/wpt/service-workers/check-service-worker-header.https.html
trunk/LayoutTests/imported/w3c/ChangeLog
trunk/LayoutTests/imported/w3c/web-platform-tests/service-workers/service-worker/register-default-scope.https-expected.txt
trunk/LayoutTests/imported/w3c/web-platform-tests/service-workers/service-worker/registration-iframe.https-expected.txt
trunk/LayoutTests/imported/w3c/web-platform-tests/service-workers/service-worker/registration-security-error.https-expected.txt
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/network/HTTPHeaderNames.in
trunk/Source/WebCore/workers/service/ServiceWorkerJob.cpp




Diff

Modified: trunk/LayoutTests/ChangeLog (226140 => 226141)

--- trunk/LayoutTests/ChangeLog	2017-12-19 22:15:18 UTC (rev 226140)
+++ trunk/LayoutTests/ChangeLog	2017-12-19 22:32:40 UTC (rev 226141)
@@ -1,3 +1,40 @@
+2017-12-19  Chris Dumez  
+
+scopeURL should start with the provided scriptURL
+https://bugs.webkit.org/show_bug.cgi?id=180983
+
+Reviewed by Youenn Fablet.
+
+   

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

2017-12-19 Thread zalan
Title: [226140] trunk/Source/WebCore








Revision 226140
Author za...@apple.com
Date 2017-12-19 14:15:18 -0800 (Tue, 19 Dec 2017)


Log Message
[RenderTreeBuilder] Move finding-the-parent/creating-wrapper logic from RenderTableSection::addChild to RenderTreeBuilder
https://bugs.webkit.org/show_bug.cgi?id=180994


Reviewed by Antti Koivisto.

This is in preparation for removing all tree mutation from renderering code.

Covered by existing tests.

* rendering/RenderTableSection.cpp:
(WebCore::RenderTableSection::addChild):
* rendering/updating/RenderTreeBuilder.cpp:
(WebCore::RenderTreeBuilder::insertChild):
* rendering/updating/RenderTreeBuilderTable.cpp:
(WebCore::RenderTreeBuilder::Table::findOrCreateParentForChild):
* rendering/updating/RenderTreeBuilderTable.h:

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/rendering/RenderTableSection.cpp
trunk/Source/WebCore/rendering/updating/RenderTreeBuilder.cpp
trunk/Source/WebCore/rendering/updating/RenderTreeBuilderTable.cpp
trunk/Source/WebCore/rendering/updating/RenderTreeBuilderTable.h




Diff

Modified: trunk/Source/WebCore/ChangeLog (226139 => 226140)

--- trunk/Source/WebCore/ChangeLog	2017-12-19 21:51:27 UTC (rev 226139)
+++ trunk/Source/WebCore/ChangeLog	2017-12-19 22:15:18 UTC (rev 226140)
@@ -1,3 +1,23 @@
+2017-12-19  Zalan Bujtas  
+
+[RenderTreeBuilder] Move finding-the-parent/creating-wrapper logic from RenderTableSection::addChild to RenderTreeBuilder
+https://bugs.webkit.org/show_bug.cgi?id=180994
+
+
+Reviewed by Antti Koivisto.
+
+This is in preparation for removing all tree mutation from renderering code.
+
+Covered by existing tests.
+
+* rendering/RenderTableSection.cpp:
+(WebCore::RenderTableSection::addChild):
+* rendering/updating/RenderTreeBuilder.cpp:
+(WebCore::RenderTreeBuilder::insertChild):
+* rendering/updating/RenderTreeBuilderTable.cpp:
+(WebCore::RenderTreeBuilder::Table::findOrCreateParentForChild):
+* rendering/updating/RenderTreeBuilderTable.h:
+
 2017-12-19  Daniel Bates  
 
 Implement InlineTextBox painting using marker subranges


Modified: trunk/Source/WebCore/rendering/RenderTableSection.cpp (226139 => 226140)

--- trunk/Source/WebCore/rendering/RenderTableSection.cpp	2017-12-19 21:51:27 UTC (rev 226139)
+++ trunk/Source/WebCore/rendering/RenderTableSection.cpp	2017-12-19 22:15:18 UTC (rev 226140)
@@ -123,43 +123,6 @@
 
 void RenderTableSection::addChild(RenderTreeBuilder& builder, RenderPtr child, RenderObject* beforeChild)
 {
-if (!is(*child)) {
-RenderObject* last = beforeChild;
-if (!last)
-last = lastRow();
-if (is(last) && last->isAnonymous() && !last->isBeforeOrAfterContent()) {
-RenderTableRow& row = downcast(*last);
-if (beforeChild == &row)
-beforeChild = row.firstCell();
-builder.insertChild(row, WTFMove(child), beforeChild);
-return;
-}
-
-if (beforeChild && !beforeChild->isAnonymous() && beforeChild->parent() == this) {
-RenderObject* row = beforeChild->previousSibling();
-if (is(row) && row->isAnonymous()) {
-builder.insertChild(downcast(*row), WTFMove(child));
-return;
-}
-}
-
-// If beforeChild is inside an anonymous cell/row, insert into the cell or into
-// the anonymous row containing it, if there is one.
-RenderObject* lastBox = last;
-while (lastBox && lastBox->parent()->isAnonymous() && !is(*lastBox))
-lastBox = lastBox->parent();
-if (is(lastBox) && lastBox->isAnonymous() && !lastBox->isBeforeOrAfterContent()) {
-builder.insertChild(downcast(*lastBox), WTFMove(child), beforeChild);
-return;
-}
-
-auto newRow = RenderTableRow::createAnonymousWithParentRenderer(*this);
-auto& row = *newRow;
-builder.insertChild(*this, WTFMove(newRow), beforeChild);
-builder.insertChild(row, WTFMove(child));
-return;
-}
-
 if (beforeChild)
 setNeedsCellRecalc();
 


Modified: trunk/Source/WebCore/rendering/updating/RenderTreeBuilder.cpp (226139 => 226140)

--- trunk/Source/WebCore/rendering/updating/RenderTreeBuilder.cpp	2017-12-19 21:51:27 UTC (rev 226139)
+++ trunk/Source/WebCore/rendering/updating/RenderTreeBuilder.cpp	2017-12-19 22:15:18 UTC (rev 226140)
@@ -67,6 +67,16 @@
 return;
 }
 
+if (is(parent)) {
+auto& parentCandidate = m_tableBuilder->findOrCreateParentForChild(downcast(parent), *child, beforeChild);
+if (&parent != &parentCandidate) {
+insertChild(parentCandidate, WTFMove(child), beforeChild);
+return;
+}
+parent.addChild(*this, WTFMove(child), beforeChild);
+return;
+}
+
 if (is(parent)) {
 rubyRunInsertChild(downcast(parent), WTFMove(child),

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

2017-12-19 Thread sbarati
Title: [226139] trunk/Source/_javascript_Core








Revision 226139
Author sbar...@apple.com
Date 2017-12-19 13:51:27 -0800 (Tue, 19 Dec 2017)


Log Message
We forgot to do index masking for in bounds int32 arrays in the FTL
https://bugs.webkit.org/show_bug.cgi?id=180987

Reviewed by Keith Miller.

* ftl/FTLLowerDFGToB3.cpp:
(JSC::FTL::DFG::LowerDFGToB3::compileGetByVal):

Modified Paths

trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/ftl/FTLLowerDFGToB3.cpp




Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (226138 => 226139)

--- trunk/Source/_javascript_Core/ChangeLog	2017-12-19 21:48:19 UTC (rev 226138)
+++ trunk/Source/_javascript_Core/ChangeLog	2017-12-19 21:51:27 UTC (rev 226139)
@@ -1,3 +1,13 @@
+2017-12-19  Saam Barati  
+
+We forgot to do index masking for in bounds int32 arrays in the FTL
+https://bugs.webkit.org/show_bug.cgi?id=180987
+
+Reviewed by Keith Miller.
+
+* ftl/FTLLowerDFGToB3.cpp:
+(JSC::FTL::DFG::LowerDFGToB3::compileGetByVal):
+
 2017-12-19  Yusuke Suzuki  
 
 [DFG][FTL] NewRegexp shoud be fast


Modified: trunk/Source/_javascript_Core/ftl/FTLLowerDFGToB3.cpp (226138 => 226139)

--- trunk/Source/_javascript_Core/ftl/FTLLowerDFGToB3.cpp	2017-12-19 21:48:19 UTC (rev 226138)
+++ trunk/Source/_javascript_Core/ftl/FTLLowerDFGToB3.cpp	2017-12-19 21:51:27 UTC (rev 226139)
@@ -3638,9 +3638,11 @@
 
 IndexedAbstractHeap& heap = m_node->arrayMode().type() == Array::Int32 ?
 m_heaps.indexedInt32Properties : m_heaps.indexedContiguousProperties;
-
+
+LValue base = lowCell(m_node->child1());
+
 if (m_node->arrayMode().isInBounds()) {
-LValue result = m_out.load64(baseIndex(heap, storage, index, m_node->child2()));
+LValue result = m_out.load64(maskedIndex(heap, storage, index, base, m_node->child2()));
 LValue isHole = m_out.isZero64(result);
 if (m_node->arrayMode().isSaneChain()) {
 DFG_ASSERT(
@@ -3653,8 +3655,6 @@
 return;
 }
 
-LValue base = lowCell(m_node->child1());
-
 LBasicBlock fastCase = m_out.newBlock();
 LBasicBlock slowCase = m_out.newBlock();
 LBasicBlock continuation = m_out.newBlock();






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


[webkit-changes] [226138] trunk

2017-12-19 Thread dbates
Title: [226138] trunk








Revision 226138
Author dba...@webkit.org
Date 2017-12-19 13:48:19 -0800 (Tue, 19 Dec 2017)


Log Message
Implement InlineTextBox painting using marker subranges
https://bugs.webkit.org/show_bug.cgi?id=180984


Reviewed by David Hyatt.

Source/WebCore:

As a step towards implementing CSS Pseudo-Elements Module Level 4, explicitly decompose a
text line into subrange objects that may be styled (say, to give the appearance of selected
text) and painted.

No functionality changed. So, no new tests.

* rendering/InlineTextBox.cpp:
(WebCore::InlineTextBox::localSelectionRect const): Update comments.

(WebCore::InlineTextBox::MarkerSubrangeStyle::operator== const):
(WebCore::InlineTextBox::MarkerSubrangeStyle::operator!= const):
(WebCore::InlineTextBox::StyledMarkerSubrange::StyledMarkerSubrange):
Define a subclass to represent a marker subrange that has associated style information.
We will make use of the style information when painting the subrange.

(WebCore::createMarkerSubrangeFromSelectionInBox): Convenience function to instantiate a
MarkerSubrange instance from the current selection of a specified text box.

(WebCore::InlineTextBox::paint): Write in terms of MarkerSubrange. We keep composition backgrounds
and composition underlines as special cases for now. We represent all other subranges of the line
as MarkerSubrange instances, including unmarked text (i.e. non-selected text without an associated
document marker). The subranges for the gaps between document markers and selection are implicitly
created by subdividing the entire line. Support for PaintBehaviorExcludeSelection is implemented
by subdividing the entire line with the selection subrange and then removing the selection subrange
from the resulting list of subdivisions before painting with the resulting list.

(WebCore::InlineTextBox::paintPlatformDocumentMarkers): Renamed; formerly named paintDocumentMarkers.
(WebCore::InlineTextBox::paintPlatformDocumentMarker): Renamed; formerly named paintDocumentMarker.

(WebCore::InlineTextBox::computeStyleForUnmarkedMarkerSubrange const): Convenience function to
compute the style for unmarked text.

(WebCore::InlineTextBox::resolveStyleForSubrange): Added

(WebCore::InlineTextBox::subdivideAndResolveStyle): Subdivides the list of marker subranges and
coalesces subranges of the same type (e.g. selection) or with the same style. The latter strategy
preserves the optimization of drawing the text of the entire line in one draw command when we know
that the selected text looks identical to non-selected text. This optimization was performed in TextPainter::paint().

(WebCore::InlineTextBox::collectSubrangesForDraggedContent): Added.
(WebCore::InlineTextBox::collectSubrangesForDocumentMarkers): Added.
(WebCore::InlineTextBox::textOriginFromBoxRect const): Added.

(WebCore::InlineTextBox::paintMarkerSubranges):
(WebCore::InlineTextBox::paintTextSubrangeBackground):
(WebCore::InlineTextBox::paintTextSubrangeForeground):
(WebCore::InlineTextBox::paintTextSubrangeDecoration):
Paint the marker subrange.

(WebCore::InlineTextBox::paintCompositionBackground): Moved function to group it with the logic to
paint composition underlines. Modified to pass clamped offsets to paintTextSubrangeBackground() as
paintTextSubrangeBackground() now expects them.

(WebCore::mirrorRTLSegment): Moved function to be above paintCompositionUnderline() as it is the only
function that makes use of it.

(WebCore::InlineTextBox::paintSelection): Deleted.
(WebCore::InlineTextBox::paintTextMatchMarker): Deleted.
(WebCore::InlineTextBox::paintDecoration): Deleted.
(WebCore::InlineTextBox::paintDocumentMarker): Deleted; renamed to paintPlatformDocumentMarker.
(WebCore::InlineTextBox::paintDocumentMarkers): Deleted; renamed to paintPlatformDocumentMarkers.
* rendering/InlineTextBox.h:
(WebCore::InlineTextBox::paintMarkerSubranges): Added.
* rendering/MarkerSubrange.h:
(WebCore::MarkerSubrange::isEmpty const): Added.
(WebCore::MarkerSubrange::operator!= const): Added.
(WebCore::MarkerSubrange::operator== const): Added.
* rendering/SimpleLineLayoutFunctions.cpp:
(WebCore::SimpleLineLayout::paintFlow): Updated code as we no longer need to pass the text run length
to TextPainter::paint(). Also modernize the code while I am here.
* rendering/TextDecorationPainter.cpp:
(WebCore::TextDecorationPainter::Styles::operator== const): Added.
(WebCore::TextDecorationPainter::TextDecorationPainter): Modified to take an optional TextDecorationPainter::Styles
instance as an argument and removed the unused parameter for PseudoId.
* rendering/TextDecorationPainter.h:
(WebCore::TextDecorationPainter::Styles::operator!= const): Added.
* rendering/TextPaintStyle.cpp:
(WebCore::TextPaintStyle::operator== const): Added.
(WebCore::computeTextSelectionPaintStyle): Removed the now unused out-arguments paintSelectedTextOnly, paintSelectedTextSeparately,
and paintNonSelectedTextOnly. The values stored in these out-arguments were intended to be used 

[webkit-changes] [226137] trunk

2017-12-19 Thread dbates
Title: [226137] trunk








Revision 226137
Author dba...@webkit.org
Date 2017-12-19 13:28:33 -0800 (Tue, 19 Dec 2017)


Log Message
Add support for computing the frontmost longest effective marker subrange
https://bugs.webkit.org/show_bug.cgi?id=180985

Reviewed by Dave Hyatt.

Source/WebCore:

Add a new subdivision overlap strategy to return the minimum list of maximal length non-
overlapping subranges. We will make use of this strategy together with an algorithm to
coalesce adjacent subranges with visually indistinct styles to minimize the total number
of drawing commands needed to paint an entire line of text. We are not making use of
this functionality now. We will make use of it to simplify the patch for .

* rendering/MarkerSubrange.cpp:
(WebCore::subdivide):
* rendering/MarkerSubrange.h:

Tools:

Adds a test case to ensure that we compute the minimum list of maximal length non-
overlapping subranges when using strategy OverlapStrategy::FrontmostWithLongestEffectiveRange.

* TestWebKitAPI/Tests/WebCore/MarkerSubrange.cpp:
(TestWebKitAPI::TEST):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/rendering/MarkerSubrange.cpp
trunk/Source/WebCore/rendering/MarkerSubrange.h
trunk/Tools/ChangeLog
trunk/Tools/TestWebKitAPI/Tests/WebCore/MarkerSubrange.cpp




Diff

Modified: trunk/Source/WebCore/ChangeLog (226136 => 226137)

--- trunk/Source/WebCore/ChangeLog	2017-12-19 21:22:22 UTC (rev 226136)
+++ trunk/Source/WebCore/ChangeLog	2017-12-19 21:28:33 UTC (rev 226137)
@@ -1,3 +1,20 @@
+2017-12-19  Daniel Bates  
+
+Add support for computing the frontmost longest effective marker subrange
+https://bugs.webkit.org/show_bug.cgi?id=180985
+
+Reviewed by Dave Hyatt.
+
+Add a new subdivision overlap strategy to return the minimum list of maximal length non-
+overlapping subranges. We will make use of this strategy together with an algorithm to
+coalesce adjacent subranges with visually indistinct styles to minimize the total number
+of drawing commands needed to paint an entire line of text. We are not making use of
+this functionality now. We will make use of it to simplify the patch for .
+
+* rendering/MarkerSubrange.cpp:
+(WebCore::subdivide):
+* rendering/MarkerSubrange.h:
+
 2017-12-19  Chris Dumez  
 
 Handle Fetch should wait for the service worker's state to become activated


Modified: trunk/Source/WebCore/rendering/MarkerSubrange.cpp (226136 => 226137)

--- trunk/Source/WebCore/rendering/MarkerSubrange.cpp	2017-12-19 21:22:22 UTC (rev 226136)
+++ trunk/Source/WebCore/rendering/MarkerSubrange.cpp	2017-12-19 21:28:33 UTC (rev 226137)
@@ -67,14 +67,22 @@
 unsigned offsetSoFar = offsets[0].value;
 for (unsigned i = 1; i < numberOfOffsets; ++i) {
 if (offsets[i].value > offsets[i - 1].value) {
-if (overlapStrategy == OverlapStrategy::Frontmost) {
+if (overlapStrategy == OverlapStrategy::Frontmost || overlapStrategy == OverlapStrategy::FrontmostWithLongestEffectiveRange) {
 std::optional frontmost;
 for (unsigned j = 0; j < i; ++j) {
 if (!processedSubranges.contains(offsets[j].subrange))
 frontmost = j;
 }
-if (frontmost)
-result.append({ offsetSoFar, offsets[i].value, offsets[frontmost.value()].subrange->type, offsets[frontmost.value()].subrange->marker });
+if (frontmost) {
+if (overlapStrategy == OverlapStrategy::FrontmostWithLongestEffectiveRange && !result.isEmpty()) {
+auto& previous = result.last();
+if (previous.endOffset == offsetSoFar && previous.type == offsets[frontmost.value()].subrange->type && previous.marker == offsets[frontmost.value()].subrange->marker)
+previous.endOffset = offsets[i].value;
+else
+result.append({ offsetSoFar, offsets[i].value, offsets[frontmost.value()].subrange->type, offsets[frontmost.value()].subrange->marker });
+} else
+result.append({ offsetSoFar, offsets[i].value, offsets[frontmost.value()].subrange->type, offsets[frontmost.value()].subrange->marker });
+}
 } else {
 for (unsigned j = 0; j < i; ++j) {
 if (!processedSubranges.contains(offsets[j].subrange))


Modified: trunk/Source/WebCore/rendering/MarkerSubrange.h (226136 => 226137)

--- trunk/Source/WebCore/rendering/MarkerSubrange.h	2017-12-19 21:22:22 UTC (rev 226136)
+++ trunk/Source/WebCore/rendering/MarkerSubrange.h	2017-12-19 21:28:33 UTC (rev 226137)
@@ -44,6 +44,7 @@
 // FIXME: See . Also, remove the PLATFORM(IOS)-guard.
 DictationPhraseWithAlternatives,
 #endif
+Selection,
 };
 #if !COMPILER_SUPPORTS(NSDMI_FOR_AGGREGATES)
 Mar

[webkit-changes] [226136] trunk

2017-12-19 Thread cdumez
Title: [226136] trunk








Revision 226136
Author cdu...@apple.com
Date 2017-12-19 13:22:22 -0800 (Tue, 19 Dec 2017)


Log Message
Handle Fetch should wait for the service worker's state to become activated
https://bugs.webkit.org/show_bug.cgi?id=180959

Reviewed by Youenn Fablet.

LayoutTests/imported/w3c:

Rebaseline WPT test that is now passing.

* web-platform-tests/service-workers/service-worker/fetch-waits-for-activate.https-expected.txt:

Source/WebCore:

Handle Fetch should wait for the service worker's state to become activated when
it is currently activating.

Specification:
- https://w3c.github.io/ServiceWorker/#on-fetch-request-algorithm (Step 16)

No new tests, rebaselined existing test.

* workers/service/server/SWServerWorker.cpp:
(WebCore::SWServerWorker::~SWServerWorker):
(WebCore::SWServerWorker::whenActivated):
(WebCore::SWServerWorker::setState):
(WebCore::SWServerWorker::callWhenActivatedHandler):
* workers/service/server/SWServerWorker.h:

Source/WebKit:

Handle Fetch should wait for the service worker's state to become activated when
it is currently activating.

Specification:
- https://w3c.github.io/ServiceWorker/#on-fetch-request-algorithm (Step 16)

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

Modified Paths

trunk/LayoutTests/imported/w3c/ChangeLog
trunk/LayoutTests/imported/w3c/web-platform-tests/service-workers/service-worker/fetch-waits-for-activate.https-expected.txt
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/workers/service/server/SWServer.h
trunk/Source/WebCore/workers/service/server/SWServerWorker.cpp
trunk/Source/WebCore/workers/service/server/SWServerWorker.h
trunk/Source/WebKit/ChangeLog
trunk/Source/WebKit/StorageProcess/ServiceWorker/WebSWServerConnection.cpp




Diff

Modified: trunk/LayoutTests/imported/w3c/ChangeLog (226135 => 226136)

--- trunk/LayoutTests/imported/w3c/ChangeLog	2017-12-19 20:46:48 UTC (rev 226135)
+++ trunk/LayoutTests/imported/w3c/ChangeLog	2017-12-19 21:22:22 UTC (rev 226136)
@@ -1,3 +1,14 @@
+2017-12-19  Chris Dumez  
+
+Handle Fetch should wait for the service worker's state to become activated
+https://bugs.webkit.org/show_bug.cgi?id=180959
+
+Reviewed by Youenn Fablet.
+
+Rebaseline WPT test that is now passing.
+
+* web-platform-tests/service-workers/service-worker/fetch-waits-for-activate.https-expected.txt:
+
 2017-12-19  Youenn Fablet  
 
 Service Worker should not clean HTTP headers added by the application or by fetch specification before service worker interception


Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/service-workers/service-worker/fetch-waits-for-activate.https-expected.txt (226135 => 226136)

--- trunk/LayoutTests/imported/w3c/web-platform-tests/service-workers/service-worker/fetch-waits-for-activate.https-expected.txt	2017-12-19 20:46:48 UTC (rev 226135)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/service-workers/service-worker/fetch-waits-for-activate.https-expected.txt	2017-12-19 21:22:22 UTC (rev 226136)
@@ -1,4 +1,3 @@
 
+PASS Fetch events should wait for the activate event to complete. 
 
-FAIL Fetch events should wait for the activate event to complete. assert_unreached: unexpected rejection: assert_equals: frame should not be loaded expected (undefined) undefined but got (object) Element node 

Modified: trunk/Source/WebCore/ChangeLog (226135 => 226136)

--- trunk/Source/WebCore/ChangeLog	2017-12-19 20:46:48 UTC (rev 226135)
+++ trunk/Source/WebCore/ChangeLog	2017-12-19 21:22:22 UTC (rev 226136)
@@ -1,3 +1,25 @@
+2017-12-19  Chris Dumez  
+
+Handle Fetch should wait for the service worker's state to become activated
+https://bugs.webkit.org/show_bug.cgi?id=180959
+
+Reviewed by Youenn Fablet.
+
+Handle Fetch should wait for the service worker's state to become activated when
+it is currently activating.
+
+Specification:
+- https://w3c.github.io/ServiceWorker/#on-fetch-request-algorithm (Step 16)
+
+No new tests, rebaselined existing test.
+
+* workers/service/server/SWServerWorker.cpp:
+(WebCore::SWServerWorker::~SWServerWorker):
+(WebCore::SWServerWorker::whenActivated):
+(WebCore::SWServerWorker::setState):
+(WebCore::SWServerWorker::callWhenActivatedHandler):
+* workers/service/server/SWServerWorker.h:
+
 2017-12-19  Yusuke Suzuki  
 
 [YARR] Yarr should return ErrorCode instead of error messages (const char*)


Modified: trunk/Source/WebCore/workers/service/server/SWServer.h (226135 => 226136)

--- trunk/Source/WebCore/workers/service/server/SWServer.h	2017-12-19 20:46:48 UTC (rev 226135)
+++ trunk/Source/WebCore/workers/service/server/SWServer.h	2017-12-19 21:22:22 UTC (rev 226136)
@@ -46,6 +46,7 @@
 #include 
 #include 
 #include 
+#include 
 
 namespace WebCore {
 
@@ -74,6 +75,8 @@
 using Identifier = SWServerConnectionIdentifier;
   

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

2017-12-19 Thread jmarcell
Title: [226135] branches/safari-604-branch/Source/_javascript_Core








Revision 226135
Author jmarc...@apple.com
Date 2017-12-19 12:46:48 -0800 (Tue, 19 Dec 2017)


Log Message
Apply patch. rdar://problem/36112002

32-bit fix.

Modified Paths

branches/safari-604-branch/Source/_javascript_Core/assembler/MacroAssembler.h
branches/safari-604-branch/Source/_javascript_Core/jit/AssemblyHelpers.h




Diff

Modified: branches/safari-604-branch/Source/_javascript_Core/assembler/MacroAssembler.h (226134 => 226135)

--- branches/safari-604-branch/Source/_javascript_Core/assembler/MacroAssembler.h	2017-12-19 19:38:31 UTC (rev 226134)
+++ branches/safari-604-branch/Source/_javascript_Core/assembler/MacroAssembler.h	2017-12-19 20:46:48 UTC (rev 226135)
@@ -593,6 +593,11 @@
 urshift32(trustedImm32ForShift(imm), srcDest);
 }
 
+void urshiftPtr(RegisterID shiftAmmount, RegisterID srcDest)
+{
+urshift32(shiftAmmount, srcDest);
+}
+
 void negPtr(RegisterID dest)
 {
 neg32(dest);
@@ -902,6 +907,11 @@
 urshift64(trustedImm32ForShift(imm), srcDest);
 }
 
+void urshiftPtr(RegisterID shiftAmmount, RegisterID srcDest)
+{
+urshift64(shiftAmmount, srcDest);
+}
+
 void negPtr(RegisterID dest)
 {
 neg64(dest);


Modified: branches/safari-604-branch/Source/_javascript_Core/jit/AssemblyHelpers.h (226134 => 226135)

--- branches/safari-604-branch/Source/_javascript_Core/jit/AssemblyHelpers.h	2017-12-19 19:38:31 UTC (rev 226134)
+++ branches/safari-604-branch/Source/_javascript_Core/jit/AssemblyHelpers.h	2017-12-19 20:46:48 UTC (rev 226135)
@@ -1442,10 +1442,20 @@
 
 void emitComputeButterflyIndexingMask(GPRReg vectorLengthGPR, GPRReg scratchGPR, GPRReg resultGPR)
 {
+ASSERT(scratchGPR != resultGPR);
+Jump done;
+if (isX86() && !isX86_64()) {
+Jump nonZero = branchTest32(NonZero, vectorLengthGPR);
+move(TrustedImm32(0), resultGPR);
+done = jump();
+nonZero.link(this);
+}
 // If vectorLength == 0 then clz will return 32 on both ARM and x86. On 64-bit systems, we can then do a 64-bit right shift on a 32-bit -1 to get a 0 mask for zero vectorLength. On 32-bit ARM, shift masks with 0xff, which means it will still create a 0 mask.
 countLeadingZeros32(vectorLengthGPR, scratchGPR);
 move(TrustedImm32(-1), resultGPR);
-urshift64(scratchGPR, resultGPR);
+urshiftPtr(scratchGPR, resultGPR);
+if (done.isSet())
+done.link(this);
 }
 
 // Call this if you know that the value held in allocatorGPR is non-null. This DOES NOT mean






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


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

2017-12-19 Thread utatane . tea
Title: [226134] trunk/Source/_javascript_Core








Revision 226134
Author utatane@gmail.com
Date 2017-12-19 11:38:31 -0800 (Tue, 19 Dec 2017)


Log Message
[DFG][FTL] NewRegexp shoud be fast
https://bugs.webkit.org/show_bug.cgi?id=180960

Reviewed by Michael Saboff.

When we encounter RegExp literal like /AAA/g, we need to create a RegExp object.
Typical idiom like `string.match(/regexp/)` requires RegExp object creation
every time.

As a first step, this patch accelerates RegExp object creation by handling it
in DFG and FTL. In a subsequent patch, we would like to introduce PhantomNewRegexp
to remove unnecessary RegExp object creations.

This patch improves SixSpeed/regex-u.{es5,es6}.

 baseline  patched

regex-u.es5  69.6759+-3.1951 ^ 53.1425+-2.0292^ definitely 1.3111x faster
regex-u.es6 129.5413+-5.4437 ^107.2105+-7.7775^ definitely 1.2083x faster

* dfg/DFGSpeculativeJIT.cpp:
(JSC::DFG::SpeculativeJIT::compileNewRegexp):
* dfg/DFGSpeculativeJIT.h:
* dfg/DFGSpeculativeJIT32_64.cpp:
(JSC::DFG::SpeculativeJIT::compile):
* dfg/DFGSpeculativeJIT64.cpp:
(JSC::DFG::SpeculativeJIT::compile):
* ftl/FTLAbstractHeapRepository.h:
* ftl/FTLLowerDFGToB3.cpp:
(JSC::FTL::DFG::LowerDFGToB3::compileNewRegexp):
* jit/JIT.h:
* jit/JITInlines.h:
(JSC::JIT::callOperation):
* jit/JITOpcodes.cpp:
(JSC::JIT::emit_op_new_regexp):
* jit/JITOperations.cpp:
* jit/JITOperations.h:
* llint/LLIntSlowPaths.cpp:
(JSC::LLInt::LLINT_SLOW_PATH_DECL):
* runtime/RegExpObject.h:
(JSC::RegExpObject::offsetOfRegExp):
(JSC::RegExpObject::allocationSize):

Modified Paths

trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/dfg/DFGSpeculativeJIT.cpp
trunk/Source/_javascript_Core/dfg/DFGSpeculativeJIT.h
trunk/Source/_javascript_Core/dfg/DFGSpeculativeJIT32_64.cpp
trunk/Source/_javascript_Core/dfg/DFGSpeculativeJIT64.cpp
trunk/Source/_javascript_Core/ftl/FTLAbstractHeapRepository.h
trunk/Source/_javascript_Core/ftl/FTLLowerDFGToB3.cpp
trunk/Source/_javascript_Core/jit/JIT.h
trunk/Source/_javascript_Core/jit/JITInlines.h
trunk/Source/_javascript_Core/jit/JITOpcodes.cpp
trunk/Source/_javascript_Core/jit/JITOperations.cpp
trunk/Source/_javascript_Core/jit/JITOperations.h
trunk/Source/_javascript_Core/llint/LLIntSlowPaths.cpp
trunk/Source/_javascript_Core/runtime/RegExpObject.h




Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (226133 => 226134)

--- trunk/Source/_javascript_Core/ChangeLog	2017-12-19 19:34:17 UTC (rev 226133)
+++ trunk/Source/_javascript_Core/ChangeLog	2017-12-19 19:38:31 UTC (rev 226134)
@@ -1,5 +1,50 @@
 2017-12-19  Yusuke Suzuki  
 
+[DFG][FTL] NewRegexp shoud be fast
+https://bugs.webkit.org/show_bug.cgi?id=180960
+
+Reviewed by Michael Saboff.
+
+When we encounter RegExp literal like /AAA/g, we need to create a RegExp object.
+Typical idiom like `string.match(/regexp/)` requires RegExp object creation
+every time.
+
+As a first step, this patch accelerates RegExp object creation by handling it
+in DFG and FTL. In a subsequent patch, we would like to introduce PhantomNewRegexp
+to remove unnecessary RegExp object creations.
+
+This patch improves SixSpeed/regex-u.{es5,es6}.
+
+ baseline  patched
+
+regex-u.es5  69.6759+-3.1951 ^ 53.1425+-2.0292^ definitely 1.3111x faster
+regex-u.es6 129.5413+-5.4437 ^107.2105+-7.7775^ definitely 1.2083x faster
+
+* dfg/DFGSpeculativeJIT.cpp:
+(JSC::DFG::SpeculativeJIT::compileNewRegexp):
+* dfg/DFGSpeculativeJIT.h:
+* dfg/DFGSpeculativeJIT32_64.cpp:
+(JSC::DFG::SpeculativeJIT::compile):
+* dfg/DFGSpeculativeJIT64.cpp:
+(JSC::DFG::SpeculativeJIT::compile):
+* ftl/FTLAbstractHeapRepository.h:
+* ftl/FTLLowerDFGToB3.cpp:
+(JSC::FTL::DFG::LowerDFGToB3::compileNewRegexp):
+* jit/JIT.h:
+* jit/JITInlines.h:
+(JSC::JIT::callOperation):
+* jit/JITOpcodes.cpp:
+(JSC::JIT::emit_op_new_regexp):
+* jit/JITOperations.cpp:
+* jit/JITOperations.h:
+* llint/LLIntSlowPaths.cpp:
+(JSC::LLInt::LLINT_SLOW_PATH_DECL):
+* runtime/RegExpObject.h:
+(JSC::RegExpObject::offsetOfRegExp):
+(JSC::RegExpObject::allocationSize):
+
+2017-12-19  Yusuke Suzuki  
+
 Unreviewed, include YarrErrorCode.h in Yarr.h
 https://bugs.webkit.org/show_bug.cgi?id=180966
 


Modified: trunk/Source/_javascript_Core/dfg/DFGSpeculativeJIT.cpp (226133 => 226134)

--- trunk/Source/_javascript_Core/dfg/DFGSpeculativeJIT.cpp	2017-12-19 19:34:17 UTC (rev 226133)
+++ trunk/Source/_javascript_Core/dfg/DFGSpeculativeJIT.cpp	2017-12-19 19:38:31 UTC (rev 226134)
@@ -9124,6 +9124,50 @@
 cellResult(resultGPR, node);
 }
 
+void Specul

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

2017-12-19 Thread jmarcell
Title: [226131] branches/safari-604-branch/Source








Revision 226131
Author jmarc...@apple.com
Date 2017-12-19 11:33:54 -0800 (Tue, 19 Dec 2017)


Log Message
Cherry-pick r226068. rdar://problem/36112026

Modified Paths

branches/safari-604-branch/Source/_javascript_Core/ChangeLog
branches/safari-604-branch/Source/_javascript_Core/dfg/DFGSpeculativeJIT.cpp
branches/safari-604-branch/Source/_javascript_Core/ftl/FTLAbstractHeapRepository.h
branches/safari-604-branch/Source/_javascript_Core/ftl/FTLLowerDFGToB3.cpp
branches/safari-604-branch/Source/_javascript_Core/jit/ThunkGenerators.cpp
branches/safari-604-branch/Source/WTF/ChangeLog
branches/safari-604-branch/Source/WTF/wtf/MathExtras.h
branches/safari-604-branch/Source/WTF/wtf/SizeLimits.cpp
branches/safari-604-branch/Source/WTF/wtf/Vector.h
branches/safari-604-branch/Source/WTF/wtf/text/StringImpl.cpp
branches/safari-604-branch/Source/WTF/wtf/text/StringImpl.h
branches/safari-604-branch/Source/WTF/wtf/text/StringView.h
branches/safari-604-branch/Source/WTF/wtf/text/WTFString.h




Diff

Modified: branches/safari-604-branch/Source/_javascript_Core/ChangeLog (226130 => 226131)

--- branches/safari-604-branch/Source/_javascript_Core/ChangeLog	2017-12-19 19:33:48 UTC (rev 226130)
+++ branches/safari-604-branch/Source/_javascript_Core/ChangeLog	2017-12-19 19:33:54 UTC (rev 226131)
@@ -1,3 +1,26 @@
+2017-12-18  Jason Marcell  
+
+Cherry-pick r226068. rdar://problem/36112026
+
+2017-12-16  Filip Pizlo  
+
+Vector index masking
+https://bugs.webkit.org/show_bug.cgi?id=180909
+
+Reviewed by Keith Miller.
+
+Adopt index masking for strings.
+
+* dfg/DFGSpeculativeJIT.cpp:
+(JSC::DFG::SpeculativeJIT::compileGetCharCodeAt):
+(JSC::DFG::SpeculativeJIT::compileGetByValOnString):
+* ftl/FTLAbstractHeapRepository.h:
+* ftl/FTLLowerDFGToB3.cpp:
+(JSC::FTL::DFG::LowerDFGToB3::compileStringCharAt):
+(JSC::FTL::DFG::LowerDFGToB3::compileStringCharCodeAt):
+* jit/ThunkGenerators.cpp:
+(JSC::stringCharLoad):
+
 2017-12-04  Jason Marcell  
 
 Cherry-pick r225273. rdar://problem/35838163


Modified: branches/safari-604-branch/Source/_javascript_Core/dfg/DFGSpeculativeJIT.cpp (226130 => 226131)

--- branches/safari-604-branch/Source/_javascript_Core/dfg/DFGSpeculativeJIT.cpp	2017-12-19 19:33:48 UTC (rev 226130)
+++ branches/safari-604-branch/Source/_javascript_Core/dfg/DFGSpeculativeJIT.cpp	2017-12-19 19:33:54 UTC (rev 226131)
@@ -1994,6 +1994,7 @@
 GPRReg scratchReg = scratch.gpr();
 
 m_jit.loadPtr(MacroAssembler::Address(stringReg, JSString::offsetOfValue()), scratchReg);
+m_jit.and32(MacroAssembler::Address(scratchReg, StringImpl::maskOffset()), indexReg);
 
 // Load the character into scratchReg
 JITCompiler::Jump is16Bit = m_jit.branchTest32(MacroAssembler::Zero, MacroAssembler::Address(scratchReg, StringImpl::flagsOffset()), TrustedImm32(StringImpl::flagIs8Bit()));
@@ -2041,6 +2042,7 @@
 speculationCheck(OutOfBounds, JSValueRegs(), 0, outOfBounds);
 
 m_jit.loadPtr(MacroAssembler::Address(baseReg, JSString::offsetOfValue()), scratchReg);
+m_jit.and32(MacroAssembler::Address(scratchReg, StringImpl::maskOffset()), propertyReg);
 
 // Load the character into scratchReg
 JITCompiler::Jump is16Bit = m_jit.branchTest32(MacroAssembler::Zero, MacroAssembler::Address(scratchReg, StringImpl::flagsOffset()), TrustedImm32(StringImpl::flagIs8Bit()));


Modified: branches/safari-604-branch/Source/_javascript_Core/ftl/FTLAbstractHeapRepository.h (226130 => 226131)

--- branches/safari-604-branch/Source/_javascript_Core/ftl/FTLAbstractHeapRepository.h	2017-12-19 19:33:48 UTC (rev 226130)
+++ branches/safari-604-branch/Source/_javascript_Core/ftl/FTLAbstractHeapRepository.h	2017-12-19 19:33:54 UTC (rev 226131)
@@ -105,6 +105,7 @@
 macro(StringImpl_data, StringImpl::dataOffset()) \
 macro(StringImpl_hashAndFlags, StringImpl::flagsOffset()) \
 macro(StringImpl_length, StringImpl::lengthMemoryOffset()) \
+macro(StringImpl_mask, StringImpl::maskOffset()) \
 macro(Structure_classInfo, Structure::classInfoOffset()) \
 macro(Structure_globalObject, Structure::globalObjectOffset()) \
 macro(Structure_prototype, Structure::prototypeOffset()) \


Modified: branches/safari-604-branch/Source/_javascript_Core/ftl/FTLLowerDFGToB3.cpp (226130 => 226131)

--- branches/safari-604-branch/Source/_javascript_Core/ftl/FTLLowerDFGToB3.cpp	2017-12-19 19:33:48 UTC (rev 226130)
+++ branches/safari-604-branch/Source/_javascript_Core/ftl/FTLLowerDFGToB3.cpp	2017-12-19 19:33:54 UTC (rev 226131)
@@ -5413,6 +5413,7 @@
 LBasicBlock lastNext = m_out.appendTo(fastPath, slowPath);
 
 LValue stringImpl = m_out.loadPtr(base, m_heaps.JSString_value);
+LValue indexForAccess = m_out.bitAnd(index, m_out.load32(stringImpl, m_heaps.StringImpl_mask

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

2017-12-19 Thread jmarcell
Title: [226132] branches/safari-604-branch/Source








Revision 226132
Author jmarc...@apple.com
Date 2017-12-19 11:34:02 -0800 (Tue, 19 Dec 2017)


Log Message
Apply patch. rdar://problem/36112002

Modified Paths

branches/safari-604-branch/Source/_javascript_Core/ChangeLog
branches/safari-604-branch/Source/_javascript_Core/b3/B3LowerToAir.cpp
branches/safari-604-branch/Source/_javascript_Core/b3/B3Validate.cpp
branches/safari-604-branch/Source/_javascript_Core/b3/B3WasmBoundsCheckValue.cpp
branches/safari-604-branch/Source/_javascript_Core/b3/B3WasmBoundsCheckValue.h
branches/safari-604-branch/Source/_javascript_Core/b3/air/AirCustom.h
branches/safari-604-branch/Source/_javascript_Core/b3/testb3.cpp
branches/safari-604-branch/Source/_javascript_Core/dfg/DFGSpeculativeJIT.cpp
branches/safari-604-branch/Source/_javascript_Core/dfg/DFGSpeculativeJIT.h
branches/safari-604-branch/Source/_javascript_Core/dfg/DFGSpeculativeJIT64.cpp
branches/safari-604-branch/Source/_javascript_Core/ftl/FTLAbstractHeapRepository.h
branches/safari-604-branch/Source/_javascript_Core/ftl/FTLLowerDFGToB3.cpp
branches/safari-604-branch/Source/_javascript_Core/jit/AssemblyHelpers.h
branches/safari-604-branch/Source/_javascript_Core/runtime/Butterfly.h
branches/safari-604-branch/Source/_javascript_Core/runtime/JSArrayBufferView.cpp
branches/safari-604-branch/Source/_javascript_Core/runtime/JSArrayBufferView.h
branches/safari-604-branch/Source/_javascript_Core/wasm/WasmB3IRGenerator.cpp
branches/safari-604-branch/Source/_javascript_Core/wasm/WasmBinding.cpp
branches/safari-604-branch/Source/_javascript_Core/wasm/WasmMemory.cpp
branches/safari-604-branch/Source/_javascript_Core/wasm/WasmMemory.h
branches/safari-604-branch/Source/_javascript_Core/wasm/WasmMemoryInformation.cpp
branches/safari-604-branch/Source/_javascript_Core/wasm/WasmMemoryInformation.h
branches/safari-604-branch/Source/_javascript_Core/wasm/js/JSWebAssemblyMemory.cpp
branches/safari-604-branch/Source/_javascript_Core/wasm/js/JSWebAssemblyMemory.h
branches/safari-604-branch/Source/WTF/ChangeLog
branches/safari-604-branch/Source/WTF/wtf/MathExtras.h
branches/safari-604-branch/Source/WTF/wtf/StdLibExtras.h




Diff

Modified: branches/safari-604-branch/Source/_javascript_Core/ChangeLog (226131 => 226132)

--- branches/safari-604-branch/Source/_javascript_Core/ChangeLog	2017-12-19 19:33:54 UTC (rev 226131)
+++ branches/safari-604-branch/Source/_javascript_Core/ChangeLog	2017-12-19 19:34:02 UTC (rev 226132)
@@ -1,5 +1,77 @@
 2017-12-18  Jason Marcell  
 
+Apply patch. rdar://problem/36112002
+
+2017-12-17  Keith Miller  
+
+Use index masking for TypedArrays and and Wasm.
+https://bugs.webkit.org/show_bug.cgi?id=180920
+
+Reviewed by Filip Pizlo.
+
+We should have index masking for our TypedArray code in the
+DFG/FTL and for Wasm when doing bounds checking. Index masking for
+Wasm is added to the WasmBoundsCheckValue. Since we don't CSE any
+WasmBoundsCheckValues we don't need to worry about combining a
+bounds check for a load and a store. I went with fusing the
+pointer masking in the WasmBoundsCheckValue since it should reduce
+additional compiler overhead.
+
+* b3/B3LowerToAir.cpp:
+* b3/B3Validate.cpp:
+* b3/B3WasmBoundsCheckValue.cpp:
+(JSC::B3::WasmBoundsCheckValue::WasmBoundsCheckValue):
+(JSC::B3::WasmBoundsCheckValue::dumpMeta const):
+* b3/B3WasmBoundsCheckValue.h:
+(JSC::B3::WasmBoundsCheckValue::pinnedIndexingMask const):
+* b3/air/AirCustom.h:
+(JSC::B3::Air::WasmBoundsCheckCustom::generate):
+* b3/testb3.cpp:
+(JSC::B3::testWasmBoundsCheck):
+* dfg/DFGSpeculativeJIT.cpp:
+(JSC::DFG::SpeculativeJIT::loadFromIntTypedArray):
+(JSC::DFG::SpeculativeJIT::compileGetByValOnIntTypedArray):
+(JSC::DFG::SpeculativeJIT::compileGetByValOnFloatTypedArray):
+(JSC::DFG::SpeculativeJIT::compileNewTypedArray):
+* dfg/DFGSpeculativeJIT.h:
+* dfg/DFGSpeculativeJIT64.cpp:
+(JSC::DFG::SpeculativeJIT::compile):
+* ftl/FTLAbstractHeapRepository.h:
+* ftl/FTLLowerDFGToB3.cpp:
+(JSC::FTL::DFG::LowerDFGToB3::compileAtomicsReadModifyWrite):
+(JSC::FTL::DFG::LowerDFGToB3::compileGetByVal):
+(JSC::FTL::DFG::LowerDFGToB3::compileNewTypedArray):
+(JSC::FTL::DFG::LowerDFGToB3::pointerIntoTypedArray):
+* jit/AssemblyHelpers.h:
+(JSC::AssemblyHelpers::emitComputeButterflyIndexingMask):
+* runtime/Butterfly.h:
+* runtime/JSArrayBufferView.cpp:
+(JSC::JSArrayBufferView::JSArrayBufferView):
+* runtime/JSArrayBufferView.h:
+(JSC::JSArrayBufferView::offsetOfIndexingMask):
+* w

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

2017-12-19 Thread jmarcell
Title: [226130] branches/safari-604-branch








Revision 226130
Author jmarc...@apple.com
Date 2017-12-19 11:33:48 -0800 (Tue, 19 Dec 2017)


Log Message
Cherry-pick r226065. rdar://problem/36080413

Modified Paths

branches/safari-604-branch/LayoutTests/ChangeLog
branches/safari-604-branch/Source/WebCore/ChangeLog
branches/safari-604-branch/Source/WebCore/svg/SVGAnimatedTypeAnimator.h
branches/safari-604-branch/Source/WebCore/svg/properties/SVGAnimatedPropertyTearOff.h
branches/safari-604-branch/Source/WebCore/svg/properties/SVGAnimatedStaticPropertyTearOff.h


Added Paths

branches/safari-604-branch/LayoutTests/svg/animations/crash-when-animation-is-running-while-getting-value-expected.txt
branches/safari-604-branch/LayoutTests/svg/animations/crash-when-animation-is-running-while-getting-value.html




Diff

Modified: branches/safari-604-branch/LayoutTests/ChangeLog (226129 => 226130)

--- branches/safari-604-branch/LayoutTests/ChangeLog	2017-12-19 19:26:39 UTC (rev 226129)
+++ branches/safari-604-branch/LayoutTests/ChangeLog	2017-12-19 19:33:48 UTC (rev 226130)
@@ -1,5 +1,20 @@
 2017-12-18  Jason Marcell  
 
+Cherry-pick r226065. rdar://problem/36080413
+
+2017-12-18  Zalan Bujtas  
+
+[SVG] Detach list wrappers before resetting the base value.
+https://bugs.webkit.org/show_bug.cgi?id=180912
+
+
+Reviewed by Simon Fraser.
+
+* svg/animations/crash-when-animation-is-running-while-getting-value-expected.txt: Added.
+* svg/animations/crash-when-animation-is-running-while-getting-value.html: Added.
+
+2017-12-18  Jason Marcell  
+
 Revert r225497. rdar://problem/36112729
 
 2017-12-06  Jason Marcell  


Added: branches/safari-604-branch/LayoutTests/svg/animations/crash-when-animation-is-running-while-getting-value-expected.txt (0 => 226130)

--- branches/safari-604-branch/LayoutTests/svg/animations/crash-when-animation-is-running-while-getting-value-expected.txt	(rev 0)
+++ branches/safari-604-branch/LayoutTests/svg/animations/crash-when-animation-is-running-while-getting-value-expected.txt	2017-12-19 19:33:48 UTC (rev 226130)
@@ -0,0 +1,2 @@
+PASS if no crash. 
+


Added: branches/safari-604-branch/LayoutTests/svg/animations/crash-when-animation-is-running-while-getting-value.html (0 => 226130)

--- branches/safari-604-branch/LayoutTests/svg/animations/crash-when-animation-is-running-while-getting-value.html	(rev 0)
+++ branches/safari-604-branch/LayoutTests/svg/animations/crash-when-animation-is-running-while-getting-value.html	2017-12-19 19:33:48 UTC (rev 226130)
@@ -0,0 +1,16 @@
+PASS if no crash.
+
+
+
+
+
+if (window.testRunner) {
+testRunner.dumpAsText();
+testRunner.waitUntilDone();
+}
+setTimeout(function() {
+textElement.x.animVal.getItem(0);
+if (window.testRunner)
+testRunner.notifyDone();
+}, 0);
+


Modified: branches/safari-604-branch/Source/WebCore/ChangeLog (226129 => 226130)

--- branches/safari-604-branch/Source/WebCore/ChangeLog	2017-12-19 19:26:39 UTC (rev 226129)
+++ branches/safari-604-branch/Source/WebCore/ChangeLog	2017-12-19 19:33:48 UTC (rev 226130)
@@ -1,5 +1,29 @@
 2017-12-18  Jason Marcell  
 
+Cherry-pick r226065. rdar://problem/36080413
+
+2017-12-18  Zalan Bujtas  
+
+[SVG] Detach list wrappers before resetting the base value.
+https://bugs.webkit.org/show_bug.cgi?id=180912
+
+
+Reviewed by Simon Fraser.
+
+Before resetting the animation value (and destroying the assigned SVG object -SVGLengthValue in this case),
+we need to check if there's an associated tear off wrapper for the said SVG object and make a copy of it.
+This is currently done in the wrong order through animValDidChange.
+
+Test: svg/animations/crash-when-animation-is-running-while-getting-value.html
+
+* svg/SVGAnimatedTypeAnimator.h:
+(WebCore::SVGAnimatedTypeAnimator::resetFromBaseValue):
+* svg/properties/SVGAnimatedPropertyTearOff.h:
+* svg/properties/SVGAnimatedStaticPropertyTearOff.h:
+(WebCore::SVGAnimatedStaticPropertyTearOff::synchronizeWrappersIfNeeded):
+
+2017-12-18  Jason Marcell  
+
 Revert r225497. rdar://problem/36112729
 
 2017-12-06  Jason Marcell  


Modified: branches/safari-604-branch/Source/WebCore/svg/SVGAnimatedTypeAnimator.h (226129 => 226130)

--- branches/safari-604-branch/Source/WebCore/svg/SVGAnimatedTypeAnimator.h	2017-12-19 19:26:39 UTC (rev 226129)
+++ branches/safari-604-branch/Source/WebCore/svg/SVGAnimatedTypeAnimator.h	2017-12-19 19:33:48 UTC (rev 226130)
@@ -78,8 +78,11 @@
 {
 ASSERT(animatedTypes[0].properties.size() == 1);
 ASSERT(type.type() == m_type);
+auto* property = castAnimatedPropertyToActualType(animatedTypes[0].properties[0].get());
+property->synchronizeWrappersIfNeeded();
+
 type

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

2017-12-19 Thread utatane . tea
Title: [226129] trunk/Source/_javascript_Core








Revision 226129
Author utatane@gmail.com
Date 2017-12-19 11:26:39 -0800 (Tue, 19 Dec 2017)


Log Message
Unreviewed, include YarrErrorCode.h in Yarr.h
https://bugs.webkit.org/show_bug.cgi?id=180966

* yarr/Yarr.h:

Modified Paths

trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/yarr/Yarr.h




Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (226128 => 226129)

--- trunk/Source/_javascript_Core/ChangeLog	2017-12-19 19:16:21 UTC (rev 226128)
+++ trunk/Source/_javascript_Core/ChangeLog	2017-12-19 19:26:39 UTC (rev 226129)
@@ -1,5 +1,12 @@
 2017-12-19  Yusuke Suzuki  
 
+Unreviewed, include YarrErrorCode.h in Yarr.h
+https://bugs.webkit.org/show_bug.cgi?id=180966
+
+* yarr/Yarr.h:
+
+2017-12-19  Yusuke Suzuki  
+
 [YARR] Yarr should return ErrorCode instead of error messages (const char*)
 https://bugs.webkit.org/show_bug.cgi?id=180966
 


Modified: trunk/Source/_javascript_Core/yarr/Yarr.h (226128 => 226129)

--- trunk/Source/_javascript_Core/yarr/Yarr.h	2017-12-19 19:16:21 UTC (rev 226128)
+++ trunk/Source/_javascript_Core/yarr/Yarr.h	2017-12-19 19:26:39 UTC (rev 226129)
@@ -28,6 +28,7 @@
 #pragma once
 
 #include 
+#include "YarrErrorCode.h"
 
 namespace JSC { namespace Yarr {
 






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


[webkit-changes] [226128] trunk/Source

2017-12-19 Thread utatane . tea
Title: [226128] trunk/Source








Revision 226128
Author utatane@gmail.com
Date 2017-12-19 11:16:21 -0800 (Tue, 19 Dec 2017)


Log Message
[YARR] Yarr should return ErrorCode instead of error messages (const char*)
https://bugs.webkit.org/show_bug.cgi?id=180966

Reviewed by Mark Lam.

Source/_javascript_Core:

Currently, Yarr returns const char*` for an error message when needed.
But it is easier to handle error status if Yarr returns an error code
instead of `const char*`.

In this patch, we introduce Yarr::ErrorCode. Yarr returns it instead of
`const char*`. `std::expected` would be appropriate
for the Yarr API interface. But it requires substantial changes removing
ErrorCode::NoError, so this patch just uses the current Yarr::ErrorCode as
a first step.

* _javascript_Core.xcodeproj/project.pbxproj:
* Sources.txt:
* inspector/ContentSearchUtilities.cpp:
(Inspector::ContentSearchUtilities::findMagicComment):
* parser/ASTBuilder.h:
(JSC::ASTBuilder::createRegExp):
* parser/Parser.cpp:
(JSC::Parser::parsePrimaryExpression):
* parser/SyntaxChecker.h:
(JSC::SyntaxChecker::createRegExp):
* runtime/RegExp.cpp:
(JSC::RegExp::RegExp):
(JSC::RegExp::byteCodeCompileIfNecessary):
(JSC::RegExp::compile):
(JSC::RegExp::compileMatchOnly):
* runtime/RegExp.h:
* yarr/RegularExpression.cpp:
(JSC::Yarr::RegularExpression::Private::Private):
(JSC::Yarr::RegularExpression::Private::compile):
* yarr/YarrErrorCode.cpp: Added.
(JSC::Yarr::errorMessage):
* yarr/YarrErrorCode.h: Copied from Source/_javascript_Core/yarr/YarrSyntaxChecker.h.
(JSC::Yarr::hasError):
* yarr/YarrParser.h:
(JSC::Yarr::Parser::CharacterClassParserDelegate::CharacterClassParserDelegate):
(JSC::Yarr::Parser::CharacterClassParserDelegate::atomPatternCharacter):
(JSC::Yarr::Parser::Parser):
(JSC::Yarr::Parser::isIdentityEscapeAnError):
(JSC::Yarr::Parser::parseEscape):
(JSC::Yarr::Parser::parseCharacterClass):
(JSC::Yarr::Parser::parseParenthesesBegin):
(JSC::Yarr::Parser::parseParenthesesEnd):
(JSC::Yarr::Parser::parseQuantifier):
(JSC::Yarr::Parser::parseTokens):
(JSC::Yarr::Parser::parse):
(JSC::Yarr::Parser::tryConsumeUnicodeEscape):
(JSC::Yarr::Parser::tryConsumeUnicodePropertyExpression):
(JSC::Yarr::parse):
* yarr/YarrPattern.cpp:
(JSC::Yarr::YarrPatternConstructor::YarrPatternConstructor):
(JSC::Yarr::YarrPatternConstructor::setupDisjunctionOffsets):
(JSC::Yarr::YarrPatternConstructor::setupOffsets):
(JSC::Yarr::YarrPattern::compile):
(JSC::Yarr::YarrPattern::YarrPattern):
(JSC::Yarr::YarrPattern::errorMessage): Deleted.
* yarr/YarrPattern.h:
(JSC::Yarr::YarrPattern::reset):
* yarr/YarrSyntaxChecker.cpp:
(JSC::Yarr::checkSyntax):
* yarr/YarrSyntaxChecker.h:

Source/WebCore:

Remove unnecessary String creation.

No behavior change.

* contentextensions/URLFilterParser.cpp:
(WebCore::ContentExtensions::URLFilterParser::addPattern):

Modified Paths

trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj
trunk/Source/_javascript_Core/Sources.txt
trunk/Source/_javascript_Core/inspector/ContentSearchUtilities.cpp
trunk/Source/_javascript_Core/parser/ASTBuilder.h
trunk/Source/_javascript_Core/parser/Parser.cpp
trunk/Source/_javascript_Core/parser/SyntaxChecker.h
trunk/Source/_javascript_Core/runtime/RegExp.cpp
trunk/Source/_javascript_Core/runtime/RegExp.h
trunk/Source/_javascript_Core/yarr/RegularExpression.cpp
trunk/Source/_javascript_Core/yarr/YarrParser.h
trunk/Source/_javascript_Core/yarr/YarrPattern.cpp
trunk/Source/_javascript_Core/yarr/YarrPattern.h
trunk/Source/_javascript_Core/yarr/YarrSyntaxChecker.cpp
trunk/Source/_javascript_Core/yarr/YarrSyntaxChecker.h
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/contentextensions/URLFilterParser.cpp


Added Paths

trunk/Source/_javascript_Core/yarr/YarrErrorCode.cpp
trunk/Source/_javascript_Core/yarr/YarrErrorCode.h




Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (226127 => 226128)

--- trunk/Source/_javascript_Core/ChangeLog	2017-12-19 18:56:47 UTC (rev 226127)
+++ trunk/Source/_javascript_Core/ChangeLog	2017-12-19 19:16:21 UTC (rev 226128)
@@ -1,3 +1,71 @@
+2017-12-19  Yusuke Suzuki  
+
+[YARR] Yarr should return ErrorCode instead of error messages (const char*)
+https://bugs.webkit.org/show_bug.cgi?id=180966
+
+Reviewed by Mark Lam.
+
+Currently, Yarr returns const char*` for an error message when needed.
+But it is easier to handle error status if Yarr returns an error code
+instead of `const char*`.
+
+In this patch, we introduce Yarr::ErrorCode. Yarr returns it instead of
+`const char*`. `std::expected` would be appropriate
+for the Yarr API interface. But it requires substantial changes removing
+ErrorCode::NoError, so this patch just uses the current Yarr::ErrorCode as
+a first step.
+
+* _javascript_Core.xcodeproj/project.pbxproj:
+* Sources.txt:
+* inspector/ContentSearchUtilities.cpp:
+(Inspector:

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

2017-12-19 Thread zalan
Title: [226127] trunk/Source/WebCore








Revision 226127
Author za...@apple.com
Date 2017-12-19 10:56:47 -0800 (Tue, 19 Dec 2017)


Log Message
[RenderTreeBuilder] Move finding-the-parent/creating-wrapper logic from RenderTableRow::addChild to RenderTreeBuilder
https://bugs.webkit.org/show_bug.cgi?id=180964


Reviewed by Antti Koivisto.

This is in preparation for removing all tree mutation from renderering code.

Covered by existing tests.

* Sources.txt:
* WebCore.xcodeproj/project.pbxproj:
* rendering/RenderTableRow.cpp:
(WebCore::RenderTableRow::addChild):
* rendering/updating/RenderTreeBuilder.cpp:
(WebCore::RenderTreeBuilder::insertChild):
* rendering/updating/RenderTreeBuilder.h:
* rendering/updating/RenderTreeBuilderTable.cpp: Added.
(WebCore::RenderTreeBuilder::Table::findOrCreateParentForChild):
* rendering/updating/RenderTreeBuilderTable.h: Copied from Source/WebCore/rendering/updating/RenderTreeBuilder.h.

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/Sources.txt
trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj
trunk/Source/WebCore/rendering/RenderTableRow.cpp
trunk/Source/WebCore/rendering/updating/RenderTreeBuilder.cpp
trunk/Source/WebCore/rendering/updating/RenderTreeBuilder.h


Added Paths

trunk/Source/WebCore/rendering/updating/RenderTreeBuilderTable.cpp
trunk/Source/WebCore/rendering/updating/RenderTreeBuilderTable.h




Diff

Modified: trunk/Source/WebCore/ChangeLog (226126 => 226127)

--- trunk/Source/WebCore/ChangeLog	2017-12-19 18:37:44 UTC (rev 226126)
+++ trunk/Source/WebCore/ChangeLog	2017-12-19 18:56:47 UTC (rev 226127)
@@ -1,3 +1,26 @@
+2017-12-19  Zalan Bujtas  
+
+[RenderTreeBuilder] Move finding-the-parent/creating-wrapper logic from RenderTableRow::addChild to RenderTreeBuilder
+https://bugs.webkit.org/show_bug.cgi?id=180964
+
+
+Reviewed by Antti Koivisto.
+
+This is in preparation for removing all tree mutation from renderering code.
+
+Covered by existing tests.
+
+* Sources.txt:
+* WebCore.xcodeproj/project.pbxproj:
+* rendering/RenderTableRow.cpp:
+(WebCore::RenderTableRow::addChild):
+* rendering/updating/RenderTreeBuilder.cpp:
+(WebCore::RenderTreeBuilder::insertChild):
+* rendering/updating/RenderTreeBuilder.h:
+* rendering/updating/RenderTreeBuilderTable.cpp: Added.
+(WebCore::RenderTreeBuilder::Table::findOrCreateParentForChild):
+* rendering/updating/RenderTreeBuilderTable.h: Copied from Source/WebCore/rendering/updating/RenderTreeBuilder.h.
+
 2017-12-19  Youenn Fablet  
 
 Service Worker should not clean HTTP headers added by the application or by fetch specification before service worker interception


Modified: trunk/Source/WebCore/Sources.txt (226126 => 226127)

--- trunk/Source/WebCore/Sources.txt	2017-12-19 18:37:44 UTC (rev 226126)
+++ trunk/Source/WebCore/Sources.txt	2017-12-19 18:56:47 UTC (rev 226127)
@@ -1980,6 +1980,7 @@
 rendering/svg/SVGTextQuery.cpp
 
 rendering/updating/RenderTreeBuilder.cpp
+rendering/updating/RenderTreeBuilderTable.cpp
 rendering/updating/RenderTreePosition.cpp
 rendering/updating/RenderTreeUpdater.cpp
 rendering/updating/RenderTreeUpdaterFirstLetter.cpp


Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (226126 => 226127)

--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj	2017-12-19 18:37:44 UTC (rev 226126)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj	2017-12-19 18:56:47 UTC (rev 226127)
@@ -389,6 +389,7 @@
 		10FB084B14E15C7E00A3DB98 /* PublicURLManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 10FB084A14E15C7E00A3DB98 /* PublicURLManager.h */; };
 		112B34D51E60B98300BB310A /* SimpleLineLayoutPagination.h in Headers */ = {isa = PBXBuildFile; fileRef = 112B34D41E60B98300BB310A /* SimpleLineLayoutPagination.h */; };
 		113D0B521F9FDD2B00F611BB /* LayoutContext.h in Headers */ = {isa = PBXBuildFile; fileRef = 113D0B501F9FDD2B00F611BB /* LayoutContext.h */; settings = {ATTRIBUTES = (Private, ); }; };
+		119340791FE8B92300935F1E /* RenderTreeBuilderTable.h in Headers */ = {isa = PBXBuildFile; fileRef = 119340771FE8B92300935F1E /* RenderTreeBuilderTable.h */; };
 		11E067EE1E6246E500162D16 /* SimpleLineLayoutCoverage.h in Headers */ = {isa = PBXBuildFile; fileRef = 11E067ED1E6246E500162D16 /* SimpleLineLayoutCoverage.h */; settings = {ATTRIBUTES = (Private, ); }; };
 		1400D7A817136EA70077CE05 /* ScriptWrappableInlines.h in Headers */ = {isa = PBXBuildFile; fileRef = 1400D7A717136EA70077CE05 /* ScriptWrappableInlines.h */; settings = {ATTRIBUTES = (Private, ); }; };
 		1403B99709EB13AF00797C7F /* DOMWindow.h in Headers */ = {isa = PBXBuildFile; fileRef = 1403B99509EB13AF00797C7F /* DOMWindow.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -5561,6 +5562,8 @@
 		112B34D41E60B98300BB310A /* SimpleLineLayoutPagination.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SimpleLine

[webkit-changes] [226126] trunk

2017-12-19 Thread commit-queue
Title: [226126] trunk








Revision 226126
Author commit-qu...@webkit.org
Date 2017-12-19 10:37:44 -0800 (Tue, 19 Dec 2017)


Log Message
Service Worker should not clean HTTP headers added by the application or by fetch specification before service worker interception
https://bugs.webkit.org/show_bug.cgi?id=180939

Patch by Youenn Fablet  on 2017-12-19
Reviewed by Chris Dumez.

LayoutTests/imported/w3c:

* web-platform-tests/service-workers/service-worker/fetch-request-xhr.https-expected.txt:
* web-platform-tests/service-workers/service-worker/resources/fetch-request-xhr-iframe.https.html:
* web-platform-tests/service-workers/service-worker/fetch-header-visibility.https-expected.txt:

Source/WebCore:

Covered by modified WPT test.

Add support to clean only specific headers in cleanHTTPRequestHeadersForAccessControl,
renamed from cleanRedirectedRequestForAccessControl.
Compute the list of headers to keep in DocumentThreadableLoader.
Add a specific rule for Accept header which is set prior service worker interception and for
HTTP headers set by DocumentThreadableLoader clients.

* loader/CrossOriginAccessControl.cpp:
(WebCore::httpHeadersToKeepFromCleaning):
(WebCore::cleanRedirectedRequestForAccessControl):
* loader/CrossOriginAccessControl.h:
(WebCore::cleanRedirectedRequestForAccessControl):
* loader/DocumentThreadableLoader.cpp:
(WebCore::DocumentThreadableLoader::DocumentThreadableLoader):
* loader/ResourceLoaderOptions.h:
* workers/service/context/ServiceWorkerFetch.cpp:
(WebCore::ServiceWorkerFetch::dispatchFetchEvent):
* workers/service/context/ServiceWorkerFetch.h:
* workers/service/context/ServiceWorkerThread.cpp:
(WebCore::ServiceWorkerThread::postFetchTask):
* workers/service/context/ServiceWorkerThread.h:

Source/WebKit:

Passing referrer as an explicit parameter of StartFetch.

Cleaning request headers based on ResourceLoaderOptions.httpHeadersToKeep.

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

LayoutTests:

* TestExpectations:

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/LayoutTests/TestExpectations
trunk/LayoutTests/imported/w3c/ChangeLog
trunk/LayoutTests/imported/w3c/web-platform-tests/service-workers/service-worker/fetch-header-visibility.https-expected.txt
trunk/LayoutTests/imported/w3c/web-platform-tests/service-workers/service-worker/fetch-request-xhr.https-expected.txt
trunk/LayoutTests/imported/w3c/web-platform-tests/service-workers/service-worker/resources/fetch-request-xhr-iframe.https.html
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/loader/CrossOriginAccessControl.cpp
trunk/Source/WebCore/loader/CrossOriginAccessControl.h
trunk/Source/WebCore/loader/DocumentThreadableLoader.cpp
trunk/Source/WebCore/loader/ResourceLoaderOptions.h
trunk/Source/WebCore/loader/SubresourceLoader.cpp
trunk/Source/WebCore/workers/service/context/ServiceWorkerFetch.cpp
trunk/Source/WebCore/workers/service/context/ServiceWorkerFetch.h
trunk/Source/WebCore/workers/service/context/ServiceWorkerThread.cpp
trunk/Source/WebCore/workers/service/context/ServiceWorkerThread.h
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/ServiceWorkerClientFetch.cpp
trunk/Source/WebKit/WebProcess/Storage/WebSWClientConnection.cpp
trunk/Source/WebKit/WebProcess/Storage/WebSWClientConnection.h
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/LayoutTests/ChangeLog (226125 => 226126)

--- trunk/LayoutTests/ChangeLog	2017-12-19 18:25:54 UTC (rev 226125)
+++ trunk/LayoutTests/ChangeLog	2017-12-19 18:37:44 UTC (rev 226126)
@@ -1,3 +1,12 @@
+2017-12-19  Youenn Fablet  
+
+Service Worker should not clean HTTP headers added by the application or by fetch specification before service worker interception
+https://bugs.webkit.org/show_bug.cgi?id=180939
+
+Reviewed by Chris Dumez.
+
+* TestExpectations:
+
 2017-12-19  Chris Dumez  
 
 Unreviewed, rebaseline service workers flaky tests.


Modified: trunk/LayoutT

[webkit-changes] [226125] trunk/LayoutTests

2017-12-19 Thread cdumez
Title: [226125] trunk/LayoutTests








Revision 226125
Author cdu...@apple.com
Date 2017-12-19 10:25:54 -0800 (Tue, 19 Dec 2017)


Log Message
Unreviewed, rebaseline service workers flaky tests.

LayoutTests/imported/w3c:

* web-platform-tests/service-workers/service-worker/fetch-canvas-tainting-cache.https-expected.txt:
* web-platform-tests/service-workers/service-worker/fetch-canvas-tainting.https-expected.txt:
* web-platform-tests/service-workers/service-worker/fetch-cors-xhr.https-expected.txt:
* web-platform-tests/service-workers/service-worker/fetch-request-redirect.https-expected.txt:
* web-platform-tests/service-workers/service-worker/unregister-controller.https-expected.txt:
* web-platform-tests/service-workers/service-worker/update-bytecheck.https-expected.txt:

LayoutTests:

* TestExpectations:

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/LayoutTests/TestExpectations
trunk/LayoutTests/imported/w3c/ChangeLog
trunk/LayoutTests/imported/w3c/web-platform-tests/service-workers/service-worker/fetch-canvas-tainting-cache.https-expected.txt
trunk/LayoutTests/imported/w3c/web-platform-tests/service-workers/service-worker/fetch-canvas-tainting.https-expected.txt
trunk/LayoutTests/imported/w3c/web-platform-tests/service-workers/service-worker/fetch-cors-xhr.https-expected.txt
trunk/LayoutTests/imported/w3c/web-platform-tests/service-workers/service-worker/fetch-request-redirect.https-expected.txt
trunk/LayoutTests/imported/w3c/web-platform-tests/service-workers/service-worker/unregister-controller.https-expected.txt
trunk/LayoutTests/imported/w3c/web-platform-tests/service-workers/service-worker/update-bytecheck.https-expected.txt




Diff

Modified: trunk/LayoutTests/ChangeLog (226124 => 226125)

--- trunk/LayoutTests/ChangeLog	2017-12-19 18:01:14 UTC (rev 226124)
+++ trunk/LayoutTests/ChangeLog	2017-12-19 18:25:54 UTC (rev 226125)
@@ -1,3 +1,9 @@
+2017-12-19  Chris Dumez  
+
+Unreviewed, rebaseline service workers flaky tests.
+
+* TestExpectations:
+
 2017-12-19  Matt Lewis  
 
 Marked accessibility/mac/search-field-cancel-button.html as flaky on macOS.


Modified: trunk/LayoutTests/TestExpectations (226124 => 226125)

--- trunk/LayoutTests/TestExpectations	2017-12-19 18:01:14 UTC (rev 226124)
+++ trunk/LayoutTests/TestExpectations	2017-12-19 18:25:54 UTC (rev 226125)
@@ -159,6 +159,7 @@
 imported/w3c/web-platform-tests/service-workers/service-worker/sandboxed-iframe-fetch-event.https.html [ Skip ]
 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-bytecheck.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/client-navigate.https.html [ Skip ]
 
@@ -170,6 +171,7 @@
 http/tests/workers/service/service-worker-cache-api.https.html [ Pass Failure ]
 imported/w3c/web-platform-tests/service-workers/service-worker/about-blank-replacement.https.html [ Pass Failure ]
 webkit.org/b/179137 imported/w3c/web-platform-tests/service-workers/cache-storage/serviceworker/cache-match.https.html [ Pass Failure ]
+imported/w3c/web-platform-tests/service-workers/service-worker/fetch-canvas-tainting-cache.https.html [ DumpJSConsoleLogInStdErr Pass Failure ]
 webkit.org/b/179248 imported/w3c/web-platform-tests/service-workers/service-worker/fetch-event-within-sw.https.html [ Pass Failure ]
 imported/w3c/web-platform-tests/service-workers/service-worker/fetch-event-respond-with-response-body-with-invalid-chunk.https.html [ Pass Failure ]
 imported/w3c/web-platform-tests/service-workers/service-worker/fetch-request-redirect.https.html [ Pass Failure Timeout ]
@@ -179,16 +181,14 @@
 imported/w3c/web-platform-tests/service-workers/service-worker/registration-service-worker-attributes.https.html [ Pass Failure ]
 imported/w3c/web-platform-tests/service-workers/service-worker/service-worker-csp-connect.https.html [ Pass Failure ]
 imported/w3c/web-platform-tests/service-workers/service-worker/uncontrolled-page.https.html [ Pass Failure ]
-imported/w3c/web-platform-tests/service-workers/service-worker/update-bytecheck.https.html [ Pass Failure ]
 imported/w3c/web-platform-tests/service-workers/service-worker/unregister-controller.https.html [ Pass Failure ]
 imported/w3c/web-platform-tests/service-workers/service-worker/websocket.https.html [ Pass Failure ]
 imported/w3c/web-platform-tests/service-workers/service-worker/windowclient-navigate.https.html [ Pass Failure ]
 imported/w3c/web-platform-tests/streams/readable-byte-streams/detached-buffers.serviceworker.https.html [ Pass Failure ]
-imported/w3c/web-platform-tests/service-workers/service-worker/fetch-canvas-tainting.https.html [ DumpJSConsoleLogInStdErr Pass Failure ]
-impor

[webkit-changes] [226124] trunk/LayoutTests

2017-12-19 Thread jlewis3
Title: [226124] trunk/LayoutTests








Revision 226124
Author jlew...@apple.com
Date 2017-12-19 10:01:14 -0800 (Tue, 19 Dec 2017)


Log Message
Marked accessibility/mac/search-field-cancel-button.html as flaky on macOS.
https://bugs.webkit.org/show_bug.cgi?id=180675

Unreviewed test gardening.

* platform/mac/TestExpectations:

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/LayoutTests/platform/mac/TestExpectations




Diff

Modified: trunk/LayoutTests/ChangeLog (226123 => 226124)

--- trunk/LayoutTests/ChangeLog	2017-12-19 17:49:29 UTC (rev 226123)
+++ trunk/LayoutTests/ChangeLog	2017-12-19 18:01:14 UTC (rev 226124)
@@ -1,3 +1,12 @@
+2017-12-19  Matt Lewis  
+
+Marked accessibility/mac/search-field-cancel-button.html as flaky on macOS.
+https://bugs.webkit.org/show_bug.cgi?id=180675
+
+Unreviewed test gardening.
+
+* platform/mac/TestExpectations:
+
 2017-12-19  Andy Estes  
 
 [Apple Pay] Stop maintaining a list of payment networks


Modified: trunk/LayoutTests/platform/mac/TestExpectations (226123 => 226124)

--- trunk/LayoutTests/platform/mac/TestExpectations	2017-12-19 17:49:29 UTC (rev 226123)
+++ trunk/LayoutTests/platform/mac/TestExpectations	2017-12-19 18:01:14 UTC (rev 226124)
@@ -1768,3 +1768,5 @@
 
 webkit.org/b/180560 accessibility/mac/html5-input-number.html [ Pass Failure ]
 
+webkit.org/b/180675 accessibility/mac/search-field-cancel-button.html [ Pass Failure ]
+






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


[webkit-changes] [226123] trunk

2017-12-19 Thread aestes
Title: [226123] trunk








Revision 226123
Author aes...@apple.com
Date 2017-12-19 09:49:29 -0800 (Tue, 19 Dec 2017)


Log Message
[Apple Pay] Stop maintaining a list of payment networks
https://bugs.webkit.org/show_bug.cgi?id=180965


Reviewed by Tim Horton.

Source/WebCore:

Instead of maintaining the list of valid payment networks in WebCore, allow the client to
provide the list when constructing a PaymentCoordinator. Then, use PaymentCoordinator's list
to validate ApplePaySessionPaymentRequests.

Validation will now be done case-insensitively since Cocoa clients will provide a list of
network names that differ in capitalization from the names formerly accepted by WebCore.

Added new test cases to http/tests/ssl/applepay/ApplePaySession.html.

* Modules/applepay/ApplePayRequestBase.cpp:
(WebCore::convertAndValidate): Changed to return a Vector of validated strings.
(WebCore::validate): Renamed to convertAndValidate.
* Modules/applepay/ApplePayRequestBase.h:
* Modules/applepay/ApplePaySession.cpp:
(WebCore::convertAndValidate):
(WebCore::ApplePaySession::create):
* Modules/applepay/ApplePaySessionPaymentRequest.cpp:
(WebCore::ApplePaySessionPaymentRequest::isValidSupportedNetwork): Deleted.
* Modules/applepay/ApplePaySessionPaymentRequest.h:
* Modules/applepay/PaymentCoordinator.cpp:
(WebCore::toHashSet):
(WebCore::PaymentCoordinator::PaymentCoordinator): Converted availablePaymentNetworks to a
case-insensitive HashSet and stored in m_availablePaymentNetworks.
(WebCore::PaymentCoordinator::validatedPaymentNetwork const): Added special cases for "jcb"
and "carteBancaire" for API compatibility. For other networks, checked m_availablePaymentNetworks.
* Modules/applepay/PaymentCoordinator.h:
* Modules/applepay/paymentrequest/ApplePayPaymentHandler.cpp:
(WebCore::ApplePayPaymentHandler::show):
* page/MainFrame.cpp:
(WebCore::MainFrame::MainFrame): Constructed m_paymentCoordinator with configuration.availablePaymentNetworks.
* page/PageConfiguration.h:
* testing/Internals.cpp:
(WebCore::Internals::Internals):
* testing/MockPaymentCoordinator.cpp:
* testing/MockPaymentCoordinator.h:

Source/WebCore/PAL:

* pal/spi/cocoa/PassKitSPI.h: Defined +[PKPaymentRequest availableNetworks].

Source/WebKit:

* Shared/WebPageCreationParameters.cpp:
(WebKit::WebPageCreationParameters::encode const):
(WebKit::WebPageCreationParameters::decode):
* Shared/WebPageCreationParameters.h: Defined availablePaymentNetworks.
* UIProcess/ApplePay/WebPaymentCoordinatorProxy.h:
* UIProcess/ApplePay/cocoa/WebPaymentCoordinatorProxyCocoa.mm:
(WebKit::toSupportedNetworks):
(WebKit::WebPaymentCoordinatorProxy::availablePaymentNetworks): Called
+[PKPaymentRequest availableNetworks].
(WebKit::toSupportedNetwork): Deleted.
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::creationParameters): Set parameters.availablePaymentNetworks by
calling WebPaymentCoordinatorProxy::availablePaymentNetworks.
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::WebPage): Set pageConfiguration.availablePaymentNetworks to
parameters.availablePaymentNetworks.

LayoutTests:

* http/tests/ssl/applepay/ApplePaySession-expected.txt:
* http/tests/ssl/applepay/ApplePaySession.html: Added a test case for network names with
varying capitalization.

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/LayoutTests/http/tests/ssl/applepay/ApplePaySession-expected.txt
trunk/LayoutTests/http/tests/ssl/applepay/ApplePaySession.html
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/Modules/applepay/ApplePayRequestBase.cpp
trunk/Source/WebCore/Modules/applepay/ApplePayRequestBase.h
trunk/Source/WebCore/Modules/applepay/ApplePaySession.cpp
trunk/Source/WebCore/Modules/applepay/ApplePaySessionPaymentRequest.cpp
trunk/Source/WebCore/Modules/applepay/ApplePaySessionPaymentRequest.h
trunk/Source/WebCore/Modules/applepay/PaymentCoordinator.cpp
trunk/Source/WebCore/Modules/applepay/PaymentCoordinator.h
trunk/Source/WebCore/Modules/applepay/paymentrequest/ApplePayPaymentHandler.cpp
trunk/Source/WebCore/PAL/ChangeLog
trunk/Source/WebCore/PAL/pal/spi/cocoa/PassKitSPI.h
trunk/Source/WebCore/page/MainFrame.cpp
trunk/Source/WebCore/page/PageConfiguration.h
trunk/Source/WebCore/testing/Internals.cpp
trunk/Source/WebCore/testing/MockPaymentCoordinator.cpp
trunk/Source/WebCore/testing/MockPaymentCoordinator.h
trunk/Source/WebKit/ChangeLog
trunk/Source/WebKit/Shared/WebPageCreationParameters.cpp
trunk/Source/WebKit/Shared/WebPageCreationParameters.h
trunk/Source/WebKit/UIProcess/ApplePay/WebPaymentCoordinatorProxy.h
trunk/Source/WebKit/UIProcess/ApplePay/cocoa/WebPaymentCoordinatorProxyCocoa.mm
trunk/Source/WebKit/UIProcess/WebPageProxy.cpp
trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp




Diff

Modified: trunk/LayoutTests/ChangeLog (226122 => 226123)

--- trunk/LayoutTests/ChangeLog	2017-12-19 17:03:48 UTC (rev 226122)
+++ trunk/LayoutTests/ChangeLog	2017-12-19 17:49:29 UTC (rev 226123)
@@ -1,3 +1,15 @@
+2017-12-19  Andy Estes  
+
+[Apple Pay] Stop maintaining a list of paymen

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

2017-12-19 Thread wenson_hsieh
Title: [226122] trunk/Source/WebCore








Revision 226122
Author wenson_hs...@apple.com
Date 2017-12-19 09:03:48 -0800 (Tue, 19 Dec 2017)


Log Message
Unreviewed, try to fix the Windows build after r226097.

* editing/markup.cpp:
(WebCore::StyledMarkupAccumulator::appendCustomAttributes):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/editing/markup.cpp




Diff

Modified: trunk/Source/WebCore/ChangeLog (226121 => 226122)

--- trunk/Source/WebCore/ChangeLog	2017-12-19 15:43:45 UTC (rev 226121)
+++ trunk/Source/WebCore/ChangeLog	2017-12-19 17:03:48 UTC (rev 226122)
@@ -1,3 +1,10 @@
+2017-12-19  Wenson Hsieh  
+
+Unreviewed, try to fix the Windows build after r226097.
+
+* editing/markup.cpp:
+(WebCore::StyledMarkupAccumulator::appendCustomAttributes):
+
 2017-12-18  Andy Estes  
 
 [Apple Pay] Only include phonetic name properties in ApplePayPaymentContact when version >= 3


Modified: trunk/Source/WebCore/editing/markup.cpp (226121 => 226122)

--- trunk/Source/WebCore/editing/markup.cpp	2017-12-19 15:43:45 UTC (rev 226121)
+++ trunk/Source/WebCore/editing/markup.cpp	2017-12-19 17:03:48 UTC (rev 226122)
@@ -382,7 +382,7 @@
 // These attributes are only intended for File deserialization, and are removed from the generated attachment
 // element after we've deserialized and set its backing File.
 appendAttribute(out, element, { webkitattachmentpathAttr, file->path() }, namespaces);
-appendAttribute(out, element, { webkitattachmentbloburlAttr, { file->url() }}, namespaces);
+appendAttribute(out, element, { webkitattachmentbloburlAttr, file->url().string() }, namespaces);
 }
 #else
 UNUSED_PARAM(out);






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


[webkit-changes] [226121] trunk/LayoutTests

2017-12-19 Thread Ms2ger
Title: [226121] trunk/LayoutTests








Revision 226121
Author ms2...@igalia.com
Date 2017-12-19 07:43:45 -0800 (Tue, 19 Dec 2017)


Log Message
[WPE] Enable the rest of the wpt html tests.
https://bugs.webkit.org/show_bug.cgi?id=180975

Unreviewed test gardening.


* platform/wpe/TestExpectations:
* platform/wpe/imported/w3c/web-platform-tests/html/browsers/browsing-the-web/read-media/pageload-video-expected.txt:
  Added: dependent on the supported video codecs.
* platform/wpe/imported/w3c/web-platform-tests/html/semantics/embedded-content/media-elements/mime-types/canPlayType-expected.txt:
  Added: dependent on the supported video codecs.
* platform/wpe/imported/w3c/web-platform-tests/html/semantics/forms/the-form-element/form-elements-filter-expected.txt:
  Added: whitespace difference.

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/LayoutTests/platform/wpe/TestExpectations


Added Paths

trunk/LayoutTests/platform/wpe/imported/w3c/web-platform-tests/html/browsers/
trunk/LayoutTests/platform/wpe/imported/w3c/web-platform-tests/html/browsers/browsing-the-web/
trunk/LayoutTests/platform/wpe/imported/w3c/web-platform-tests/html/browsers/browsing-the-web/read-media/
trunk/LayoutTests/platform/wpe/imported/w3c/web-platform-tests/html/browsers/browsing-the-web/read-media/pageload-video-expected.txt
trunk/LayoutTests/platform/wpe/imported/w3c/web-platform-tests/html/semantics/embedded-content/
trunk/LayoutTests/platform/wpe/imported/w3c/web-platform-tests/html/semantics/embedded-content/media-elements/
trunk/LayoutTests/platform/wpe/imported/w3c/web-platform-tests/html/semantics/embedded-content/media-elements/mime-types/
trunk/LayoutTests/platform/wpe/imported/w3c/web-platform-tests/html/semantics/embedded-content/media-elements/mime-types/canPlayType-expected.txt
trunk/LayoutTests/platform/wpe/imported/w3c/web-platform-tests/html/semantics/forms/
trunk/LayoutTests/platform/wpe/imported/w3c/web-platform-tests/html/semantics/forms/the-form-element/
trunk/LayoutTests/platform/wpe/imported/w3c/web-platform-tests/html/semantics/forms/the-form-element/form-elements-filter-expected.txt




Diff

Modified: trunk/LayoutTests/ChangeLog (226120 => 226121)

--- trunk/LayoutTests/ChangeLog	2017-12-19 15:09:09 UTC (rev 226120)
+++ trunk/LayoutTests/ChangeLog	2017-12-19 15:43:45 UTC (rev 226121)
@@ -1,5 +1,20 @@
 2017-12-19  Ms2ger  
 
+[WPE] Enable the rest of the wpt html tests.
+https://bugs.webkit.org/show_bug.cgi?id=180975
+
+Unreviewed test gardening.
+
+* platform/wpe/TestExpectations:
+* platform/wpe/imported/w3c/web-platform-tests/html/browsers/browsing-the-web/read-media/pageload-video-expected.txt:
+  Added: dependent on the supported video codecs.
+* platform/wpe/imported/w3c/web-platform-tests/html/semantics/embedded-content/media-elements/mime-types/canPlayType-expected.txt:
+  Added: dependent on the supported video codecs.
+* platform/wpe/imported/w3c/web-platform-tests/html/semantics/forms/the-form-element/form-elements-filter-expected.txt:
+  Added: whitespace difference.
+
+2017-12-19  Ms2ger  
+
 Mark scroll-restoration-navigation-samedoc.html as passing.
 https://bugs.webkit.org/show_bug.cgi?id=169264
 


Modified: trunk/LayoutTests/platform/wpe/TestExpectations (226120 => 226121)

--- trunk/LayoutTests/platform/wpe/TestExpectations	2017-12-19 15:09:09 UTC (rev 226120)
+++ trunk/LayoutTests/platform/wpe/TestExpectations	2017-12-19 15:43:45 UTC (rev 226121)
@@ -296,13 +296,34 @@
 
 # WPT: html
 # =
-Bug(WPE) imported/w3c/web-platform-tests/html/browsers [ Skip ]
-Bug(WPE) imported/w3c/web-platform-tests/html/semantics/embedded-content/media-elements/ [ Skip ]
-Bug(WPE) imported/w3c/web-platform-tests/html/semantics/forms/ [ Skip ]
-
+webkit.org/b/169572 imported/w3c/web-platform-tests/html/browsers/history/the-location-interface/location_hash.html [ Pass Failure ]
+webkit.org/b/180967 imported/w3c/web-platform-tests/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-non-integer-height.html [ Failure ]
+webkit.org/b/180967 imported/w3c/web-platform-tests/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-non-integer-innerheight.html [ Failure ]
+webkit.org/b/180967 imported/w3c/web-platform-tests/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-non-integer-innerwidth.html [ Failure ]
+webkit.org/b/180967 imported/w3c/web-platform-tests/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-non-integer-left.html [ Failure ]
+webkit.org/b/180967 imported/w3c/web-platform-tests/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-non-integer-screenx.html [ Failure ]
+webkit.org/b/180967 imported/w3c/web-platform-tests/html/browsers/the-wi

[webkit-changes] [226120] trunk/LayoutTests

2017-12-19 Thread Ms2ger
Title: [226120] trunk/LayoutTests








Revision 226120
Author ms2...@igalia.com
Date 2017-12-19 07:09:09 -0800 (Tue, 19 Dec 2017)


Log Message
Mark scroll-restoration-navigation-samedoc.html as passing.
https://bugs.webkit.org/show_bug.cgi?id=169264

Unreviewed test gardening.

It is passing on mac, gtk, and wpe, disabled on win, and still marked
as failing on ios.


* TestExpectations:
* platform/gtk/TestExpectations:

Modified Paths

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




Diff

Modified: trunk/LayoutTests/ChangeLog (226119 => 226120)

--- trunk/LayoutTests/ChangeLog	2017-12-19 11:50:39 UTC (rev 226119)
+++ trunk/LayoutTests/ChangeLog	2017-12-19 15:09:09 UTC (rev 226120)
@@ -1,3 +1,16 @@
+2017-12-19  Ms2ger  
+
+Mark scroll-restoration-navigation-samedoc.html as passing.
+https://bugs.webkit.org/show_bug.cgi?id=169264
+
+Unreviewed test gardening.
+
+It is passing on mac, gtk, and wpe, disabled on win, and still marked
+as failing on ios.
+
+* TestExpectations:
+* platform/gtk/TestExpectations:
+
 2017-12-19  Frederic Wang  
 
 Unreviewed test gardening.


Modified: trunk/LayoutTests/TestExpectations (226119 => 226120)

--- trunk/LayoutTests/TestExpectations	2017-12-19 11:50:39 UTC (rev 226119)
+++ trunk/LayoutTests/TestExpectations	2017-12-19 15:09:09 UTC (rev 226120)
@@ -1392,7 +1392,6 @@
 webkit.org/b/168175 imported/w3c/web-platform-tests/html/semantics/grouping-content/the-li-element/grouping-li-reftest-list-owner-menu.html [ ImageOnlyFailure ]
 webkit.org/b/168175 imported/w3c/web-platform-tests/html/browsers/browsing-the-web/history-traversal/same-url.html [ Pass Failure ]
 webkit.org/b/168175 imported/w3c/web-platform-tests/html/browsers/offline/browser-state/navigator_online_online.html [ Pass Failure ]
-webkit.org/b/169264 imported/w3c/web-platform-tests/html/browsers/browsing-the-web/history-traversal/persisted-user-state-restoration/scroll-restoration-navigation-samedoc.html [ Failure ]
 
 imported/w3c/web-platform-tests/cssom/MediaList.html [ Failure ]
 imported/w3c/web-platform-tests/html/semantics/embedded-content/the-img-element/document-adopt-base-url.html [ ImageOnlyFailure ]


Modified: trunk/LayoutTests/platform/gtk/TestExpectations (226119 => 226120)

--- trunk/LayoutTests/platform/gtk/TestExpectations	2017-12-19 11:50:39 UTC (rev 226119)
+++ trunk/LayoutTests/platform/gtk/TestExpectations	2017-12-19 15:09:09 UTC (rev 226120)
@@ -3451,8 +3451,6 @@
 
 webkit.org/b/175290 imported/w3c/web-platform-tests/css/css-ui-3/text-overflow-005.html [ Pass ]
 
-webkit.org/b/169264 imported/w3c/web-platform-tests/html/browsers/browsing-the-web/history-traversal/persisted-user-state-restoration/scroll-restoration-navigation-samedoc.html [ Pass ]
-
 #
 # End of PASSING tests. See top of file where to put new expectations.
 #






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


[webkit-changes] [226119] trunk/LayoutTests

2017-12-19 Thread fred . wang
Title: [226119] trunk/LayoutTests








Revision 226119
Author fred.w...@free.fr
Date 2017-12-19 03:50:39 -0800 (Tue, 19 Dec 2017)


Log Message
Unreviewed test gardening.

Patch by Frederic Wang  on 2017-12-19

* platform/gtk/mathml/opentype/opentype-stretchy-horizontal-expected.png:
* platform/gtk/mathml/opentype/opentype-stretchy-horizontal-expected.txt: Added.

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/LayoutTests/platform/gtk/mathml/opentype/opentype-stretchy-horizontal-expected.png


Added Paths

trunk/LayoutTests/platform/gtk/mathml/opentype/opentype-stretchy-horizontal-expected.txt




Diff

Modified: trunk/LayoutTests/ChangeLog (226118 => 226119)

--- trunk/LayoutTests/ChangeLog	2017-12-19 09:24:48 UTC (rev 226118)
+++ trunk/LayoutTests/ChangeLog	2017-12-19 11:50:39 UTC (rev 226119)
@@ -1,3 +1,10 @@
+2017-12-19  Frederic Wang  
+
+Unreviewed test gardening.
+
+* platform/gtk/mathml/opentype/opentype-stretchy-horizontal-expected.png:
+* platform/gtk/mathml/opentype/opentype-stretchy-horizontal-expected.txt: Added.
+
 2017-12-18  Chris Dumez  
 
 Default scope used when registering a service worker is wrong


Modified: trunk/LayoutTests/platform/gtk/mathml/opentype/opentype-stretchy-horizontal-expected.png

(Binary files differ)


Added: trunk/LayoutTests/platform/gtk/mathml/opentype/opentype-stretchy-horizontal-expected.txt (0 => 226119)

--- trunk/LayoutTests/platform/gtk/mathml/opentype/opentype-stretchy-horizontal-expected.txt	(rev 0)
+++ trunk/LayoutTests/platform/gtk/mathml/opentype/opentype-stretchy-horizontal-expected.txt	2017-12-19 11:50:39 UTC (rev 226119)
@@ -0,0 +1,35 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x157
+  RenderBlock {HTML} at (0,0) size 800x157
+RenderBody {BODY} at (8,16) size 784x125
+  RenderBlock {P} at (0,0) size 784x25
+RenderMathMLMath {math} at (0,2) size 10x23
+  RenderMathMLRow {mstyle} at (0,0) size 10x23
+RenderMathMLUnderOver {mover} at (0,0) size 10x23
+  RenderMathMLOperator {mo} at (0,1) size 10x22
+RenderBlock (anonymous) at (0,0) size 1x4
+  RenderText {#text} at (0,-3) size 1x0
+text run at (0,-3) width 1: "\x{219C}"
+  RenderMathMLSpace {mspace} at (1,0) size 8x1
+RenderText {#text} at (0,0) size 0x0
+  RenderBlock {P} at (0,41) size 784x25
+RenderMathMLMath {math} at (0,2) size 20x23
+  RenderMathMLRow {mstyle} at (0,0) size 20x23
+RenderMathMLUnderOver {mover} at (0,0) size 20x23
+  RenderMathMLOperator {mo} at (0,1) size 20x22
+RenderBlock (anonymous) at (0,0) size 1x4
+  RenderText {#text} at (0,-3) size 1x0
+text run at (0,-3) width 1: "\x{219C}"
+  RenderMathMLSpace {mspace} at (2,0) size 16x1
+RenderText {#text} at (0,0) size 0x0
+  RenderBlock {P} at (0,82) size 784x43
+RenderMathMLMath {math} at (0,0) size 150x43
+  RenderMathMLRow {mstyle} at (0,0) size 150x43
+RenderMathMLUnderOver {mover} at (0,0) size 150x43
+  RenderMathMLOperator {mo} at (0,1) size 150x42
+RenderBlock (anonymous) at (0,0) size 1x4
+  RenderText {#text} at (0,-3) size 1x0
+text run at (0,-3) width 1: "\x{219C}"
+  RenderMathMLSpace {mspace} at (0,0) size 150x1
+RenderText {#text} at (0,0) size 0x0
Property changes on: trunk/LayoutTests/platform/gtk/mathml/opentype/opentype-stretchy-horizontal-expected.txt
___


Added: svn:eol-style
+LF
\ No newline at end of property




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


[webkit-changes] [226118] releases/WebKitGTK/webkit-2.18.4/

2017-12-19 Thread carlosgc
Title: [226118] releases/WebKitGTK/webkit-2.18.4/








Revision 226118
Author carlo...@webkit.org
Date 2017-12-19 01:24:48 -0800 (Tue, 19 Dec 2017)


Log Message
WebKitGTK+ 2.18.4

Added Paths

releases/WebKitGTK/webkit-2.18.4/




Diff




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


[webkit-changes] [226117] releases/WebKitGTK/webkit-2.18

2017-12-19 Thread carlosgc
Title: [226117] releases/WebKitGTK/webkit-2.18








Revision 226117
Author carlo...@webkit.org
Date 2017-12-19 01:23:26 -0800 (Tue, 19 Dec 2017)


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

.:

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

Source/WebKit:

* gtk/NEWS: Add release notes for 2.18.4.

Modified Paths

releases/WebKitGTK/webkit-2.18/ChangeLog
releases/WebKitGTK/webkit-2.18/Source/WebKit/ChangeLog
releases/WebKitGTK/webkit-2.18/Source/WebKit/gtk/NEWS
releases/WebKitGTK/webkit-2.18/Source/cmake/OptionsGTK.cmake




Diff

Modified: releases/WebKitGTK/webkit-2.18/ChangeLog (226116 => 226117)

--- releases/WebKitGTK/webkit-2.18/ChangeLog	2017-12-19 08:17:33 UTC (rev 226116)
+++ releases/WebKitGTK/webkit-2.18/ChangeLog	2017-12-19 09:23:26 UTC (rev 226117)
@@ -1,3 +1,9 @@
+2017-12-19  Carlos Garcia Campos  
+
+Unreviewed. Update OptionsGTK.cmake and NEWS for 2.18.4 release.
+
+* Source/cmake/OptionsGTK.cmake: Bump version numbers.
+
 2017-11-27  Adrian Perez de Castro  
 
 [CMake] Values of CMAKE_BUILD_TYPE from toolchain file are ignored


Modified: releases/WebKitGTK/webkit-2.18/Source/WebKit/ChangeLog (226116 => 226117)

--- releases/WebKitGTK/webkit-2.18/Source/WebKit/ChangeLog	2017-12-19 08:17:33 UTC (rev 226116)
+++ releases/WebKitGTK/webkit-2.18/Source/WebKit/ChangeLog	2017-12-19 09:23:26 UTC (rev 226117)
@@ -1,3 +1,9 @@
+2017-12-19  Carlos Garcia Campos  
+
+Unreviewed. Update OptionsGTK.cmake and NEWS for 2.18.4 release.
+
+* gtk/NEWS: Add release notes for 2.18.4.
+
 2017-11-21  Carlos Garcia Campos  
 
 [WPE] WPEWebProcess: Couldn't find current GLX or EGL context


Modified: releases/WebKitGTK/webkit-2.18/Source/WebKit/gtk/NEWS (226116 => 226117)

--- releases/WebKitGTK/webkit-2.18/Source/WebKit/gtk/NEWS	2017-12-19 08:17:33 UTC (rev 226116)
+++ releases/WebKitGTK/webkit-2.18/Source/WebKit/gtk/NEWS	2017-12-19 09:23:26 UTC (rev 226117)
@@ -1,4 +1,16 @@
 ==
+WebKitGTK+  2.18.4
+==
+
+What's new in WebKitGTK+ 2.18.4?
+
+  - Make WebDriver implementation more spec compliant.
+  - Fix a bug when trying to remove cookies before a web process is spawned.
+  - WebKitWebDriver process no longer links to libjavascriptcoregtk.
+  - Fix several memory leaks in GStreamer media backend.
+  - Security fixes: CVE-2017-13866, CVE-2017-13870, CVE-2017-7156, CVE-2017-13856.
+
+==
 WebKitGTK+  2.18.3
 ==
 


Modified: releases/WebKitGTK/webkit-2.18/Source/cmake/OptionsGTK.cmake (226116 => 226117)

--- releases/WebKitGTK/webkit-2.18/Source/cmake/OptionsGTK.cmake	2017-12-19 08:17:33 UTC (rev 226116)
+++ releases/WebKitGTK/webkit-2.18/Source/cmake/OptionsGTK.cmake	2017-12-19 09:23:26 UTC (rev 226117)
@@ -1,11 +1,11 @@
 include(GNUInstallDirs)
 include(VersioningUtils)
 
-SET_PROJECT_VERSION(2 18 3)
+SET_PROJECT_VERSION(2 18 4)
 set(WEBKITGTK_API_VERSION 4.0)
 
-CALCULATE_LIBRARY_VERSIONS_FROM_LIBTOOL_TRIPLE(WEBKIT2 61 6 24)
-CALCULATE_LIBRARY_VERSIONS_FROM_LIBTOOL_TRIPLE(_javascript_CORE 24 12 6)
+CALCULATE_LIBRARY_VERSIONS_FROM_LIBTOOL_TRIPLE(WEBKIT2 61 7 24)
+CALCULATE_LIBRARY_VERSIONS_FROM_LIBTOOL_TRIPLE(_javascript_CORE 24 13 6)
 
 # These are shared variables, but we special case their definition so that we can use the
 # CMAKE_INSTALL_* variables that are populated by the GNUInstallDirs macro.






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


[webkit-changes] [226116] releases/WebKitGTK/webkit-2.18

2017-12-19 Thread carlosgc
Title: [226116] releases/WebKitGTK/webkit-2.18








Revision 226116
Author carlo...@webkit.org
Date 2017-12-19 00:17:33 -0800 (Tue, 19 Dec 2017)


Log Message
Merge r225168 - [CMake] Values of CMAKE_BUILD_TYPE from toolchain file are ignored
https://bugs.webkit.org/show_bug.cgi?id=179971

Reviewed by Carlos Alberto Lopez Perez.

* CMakeLists.txt: Call project() first, as it loads the toolchain
file, so that's done before checking CMAKE_BUILD_TYPE.

Modified Paths

releases/WebKitGTK/webkit-2.18/CMakeLists.txt
releases/WebKitGTK/webkit-2.18/ChangeLog




Diff

Modified: releases/WebKitGTK/webkit-2.18/CMakeLists.txt (226115 => 226116)

--- releases/WebKitGTK/webkit-2.18/CMakeLists.txt	2017-12-19 08:16:28 UTC (rev 226115)
+++ releases/WebKitGTK/webkit-2.18/CMakeLists.txt	2017-12-19 08:17:33 UTC (rev 226116)
@@ -1,8 +1,17 @@
 # -
 # Determine CMake version and build type.
 # -
+#
+# NOTE: cmake_minimum_required() and project() *MUST* be the two fist commands
+# used, see https://cmake.org/cmake/help/v3.3/command/project.html -- the
+# latter in particular handles loading a bunch of shared CMake definitions
+# and loading the cross-compilation settings from CMAKE_TOOLCHAIN_FILE.
+#
+
 cmake_minimum_required(VERSION 3.3)
 
+project(WebKit)
+
 if (NOT CMAKE_BUILD_TYPE)
 message(WARNING "No CMAKE_BUILD_TYPE value specified, defaulting to RelWithDebInfo.")
 set(CMAKE_BUILD_TYPE "RelWithDebInfo" CACHE STRING "Choose the type of build." FORCE)
@@ -10,8 +19,6 @@
 message(STATUS "The CMake build type is: ${CMAKE_BUILD_TYPE}")
 endif ()
 
-project(WebKit)
-
 set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/Source/cmake")
 
 set(ENABLE_WEBCORE ON)


Modified: releases/WebKitGTK/webkit-2.18/ChangeLog (226115 => 226116)

--- releases/WebKitGTK/webkit-2.18/ChangeLog	2017-12-19 08:16:28 UTC (rev 226115)
+++ releases/WebKitGTK/webkit-2.18/ChangeLog	2017-12-19 08:17:33 UTC (rev 226116)
@@ -1,3 +1,13 @@
+2017-11-27  Adrian Perez de Castro  
+
+[CMake] Values of CMAKE_BUILD_TYPE from toolchain file are ignored
+https://bugs.webkit.org/show_bug.cgi?id=179971
+
+Reviewed by Carlos Alberto Lopez Perez.
+
+* CMakeLists.txt: Call project() first, as it loads the toolchain
+file, so that's done before checking CMAKE_BUILD_TYPE.
+
 2017-11-15  Carlos Garcia Campos  
 
 [WPE] Add initial support for WebDriver






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


[webkit-changes] [226115] releases/WebKitGTK/webkit-2.18/Source/WebKit

2017-12-19 Thread carlosgc
Title: [226115] releases/WebKitGTK/webkit-2.18/Source/WebKit








Revision 226115
Author carlo...@webkit.org
Date 2017-12-19 00:16:28 -0800 (Tue, 19 Dec 2017)


Log Message
Merge r225078 - [WPE] WPEWebProcess: Couldn't find current GLX or EGL context
https://bugs.webkit.org/show_bug.cgi?id=179883

Reviewed by Žan Doberšek.

I'm seeing that message quite often when running the unit tests. The problem seems to be that some tests run so
fast that the web process never renders the first frame, so the context is created but never made current. I've
checked with apitrace that there are calls to eglQueryContext with null display, causing a EGL_BAD_DISPLAY, but
I don't know where those calls are originated. Making the context current right after it's created fixes the
problem.

* Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.cpp:
(WebKit::ThreadedCompositor::createGLContext): Always call makeContextCurrent() right after the context is created.

Modified Paths

releases/WebKitGTK/webkit-2.18/Source/WebKit/ChangeLog
releases/WebKitGTK/webkit-2.18/Source/WebKit/Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.cpp




Diff

Modified: releases/WebKitGTK/webkit-2.18/Source/WebKit/ChangeLog (226114 => 226115)

--- releases/WebKitGTK/webkit-2.18/Source/WebKit/ChangeLog	2017-12-19 08:15:33 UTC (rev 226114)
+++ releases/WebKitGTK/webkit-2.18/Source/WebKit/ChangeLog	2017-12-19 08:16:28 UTC (rev 226115)
@@ -1,3 +1,19 @@
+2017-11-21  Carlos Garcia Campos  
+
+[WPE] WPEWebProcess: Couldn't find current GLX or EGL context
+https://bugs.webkit.org/show_bug.cgi?id=179883
+
+Reviewed by Žan Doberšek.
+
+I'm seeing that message quite often when running the unit tests. The problem seems to be that some tests run so
+fast that the web process never renders the first frame, so the context is created but never made current. I've
+checked with apitrace that there are calls to eglQueryContext with null display, causing a EGL_BAD_DISPLAY, but
+I don't know where those calls are originated. Making the context current right after it's created fixes the
+problem.
+
+* Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.cpp:
+(WebKit::ThreadedCompositor::createGLContext): Always call makeContextCurrent() right after the context is created.
+
 2017-12-08  Michael Catanzaro  
 
 [GTK] WebInspectorProxyClient needs a virtual destructor


Modified: releases/WebKitGTK/webkit-2.18/Source/WebKit/Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.cpp (226114 => 226115)

--- releases/WebKitGTK/webkit-2.18/Source/WebKit/Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.cpp	2017-12-19 08:15:33 UTC (rev 226114)
+++ releases/WebKitGTK/webkit-2.18/Source/WebKit/Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.cpp	2017-12-19 08:16:28 UTC (rev 226115)
@@ -93,10 +93,11 @@
 if (!m_context)
 return;
 
-if (m_doFrameSync == ShouldDoFrameSync::No) {
-if (m_context->makeContextCurrent())
-m_context->swapInterval(0);
-}
+if (!m_context->makeContextCurrent())
+return;
+
+if (m_doFrameSync == ShouldDoFrameSync::No)
+m_context->swapInterval(0);
 }
 
 void ThreadedCompositor::invalidate()






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


[webkit-changes] [226114] releases/WebKitGTK/webkit-2.18/Source/WebCore

2017-12-19 Thread carlosgc
Title: [226114] releases/WebKitGTK/webkit-2.18/Source/WebCore








Revision 226114
Author carlo...@webkit.org
Date 2017-12-19 00:15:33 -0800 (Tue, 19 Dec 2017)


Log Message
Merge r225051 - [WPE] GLContextEGLWPE.cpp:44:96: error: invalid cast from type ‘GLNativeWindowType {aka long long unsigned int}’ to type ‘EGLNativeWindowType {aka unsigned int}
https://bugs.webkit.org/show_bug.cgi?id=179511

Reviewed by Žan Doberšek.

r217208 changed the definition of GLNativeWindowType from EGLNativeWindowType to uint64_t for platform WPE.
This built fine on a 64-bit platform since uint64_t matches the size of a pointer, but fails on 32-bits.

This switches back the definition to EGLNativeWindowType.
And we need to include  first in order to get a definition for EGLNativeWindowType itself.

This commit pretty much reverts the changes r217208 did on platform/graphics/GLContext.h

No new tests, it is a build fix.

* platform/graphics/GLContext.h:

Modified Paths

releases/WebKitGTK/webkit-2.18/Source/WebCore/ChangeLog
releases/WebKitGTK/webkit-2.18/Source/WebCore/platform/graphics/GLContext.h




Diff

Modified: releases/WebKitGTK/webkit-2.18/Source/WebCore/ChangeLog (226113 => 226114)

--- releases/WebKitGTK/webkit-2.18/Source/WebCore/ChangeLog	2017-12-19 08:13:07 UTC (rev 226113)
+++ releases/WebKitGTK/webkit-2.18/Source/WebCore/ChangeLog	2017-12-19 08:15:33 UTC (rev 226114)
@@ -1,3 +1,22 @@
+2017-11-20  Carlos Alberto Lopez Perez  
+
+[WPE] GLContextEGLWPE.cpp:44:96: error: invalid cast from type ‘GLNativeWindowType {aka long long unsigned int}’ to type ‘EGLNativeWindowType {aka unsigned int}
+https://bugs.webkit.org/show_bug.cgi?id=179511
+
+Reviewed by Žan Doberšek.
+
+r217208 changed the definition of GLNativeWindowType from EGLNativeWindowType to uint64_t for platform WPE.
+This built fine on a 64-bit platform since uint64_t matches the size of a pointer, but fails on 32-bits.
+
+This switches back the definition to EGLNativeWindowType.
+And we need to include  first in order to get a definition for EGLNativeWindowType itself.
+
+This commit pretty much reverts the changes r217208 did on platform/graphics/GLContext.h
+
+No new tests, it is a build fix.
+
+* platform/graphics/GLContext.h:
+
 2017-11-11  Helmut Grohne  
 
 [GTK] PlatformGTK.cmake: use the PKG_CONFIG_EXECUTABLE variable


Modified: releases/WebKitGTK/webkit-2.18/Source/WebCore/platform/graphics/GLContext.h (226113 => 226114)

--- releases/WebKitGTK/webkit-2.18/Source/WebCore/platform/graphics/GLContext.h	2017-12-19 08:13:07 UTC (rev 226113)
+++ releases/WebKitGTK/webkit-2.18/Source/WebCore/platform/graphics/GLContext.h	2017-12-19 08:15:33 UTC (rev 226114)
@@ -24,10 +24,17 @@
 #include "PlatformDisplay.h"
 #include 
 
-#if USE(EGL) && !PLATFORM(GTK) && !PLATFORM(WPE)
+#if USE(EGL) && !PLATFORM(GTK)
+#if PLATFORM(WPE)
+// FIXME: For now default to the GBM EGL platform, but this should really be
+// somehow deducible from the build configuration.
+#define __GBM__ 1
+#include 
+#else
 #include "eglplatform.h"
+#endif // PLATFORM(WPE)
 typedef EGLNativeWindowType GLNativeWindowType;
-#else
+#else // !USE(EGL) || PLATFORM(GTK)
 typedef uint64_t GLNativeWindowType;
 #endif
 






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


[webkit-changes] [226113] releases/WebKitGTK/webkit-2.18/Source/WebCore

2017-12-19 Thread carlosgc
Title: [226113] releases/WebKitGTK/webkit-2.18/Source/WebCore








Revision 226113
Author carlo...@webkit.org
Date 2017-12-19 00:13:07 -0800 (Tue, 19 Dec 2017)


Log Message
Merge r224725 - [GTK] PlatformGTK.cmake: use the PKG_CONFIG_EXECUTABLE variable
https://bugs.webkit.org/show_bug.cgi?id=179547

Patch by Helmut Grohne  on 2017-11-11
Reviewed by Michael Catanzaro.

* PlatformGTK.cmake: Use PKG_CONFIG_EXECUTABLE instead of
hardcoding the executable name.

Modified Paths

releases/WebKitGTK/webkit-2.18/Source/WebCore/ChangeLog
releases/WebKitGTK/webkit-2.18/Source/WebCore/PlatformGTK.cmake




Diff

Modified: releases/WebKitGTK/webkit-2.18/Source/WebCore/ChangeLog (226112 => 226113)

--- releases/WebKitGTK/webkit-2.18/Source/WebCore/ChangeLog	2017-12-19 08:07:06 UTC (rev 226112)
+++ releases/WebKitGTK/webkit-2.18/Source/WebCore/ChangeLog	2017-12-19 08:13:07 UTC (rev 226113)
@@ -1,3 +1,13 @@
+2017-11-11  Helmut Grohne  
+
+[GTK] PlatformGTK.cmake: use the PKG_CONFIG_EXECUTABLE variable
+https://bugs.webkit.org/show_bug.cgi?id=179547
+
+Reviewed by Michael Catanzaro.
+
+* PlatformGTK.cmake: Use PKG_CONFIG_EXECUTABLE instead of
+hardcoding the executable name.
+
 2017-12-04  Carlos Garcia Campos  
 
 [GStreamer] More leaks in TextCombinerGStreamer


Modified: releases/WebKitGTK/webkit-2.18/Source/WebCore/PlatformGTK.cmake (226112 => 226113)

--- releases/WebKitGTK/webkit-2.18/Source/WebCore/PlatformGTK.cmake	2017-12-19 08:07:06 UTC (rev 226112)
+++ releases/WebKitGTK/webkit-2.18/Source/WebCore/PlatformGTK.cmake	2017-12-19 08:13:07 UTC (rev 226113)
@@ -188,7 +188,7 @@
 list(APPEND WebCore_DERIVED_SOURCES
 ${DERIVED_SOURCES_WEBCORE_DIR}/Geoclue2Interface.c
 )
-execute_process(COMMAND pkg-config --variable dbus_interface geoclue-2.0 OUTPUT_VARIABLE GEOCLUE_DBUS_INTERFACE)
+execute_process(COMMAND ${PKG_CONFIG_EXECUTABLE} --variable dbus_interface geoclue-2.0 OUTPUT_VARIABLE GEOCLUE_DBUS_INTERFACE)
 add_custom_command(
  OUTPUT ${DERIVED_SOURCES_WEBCORE_DIR}/Geoclue2Interface.c ${DERIVED_SOURCES_WEBCORE_DIR}/Geoclue2Interface.h
  COMMAND gdbus-codegen --interface-prefix org.freedesktop.GeoClue2. --c-namespace Geoclue --generate-c-code ${DERIVED_SOURCES_WEBCORE_DIR}/Geoclue2Interface ${GEOCLUE_DBUS_INTERFACE}






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


[webkit-changes] [226112] releases/WebKitGTK/webkit-2.18/Source/WebCore

2017-12-19 Thread carlosgc
Title: [226112] releases/WebKitGTK/webkit-2.18/Source/WebCore








Revision 226112
Author carlo...@webkit.org
Date 2017-12-19 00:07:06 -0800 (Tue, 19 Dec 2017)


Log Message
Merge r225473 - [GStreamer] More leaks in TextCombinerGStreamer
https://bugs.webkit.org/show_bug.cgi?id=180331

Reviewed by Michael Catanzaro.

I've noticed more leaks reading the code, but I couldn't check them with valgrind, because I don't know how to
trigger that code path. This patch cleans up the file using smart pointer everywhere.

* platform/graphics/gstreamer/TextCombinerGStreamer.cpp:
(webkit_text_combiner_pad_init):
(webkitTextCombinerPadEvent):
(webkitTextCombinerReleasePad):

Modified Paths

releases/WebKitGTK/webkit-2.18/Source/WebCore/ChangeLog
releases/WebKitGTK/webkit-2.18/Source/WebCore/platform/graphics/gstreamer/TextCombinerGStreamer.cpp




Diff

Modified: releases/WebKitGTK/webkit-2.18/Source/WebCore/ChangeLog (226111 => 226112)

--- releases/WebKitGTK/webkit-2.18/Source/WebCore/ChangeLog	2017-12-19 08:07:01 UTC (rev 226111)
+++ releases/WebKitGTK/webkit-2.18/Source/WebCore/ChangeLog	2017-12-19 08:07:06 UTC (rev 226112)
@@ -1,3 +1,18 @@
+2017-12-04  Carlos Garcia Campos  
+
+[GStreamer] More leaks in TextCombinerGStreamer
+https://bugs.webkit.org/show_bug.cgi?id=180331
+
+Reviewed by Michael Catanzaro.
+
+I've noticed more leaks reading the code, but I couldn't check them with valgrind, because I don't know how to
+trigger that code path. This patch cleans up the file using smart pointer everywhere.
+
+* platform/graphics/gstreamer/TextCombinerGStreamer.cpp:
+(webkit_text_combiner_pad_init):
+(webkitTextCombinerPadEvent):
+(webkitTextCombinerReleasePad):
+
 2017-12-03  Carlos Garcia Campos  
 
 [GStreamer] GstPad leaked in WebKitTextCombiner


Modified: releases/WebKitGTK/webkit-2.18/Source/WebCore/platform/graphics/gstreamer/TextCombinerGStreamer.cpp (226111 => 226112)

--- releases/WebKitGTK/webkit-2.18/Source/WebCore/platform/graphics/gstreamer/TextCombinerGStreamer.cpp	2017-12-19 08:07:01 UTC (rev 226111)
+++ releases/WebKitGTK/webkit-2.18/Source/WebCore/platform/graphics/gstreamer/TextCombinerGStreamer.cpp	2017-12-19 08:07:06 UTC (rev 226112)
@@ -94,8 +94,6 @@
 
 static void webkit_text_combiner_pad_init(WebKitTextCombinerPad* pad)
 {
-pad->tags = 0;
-
 gst_pad_set_event_function(GST_PAD(pad), webkitTextCombinerPadEvent);
 }
 
@@ -137,17 +135,17 @@
 gst_event_parse_caps(event, &caps);
 ASSERT(caps);
 
-GstPad* target = gst_ghost_pad_get_target(GST_GHOST_PAD(pad));
+GRefPtr target = adoptGRef(gst_ghost_pad_get_target(GST_GHOST_PAD(pad)));
 ASSERT(target);
 
-GstElement* targetParent = gst_pad_get_parent_element(target);
+GRefPtr targetParent = adoptGRef(gst_pad_get_parent_element(target.get()));
 ASSERT(targetParent);
 
-GstCaps* textCaps = gst_caps_new_empty_simple("text/x-raw");
-if (gst_caps_can_intersect(textCaps, caps)) {
+GRefPtr textCaps = adoptGRef(gst_caps_new_empty_simple("text/x-raw"));
+if (gst_caps_can_intersect(textCaps.get(), caps)) {
 /* Caps are plain text, put a WebVTT encoder between the ghostpad and
  * the funnel */
-if (targetParent == combiner->funnel) {
+if (targetParent.get() == combiner->funnel) {
 /* Setup a WebVTT encoder */
 GstElement* encoder = gst_element_factory_make("webvttenc", nullptr);
 ASSERT(encoder);
@@ -159,45 +157,38 @@
 ASSERT(ret);
 
 /* Switch the ghostpad to target the WebVTT encoder */
-GstPad* sinkPad = gst_element_get_static_pad(encoder, "sink");
+GRefPtr sinkPad = adoptGRef(gst_element_get_static_pad(encoder, "sink"));
 ASSERT(sinkPad);
 
-ret = gst_ghost_pad_set_target(GST_GHOST_PAD(pad), sinkPad);
+ret = gst_ghost_pad_set_target(GST_GHOST_PAD(pad), sinkPad.get());
 ASSERT(ret);
-gst_object_unref(sinkPad);
 
 /* Connect the WebVTT encoder to the funnel */
-GstPad* srcPad = gst_element_get_static_pad(encoder, "src");
+GRefPtr srcPad = adoptGRef(gst_element_get_static_pad(encoder, "src"));
 ASSERT(srcPad);
 
-ret = GST_PAD_LINK_SUCCESSFUL(gst_pad_link(srcPad, target));
+ret = GST_PAD_LINK_SUCCESSFUL(gst_pad_link(srcPad.get(), target.get()));
 ASSERT(ret);
-gst_object_unref(srcPad);
 } /* else: pipeline is already correct */
 } else {
 /* Caps are not plain text, remove the WebVTT encoder */
-if (targetParent != combiner->funnel) {
+if (targetParent.get() != combiner->funnel) {
 /* Get the funnel sink pad */
-GstPad* srcPad = gst_e

[webkit-changes] [226111] releases/WebKitGTK/webkit-2.18/Source/WebCore

2017-12-19 Thread carlosgc
Title: [226111] releases/WebKitGTK/webkit-2.18/Source/WebCore








Revision 226111
Author carlo...@webkit.org
Date 2017-12-19 00:07:01 -0800 (Tue, 19 Dec 2017)


Log Message
Merge r225459 - [GStreamer] GstPad leaked in WebKitTextCombiner
https://bugs.webkit.org/show_bug.cgi?id=180314

Reviewed by Michael Catanzaro.

gst_element_get_static_pad() returns a full reference that si never freed, because gst_ghost_pad_new doesn't
take the ownership of the given pad.

* platform/graphics/gstreamer/TextCombinerGStreamer.cpp:
(webkit_text_combiner_init):

Modified Paths

releases/WebKitGTK/webkit-2.18/Source/WebCore/ChangeLog
releases/WebKitGTK/webkit-2.18/Source/WebCore/platform/graphics/gstreamer/TextCombinerGStreamer.cpp




Diff

Modified: releases/WebKitGTK/webkit-2.18/Source/WebCore/ChangeLog (226110 => 226111)

--- releases/WebKitGTK/webkit-2.18/Source/WebCore/ChangeLog	2017-12-19 08:06:56 UTC (rev 226110)
+++ releases/WebKitGTK/webkit-2.18/Source/WebCore/ChangeLog	2017-12-19 08:07:01 UTC (rev 226111)
@@ -1,5 +1,18 @@
 2017-12-03  Carlos Garcia Campos  
 
+[GStreamer] GstPad leaked in WebKitTextCombiner
+https://bugs.webkit.org/show_bug.cgi?id=180314
+
+Reviewed by Michael Catanzaro.
+
+gst_element_get_static_pad() returns a full reference that si never freed, because gst_ghost_pad_new doesn't
+take the ownership of the given pad.
+
+* platform/graphics/gstreamer/TextCombinerGStreamer.cpp:
+(webkit_text_combiner_init):
+
+2017-12-03  Carlos Garcia Campos  
+
 [GStreamer] GstCaps leaked in MediaPlayerPrivateGStreamer::createGSTPlayBin
 https://bugs.webkit.org/show_bug.cgi?id=180311
 


Modified: releases/WebKitGTK/webkit-2.18/Source/WebCore/platform/graphics/gstreamer/TextCombinerGStreamer.cpp (226110 => 226111)

--- releases/WebKitGTK/webkit-2.18/Source/WebCore/platform/graphics/gstreamer/TextCombinerGStreamer.cpp	2017-12-19 08:06:56 UTC (rev 226110)
+++ releases/WebKitGTK/webkit-2.18/Source/WebCore/platform/graphics/gstreamer/TextCombinerGStreamer.cpp	2017-12-19 08:07:01 UTC (rev 226111)
@@ -24,9 +24,11 @@
  */
 
 #include "config.h"
+#include "TextCombinerGStreamer.h"
+
 #if ENABLE(VIDEO) && USE(GSTREAMER) && ENABLE(VIDEO_TRACK)
 
-#include "TextCombinerGStreamer.h"
+#include "GRefPtrGStreamer.h"
 
 static GstStaticPadTemplate sinkTemplate =
 GST_STATIC_PAD_TEMPLATE("sink_%u", GST_PAD_SINK, GST_PAD_REQUEST,
@@ -83,10 +85,10 @@
 UNUSED_PARAM(ret);
 ASSERT(ret);
 
-GstPad* pad = gst_element_get_static_pad(combiner->funnel, "src");
+GRefPtr pad = adoptGRef(gst_element_get_static_pad(combiner->funnel, "src"));
 ASSERT(pad);
 
-ret = gst_element_add_pad(GST_ELEMENT(combiner), gst_ghost_pad_new("src", pad));
+ret = gst_element_add_pad(GST_ELEMENT(combiner), gst_ghost_pad_new("src", pad.get()));
 ASSERT(ret);
 }
 






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


[webkit-changes] [226110] releases/WebKitGTK/webkit-2.18/Source/WebCore

2017-12-19 Thread carlosgc
Title: [226110] releases/WebKitGTK/webkit-2.18/Source/WebCore








Revision 226110
Author carlo...@webkit.org
Date 2017-12-19 00:06:56 -0800 (Tue, 19 Dec 2017)


Log Message
Merge r225458 - [GStreamer] GstCaps leaked in MediaPlayerPrivateGStreamer::createGSTPlayBin
https://bugs.webkit.org/show_bug.cgi?id=180311

Reviewed by Michael Catanzaro.

gst_caps_new_empty_simple() is passed directly to g_object_set(). The returned caps should be freed with
gst_caps_unref().

* platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
(WebCore::MediaPlayerPrivateGStreamer::createGSTPlayBin):

Modified Paths

releases/WebKitGTK/webkit-2.18/Source/WebCore/ChangeLog
releases/WebKitGTK/webkit-2.18/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp




Diff

Modified: releases/WebKitGTK/webkit-2.18/Source/WebCore/ChangeLog (226109 => 226110)

--- releases/WebKitGTK/webkit-2.18/Source/WebCore/ChangeLog	2017-12-19 08:03:59 UTC (rev 226109)
+++ releases/WebKitGTK/webkit-2.18/Source/WebCore/ChangeLog	2017-12-19 08:06:56 UTC (rev 226110)
@@ -1,3 +1,16 @@
+2017-12-03  Carlos Garcia Campos  
+
+[GStreamer] GstCaps leaked in MediaPlayerPrivateGStreamer::createGSTPlayBin
+https://bugs.webkit.org/show_bug.cgi?id=180311
+
+Reviewed by Michael Catanzaro.
+
+gst_caps_new_empty_simple() is passed directly to g_object_set(). The returned caps should be freed with
+gst_caps_unref().
+
+* platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
+(WebCore::MediaPlayerPrivateGStreamer::createGSTPlayBin):
+
 2017-11-10  Miguel Gomez  
 
 [GTK][WPE] CoordinatedGraphicsLayer::setNeedsDisplayInRect() converts FloatRect to IntRect erroneously


Modified: releases/WebKitGTK/webkit-2.18/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp (226109 => 226110)

--- releases/WebKitGTK/webkit-2.18/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp	2017-12-19 08:03:59 UTC (rev 226109)
+++ releases/WebKitGTK/webkit-2.18/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp	2017-12-19 08:06:56 UTC (rev 226110)
@@ -2124,7 +2124,8 @@
 m_textAppSinkPad = adoptGRef(gst_element_get_static_pad(m_textAppSink.get(), "sink"));
 ASSERT(m_textAppSinkPad);
 
-g_object_set(m_textAppSink.get(), "emit-signals", true, "enable-last-sample", false, "caps", gst_caps_new_empty_simple("text/vtt"), nullptr);
+GRefPtr textCaps = adoptGRef(gst_caps_new_empty_simple("text/vtt"));
+g_object_set(m_textAppSink.get(), "emit-signals", TRUE, "enable-last-sample", FALSE, "caps", textCaps.get(), nullptr);
 g_signal_connect_swapped(m_textAppSink.get(), "new-sample", G_CALLBACK(newTextSampleCallback), this);
 
 g_object_set(m_pipeline.get(), "text-sink", m_textAppSink.get(), nullptr);






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


[webkit-changes] [226109] releases/WebKitGTK/webkit-2.18/Source/WebKit

2017-12-19 Thread carlosgc
Title: [226109] releases/WebKitGTK/webkit-2.18/Source/WebKit








Revision 226109
Author carlo...@webkit.org
Date 2017-12-19 00:03:59 -0800 (Tue, 19 Dec 2017)


Log Message
Merge r225676 - [GTK] WebInspectorProxyClient needs a virtual destructor
https://bugs.webkit.org/show_bug.cgi?id=180533

Reviewed by Carlos Garcia Campos.

Otherwise the derived class portion of the object, WebKitInspectorClient, is not destroyed.

* UIProcess/gtk/WebInspectorProxyClient.h:

Modified Paths

releases/WebKitGTK/webkit-2.18/Source/WebKit/ChangeLog
releases/WebKitGTK/webkit-2.18/Source/WebKit/UIProcess/gtk/WebInspectorProxyClient.h




Diff

Modified: releases/WebKitGTK/webkit-2.18/Source/WebKit/ChangeLog (226108 => 226109)

--- releases/WebKitGTK/webkit-2.18/Source/WebKit/ChangeLog	2017-12-19 08:03:07 UTC (rev 226108)
+++ releases/WebKitGTK/webkit-2.18/Source/WebKit/ChangeLog	2017-12-19 08:03:59 UTC (rev 226109)
@@ -1,3 +1,14 @@
+2017-12-08  Michael Catanzaro  
+
+[GTK] WebInspectorProxyClient needs a virtual destructor
+https://bugs.webkit.org/show_bug.cgi?id=180533
+
+Reviewed by Carlos Garcia Campos.
+
+Otherwise the derived class portion of the object, WebKitInspectorClient, is not destroyed.
+
+* UIProcess/gtk/WebInspectorProxyClient.h:
+
 2017-11-29  Michael Catanzaro  
 
 REGRESSION(r218064): [GTK] Broke entering fullscreen mode in debug builds


Modified: releases/WebKitGTK/webkit-2.18/Source/WebKit/UIProcess/gtk/WebInspectorProxyClient.h (226108 => 226109)

--- releases/WebKitGTK/webkit-2.18/Source/WebKit/UIProcess/gtk/WebInspectorProxyClient.h	2017-12-19 08:03:07 UTC (rev 226108)
+++ releases/WebKitGTK/webkit-2.18/Source/WebKit/UIProcess/gtk/WebInspectorProxyClient.h	2017-12-19 08:03:59 UTC (rev 226109)
@@ -33,6 +33,7 @@
 
 class WebInspectorProxyClient {
 public:
+virtual ~WebInspectorProxyClient() = default;
 virtual bool openWindow(WebInspectorProxy&) = 0;
 virtual void didClose(WebInspectorProxy&) = 0;
 virtual bool bringToFront(WebInspectorProxy&) = 0;






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


[webkit-changes] [226108] releases/WebKitGTK/webkit-2.18/Source/WebKit

2017-12-19 Thread carlosgc
Title: [226108] releases/WebKitGTK/webkit-2.18/Source/WebKit








Revision 226108
Author carlo...@webkit.org
Date 2017-12-19 00:03:07 -0800 (Tue, 19 Dec 2017)


Log Message
Merge r225267 - REGRESSION(r218064): [GTK] Broke entering fullscreen mode in debug builds
https://bugs.webkit.org/show_bug.cgi?id=180120

Reviewed by Carlos Garcia Campos.

These assertions need to be swapped. Fixes /webkit2/WebKitWebView/fullscreen in debug mode.

* UIProcess/API/gtk/WebKitWebViewBase.cpp:
(webkitWebViewBaseEnterFullScreen):
(webkitWebViewBaseExitFullScreen):

Modified Paths

releases/WebKitGTK/webkit-2.18/Source/WebKit/ChangeLog
releases/WebKitGTK/webkit-2.18/Source/WebKit/UIProcess/API/gtk/WebKitWebViewBase.cpp




Diff

Modified: releases/WebKitGTK/webkit-2.18/Source/WebKit/ChangeLog (226107 => 226108)

--- releases/WebKitGTK/webkit-2.18/Source/WebKit/ChangeLog	2017-12-19 07:59:16 UTC (rev 226107)
+++ releases/WebKitGTK/webkit-2.18/Source/WebKit/ChangeLog	2017-12-19 08:03:07 UTC (rev 226108)
@@ -1,3 +1,16 @@
+2017-11-29  Michael Catanzaro  
+
+REGRESSION(r218064): [GTK] Broke entering fullscreen mode in debug builds
+https://bugs.webkit.org/show_bug.cgi?id=180120
+
+Reviewed by Carlos Garcia Campos.
+
+These assertions need to be swapped. Fixes /webkit2/WebKitWebView/fullscreen in debug mode.
+
+* UIProcess/API/gtk/WebKitWebViewBase.cpp:
+(webkitWebViewBaseEnterFullScreen):
+(webkitWebViewBaseExitFullScreen):
+
 2017-12-02  Carlos Garcia Campos  
 
 WebDriver: handle user prompts shown while executing scripts


Modified: releases/WebKitGTK/webkit-2.18/Source/WebKit/UIProcess/API/gtk/WebKitWebViewBase.cpp (226107 => 226108)

--- releases/WebKitGTK/webkit-2.18/Source/WebKit/UIProcess/API/gtk/WebKitWebViewBase.cpp	2017-12-19 07:59:16 UTC (rev 226107)
+++ releases/WebKitGTK/webkit-2.18/Source/WebKit/UIProcess/API/gtk/WebKitWebViewBase.cpp	2017-12-19 08:03:07 UTC (rev 226108)
@@ -1306,7 +1306,7 @@
 {
 #if ENABLE(FULLSCREEN_API)
 WebKitWebViewBasePrivate* priv = webkitWebViewBase->priv;
-ASSERT(priv->fullScreenModeActive);
+ASSERT(!priv->fullScreenModeActive);
 
 WebFullScreenManagerProxy* fullScreenManagerProxy = priv->pageProxy->fullScreenManager();
 fullScreenManagerProxy->willEnterFullScreen();
@@ -1324,7 +1324,7 @@
 {
 #if ENABLE(FULLSCREEN_API)
 WebKitWebViewBasePrivate* priv = webkitWebViewBase->priv;
-ASSERT(!priv->fullScreenModeActive);
+ASSERT(priv->fullScreenModeActive);
 
 WebFullScreenManagerProxy* fullScreenManagerProxy = priv->pageProxy->fullScreenManager();
 fullScreenManagerProxy->willExitFullScreen();






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


[webkit-changes] [226107] releases/WebKitGTK/webkit-2.18/Source/WebCore

2017-12-19 Thread carlosgc
Title: [226107] releases/WebKitGTK/webkit-2.18/Source/WebCore








Revision 226107
Author carlo...@webkit.org
Date 2017-12-18 23:59:16 -0800 (Mon, 18 Dec 2017)


Log Message
Merge r224671 - [GTK][WPE] CoordinatedGraphicsLayer::setNeedsDisplayInRect() converts FloatRect to IntRect erroneously
https://bugs.webkit.org/show_bug.cgi?id=179476

Reviewed by Žan Doberšek.

Convert the passed FloatRect into an IntRect using enclosingIntRect(), so we are guaranteed that
the rectangle to paint fits into the buffer that the backingStore will allocate.

No behaviour change.

* platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp:
(WebCore::CoordinatedGraphicsLayer::setNeedsDisplayInRect):

Modified Paths

releases/WebKitGTK/webkit-2.18/Source/WebCore/ChangeLog
releases/WebKitGTK/webkit-2.18/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp




Diff

Modified: releases/WebKitGTK/webkit-2.18/Source/WebCore/ChangeLog (226106 => 226107)

--- releases/WebKitGTK/webkit-2.18/Source/WebCore/ChangeLog	2017-12-19 07:57:25 UTC (rev 226106)
+++ releases/WebKitGTK/webkit-2.18/Source/WebCore/ChangeLog	2017-12-19 07:59:16 UTC (rev 226107)
@@ -1,3 +1,18 @@
+2017-11-10  Miguel Gomez  
+
+[GTK][WPE] CoordinatedGraphicsLayer::setNeedsDisplayInRect() converts FloatRect to IntRect erroneously
+https://bugs.webkit.org/show_bug.cgi?id=179476
+
+Reviewed by Žan Doberšek.
+
+Convert the passed FloatRect into an IntRect using enclosingIntRect(), so we are guaranteed that
+the rectangle to paint fits into the buffer that the backingStore will allocate.
+
+No behaviour change.
+
+* platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp:
+(WebCore::CoordinatedGraphicsLayer::setNeedsDisplayInRect):
+
 2017-12-18  Zalan Bujtas  
 
 [SVG] Detach list wrappers before resetting the base value.


Modified: releases/WebKitGTK/webkit-2.18/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp (226106 => 226107)

--- releases/WebKitGTK/webkit-2.18/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp	2017-12-19 07:57:25 UTC (rev 226106)
+++ releases/WebKitGTK/webkit-2.18/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp	2017-12-19 07:59:16 UTC (rev 226107)
@@ -532,7 +532,7 @@
 void CoordinatedGraphicsLayer::setNeedsDisplayInRect(const FloatRect& rect, ShouldClipToLayer)
 {
 if (m_mainBackingStore)
-m_mainBackingStore->invalidate(IntRect(rect));
+m_mainBackingStore->invalidate(enclosingIntRect(rect));
 
 didChangeLayerState();
 






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