[webkit-changes] [217320] branches/safari-603-branch

[jmarcell]

Title: [217320] branches/safari-603-branch








Revision 217320
Author jmarc...@apple.com
Date 2017-05-23 22:58:15 -0700 (Tue, 23 May 2017)


Log Message
Cherry-pick r217197. rdar://problem/32355285

Modified Paths

branches/safari-603-branch/LayoutTests/ChangeLog
branches/safari-603-branch/Source/WebCore/ChangeLog
branches/safari-603-branch/Source/WebCore/page/FrameView.cpp
branches/safari-603-branch/Source/WebCore/testing/Internals.cpp
branches/safari-603-branch/Source/WebCore/testing/Internals.h
branches/safari-603-branch/Source/WebCore/testing/Internals.idl


Added Paths

branches/safari-603-branch/LayoutTests/fast/media/matchMedia-print-expected.txt
branches/safari-603-branch/LayoutTests/fast/media/matchMedia-print.html




Diff

Modified: branches/safari-603-branch/LayoutTests/ChangeLog (217319 => 217320)

--- branches/safari-603-branch/LayoutTests/ChangeLog	2017-05-24 05:39:22 UTC (rev 217319)
+++ branches/safari-603-branch/LayoutTests/ChangeLog	2017-05-24 05:58:15 UTC (rev 217320)
@@ -1,3 +1,18 @@
+2017-05-23  Jason Marcell  
+
+Cherry-pick r217197. rdar://problem/32355285
+
+2017-05-21  Antti Koivisto  
+
+matchMedia('print').addListener() fires in WK1 but never in WK2 when printing (breaks printing Google maps, QuickLooks)
+https://bugs.webkit.org/show_bug.cgi?id=172361
+
+
+Reviewed by Sam Weinig.
+
+* fast/media/matchMedia-print-expected.txt: Added.
+* fast/media/matchMedia-print.html: Added.
+
 2017-05-22  Jason Marcell  
 
 Cherry-pick r216992. rdar://problem/32258716


Added: branches/safari-603-branch/LayoutTests/fast/media/matchMedia-print-expected.txt (0 => 217320)

--- branches/safari-603-branch/LayoutTests/fast/media/matchMedia-print-expected.txt	(rev 0)
+++ branches/safari-603-branch/LayoutTests/fast/media/matchMedia-print-expected.txt	2017-05-24 05:58:15 UTC (rev 217320)
@@ -0,0 +1,2 @@
+This document was
+printed


Added: branches/safari-603-branch/LayoutTests/fast/media/matchMedia-print.html (0 => 217320)

--- branches/safari-603-branch/LayoutTests/fast/media/matchMedia-print.html	(rev 0)
+++ branches/safari-603-branch/LayoutTests/fast/media/matchMedia-print.html	2017-05-24 05:58:15 UTC (rev 217320)
@@ -0,0 +1,16 @@
+
+if (window.testRunner)
+testRunner.dumpAsText();
+
+This document was
+not printed
+
+var mediaQueryList = window.matchMedia("print");
+mediaQueryList.addListener((e) => {
+if (e.matches)
+test.innerHTML = "printed";
+});
+
+if (window.internals)
+window.internals.setPrinting(500,500);
+


Modified: branches/safari-603-branch/Source/WebCore/ChangeLog (217319 => 217320)

--- branches/safari-603-branch/Source/WebCore/ChangeLog	2017-05-24 05:39:22 UTC (rev 217319)
+++ branches/safari-603-branch/Source/WebCore/ChangeLog	2017-05-24 05:58:15 UTC (rev 217320)
@@ -1,3 +1,31 @@
+2017-05-23  Jason Marcell  
+
+Cherry-pick r217197. rdar://problem/32355285
+
+2017-05-21  Antti Koivisto  
+
+matchMedia('print').addListener() fires in WK1 but never in WK2 when printing (breaks printing Google maps, QuickLooks)
+https://bugs.webkit.org/show_bug.cgi?id=172361
+
+
+Reviewed by Sam Weinig.
+
+Test: fast/media/matchMedia-print.html
+
+* page/FrameView.cpp:
+(WebCore::FrameView::layout):
+
+Evaluate matchMedia queries unconditionally. No idea why it wasn't like that.
+
+* testing/Internals.cpp:
+(WebCore::Internals::setPrinting):
+
+Add testing support. The existing ways to do printing testing were unable to hit this bug as
+they had too much additional gunk.
+
+* testing/Internals.h:
+* testing/Internals.idl:
+
 2017-05-22  Jason Marcell  
 
 Cherry-pick r216992. rdar://problem/32258716


Modified: branches/safari-603-branch/Source/WebCore/page/FrameView.cpp (217319 => 217320)

--- branches/safari-603-branch/Source/WebCore/page/FrameView.cpp	2017-05-24 05:39:22 UTC (rev 217319)
+++ branches/safari-603-branch/Source/WebCore/page/FrameView.cpp	2017-05-24 05:58:15 UTC (rev 217320)
@@ -1360,8 +1360,9 @@
 document.styleScope().didChangeStyleSheetEnvironment();
 // FIXME: This instrumentation event is not strictly accurate since cached media query results do not persist across StyleResolver rebuilds.
 InspectorInstrumentation::mediaQueryResultChanged(document);
-} else
-document.evaluateMediaQueryList();
+}
+
+document.evaluateMediaQueryList();
 
 // If there is any pagination to apply, it will affect the RenderView's style, so we should
 // take care of that now.


Modified: 

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

[eric . carlson]

Title: [217319] trunk/Source/WebCore








Revision 217319
Author eric.carl...@apple.com
Date 2017-05-23 22:39:22 -0700 (Tue, 23 May 2017)


Log Message
CoreAudioCaptureSource is ducking system sound
https://bugs.webkit.org/show_bug.cgi?id=172512

Reviewed by Youenn Fablet.

Manual testing.

* platform/mediastream/mac/CoreAudioCaptureSource.cpp:
(WebCore::CoreAudioSharedUnit::setupAudioUnit):
(WebCore::CoreAudioSharedUnit::defaultOutputDevice):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/mediastream/mac/CoreAudioCaptureSource.cpp




Diff

Modified: trunk/Source/WebCore/ChangeLog (217318 => 217319)

--- trunk/Source/WebCore/ChangeLog	2017-05-24 03:42:41 UTC (rev 217318)
+++ trunk/Source/WebCore/ChangeLog	2017-05-24 05:39:22 UTC (rev 217319)
@@ -1,3 +1,16 @@
+2017-05-23  Eric Carlson  
+
+CoreAudioCaptureSource is ducking system sound
+https://bugs.webkit.org/show_bug.cgi?id=172512
+
+Reviewed by Youenn Fablet.
+
+Manual testing.
+
+* platform/mediastream/mac/CoreAudioCaptureSource.cpp:
+(WebCore::CoreAudioSharedUnit::setupAudioUnit):
+(WebCore::CoreAudioSharedUnit::defaultOutputDevice):
+
 2017-05-23  Said Abou-Hallawa  
 
 [iOS] Speculative fix for a PLT regression


Modified: trunk/Source/WebCore/platform/mediastream/mac/CoreAudioCaptureSource.cpp (217318 => 217319)

--- trunk/Source/WebCore/platform/mediastream/mac/CoreAudioCaptureSource.cpp	2017-05-24 03:42:41 UTC (rev 217318)
+++ trunk/Source/WebCore/platform/mediastream/mac/CoreAudioCaptureSource.cpp	2017-05-24 05:39:22 UTC (rev 217319)
@@ -47,6 +47,12 @@
 #include 
 #include "CoreMediaSoftLink.h"
 
+extern "C" {
+typedef UInt32 AudioObjectID;
+typedef AudioObjectID AudioDeviceID;
+extern OSStatus AudioDeviceDuck(AudioDeviceID inDevice, Float32 inDuckedLevel, const AudioTimeStamp* inStartTime, Float32 inRampDuration);
+}
+
 namespace WebCore {
 
 class CoreAudioCaptureSourceFactory : public RealtimeMediaSource::AudioCaptureFactory
@@ -126,7 +132,9 @@
 enum QueueAction { Add, Remove };
 Vector> m_pendingSources;
 
+#if PLATFORM(MAC)
 uint32_t m_captureDeviceID { 0 };
+#endif
 
 CAAudioStreamDescription m_microphoneProcFormat;
 RefPtr m_microphoneSampleBuffer;
@@ -143,7 +151,6 @@
 Lock m_pendingSourceQueueLock;
 Lock m_internalStateLock;
 
-int32_t m_suspendCount { 0 };
 int32_t m_producingCount { 0 };
 
 mutable std::unique_ptr m_capabilities;
@@ -293,6 +300,10 @@
 }
 m_ioUnitInitialized = true;
 
+uint32_t outputDevice;
+if (!defaultOutputDevice())
+AudioDeviceDuck(outputDevice, 1.0, nullptr, 0);
+
 return err;
 }
 
@@ -611,6 +622,22 @@
 return err;
 }
 
+OSStatus CoreAudioSharedUnit::defaultOutputDevice(uint32_t* deviceID)
+{
+OSErr err = -1;
+#if PLATFORM(MAC)
+AudioObjectPropertyAddress address = { kAudioHardwarePropertyDefaultOutputDevice, kAudioObjectPropertyScopeGlobal, kAudioObjectPropertyElementMaster };
+
+if (AudioObjectHasProperty(kAudioObjectSystemObject, )) {
+UInt32 propertySize = sizeof(AudioDeviceID);
+err = AudioObjectGetPropertyData(kAudioObjectSystemObject, , 0, nullptr, , deviceID);
+}
+#else
+UNUSED_PARAM(deviceID);
+#endif
+return err;
+}
+
 CaptureSourceOrError CoreAudioCaptureSource::create(const String& deviceID, const MediaConstraints* constraints)
 {
 String label;






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

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

[wilander]

Title: [217318] trunk/Source/WebKit2








Revision 217318
Author wilan...@apple.com
Date 2017-05-23 20:42:41 -0700 (Tue, 23 May 2017)


Log Message
Resource Load Statistics: Don't include HSTS cache data in website data removal
https://bugs.webkit.org/show_bug.cgi?id=172525


Reviewed by Brent Fulgham.

* UIProcess/WebResourceLoadStatisticsStore.cpp:
(WebKit::initializeDataTypesToRemove):

Modified Paths

trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/WebResourceLoadStatisticsStore.cpp




Diff

Modified: trunk/Source/WebKit2/ChangeLog (217317 => 217318)

--- trunk/Source/WebKit2/ChangeLog	2017-05-24 01:09:18 UTC (rev 217317)
+++ trunk/Source/WebKit2/ChangeLog	2017-05-24 03:42:41 UTC (rev 217318)
@@ -1,3 +1,14 @@
+2017-05-23  John Wilander  
+
+Resource Load Statistics: Don't include HSTS cache data in website data removal
+https://bugs.webkit.org/show_bug.cgi?id=172525
+
+
+Reviewed by Brent Fulgham.
+
+* UIProcess/WebResourceLoadStatisticsStore.cpp:
+(WebKit::initializeDataTypesToRemove):
+
 2017-05-15  Matt Rajca  
 
 Replace autoplay events that fire at navigation with a DidAutoplayMediaPastThreshold event.


Modified: trunk/Source/WebKit2/UIProcess/WebResourceLoadStatisticsStore.cpp (217317 => 217318)

--- trunk/Source/WebKit2/UIProcess/WebResourceLoadStatisticsStore.cpp	2017-05-24 01:09:18 UTC (rev 217317)
+++ trunk/Source/WebKit2/UIProcess/WebResourceLoadStatisticsStore.cpp	2017-05-24 03:42:41 UTC (rev 217318)
@@ -91,7 +91,6 @@
 dataTypesToRemove |= WebsiteDataType::WebSQLDatabases;
 dataTypesToRemove |= WebsiteDataType::IndexedDBDatabases;
 dataTypesToRemove |= WebsiteDataType::MediaKeys;
-dataTypesToRemove |= WebsiteDataType::HSTSCache;
 dataTypesToRemove |= WebsiteDataType::SearchFieldRecentSearches;
 #if ENABLE(NETSCAPE_PLUGIN_API)
 dataTypesToRemove |= WebsiteDataType::PlugInData;






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

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

[mattbaker]

Title: [217317] trunk/Source/WebInspectorUI








Revision 217317
Author mattba...@apple.com
Date 2017-05-23 18:09:18 -0700 (Tue, 23 May 2017)


Log Message
Web Inspector: content views are not restored on reload if its tree element is filtered out
https://bugs.webkit.org/show_bug.cgi?id=165744


Reviewed by Devin Rousso.

By default, NavigationSidebar should get the selected represented object
from its content browser, instead of relying on the tree selection. This
allows a filtered tree selection to persist across page loads.

* UserInterface/Views/NavigationSidebarPanel.js:
(WebInspector.NavigationSidebarPanel.prototype.get currentRepresentedObject):
(WebInspector.NavigationSidebarPanel.prototype.saveStateToCookie):
Get the represented object from the content browser instead of relying
on the tree selection (which can be filtered out).

(WebInspector.NavigationSidebarPanel.prototype._updateFilter):
(WebInspector.NavigationSidebarPanel.prototype._treeElementAddedOrChanged):
(WebInspector.NavigationSidebarPanel.prototype._treeElementWasFiltered):
Reselect the represented object's tree element when it is shown due
to a change in the filter state.

(WebInspector.NavigationSidebarPanel.prototype.get hasSelectedElement): Deleted.
Not used.
(WebInspector.NavigationSidebarPanel.prototype.representedObjectWasFiltered): Deleted.
Not used. Replaced by _treeElementWasFiltered.

Modified Paths

trunk/Source/WebInspectorUI/ChangeLog
trunk/Source/WebInspectorUI/UserInterface/Views/NavigationSidebarPanel.js




Diff

Modified: trunk/Source/WebInspectorUI/ChangeLog (217316 => 217317)

--- trunk/Source/WebInspectorUI/ChangeLog	2017-05-24 01:06:25 UTC (rev 217316)
+++ trunk/Source/WebInspectorUI/ChangeLog	2017-05-24 01:09:18 UTC (rev 217317)
@@ -1,5 +1,34 @@
 2017-05-23  Matt Baker  
 
+Web Inspector: content views are not restored on reload if its tree element is filtered out
+https://bugs.webkit.org/show_bug.cgi?id=165744
+
+
+Reviewed by Devin Rousso.
+
+By default, NavigationSidebar should get the selected represented object
+from its content browser, instead of relying on the tree selection. This
+allows a filtered tree selection to persist across page loads.
+
+* UserInterface/Views/NavigationSidebarPanel.js:
+(WebInspector.NavigationSidebarPanel.prototype.get currentRepresentedObject):
+(WebInspector.NavigationSidebarPanel.prototype.saveStateToCookie):
+Get the represented object from the content browser instead of relying
+on the tree selection (which can be filtered out).
+
+(WebInspector.NavigationSidebarPanel.prototype._updateFilter):
+(WebInspector.NavigationSidebarPanel.prototype._treeElementAddedOrChanged):
+(WebInspector.NavigationSidebarPanel.prototype._treeElementWasFiltered):
+Reselect the represented object's tree element when it is shown due
+to a change in the filter state.
+
+(WebInspector.NavigationSidebarPanel.prototype.get hasSelectedElement): Deleted.
+Not used.
+(WebInspector.NavigationSidebarPanel.prototype.representedObjectWasFiltered): Deleted.
+Not used. Replaced by _treeElementWasFiltered.
+
+2017-05-23  Matt Baker  
+
 Web Inspector: Cannot delete a disabled XHR breakpoint
 https://bugs.webkit.org/show_bug.cgi?id=171971
 


Modified: trunk/Source/WebInspectorUI/UserInterface/Views/NavigationSidebarPanel.js (217316 => 217317)

--- trunk/Source/WebInspectorUI/UserInterface/Views/NavigationSidebarPanel.js	2017-05-24 01:06:25 UTC (rev 217316)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/NavigationSidebarPanel.js	2017-05-24 01:09:18 UTC (rev 217317)
@@ -100,9 +100,12 @@
 return this._contentTreeOutlineGroup.items;
 }
 
-get hasSelectedElement()
+get currentRepresentedObject()
 {
-return !!this._contentTreeOutlineGroup.selectedTreeElement
+if (!this._contentBrowser)
+return null;
+
+return this._contentBrowser.currentRepresentedObjects[0] || null;
 }
 
 get filterBar()
@@ -204,26 +207,21 @@
 {
 console.assert(cookie);
 
-// This does not save folder selections, which lack a represented object and content view.
-var selectedTreeElement = null;
-this.contentTreeOutlines.forEach(function(outline) {
-if (outline.selectedTreeElement)
-selectedTreeElement = outline.selectedTreeElement;
-});
-
-if (!selectedTreeElement)
+if (!this._contentBrowser)
 return;
 
-if (this._isTreeElementWithoutRepresentedObject(selectedTreeElement))
+let representedObject = this.currentRepresentedObject;
+if (!representedObject)
 return;
 
-var representedObject = selectedTreeElement.representedObject;
 cookie[WebInspector.TypeIdentifierCookieKey] = 

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

[said]

Title: [217316] trunk/Source/WebCore








Revision 217316
Author s...@apple.com
Date 2017-05-23 18:06:25 -0700 (Tue, 23 May 2017)


Log Message
[iOS] Speculative fix for a PLT regression


Unreviewed.

Make sure CGImageSourceGetTypeWithData() is called with a buffer which is
32 bytes or more.

* platform/graphics/cg/ImageDecoderCG.cpp:
(WebCore::ImageDecoder::ImageDecoder):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/graphics/cg/ImageDecoderCG.cpp




Diff

Modified: trunk/Source/WebCore/ChangeLog (217315 => 217316)

--- trunk/Source/WebCore/ChangeLog	2017-05-24 00:33:23 UTC (rev 217315)
+++ trunk/Source/WebCore/ChangeLog	2017-05-24 01:06:25 UTC (rev 217316)
@@ -1,3 +1,16 @@
+2017-05-23  Said Abou-Hallawa  
+
+[iOS] Speculative fix for a PLT regression
+
+
+Unreviewed.
+
+Make sure CGImageSourceGetTypeWithData() is called with a buffer which is
+32 bytes or more.
+
+* platform/graphics/cg/ImageDecoderCG.cpp:
+(WebCore::ImageDecoder::ImageDecoder):
+
 2017-05-22  Jiewen Tan  
 
 [WebCrypto] Support RSA-PSS


Modified: trunk/Source/WebCore/platform/graphics/cg/ImageDecoderCG.cpp (217315 => 217316)

--- trunk/Source/WebCore/platform/graphics/cg/ImageDecoderCG.cpp	2017-05-24 00:33:23 UTC (rev 217315)
+++ trunk/Source/WebCore/platform/graphics/cg/ImageDecoderCG.cpp	2017-05-24 01:06:25 UTC (rev 217316)
@@ -150,7 +150,9 @@
 
 ImageDecoder::ImageDecoder(SharedBuffer& data, AlphaOption, GammaAndColorProfileOption)
 {
-RetainPtr utiHint = adoptCF(CGImageSourceGetTypeWithData(data.createCFData().get(), nullptr, nullptr));
+RetainPtr utiHint;
+if (data.size() >= 32)
+utiHint = adoptCF(CGImageSourceGetTypeWithData(data.createCFData().get(), nullptr, nullptr));
 
 if (utiHint) {
 const void* key = kCGImageSourceTypeIdentifierHint;






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

[webkit-changes] [217314] trunk

[sbarati]

Title: [217314] trunk








Revision 217314
Author sbar...@apple.com
Date 2017-05-23 17:32:12 -0700 (Tue, 23 May 2017)


Log Message
We should not mmap zero bytes for a memory in Wasm
https://bugs.webkit.org/show_bug.cgi?id=172528


Reviewed by Mark Lam.

JSTests:

* wasm/js-api/dont-mmap-zero-byte-memory.js: Added.
(testMems):

Source/_javascript_Core:

This patch fixes a bug where we would call into mmap with zero bytes
when creating a slow WasmMemory with zero initial page size. This fix
is simple: if we don't have any initial bytes, we just call the constructor
in WasmMemory that's meant to handle this case.

* wasm/WasmMemory.cpp:
(JSC::Wasm::Memory::create):

Modified Paths

trunk/JSTests/ChangeLog
trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/wasm/WasmMemory.cpp


Added Paths

trunk/JSTests/wasm/js-api/dont-mmap-zero-byte-memory.js




Diff

Modified: trunk/JSTests/ChangeLog (217313 => 217314)

--- trunk/JSTests/ChangeLog	2017-05-24 00:31:35 UTC (rev 217313)
+++ trunk/JSTests/ChangeLog	2017-05-24 00:32:12 UTC (rev 217314)
@@ -1,5 +1,16 @@
 2017-05-23  Saam Barati  
 
+We should not mmap zero bytes for a memory in Wasm
+https://bugs.webkit.org/show_bug.cgi?id=172528
+
+
+Reviewed by Mark Lam.
+
+* wasm/js-api/dont-mmap-zero-byte-memory.js: Added.
+(testMems):
+
+2017-05-23  Saam Barati  
+
 CFGSimplificationPhase should not merge a block with itself
 https://bugs.webkit.org/show_bug.cgi?id=172508
 


Added: trunk/JSTests/wasm/js-api/dont-mmap-zero-byte-memory.js (0 => 217314)

--- trunk/JSTests/wasm/js-api/dont-mmap-zero-byte-memory.js	(rev 0)
+++ trunk/JSTests/wasm/js-api/dont-mmap-zero-byte-memory.js	2017-05-24 00:32:12 UTC (rev 217314)
@@ -0,0 +1,54 @@
+import Builder from '../Builder.js';
+import * as assert from '../assert.js';
+
+let mems = [];
+function makeMem(initial) {
+const desc = {initial};
+mems.push([desc, new WebAssembly.Memory(desc)]);
+}
+for (let i = 0; i < 100; ++i) {
+makeMem(1);
+}
+
+// This loop should not OOM! This tests a bug where we
+// would call mmap with zero bytes if we ran out of
+// fast memories but created a slow memory with zero
+// initial page count.
+for (let i = 0; i < 100; ++i) {
+makeMem(0);
+}
+
+function testMems() {
+for (const [memDesc, mem] of mems) {
+const builder = (new Builder())
+.Type().End()
+.Import()
+.Memory("imp", "memory", memDesc)
+.End()
+.Function().End()
+.Export()
+.Function("foo")
+.End()
+.Code()
+.Function("foo", { params: [], ret: "i32" })
+.I32Const(0)
+.I32Load8U(2, 0)
+.Return()
+.End()
+.End();
+const bin = builder.WebAssembly().get();
+const module = new WebAssembly.Module(bin);
+const instance = new WebAssembly.Instance(module, {imp: {memory: mem}});
+if (mem.buffer.byteLength > 0)
+assert.eq(instance.exports.foo(), 0);
+else
+assert.throws(() => instance.exports.foo(), WebAssembly.RuntimeError, "Out of bounds memory access");
+}
+}
+
+testMems();
+
+for (const [_, mem] of mems)
+mem.grow(1);
+
+testMems();


Modified: trunk/Source/_javascript_Core/ChangeLog (217313 => 217314)

--- trunk/Source/_javascript_Core/ChangeLog	2017-05-24 00:31:35 UTC (rev 217313)
+++ trunk/Source/_javascript_Core/ChangeLog	2017-05-24 00:32:12 UTC (rev 217314)
@@ -1,3 +1,19 @@
+2017-05-23  Saam Barati  
+
+We should not mmap zero bytes for a memory in Wasm
+https://bugs.webkit.org/show_bug.cgi?id=172528
+
+
+Reviewed by Mark Lam.
+
+This patch fixes a bug where we would call into mmap with zero bytes
+when creating a slow WasmMemory with zero initial page size. This fix
+is simple: if we don't have any initial bytes, we just call the constructor
+in WasmMemory that's meant to handle this case.
+
+* wasm/WasmMemory.cpp:
+(JSC::Wasm::Memory::create):
+
 2017-05-23  Brian Burg  
 
 REGRESSION(r217051): Automation sessions fail to complete bootstrap


Modified: trunk/Source/_javascript_Core/wasm/WasmMemory.cpp (217313 => 217314)

--- trunk/Source/_javascript_Core/wasm/WasmMemory.cpp	2017-05-24 00:31:35 UTC (rev 217313)
+++ trunk/Source/_javascript_Core/wasm/WasmMemory.cpp	2017-05-24 00:32:12 UTC (rev 217314)
@@ -413,6 +413,8 @@
 
 // We're stuck with a slow memory which may be slower or impossible to grow.
 if (!memory) {
+if (!initialBytes)
+return adoptRef(new Memory(initial, maximum));
 memory = tryGetSlowMemory(initialBytes);
 if (memory) {
 mappedCapacityBytes = initialBytes;

[webkit-changes] [217313] branches/safari-604.1.21-branch/Source

[jmarcell]

Title: [217313] branches/safari-604.1.21-branch/Source








Revision 217313
Author jmarc...@apple.com
Date 2017-05-23 17:31:35 -0700 (Tue, 23 May 2017)


Log Message
Versioning.

Modified Paths

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




Diff

Modified: branches/safari-604.1.21-branch/Source/_javascript_Core/Configurations/Version.xcconfig (217312 => 217313)

--- branches/safari-604.1.21-branch/Source/_javascript_Core/Configurations/Version.xcconfig	2017-05-24 00:27:24 UTC (rev 217312)
+++ branches/safari-604.1.21-branch/Source/_javascript_Core/Configurations/Version.xcconfig	2017-05-24 00:31:35 UTC (rev 217313)
@@ -24,7 +24,7 @@
 MAJOR_VERSION = 604;
 MINOR_VERSION = 1;
 TINY_VERSION = 21;
-MICRO_VERSION = 8;
+MICRO_VERSION = 9;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION);
 


Modified: branches/safari-604.1.21-branch/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig (217312 => 217313)

--- branches/safari-604.1.21-branch/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig	2017-05-24 00:27:24 UTC (rev 217312)
+++ branches/safari-604.1.21-branch/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig	2017-05-24 00:31:35 UTC (rev 217313)
@@ -24,7 +24,7 @@
 MAJOR_VERSION = 604;
 MINOR_VERSION = 1;
 TINY_VERSION = 21;
-MICRO_VERSION = 8;
+MICRO_VERSION = 9;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION);
 


Modified: branches/safari-604.1.21-branch/Source/WebCore/Configurations/Version.xcconfig (217312 => 217313)

--- branches/safari-604.1.21-branch/Source/WebCore/Configurations/Version.xcconfig	2017-05-24 00:27:24 UTC (rev 217312)
+++ branches/safari-604.1.21-branch/Source/WebCore/Configurations/Version.xcconfig	2017-05-24 00:31:35 UTC (rev 217313)
@@ -24,7 +24,7 @@
 MAJOR_VERSION = 604;
 MINOR_VERSION = 1;
 TINY_VERSION = 21;
-MICRO_VERSION = 8;
+MICRO_VERSION = 9;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION);
 


Modified: branches/safari-604.1.21-branch/Source/WebCore/PAL/Configurations/Version.xcconfig (217312 => 217313)

--- branches/safari-604.1.21-branch/Source/WebCore/PAL/Configurations/Version.xcconfig	2017-05-24 00:27:24 UTC (rev 217312)
+++ branches/safari-604.1.21-branch/Source/WebCore/PAL/Configurations/Version.xcconfig	2017-05-24 00:31:35 UTC (rev 217313)
@@ -24,7 +24,7 @@
 MAJOR_VERSION = 604;
 MINOR_VERSION = 1;
 TINY_VERSION = 21;
-MICRO_VERSION = 8;
+MICRO_VERSION = 9;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION);
 


Modified: branches/safari-604.1.21-branch/Source/WebInspectorUI/Configurations/Version.xcconfig (217312 => 217313)

--- branches/safari-604.1.21-branch/Source/WebInspectorUI/Configurations/Version.xcconfig	2017-05-24 00:27:24 UTC (rev 217312)
+++ branches/safari-604.1.21-branch/Source/WebInspectorUI/Configurations/Version.xcconfig	2017-05-24 00:31:35 UTC (rev 217313)
@@ -1,7 +1,7 @@
 MAJOR_VERSION = 604;
 MINOR_VERSION = 1;
 TINY_VERSION = 21;
-MICRO_VERSION = 8;
+MICRO_VERSION = 9;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION);
 


Modified: branches/safari-604.1.21-branch/Source/WebKit/mac/Configurations/Version.xcconfig (217312 => 217313)

--- branches/safari-604.1.21-branch/Source/WebKit/mac/Configurations/Version.xcconfig	2017-05-24 00:27:24 UTC (rev 217312)
+++ branches/safari-604.1.21-branch/Source/WebKit/mac/Configurations/Version.xcconfig	2017-05-24 00:31:35 UTC (rev 217313)
@@ -24,7 +24,7 @@
 MAJOR_VERSION = 604;
 MINOR_VERSION = 1;
 TINY_VERSION = 21;
-MICRO_VERSION = 8;
+MICRO_VERSION = 9;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION);
 


Modified: branches/safari-604.1.21-branch/Source/WebKit2/Configurations/Version.xcconfig (217312 => 217313)

--- branches/safari-604.1.21-branch/Source/WebKit2/Configurations/Version.xcconfig	2017-05-24 00:27:24 UTC (rev 217312)
+++ branches/safari-604.1.21-branch/Source/WebKit2/Configurations/Version.xcconfig	2017-05-24 00:31:35 UTC (rev 217313)
@@ -24,7 +24,7 @@
 MAJOR_VERSION = 604;
 MINOR_VERSION = 1;
 TINY_VERSION = 21;
-MICRO_VERSION = 8;
+MICRO_VERSION = 9;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION);
 






___

[webkit-changes] [217312] trunk/LayoutTests

[cdumez]

Title: [217312] trunk/LayoutTests








Revision 217312
Author cdu...@apple.com
Date 2017-05-23 17:27:24 -0700 (Tue, 23 May 2017)


Log Message
Some async tests ignore jsTestIsAsync when ported from js-test-pre.js / js-test-post.js to js-test.js
https://bugs.webkit.org/show_bug.cgi?id=172523

Reviewed by Ryosuke Niwa.

* TestExpectations:
This test used to be flaky because jsTestIsAsync was ignored. It now consistently times out.

* fast/dom/script-charset-update.html:
Port test to js-test.js instead of js-test-pre.js / js-test-post.js now that it works.

* fast/mediacapturefromelement/CanvasCaptureMediaStream-webgl-events-expected.txt:
Rebaseline test now that it actually runs to the end.

* platform/ios-wk2/TestExpectations:
* platform/mac-wk2/TestExpectations:
Remove expectation for a test that is now skipped in root TestExpectations file.

* resources/js-test.js:
Call testRunner.waitUntilDone() in the DOMContentLoader event listener if jsTestIsAsync is already
set then, instead of waiting for the load event listener to do so. This is needed because some
tests may decide to complete *before* the load event has fired, such as the test updated in this
patch. We still need to call testRunner.waitUntilDone() in the load event listener as well because
some tests only set jsTestIsAsync in a load event handler.

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/LayoutTests/TestExpectations
trunk/LayoutTests/fast/dom/script-charset-update.html
trunk/LayoutTests/fast/mediacapturefromelement/CanvasCaptureMediaStream-webgl-events-expected.txt
trunk/LayoutTests/platform/ios-wk2/TestExpectations
trunk/LayoutTests/platform/mac-wk2/TestExpectations
trunk/LayoutTests/resources/js-test.js




Diff

Modified: trunk/LayoutTests/ChangeLog (217311 => 217312)

--- trunk/LayoutTests/ChangeLog	2017-05-24 00:07:21 UTC (rev 217311)
+++ trunk/LayoutTests/ChangeLog	2017-05-24 00:27:24 UTC (rev 217312)
@@ -1,3 +1,30 @@
+2017-05-23  Chris Dumez  
+
+Some async tests ignore jsTestIsAsync when ported from js-test-pre.js / js-test-post.js to js-test.js
+https://bugs.webkit.org/show_bug.cgi?id=172523
+
+Reviewed by Ryosuke Niwa.
+
+* TestExpectations:
+This test used to be flaky because jsTestIsAsync was ignored. It now consistently times out.
+
+* fast/dom/script-charset-update.html:
+Port test to js-test.js instead of js-test-pre.js / js-test-post.js now that it works.
+
+* fast/mediacapturefromelement/CanvasCaptureMediaStream-webgl-events-expected.txt:
+Rebaseline test now that it actually runs to the end.
+
+* platform/ios-wk2/TestExpectations:
+* platform/mac-wk2/TestExpectations:
+Remove expectation for a test that is now skipped in root TestExpectations file.
+
+* resources/js-test.js:
+Call testRunner.waitUntilDone() in the DOMContentLoader event listener if jsTestIsAsync is already
+set then, instead of waiting for the load event listener to do so. This is needed because some
+tests may decide to complete *before* the load event has fired, such as the test updated in this
+patch. We still need to call testRunner.waitUntilDone() in the load event listener as well because
+some tests only set jsTestIsAsync in a load event handler.
+
 2017-05-23  Ryan Haddad  
 
 Rebaseline tests for iOS simulator.


Modified: trunk/LayoutTests/TestExpectations (217311 => 217312)

--- trunk/LayoutTests/TestExpectations	2017-05-24 00:07:21 UTC (rev 217311)
+++ trunk/LayoutTests/TestExpectations	2017-05-24 00:27:24 UTC (rev 217312)
@@ -140,6 +140,9 @@
 # The test frequently times out, and is just unsuccessful at detecting incorrect behavior when it passes.
 webkit.org/b/72698 media/audio-garbage-collect.html [ Skip ]
 
+# This test times out.
+webkit.org/b/172527 fast/mediacapturefromelement/CanvasCaptureMediaStream-request-frame-events.html [ Skip ]
+
 webkit.org/b/53990 fast/forms/search-event-delay.html [ Pass Failure ]
 
 webkit.org/b/126142 css3/calc/transitions-dependent.html [ Pass Failure ]


Modified: trunk/LayoutTests/fast/dom/script-charset-update.html (217311 => 217312)

--- trunk/LayoutTests/fast/dom/script-charset-update.html	2017-05-24 00:07:21 UTC (rev 217311)
+++ trunk/LayoutTests/fast/dom/script-charset-update.html	2017-05-24 00:27:24 UTC (rev 217312)
@@ -2,7 +2,7 @@
 
 
 
-+