[webkit-changes] [188914] releases/WebKitGTK/webkit-2.10/Source
Title: [188914] releases/WebKitGTK/webkit-2.10/Source Revision 188914 Author carlo...@webkit.org Date 2015-08-25 10:35:41 -0700 (Tue, 25 Aug 2015) Log Message Merge r188677 - Remove WTF::SpinLock https://bugs.webkit.org/show_bug.cgi?id=148208 Reviewed by Geoffrey Garen. Source/_javascript_Core: Remove the one remaining use of SpinLock. * API/JSValue.mm: (handerForStructTag): Source/WTF: Remove the SpinLock.h file and remove references to the SpinLock class. Put the old SpinLock algorithm in LockSpeedTest.cpp - which isn't compiled as part of a WTF or WebKit build - just so we can still benchmark our locking algorithms against a spinlock baseline. * WTF.vcxproj/WTF.vcxproj: * WTF.xcodeproj/project.pbxproj: * benchmarks/LockSpeedTest.cpp: * wtf/CMakeLists.txt: * wtf/Lock.h: * wtf/SpinLock.h: Removed. * wtf/WordLock.h: Modified Paths releases/WebKitGTK/webkit-2.10/Source/_javascript_Core/API/JSValue.mm releases/WebKitGTK/webkit-2.10/Source/_javascript_Core/ChangeLog releases/WebKitGTK/webkit-2.10/Source/WTF/ChangeLog releases/WebKitGTK/webkit-2.10/Source/WTF/WTF.vcxproj/WTF.vcxproj releases/WebKitGTK/webkit-2.10/Source/WTF/benchmarks/LockSpeedTest.cpp releases/WebKitGTK/webkit-2.10/Source/WTF/wtf/CMakeLists.txt releases/WebKitGTK/webkit-2.10/Source/WTF/wtf/Lock.h releases/WebKitGTK/webkit-2.10/Source/WTF/wtf/WordLock.h Removed Paths releases/WebKitGTK/webkit-2.10/Source/WTF/wtf/SpinLock.h Diff Modified: releases/WebKitGTK/webkit-2.10/Source/_javascript_Core/API/JSValue.mm (188913 => 188914) --- releases/WebKitGTK/webkit-2.10/Source/_javascript_Core/API/JSValue.mm 2015-08-25 17:04:47 UTC (rev 188913) +++ releases/WebKitGTK/webkit-2.10/Source/_javascript_Core/API/JSValue.mm 2015-08-25 17:35:41 UTC (rev 188914) @@ -41,8 +41,8 @@ #import StrongInlines.h #import wtf/HashMap.h #import wtf/HashSet.h +#import wtf/Lock.h #import wtf/ObjcRuntimeExtras.h -#import wtf/SpinLock.h #import wtf/Vector.h #import wtf/text/WTFString.h #import wtf/text/StringHash.h @@ -1114,8 +1114,8 @@ static StructTagHandler* handerForStructTag(const char* encodedType) { -static StaticSpinLock handerForStructTagLock; -SpinLockHolder lockHolder(handerForStructTagLock); +static StaticLock handerForStructTagLock; +LockHolder lockHolder(handerForStructTagLock); static StructHandlers* structHandlers = createStructHandlerMap(); Modified: releases/WebKitGTK/webkit-2.10/Source/_javascript_Core/ChangeLog (188913 => 188914) --- releases/WebKitGTK/webkit-2.10/Source/_javascript_Core/ChangeLog 2015-08-25 17:04:47 UTC (rev 188913) +++ releases/WebKitGTK/webkit-2.10/Source/_javascript_Core/ChangeLog 2015-08-25 17:35:41 UTC (rev 188914) @@ -1,3 +1,15 @@ +2015-08-19 Filip Pizlo fpi...@apple.com + +Remove WTF::SpinLock +https://bugs.webkit.org/show_bug.cgi?id=148208 + +Reviewed by Geoffrey Garen. + +Remove the one remaining use of SpinLock. + +* API/JSValue.mm: +(handerForStructTag): + 2015-08-18 Filip Pizlo fpi...@apple.com Replace all uses of std::mutex/std::condition_variable with WTF::Lock/WTF::Condition Modified: releases/WebKitGTK/webkit-2.10/Source/WTF/ChangeLog (188913 => 188914) --- releases/WebKitGTK/webkit-2.10/Source/WTF/ChangeLog 2015-08-25 17:04:47 UTC (rev 188913) +++ releases/WebKitGTK/webkit-2.10/Source/WTF/ChangeLog 2015-08-25 17:35:41 UTC (rev 188914) @@ -1,3 +1,22 @@ +2015-08-19 Filip Pizlo fpi...@apple.com + +Remove WTF::SpinLock +https://bugs.webkit.org/show_bug.cgi?id=148208 + +Reviewed by Geoffrey Garen. + +Remove the SpinLock.h file and remove references to the SpinLock class. Put the old SpinLock +algorithm in LockSpeedTest.cpp - which isn't compiled as part of a WTF or WebKit build - just +so we can still benchmark our locking algorithms against a spinlock baseline. + +* WTF.vcxproj/WTF.vcxproj: +* WTF.xcodeproj/project.pbxproj: +* benchmarks/LockSpeedTest.cpp: +* wtf/CMakeLists.txt: +* wtf/Lock.h: +* wtf/SpinLock.h: Removed. +* wtf/WordLock.h: + 2015-08-18 Filip Pizlo fpi...@apple.com Replace all uses of std::mutex/std::condition_variable with WTF::Lock/WTF::Condition Modified: releases/WebKitGTK/webkit-2.10/Source/WTF/WTF.vcxproj/WTF.vcxproj (188913 => 188914) --- releases/WebKitGTK/webkit-2.10/Source/WTF/WTF.vcxproj/WTF.vcxproj 2015-08-25 17:04:47 UTC (rev 188913) +++ releases/WebKitGTK/webkit-2.10/Source/WTF/WTF.vcxproj/WTF.vcxproj 2015-08-25 17:35:41 UTC (rev 188914) @@ -270,7 +270,6 @@ ClInclude Include=..\wtf\SHA1.h / ClInclude Include=..\wtf\SinglyLinkedList.h / ClInclude Include=..\wtf\SixCharacterHash.h / -ClInclude Include=..\wtf\SpinLock.h / ClInclude Include=..\wtf\StackBounds.h / ClInclude Include=..\wtf\StaticConstructors.h / ClInclude Include=..\wtf\StdLibExtras.h / Modified:
[webkit-changes] [188915] releases/WebKitGTK/webkit-2.10/Tools
Title: [188915] releases/WebKitGTK/webkit-2.10/Tools Revision 188915 Author carlo...@webkit.org Date 2015-08-25 10:36:41 -0700 (Tue, 25 Aug 2015) Log Message Merge r188701 - Unreviewed, shorten a test that runs too long and times out. * TestWebKitAPI/Tests/WTF/Lock.cpp: (TestWebKitAPI::TEST): Modified Paths releases/WebKitGTK/webkit-2.10/Tools/ChangeLog releases/WebKitGTK/webkit-2.10/Tools/TestWebKitAPI/Tests/WTF/Lock.cpp Diff Modified: releases/WebKitGTK/webkit-2.10/Tools/ChangeLog (188914 => 188915) --- releases/WebKitGTK/webkit-2.10/Tools/ChangeLog 2015-08-25 17:35:41 UTC (rev 188914) +++ releases/WebKitGTK/webkit-2.10/Tools/ChangeLog 2015-08-25 17:36:41 UTC (rev 188915) @@ -1,3 +1,10 @@ +2015-08-20 Filip Pizlo fpi...@apple.com + +Unreviewed, shorten a test that runs too long and times out. + +* TestWebKitAPI/Tests/WTF/Lock.cpp: +(TestWebKitAPI::TEST): + 2015-08-18 Filip Pizlo fpi...@apple.com Unreviewed, fix GTK build. Modified: releases/WebKitGTK/webkit-2.10/Tools/TestWebKitAPI/Tests/WTF/Lock.cpp (188914 => 188915) --- releases/WebKitGTK/webkit-2.10/Tools/TestWebKitAPI/Tests/WTF/Lock.cpp 2015-08-25 17:35:41 UTC (rev 188914) +++ releases/WebKitGTK/webkit-2.10/Tools/TestWebKitAPI/Tests/WTF/Lock.cpp 2015-08-25 17:36:41 UTC (rev 188915) @@ -149,7 +149,7 @@ TEST(WTF_Lock, ManyContendedLongerSections) { -runLockTestLock(10, 10, 10, 100); +runLockTestLock(10, 10, 10, 10); } TEST(WTF_Lock, SectionAddressCollision) ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [188917] trunk
Title: [188917] trunk Revision 188917 Author cdu...@apple.com Date 2015-08-25 10:58:27 -0700 (Tue, 25 Aug 2015) Log Message compareDocumentPosition() should report PRECEDING or FOLLOWING information even if nodes are disconnected https://bugs.webkit.org/show_bug.cgi?id=119316 Reviewed by Darin Adler. Source/WebCore: As the latest DOM specification, compareDocumentPosition() should report PRECEDING or FOLLOWING information even if nodes are disconnected: - http://dom.spec.whatwg.org/#dom-node-comparedocumentposition This behavior is consistent with both IE10, Firefox and Chrome. The implementation relies on the comparison of cryptographic hashes (SHA1) of the Node pointers so that the results returned by the function are consistent. We don't compare Node pointers directly as it was done previously in r153660 to avoid leaking information about our memory model to the Web. Test: fast/dom/compare-document-position-disconnected-nodes.html W3C Test suite: http://w3c-test.org/dom/nodes/Node-compareDocumentPosition.html * dom/Node.cpp: (WebCore::hashPointer): (WebCore::compareDetachedElementsPosition): (WebCore::Node::compareDocumentPosition): LayoutTests: Update fast/dom/compare-document-position-disconnected-nodes.html to check that compareDocumentPosition() now returns one of the following values for disconnected nodes: - DOCUMENT_POSITION_DISCONNECTED | DOCUMENT_POSITION_IMPLEMENTATION_SPECIFIC | DOCUMENT_POSITION_PRECEDING - DOCUMENT_POSITION_DISCONNECTED | DOCUMENT_POSITION_IMPLEMENTATION_SPECIFIC | DOCUMENT_POSITION_FOLLOWING * TestExpectations: Several dom/xhtml/level3 are skipped and marked as WonfFix because they are outdated and no longer match the latest DOM specification. They expect compareDocumentPosition() not to return PRECEDING / FOLLOWING information for disconnected nodes. * dom/xhtml/level3/core/nodecomparedocumentposition38-expected.txt: * fast/dom/compare-document-position-disconnected-nodes-expected.txt: * fast/dom/compare-document-position-disconnected-nodes.html: * fast/dom/shadow/compare-document-position-expected.txt: * fast/dom/shadow/compare-document-position.html: Modified Paths trunk/LayoutTests/ChangeLog trunk/LayoutTests/TestExpectations trunk/LayoutTests/dom/xhtml/level3/core/nodecomparedocumentposition38-expected.txt trunk/LayoutTests/fast/dom/compare-document-position-disconnected-nodes-expected.txt trunk/LayoutTests/fast/dom/compare-document-position-disconnected-nodes.html trunk/LayoutTests/fast/dom/shadow/compare-document-position-expected.txt trunk/LayoutTests/fast/dom/shadow/compare-document-position.html trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/dom/Node.cpp Diff Modified: trunk/LayoutTests/ChangeLog (188916 => 188917) --- trunk/LayoutTests/ChangeLog 2015-08-25 17:55:07 UTC (rev 188916) +++ trunk/LayoutTests/ChangeLog 2015-08-25 17:58:27 UTC (rev 188917) @@ -1,3 +1,26 @@ +2015-08-25 Chris Dumez cdu...@apple.com + +compareDocumentPosition() should report PRECEDING or FOLLOWING information even if nodes are disconnected +https://bugs.webkit.org/show_bug.cgi?id=119316 + +Reviewed by Darin Adler. + +Update fast/dom/compare-document-position-disconnected-nodes.html to check that compareDocumentPosition() +now returns one of the following values for disconnected nodes: +- DOCUMENT_POSITION_DISCONNECTED | DOCUMENT_POSITION_IMPLEMENTATION_SPECIFIC | DOCUMENT_POSITION_PRECEDING +- DOCUMENT_POSITION_DISCONNECTED | DOCUMENT_POSITION_IMPLEMENTATION_SPECIFIC | DOCUMENT_POSITION_FOLLOWING + +* TestExpectations: +Several dom/xhtml/level3 are skipped and marked as WonfFix because they are outdated and no longer match +the latest DOM specification. They expect compareDocumentPosition() not to return PRECEDING / FOLLOWING +information for disconnected nodes. + +* dom/xhtml/level3/core/nodecomparedocumentposition38-expected.txt: +* fast/dom/compare-document-position-disconnected-nodes-expected.txt: +* fast/dom/compare-document-position-disconnected-nodes.html: +* fast/dom/shadow/compare-document-position-expected.txt: +* fast/dom/shadow/compare-document-position.html: + 2015-08-24 Nan Wang n_w...@apple.com AX: Fix accessibility/mac/search-with-frames.html test Modified: trunk/LayoutTests/TestExpectations (188916 => 188917) --- trunk/LayoutTests/TestExpectations 2015-08-25 17:55:07 UTC (rev 188916) +++ trunk/LayoutTests/TestExpectations 2015-08-25 17:58:27 UTC (rev 188917) @@ -126,6 +126,21 @@ webkit.org/b/74144 fast/regions/universal-selector-children-to-the-same-region.html [ Skip ] webkit.org/b/74144 fast/regions/region-content-flown-into-region.html [ Skip ] +# These conformace tests are no longer in sync with the latest specification +# and expect compareDocumentPosition() to return: +# DOCUMENT_POSITION_IMPLEMENTATION_SPECIFIC | DOCUMENT_POSITION_DISCONNECTED +# for disconnected nodes (missing
[webkit-changes] [188921] trunk/Source/WebCore
Title: [188921] trunk/Source/WebCore Revision 188921 Author o...@webkit.org Date 2015-08-25 11:04:10 -0700 (Tue, 25 Aug 2015) Log Message Fix the !ENABLE(CSS_REGIONS) build after r188663 https://bugs.webkit.org/show_bug.cgi?id=148425 Reviewed by Chris Dumez. * bindings/js/JSDOMNamedFlowCollectionCustom.cpp: Modified Paths trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/bindings/js/JSDOMNamedFlowCollectionCustom.cpp Diff Modified: trunk/Source/WebCore/ChangeLog (188920 => 188921) --- trunk/Source/WebCore/ChangeLog 2015-08-25 18:03:00 UTC (rev 188920) +++ trunk/Source/WebCore/ChangeLog 2015-08-25 18:04:10 UTC (rev 188921) @@ -1,3 +1,12 @@ +2015-08-25 Csaba Osztrogonác o...@webkit.org + +Fix the !ENABLE(CSS_REGIONS) build after r188663 +https://bugs.webkit.org/show_bug.cgi?id=148425 + +Reviewed by Chris Dumez. + +* bindings/js/JSDOMNamedFlowCollectionCustom.cpp: + 2015-08-24 Brent Fulgham bfulg...@apple.com Wheel events stop propagating when target element is removed from DOM Modified: trunk/Source/WebCore/bindings/js/JSDOMNamedFlowCollectionCustom.cpp (188920 => 188921) --- trunk/Source/WebCore/bindings/js/JSDOMNamedFlowCollectionCustom.cpp 2015-08-25 18:03:00 UTC (rev 188920) +++ trunk/Source/WebCore/bindings/js/JSDOMNamedFlowCollectionCustom.cpp 2015-08-25 18:04:10 UTC (rev 188921) @@ -26,6 +26,8 @@ #include config.h #include JSDOMNamedFlowCollection.h +#if ENABLE(CSS_REGIONS) + #include DOMNamedFlowCollection.h #include JSDOMBinding.h #include JSWebKitNamedFlow.h @@ -45,3 +47,5 @@ } } // namespace WebCore + +#endif // ENABLE(CSS_REGIONS) ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [188916] trunk/Source/WebInspectorUI
Title: [188916] trunk/Source/WebInspectorUI Revision 188916 Author mattba...@apple.com Date 2015-08-25 10:55:07 -0700 (Tue, 25 Aug 2015) Log Message Web Inspector: Rendering Frames pie chart should use the needsLayout/updateLayout idiom https://bugs.webkit.org/show_bug.cgi?id=148412 Reviewed by Timothy Hatcher. * UserInterface/Views/ChartDetailsSectionRow.js: (WebInspector.ChartDetailsSectionRow): (WebInspector.ChartDetailsSectionRow.prototype.set innerLabel): (WebInspector.ChartDetailsSectionRow.prototype.set innerRadius): Schedule a layout. (WebInspector.ChartDetailsSectionRow.prototype.set data): Deleted. Replaced by addItem, setItemValue, and clearItems. (WebInspector.ChartDetailsSectionRow.prototype.addItem): (WebInspector.ChartDetailsSectionRow.prototype.setItemValue): (WebInspector.ChartDetailsSectionRow.prototype.clearItems): Add/update data points and schedule a layout. (WebInspector.ChartDetailsSectionRow.prototype._needsLayout): (WebInspector.ChartDetailsSectionRow.prototype.updateLayout): Update legend and draw pie chart. (WebInspector.ChartDetailsSectionRow.prototype._createLegend): Deleted. Refactored as _updateLegend. (WebInspector.ChartDetailsSectionRow.prototype._refresh): Deleted. Refactored as updateLayout. * UserInterface/Views/TimelineSidebarPanel.js: (WebInspector.TimelineSidebarPanel): Add chart data points once. (WebInspector.TimelineSidebarPanel._refreshFrameSelectionChart): Update chart values. Modified Paths trunk/Source/WebInspectorUI/ChangeLog trunk/Source/WebInspectorUI/UserInterface/Views/ChartDetailsSectionRow.js trunk/Source/WebInspectorUI/UserInterface/Views/TimelineSidebarPanel.js Diff Modified: trunk/Source/WebInspectorUI/ChangeLog (188915 => 188916) --- trunk/Source/WebInspectorUI/ChangeLog 2015-08-25 17:36:41 UTC (rev 188915) +++ trunk/Source/WebInspectorUI/ChangeLog 2015-08-25 17:55:07 UTC (rev 188916) @@ -1,3 +1,35 @@ +2015-08-25 Matt Baker mattba...@apple.com + +Web Inspector: Rendering Frames pie chart should use the needsLayout/updateLayout idiom +https://bugs.webkit.org/show_bug.cgi?id=148412 + +Reviewed by Timothy Hatcher. + +* UserInterface/Views/ChartDetailsSectionRow.js: +(WebInspector.ChartDetailsSectionRow): +(WebInspector.ChartDetailsSectionRow.prototype.set innerLabel): +(WebInspector.ChartDetailsSectionRow.prototype.set innerRadius): +Schedule a layout. +(WebInspector.ChartDetailsSectionRow.prototype.set data): Deleted. +Replaced by addItem, setItemValue, and clearItems. +(WebInspector.ChartDetailsSectionRow.prototype.addItem): +(WebInspector.ChartDetailsSectionRow.prototype.setItemValue): +(WebInspector.ChartDetailsSectionRow.prototype.clearItems): +Add/update data points and schedule a layout. +(WebInspector.ChartDetailsSectionRow.prototype._needsLayout): +(WebInspector.ChartDetailsSectionRow.prototype.updateLayout): +Update legend and draw pie chart. +(WebInspector.ChartDetailsSectionRow.prototype._createLegend): Deleted. +Refactored as _updateLegend. +(WebInspector.ChartDetailsSectionRow.prototype._refresh): Deleted. +Refactored as updateLayout. + +* UserInterface/Views/TimelineSidebarPanel.js: +(WebInspector.TimelineSidebarPanel): +Add chart data points once. +(WebInspector.TimelineSidebarPanel._refreshFrameSelectionChart): +Update chart values. + 2015-08-24 Brian Burg bb...@apple.com Web Inspector: add protocol test for existing error handling performed by the backend Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ChartDetailsSectionRow.js (188915 => 188916) --- trunk/Source/WebInspectorUI/UserInterface/Views/ChartDetailsSectionRow.js 2015-08-25 17:36:41 UTC (rev 188915) +++ trunk/Source/WebInspectorUI/UserInterface/Views/ChartDetailsSectionRow.js 2015-08-25 17:55:07 UTC (rev 188916) @@ -48,7 +48,7 @@ chartContentElement.appendChild(this._legendElement); this._delegate = delegate; -this._items = []; +this._items = new Map; this._title = ; this._innerLabel = ; this._innerRadius = 0; @@ -83,7 +83,7 @@ this._innerLabel = label; -this._refresh(); +this._needsLayout(); } set innerRadius(radius) @@ -93,7 +93,7 @@ this._innerRadius = radius; -this._refresh(); +this._needsLayout(); } get total() @@ -101,25 +101,50 @@ return this._total; } -set data(items) +addItem(id, label, value, color, checkbox, checked) { -if (!(items instanceof Array)) -items = [items]; +console.assert(!this._items.has(id), Already added item with id: + id); +if (this._items.has(id)) +return; -items = items.filter(function(item) { return item.value = 0; }); -if (!this._items.length
[webkit-changes] [188918] trunk
Title: [188918] trunk Revision 188918 Author wenson_hs...@apple.com Date 2015-08-25 11:00:02 -0700 (Tue, 25 Aug 2015) Log Message Fix crash due to search field disappearing when showing results menu https://bugs.webkit.org/show_bug.cgi?id=148410 rdar://problem/22399850 Reviewed by Brent Fulgham. When clicking on the results button of a search field that hides upon being focused, WebKit will crash because we attempt to toggle the results menu using the search field's renderer which is null. This is addressed by adding a null check to make sure the search field has not been hidden before toggling the menu. Test: fast/forms/search/search-results-hidden-crash.html * html/shadow/TextControlInnerElements.cpp: (WebCore::SearchFieldResultsButtonElement::defaultEventHandler): Add a null check for the search field's renderer. Modified Paths trunk/LayoutTests/TestExpectations trunk/LayoutTests/platform/mac/TestExpectations trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/html/shadow/TextControlInnerElements.cpp Added Paths trunk/LayoutTests/fast/forms/search/search-results-hidden-crash-expected.txt trunk/LayoutTests/fast/forms/search/search-results-hidden-crash.html Diff Modified: trunk/LayoutTests/TestExpectations (188917 => 188918) --- trunk/LayoutTests/TestExpectations 2015-08-25 17:58:27 UTC (rev 188917) +++ trunk/LayoutTests/TestExpectations 2015-08-25 18:00:02 UTC (rev 188918) @@ -18,6 +18,7 @@ fast/scrolling/latching [ Skip ] fast/forms/search/search-padding-cancel-results-buttons.html [ Skip ] +fast/forms/search/search-results-hidden-crash.html [ Skip ] #// # End platform-specific tests. Added: trunk/LayoutTests/fast/forms/search/search-results-hidden-crash-expected.txt (0 => 188918) --- trunk/LayoutTests/fast/forms/search/search-results-hidden-crash-expected.txt (rev 0) +++ trunk/LayoutTests/fast/forms/search/search-results-hidden-crash-expected.txt 2015-08-25 18:00:02 UTC (rev 188918) @@ -0,0 +1 @@ +We did not crash! Added: trunk/LayoutTests/fast/forms/search/search-results-hidden-crash.html (0 => 188918) --- trunk/LayoutTests/fast/forms/search/search-results-hidden-crash.html (rev 0) +++ trunk/LayoutTests/fast/forms/search/search-results-hidden-crash.html 2015-08-25 18:00:02 UTC (rev 188918) @@ -0,0 +1,32 @@ +html + +head +script +function hideSearchField() { +var search = document.getElementsByTagName(input)[0]; +search.style.display = none; +} + +function setup() { +if (window.testRunner) { +testRunner.dumpAsText(); +window.eventSender.mouseMoveTo(10, 10); +window.eventSender.mouseDown(); +window.eventSender.mouseUp(); +} +} +/script + +style +body, input { +margin: 0; +} +/style +/head + +body _onload_=setup() +input _onfocus_=hideSearchField() type=search results=5/input +pWe did not crash!/p +/body + +/html Modified: trunk/LayoutTests/platform/mac/TestExpectations (188917 => 188918) --- trunk/LayoutTests/platform/mac/TestExpectations 2015-08-25 17:58:27 UTC (rev 188917) +++ trunk/LayoutTests/platform/mac/TestExpectations 2015-08-25 18:00:02 UTC (rev 188918) @@ -11,6 +11,7 @@ fast/scrolling/latching [ Pass ] fast/forms/search/search-padding-cancel-results-buttons.html [ Pass ] +fast/forms/search/search-results-hidden-crash.html [ Pass ] #// # End platform-specific directories. Modified: trunk/Source/WebCore/ChangeLog (188917 => 188918) --- trunk/Source/WebCore/ChangeLog 2015-08-25 17:58:27 UTC (rev 188917) +++ trunk/Source/WebCore/ChangeLog 2015-08-25 18:00:02 UTC (rev 188918) @@ -1,3 +1,20 @@ +2015-08-25 Wenson Hsieh wenson_hs...@apple.com + +Fix crash due to search field disappearing when showing results menu +https://bugs.webkit.org/show_bug.cgi?id=148410 +rdar://problem/22399850 + +Reviewed by Brent Fulgham. + +When clicking on the results button of a search field that hides upon being focused, WebKit will crash because we +attempt to toggle the results menu using the search field's renderer which is null. This is addressed by adding a null +check to make sure the search field has not been hidden before toggling the menu. + +Test: fast/forms/search/search-results-hidden-crash.html + +* html/shadow/TextControlInnerElements.cpp: +(WebCore::SearchFieldResultsButtonElement::defaultEventHandler): Add a null check for the search field's renderer. + 2015-08-25 Chris Dumez cdu...@apple.com compareDocumentPosition() should report PRECEDING or FOLLOWING information even if nodes are disconnected Modified: trunk/Source/WebCore/html/shadow/TextControlInnerElements.cpp (188917 => 188918) ---
[webkit-changes] [188920] trunk
Title: [188920] trunk Revision 188920 Author bfulg...@apple.com Date 2015-08-25 11:03:00 -0700 (Tue, 25 Aug 2015) Log Message Wheel events stop propagating when target element is removed from DOM https://bugs.webkit.org/show_bug.cgi?id=148384 rdar://problem/19732211 Reviewed by David Hyatt. Source/WebCore: Tested by tiled-drawing/scrolling/latched-to-deleted-node.html We need to reset our latching state if the targeted node is removed from the DOM. Add a check in 'platformPrepareForWheelEvents' that checks if the expected latching target node was already removed from the DOM. If it was, we should not send events to it, and should reset latching state so we can attach to the next relevant node. * dom/Element.cpp: (WebCore::Element::removedFrom): Remove any latched wheel event state objects that match the current element. * page/MainFrame.cpp: (WebCore::MainFrame::removeLatchingStateForTarget): Remove any latched wheel event state structures that match the passed wheel event target. * page/MainFrame.h: LayoutTests: * tiled-drawing/scrolling/latched-to-deleted-node-expected.txt: Added. * tiled-drawing/scrolling/latched-to-deleted-node.html: Added. Modified Paths trunk/LayoutTests/ChangeLog trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/dom/Element.cpp trunk/Source/WebCore/page/MainFrame.cpp trunk/Source/WebCore/page/MainFrame.h Added Paths trunk/LayoutTests/tiled-drawing/scrolling/latched-to-deleted-node-expected.txt trunk/LayoutTests/tiled-drawing/scrolling/latched-to-deleted-node.html Diff Modified: trunk/LayoutTests/ChangeLog (188919 => 188920) --- trunk/LayoutTests/ChangeLog 2015-08-25 18:01:58 UTC (rev 188919) +++ trunk/LayoutTests/ChangeLog 2015-08-25 18:03:00 UTC (rev 188920) @@ -1,3 +1,14 @@ +2015-08-24 Brent Fulgham bfulg...@apple.com + +Wheel events stop propagating when target element is removed from DOM +https://bugs.webkit.org/show_bug.cgi?id=148384 +rdar://problem/19732211 + +Reviewed by David Hyatt. + +* tiled-drawing/scrolling/latched-to-deleted-node-expected.txt: Added. +* tiled-drawing/scrolling/latched-to-deleted-node.html: Added. + 2015-08-25 Chris Dumez cdu...@apple.com compareDocumentPosition() should report PRECEDING or FOLLOWING information even if nodes are disconnected Added: trunk/LayoutTests/tiled-drawing/scrolling/latched-to-deleted-node-expected.txt (0 => 188920) --- trunk/LayoutTests/tiled-drawing/scrolling/latched-to-deleted-node-expected.txt (rev 0) +++ trunk/LayoutTests/tiled-drawing/scrolling/latched-to-deleted-node-expected.txt 2015-08-25 18:03:00 UTC (rev 188920) @@ -0,0 +1,18 @@ +Container + +After moving 40px up or down we remove the initial target element of wheel event from +the dom. In safari this causes the wheel event to stop firing on the current frame, but it +then starts firing on the parent frame. + +Tests that iframe doesn't consume wheel events when scrolling a select in an iframe. + +On success, you will see a series of PASS messages, followed by TEST COMPLETE. + + +PASS Removed the target element +PASS Page did not scroll +PASS div continued scrolling after target element was deleted. +PASS successfullyParsed is true + +TEST COMPLETE + Added: trunk/LayoutTests/tiled-drawing/scrolling/latched-to-deleted-node.html (0 => 188920) --- trunk/LayoutTests/tiled-drawing/scrolling/latched-to-deleted-node.html (rev 0) +++ trunk/LayoutTests/tiled-drawing/scrolling/latched-to-deleted-node.html 2015-08-25 18:03:00 UTC (rev 188920) @@ -0,0 +1,181 @@ +!DOCTYPE html +html +head + style + #pane { + display:inline-block; + width:200px; + height:500px; + } + #boxup { + position: absolute; + top:0px; + width:200px; + height:230px; + background-color: #000; + opacity:.4; + } + #boxdown { + position: absolute; + top:270px; + width:200px; + height:230px; + background-color: #000; + opacity:.4; + } + #objectBack { + position: absolute; + top:200px; + width:200px; + height:100px; + background-color: #6c6; + } + #targetElement { + position: absolute; + top:30px; + width:200px; + height:40px; + background-color: #c66; + } + /style +script src="" +/head +body _onload_=setupTopLevel(); +script +window.jsTestIsAsync = true; + +var pageScrollPositionBeforeGesture; +var divElement; +var divScrollPositionBeforeGesture; + +var deleteThreshhold = 40; + +function locationInWindowCoordinates(element) +{ +var position = {}; +position.x = element.offsetLeft; +position.y = element.offsetTop; + +while (element.offsetParent) { +position.x = position.x + element.offsetParent.offsetLeft; +position.y = position.y + element.offsetParent.offsetTop; +if (element == document.getElementsByTagName(body)[0]) +break; + +element = element.offsetParent; +} + +return position; +} + +document.addEventListener(DOMContentLoaded, function() { + var
[webkit-changes] [188910] releases/WebKitGTK/webkit-2.10/Source/WTF
Title: [188910] releases/WebKitGTK/webkit-2.10/Source/WTF Revision 188910 Author carlo...@webkit.org Date 2015-08-25 09:17:35 -0700 (Tue, 25 Aug 2015) Log Message Merge r188605 - WTF::Condition should have a fast path for notifyOne/notifyAll that avoids calling unparkOne/unparkAll https://bugs.webkit.org/show_bug.cgi?id=148090 Reviewed by Geoffrey Garen. This change makes notifyOne()/notifyAll() blazing fast when nobody is waiting, by using the various hooks that ParkingLot gives us to maintain a m_hasWaiters variable. When it's false, it means that any unpark operation would simply return immediately. This is a 45% speed-up for the 1-producer/1-consumer scenario with a 100-element queue when you use the notifyOne()-per-enqueue style. What's cool about this change is that you can now safely call notifyOne() (or notifyAll()) out of paranoia, just in case someone might be waiting. It's free to do so if nobody is waiting! * wtf/Condition.h: (WTF::Condition::Condition): (WTF::Condition::waitUntil): (WTF::Condition::notifyOne): (WTF::Condition::notifyAll): Modified Paths releases/WebKitGTK/webkit-2.10/Source/WTF/ChangeLog releases/WebKitGTK/webkit-2.10/Source/WTF/wtf/Condition.h Diff Modified: releases/WebKitGTK/webkit-2.10/Source/WTF/ChangeLog (188909 => 188910) --- releases/WebKitGTK/webkit-2.10/Source/WTF/ChangeLog 2015-08-25 15:50:51 UTC (rev 188909) +++ releases/WebKitGTK/webkit-2.10/Source/WTF/ChangeLog 2015-08-25 16:17:35 UTC (rev 188910) @@ -1,3 +1,25 @@ +2015-08-18 Filip Pizlo fpi...@apple.com + +WTF::Condition should have a fast path for notifyOne/notifyAll that avoids calling unparkOne/unparkAll +https://bugs.webkit.org/show_bug.cgi?id=148090 + +Reviewed by Geoffrey Garen. + +This change makes notifyOne()/notifyAll() blazing fast when nobody is waiting, by using the +various hooks that ParkingLot gives us to maintain a m_hasWaiters variable. When it's false, it +means that any unpark operation would simply return immediately. + +This is a 45% speed-up for the 1-producer/1-consumer scenario with a 100-element queue when you +use the notifyOne()-per-enqueue style. What's cool about this change is that you can now safely +call notifyOne() (or notifyAll()) out of paranoia, just in case someone might be waiting. It's +free to do so if nobody is waiting! + +* wtf/Condition.h: +(WTF::Condition::Condition): +(WTF::Condition::waitUntil): +(WTF::Condition::notifyOne): +(WTF::Condition::notifyAll): + 2015-08-17 Filip Pizlo fpi...@apple.com Replace all remaining uses of WTF::Mutex with WTF::Lock Modified: releases/WebKitGTK/webkit-2.10/Source/WTF/wtf/Condition.h (188909 => 188910) --- releases/WebKitGTK/webkit-2.10/Source/WTF/wtf/Condition.h 2015-08-25 15:50:51 UTC (rev 188909) +++ releases/WebKitGTK/webkit-2.10/Source/WTF/wtf/Condition.h 2015-08-25 16:17:35 UTC (rev 188910) @@ -38,7 +38,10 @@ public: typedef ParkingLot::Clock Clock; -Condition() { } +Condition() +{ +m_hasWaiters.store(false); +} // Wait on a parking queue while releasing the given lock. It will unlock the lock just before // parking, and relock it upon wakeup. Returns true if we woke up due to some call to @@ -64,8 +67,13 @@ result = false; } else { result = ParkingLot::parkConditionally( -m_dummy, -[] () - bool { return true; }, +m_hasWaiters, +[this] () - bool { +// Let everyone know that we will be waiting. Do this while we hold the queue lock, +// to prevent races with notifyOne(). +m_hasWaiters.store(true); +return true; +}, [lock] () { lock.unlock(); }, timeout); } @@ -129,18 +137,39 @@ return waitForSecondsImpl(lock, absoluteTimeoutSeconds - monotonicallyIncreasingTime()); } -// FIXME: We could replace the dummy byte with a boolean to tell us if there is anyone waiting -// right now. This could be used to implement a fast path for notifyOne() and notifyAll(). -// https://bugs.webkit.org/show_bug.cgi?id=148090 - +// Note that this method is extremely fast when nobody is waiting. It is not necessary to try to +// avoid calling this method. void notifyOne() { -ParkingLot::unparkOne(m_dummy); +if (!m_hasWaiters.load()) { +// At this exact instant, there is nobody waiting on this condition. The way to visualize +// this is that if unparkOne() ran to completion without obstructions at this moment, it +// wouldn't wake anyone up. Hence, we have nothing to do! +return; +} + +ParkingLot::unparkOne( +m_hasWaiters, +[this] (bool, bool mayHaveMoreThreads)
[webkit-changes] [188912] trunk/Source/WTF
Title: [188912] trunk/Source/WTF Revision 188912 Author o...@webkit.org Date 2015-08-25 10:02:34 -0700 (Tue, 25 Aug 2015) Log Message Require GCC version at least 4.9 https://bugs.webkit.org/show_bug.cgi?id=148430 Reviewed by Darin Adler. * wtf/Compiler.h: Modified Paths trunk/Source/WTF/ChangeLog trunk/Source/WTF/wtf/Compiler.h Diff Modified: trunk/Source/WTF/ChangeLog (188911 => 188912) --- trunk/Source/WTF/ChangeLog 2015-08-25 16:53:45 UTC (rev 188911) +++ trunk/Source/WTF/ChangeLog 2015-08-25 17:02:34 UTC (rev 188912) @@ -1,3 +1,12 @@ +2015-08-25 Csaba Osztrogonác o...@webkit.org + +Require GCC version at least 4.9 +https://bugs.webkit.org/show_bug.cgi?id=148430 + +Reviewed by Darin Adler. + +* wtf/Compiler.h: + 2015-08-22 Anders Carlsson ander...@apple.com std::once_flag needs to be static. Modified: trunk/Source/WTF/wtf/Compiler.h (188911 => 188912) --- trunk/Source/WTF/wtf/Compiler.h 2015-08-25 16:53:45 UTC (rev 188911) +++ trunk/Source/WTF/wtf/Compiler.h 2015-08-25 17:02:34 UTC (rev 188912) @@ -71,17 +71,15 @@ #define GCC_VERSION (__GNUC__ * 1 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) #define GCC_VERSION_AT_LEAST(major, minor, patch) (GCC_VERSION = (major * 1 + minor * 100 + patch)) -#if !GCC_VERSION_AT_LEAST(4, 7, 0) -#error Please use a newer version of GCC. WebKit requires GCC 4.7.0 or newer to compile. +#if !GCC_VERSION_AT_LEAST(4, 9, 0) +#error Please use a newer version of GCC. WebKit requires GCC 4.9.0 or newer to compile. #endif #if defined(__STDC_VERSION__) __STDC_VERSION__ = 201112L #define WTF_COMPILER_SUPPORTS_C_STATIC_ASSERT 1 #endif -#if GCC_VERSION_AT_LEAST(4, 8, 0) #pragma GCC diagnostic ignored -Wmaybe-uninitialized -#endif #if (defined(__GXX_EXPERIMENTAL_CXX0X__) || (defined(__cplusplus) __cplusplus = 201103L)) #pragma GCC diagnostic ignored -Wunused-local-typedefs ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [188922] trunk/Source/WebCore
Title: [188922] trunk/Source/WebCore Revision 188922 Author eric.carl...@apple.com Date 2015-08-25 11:10:19 -0700 (Tue, 25 Aug 2015) Log Message [iOS] Don't clear AVPlayerItem when pausing if AirPlay is active https://bugs.webkit.org/show_bug.cgi?id=148319 Reviewed by Jer Noble. * html/HTMLMediaElement.cpp: (WebCore::HTMLMediaElement::purgeBufferedDataIfPossible): Do nothing if the session is allowed to load data when in the background and we are not under memory pressure. * platform/audio/ios/MediaSessionManagerIOS.mm: (WebCore::MediaSessionManageriOS::sessionCanLoadMedia): Call base class. Modified Paths trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/html/HTMLMediaElement.cpp trunk/Source/WebCore/platform/audio/ios/MediaSessionManagerIOS.mm Diff Modified: trunk/Source/WebCore/ChangeLog (188921 => 188922) --- trunk/Source/WebCore/ChangeLog 2015-08-25 18:04:10 UTC (rev 188921) +++ trunk/Source/WebCore/ChangeLog 2015-08-25 18:10:19 UTC (rev 188922) @@ -1,3 +1,17 @@ +2015-08-25 Eric Carlson eric.carl...@apple.com + +[iOS] Don't clear AVPlayerItem when pausing if AirPlay is active +https://bugs.webkit.org/show_bug.cgi?id=148319 + +Reviewed by Jer Noble. + +* html/HTMLMediaElement.cpp: +(WebCore::HTMLMediaElement::purgeBufferedDataIfPossible): Do nothing if the session + is allowed to load data when in the background and we are not under memory pressure. + +* platform/audio/ios/MediaSessionManagerIOS.mm: +(WebCore::MediaSessionManageriOS::sessionCanLoadMedia): Call base class. + 2015-08-25 Csaba Osztrogonác o...@webkit.org Fix the !ENABLE(CSS_REGIONS) build after r188663 Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (188921 => 188922) --- trunk/Source/WebCore/html/HTMLMediaElement.cpp 2015-08-25 18:04:10 UTC (rev 188921) +++ trunk/Source/WebCore/html/HTMLMediaElement.cpp 2015-08-25 18:10:19 UTC (rev 188922) @@ -6481,6 +6481,9 @@ void HTMLMediaElement::purgeBufferedDataIfPossible() { #if PLATFORM(IOS) +if (!MemoryPressureHandler::singleton().isUnderMemoryPressure() PlatformMediaSessionManager::sharedManager().sessionCanLoadMedia(*m_mediaSession)) +return; + // This is called to relieve memory pressure. Turning off buffering causes the media playback // daemon to release memory associated with queued-up video frames. // We turn it back on right away, but new frames won't get loaded unless playback is resumed. Modified: trunk/Source/WebCore/platform/audio/ios/MediaSessionManagerIOS.mm (188921 => 188922) --- trunk/Source/WebCore/platform/audio/ios/MediaSessionManagerIOS.mm 2015-08-25 18:04:10 UTC (rev 188921) +++ trunk/Source/WebCore/platform/audio/ios/MediaSessionManagerIOS.mm 2015-08-25 18:10:19 UTC (rev 188922) @@ -245,7 +245,10 @@ bool MediaSessionManageriOS::sessionCanLoadMedia(const PlatformMediaSession session) const { -return session.state() == PlatformMediaSession::Playing || !session.isHidden() || session.displayType() == PlatformMediaSession::Optimized; +if (session.displayType() == PlatformMediaSession::Optimized) +return true; + +return PlatformMediaSessionManager::sessionCanLoadMedia(session); } void MediaSessionManageriOS::externalOutputDeviceAvailableDidChange() ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [188913] trunk/Source/WebCore
Title: [188913] trunk/Source/WebCore Revision 188913 Author cdu...@apple.com Date 2015-08-25 10:04:47 -0700 (Tue, 25 Aug 2015) Log Message Add support for callback interfaces using other callback names than handleEvent https://bugs.webkit.org/show_bug.cgi?id=148418 Reviewed by Ryosuke Niwa. Add support for callback interfaces using other callback names than handleEvent [1]. This is a pre-requirement for Bug 148415, as NodeFilter's callback function name is acceptNode: - https://dom.spec.whatwg.org/#interface-nodefilter [1] https://heycam.github.io/webidl/#es-user-objects * bindings/js/JSCallbackData.cpp: (WebCore::JSCallbackData::invokeCallback): * bindings/js/JSCallbackData.h: * bindings/js/JSCustomSQLStatementErrorCallback.cpp: (WebCore::JSSQLStatementErrorCallback::handleEvent): * bindings/scripts/CodeGeneratorJS.pm: (GenerateCallbackImplementation): * bindings/scripts/test/JS/JSTestCallback.cpp: (WebCore::JSTestCallback::callbackWithNoParam): (WebCore::JSTestCallback::callbackWithArrayParam): (WebCore::JSTestCallback::callbackWithSerializedScriptValueParam): (WebCore::JSTestCallback::callbackWithStringList): (WebCore::JSTestCallback::callbackWithBoolean): (WebCore::JSTestCallback::callbackRequiresThisToPass): Modified Paths trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/bindings/js/JSCallbackData.cpp trunk/Source/WebCore/bindings/js/JSCallbackData.h trunk/Source/WebCore/bindings/js/JSCustomSQLStatementErrorCallback.cpp trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm trunk/Source/WebCore/bindings/scripts/test/JS/JSTestCallback.cpp Diff Modified: trunk/Source/WebCore/ChangeLog (188912 => 188913) --- trunk/Source/WebCore/ChangeLog 2015-08-25 17:02:34 UTC (rev 188912) +++ trunk/Source/WebCore/ChangeLog 2015-08-25 17:04:47 UTC (rev 188913) @@ -1,5 +1,36 @@ 2015-08-25 Chris Dumez cdu...@apple.com +Add support for callback interfaces using other callback names than handleEvent +https://bugs.webkit.org/show_bug.cgi?id=148418 + +Reviewed by Ryosuke Niwa. + +Add support for callback interfaces using other callback names than +handleEvent [1]. + +This is a pre-requirement for Bug 148415, as NodeFilter's callback +function name is acceptNode: +- https://dom.spec.whatwg.org/#interface-nodefilter + +[1] https://heycam.github.io/webidl/#es-user-objects + +* bindings/js/JSCallbackData.cpp: +(WebCore::JSCallbackData::invokeCallback): +* bindings/js/JSCallbackData.h: +* bindings/js/JSCustomSQLStatementErrorCallback.cpp: +(WebCore::JSSQLStatementErrorCallback::handleEvent): +* bindings/scripts/CodeGeneratorJS.pm: +(GenerateCallbackImplementation): +* bindings/scripts/test/JS/JSTestCallback.cpp: +(WebCore::JSTestCallback::callbackWithNoParam): +(WebCore::JSTestCallback::callbackWithArrayParam): +(WebCore::JSTestCallback::callbackWithSerializedScriptValueParam): +(WebCore::JSTestCallback::callbackWithStringList): +(WebCore::JSTestCallback::callbackWithBoolean): +(WebCore::JSTestCallback::callbackRequiresThisToPass): + +2015-08-25 Chris Dumez cdu...@apple.com + Get rid of custom bindings for RequestAnimationFrameCallback.handleEvent() https://bugs.webkit.org/show_bug.cgi?id=148417 Modified: trunk/Source/WebCore/bindings/js/JSCallbackData.cpp (188912 => 188913) --- trunk/Source/WebCore/bindings/js/JSCallbackData.cpp 2015-08-25 17:02:34 UTC (rev 188912) +++ trunk/Source/WebCore/bindings/js/JSCallbackData.cpp 2015-08-25 17:04:47 UTC (rev 188913) @@ -43,13 +43,13 @@ delete static_castJSCallbackData*(context); } -JSValue JSCallbackData::invokeCallback(MarkedArgumentBuffer args, bool* raisedException) +JSValue JSCallbackData::invokeCallback(MarkedArgumentBuffer args, PropertyName functionName, bool* raisedException) { ASSERT(callback()); -return invokeCallback(callback(), args, raisedException); +return invokeCallback(callback(), args, functionName, raisedException); } -JSValue JSCallbackData::invokeCallback(JSValue thisValue, MarkedArgumentBuffer args, bool* raisedException) +JSValue JSCallbackData::invokeCallback(JSValue thisValue, MarkedArgumentBuffer args, PropertyName functionName, bool* raisedException) { ASSERT(callback()); ASSERT(globalObject()); @@ -60,7 +60,7 @@ CallData callData; CallType callType = callback()-methodTable()-getCallData(callback(), callData); if (callType == CallTypeNone) { -function = callback()-get(exec, Identifier::fromString(exec, handleEvent)); +function = callback()-get(exec, functionName); callType = getCallData(function, callData); if (callType == CallTypeNone) return JSValue(); Modified: trunk/Source/WebCore/bindings/js/JSCallbackData.h (188912 => 188913) --- trunk/Source/WebCore/bindings/js/JSCallbackData.h 2015-08-25 17:02:34 UTC (rev 188912) +++
[webkit-changes] [188943] trunk/Tools
Title: [188943] trunk/Tools Revision 188943 Author aes...@apple.com Date 2015-08-25 20:41:32 -0700 (Tue, 25 Aug 2015) Log Message [iOS] run-webkit-tests fails if watchOS SDK is installed https://bugs.webkit.org/show_bug.cgi?id=148453 Reviewed by David Kilzer. * Scripts/webkitpy/xcode/simulator.py: (Simulator): Taught Simulator how to parse watchOS runtimes and devices. * Scripts/webkitpy/xcode/simulator_unittest.py: Added tests. Modified Paths trunk/Tools/ChangeLog trunk/Tools/Scripts/webkitpy/xcode/simulator.py trunk/Tools/Scripts/webkitpy/xcode/simulator_unittest.py Diff Modified: trunk/Tools/ChangeLog (188942 => 188943) --- trunk/Tools/ChangeLog 2015-08-26 02:01:42 UTC (rev 188942) +++ trunk/Tools/ChangeLog 2015-08-26 03:41:32 UTC (rev 188943) @@ -1,3 +1,14 @@ +2015-08-25 Andy Estes aes...@apple.com + +[iOS] run-webkit-tests fails if watchOS SDK is installed +https://bugs.webkit.org/show_bug.cgi?id=148453 + +Reviewed by David Kilzer. + +* Scripts/webkitpy/xcode/simulator.py: +(Simulator): Taught Simulator how to parse watchOS runtimes and devices. +* Scripts/webkitpy/xcode/simulator_unittest.py: Added tests. + 2015-08-25 Aakash Jain aakash_j...@apple.com iOS Simulator layout-tests fail to start while cleaning a directory structure if simulator is already running Modified: trunk/Tools/Scripts/webkitpy/xcode/simulator.py (188942 => 188943) --- trunk/Tools/Scripts/webkitpy/xcode/simulator.py 2015-08-26 02:01:42 UTC (rev 188942) +++ trunk/Tools/Scripts/webkitpy/xcode/simulator.py 2015-08-26 03:41:32 UTC (rev 188943) @@ -240,9 +240,9 @@ device_type_re = re.compile('(?Pname[^(]+)\((?Pidentifier[^)]+)\)') runtime_re = re.compile( -'iOS (?Pversion[0-9]+\.[0-9])(?Pinternal Internal)? \([0-9]+\.[0-9]+ - (?Pbuild_version[^)]+)\) \((?Pidentifier[^)]+)\)( \((?Pavailability[^)]+)\))?') +'(i|watch)OS (?Pversion[0-9]+\.[0-9])(?Pinternal Internal)? \([0-9]+\.[0-9]+ - (?Pbuild_version[^)]+)\) \((?Pidentifier[^)]+)\)( \((?Pavailability[^)]+)\))?') unavailable_version_re = re.compile('-- Unavailable: (?Pidentifier[^ ]+) --') -version_re = re.compile('-- iOS (?Pversion[0-9]+\.[0-9]+)(?Pinternal Internal)? --') +version_re = re.compile('-- (i|watch)OS (?Pversion[0-9]+\.[0-9]+)(?Pinternal Internal)? --') devices_re = re.compile( '\s*(?Pname[^(]+ )\((?Pudid[^)]+)\) \((?Pstate[^)]+)\)( \((?Pavailability[^)]+)\))?') Modified: trunk/Tools/Scripts/webkitpy/xcode/simulator_unittest.py (188942 => 188943) --- trunk/Tools/Scripts/webkitpy/xcode/simulator_unittest.py 2015-08-26 02:01:42 UTC (rev 188942) +++ trunk/Tools/Scripts/webkitpy/xcode/simulator_unittest.py 2015-08-26 03:41:32 UTC (rev 188943) @@ -46,9 +46,12 @@ iPad 2 (com.apple.CoreSimulator.SimDeviceType.iPad-2) iPad Retina (com.apple.CoreSimulator.SimDeviceType.iPad-Retina) iPad Air (com.apple.CoreSimulator.SimDeviceType.iPad-Air) +Apple Watch - 38mm (com.apple.CoreSimulator.SimDeviceType.Apple-Watch-38mm) +Apple Watch - 42mm (com.apple.CoreSimulator.SimDeviceType.Apple-Watch-42mm) == Runtimes == iOS 8.0 (8.0 - 12A465) (com.apple.CoreSimulator.SimRuntime.iOS-8-0) iOS 8.0 Internal (8.0 - Unknown) (com.apple.CoreSimulator.SimRuntime.iOS-8-0-Internal) (unavailable, runtime path not found) +watchOS 2.0 (2.0 - 13S343) (com.apple.CoreSimulator.SimRuntime.watchOS-2-0) == Devices == -- iOS 8.0 -- iPhone 4s (68D9A792-E3A9-462B-B211-762C6A5D3779) (Shutdown) @@ -61,9 +64,12 @@ iPad Retina (733FC71E-22F4-4077-BF79-25C27EA881FC) (Shutdown) iPad Air (67266841-82F3-4545-AED6-568B117E41A8) (Shutdown) -- iOS 8.0 Internal -- +-- watchOS 2.0 -- +Apple Watch - 38mm (00138CD2-D30C-4380-A30E-A70B88E1A3C5) (Shutdown) +Apple Watch - 42mm (186AD85E-9BE5-4734-BC33-DF50484AAFF0) (Shutdown) ''') simulator = Simulator(host=self._host) -self.assertEqual(8, len(simulator.device_types)) +self.assertEqual(10, len(simulator.device_types)) device_type_iphone_4s = simulator.device_types[0] self.assertEqual('iPhone 4s', device_type_iphone_4s.name) @@ -97,8 +103,16 @@ self.assertEqual('iPad Air', device_type_ipad_air.name) self.assertEqual('com.apple.CoreSimulator.SimDeviceType.iPad-Air', device_type_ipad_air.identifier) -self.assertEqual(2, len(simulator.runtimes)) +device_type_apple_watch_38mm = simulator.device_types[8] +self.assertEqual('Apple Watch - 38mm', device_type_apple_watch_38mm.name) +self.assertEqual('com.apple.CoreSimulator.SimDeviceType.Apple-Watch-38mm', device_type_apple_watch_38mm.identifier) +device_type_apple_watch_42mm = simulator.device_types[9] +self.assertEqual('Apple Watch - 42mm', device_type_apple_watch_42mm.name) +self.assertEqual('com.apple.CoreSimulator.SimDeviceType.Apple-Watch-42mm', device_type_apple_watch_42mm.identifier) + +self.assertEqual(3, len(simulator.runtimes))
[webkit-changes] [188944] trunk/LayoutTests
Title: [188944] trunk/LayoutTests Revision 188944 Author mmaxfi...@apple.com Date 2015-08-25 22:17:34 -0700 (Tue, 25 Aug 2015) Log Message More test gardening of css3/line-break-language-sensitive. Unreviewed. * css3/line-break-language-sensitive/line-break-auto-hyphens-expected.html: * css3/line-break-language-sensitive/line-break-auto-hyphens.html: * css3/line-break-language-sensitive/line-break-auto-sound-marks-expected.html: * css3/line-break-language-sensitive/line-break-auto-sound-marks.html: Modified Paths trunk/LayoutTests/ChangeLog trunk/LayoutTests/css3/line-break-language-sensitive/line-break-auto-hyphens-expected.html trunk/LayoutTests/css3/line-break-language-sensitive/line-break-auto-hyphens.html trunk/LayoutTests/css3/line-break-language-sensitive/line-break-auto-sound-marks-expected.html trunk/LayoutTests/css3/line-break-language-sensitive/line-break-auto-sound-marks.html Diff Modified: trunk/LayoutTests/ChangeLog (188943 => 188944) --- trunk/LayoutTests/ChangeLog 2015-08-26 03:41:32 UTC (rev 188943) +++ trunk/LayoutTests/ChangeLog 2015-08-26 05:17:34 UTC (rev 188944) @@ -1,3 +1,14 @@ +2015-08-25 Myles C. Maxfield mmaxfi...@apple.com + +More test gardening of css3/line-break-language-sensitive. + +Unreviewed. + +* css3/line-break-language-sensitive/line-break-auto-hyphens-expected.html: +* css3/line-break-language-sensitive/line-break-auto-hyphens.html: +* css3/line-break-language-sensitive/line-break-auto-sound-marks-expected.html: +* css3/line-break-language-sensitive/line-break-auto-sound-marks.html: + 2015-08-25 Nan Wang n_w...@apple.com AX: accessibility/mac/misspelled-attributed-string.html is flaky Modified: trunk/LayoutTests/css3/line-break-language-sensitive/line-break-auto-hyphens-expected.html (188943 => 188944) --- trunk/LayoutTests/css3/line-break-language-sensitive/line-break-auto-hyphens-expected.html 2015-08-26 03:41:32 UTC (rev 188943) +++ trunk/LayoutTests/css3/line-break-language-sensitive/line-break-auto-hyphens-expected.html 2015-08-26 05:17:34 UTC (rev 188944) @@ -43,10 +43,10 @@ /div /div div lang=ko -div +div style=width: 3.9em; pnobr#x4e00;#x4e8c;#x4e09;/nobrbr#x56db;#x2010;/p /div -div +div style=width: 3.9em; pnobr#x4e00;#x4e8c;#x4e09;/nobrbr#x56db;#x2013;/p /div div Modified: trunk/LayoutTests/css3/line-break-language-sensitive/line-break-auto-hyphens.html (188943 => 188944) --- trunk/LayoutTests/css3/line-break-language-sensitive/line-break-auto-hyphens.html 2015-08-26 03:41:32 UTC (rev 188943) +++ trunk/LayoutTests/css3/line-break-language-sensitive/line-break-auto-hyphens.html 2015-08-26 05:17:34 UTC (rev 188944) @@ -44,10 +44,10 @@ /div /div div lang=ko -div +div style=width: 3.9em; p#x4e00;#x4e8c;#x4e09;#x56db;#x2010;/p /div -div +div style=width: 3.9em; p#x4e00;#x4e8c;#x4e09;#x56db;#x2013;/p /div div Modified: trunk/LayoutTests/css3/line-break-language-sensitive/line-break-auto-sound-marks-expected.html (188943 => 188944) --- trunk/LayoutTests/css3/line-break-language-sensitive/line-break-auto-sound-marks-expected.html 2015-08-26 03:41:32 UTC (rev 188943) +++ trunk/LayoutTests/css3/line-break-language-sensitive/line-break-auto-sound-marks-expected.html 2015-08-26 05:17:34 UTC (rev 188944) @@ -34,7 +34,7 @@ div pnobr#x4e00;#x4e8c;#x4e09;/nobrbr#x56db;#x30fc;/p /div -div +div style=width: 3.9em; pnobr#x4e00;#x4e8c;#x4e09;/nobrbr#x56db;#xff70;/p /div /div Modified: trunk/LayoutTests/css3/line-break-language-sensitive/line-break-auto-sound-marks.html (188943 => 188944) --- trunk/LayoutTests/css3/line-break-language-sensitive/line-break-auto-sound-marks.html 2015-08-26 03:41:32 UTC (rev 188943) +++ trunk/LayoutTests/css3/line-break-language-sensitive/line-break-auto-sound-marks.html 2015-08-26 05:17:34 UTC (rev 188944) @@ -35,7 +35,7 @@ div p#x4e00;#x4e8c;#x4e09;#x56db;#x30fc;/p /div -div +div style=width: 3.9em; p#x4e00;#x4e8c;#x4e09;#x56db;#xff70;/p /div /div ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [188945] trunk/Tools
Title: [188945] trunk/Tools Revision 188945 Author gyuyoung@webkit.org Date 2015-08-25 22:47:59 -0700 (Tue, 25 Aug 2015) Log Message Remove python tests for PassRefPtr https://bugs.webkit.org/show_bug.cgi?id=148463 Reviewed by Andy Estes. As we're removing uses of PassRefPtr, we need to remove all python tests for PassRefPtr as well. * Scripts/webkitpy/style/checkers/cpp_unittest.py: (PassPtrTest): Deleted. (PassPtrTest.assert_pass_ptr_check): Deleted. (PassPtrTest.test_pass_ref_ptr_in_function): Deleted. (PassPtrTest.test_pass_other_type_ptr_in_function): Deleted. (PassPtrTest.test_pass_ref_ptr_return_value): Deleted. (PassPtrTest.test_ref_ptr_parameter_value): Deleted. (PassPtrTest.test_ref_ptr_member_variable): Deleted. (PassPtrTest.test_ref_ptr_member_variable.Foo): Deleted. Modified Paths trunk/Tools/ChangeLog trunk/Tools/Scripts/webkitpy/style/checkers/cpp_unittest.py Diff Modified: trunk/Tools/ChangeLog (188944 => 188945) --- trunk/Tools/ChangeLog 2015-08-26 05:17:34 UTC (rev 188944) +++ trunk/Tools/ChangeLog 2015-08-26 05:47:59 UTC (rev 188945) @@ -1,3 +1,22 @@ +2015-08-25 Gyuyoung Kim gyuyoung@webkit.org + +Remove python tests for PassRefPtr +https://bugs.webkit.org/show_bug.cgi?id=148463 + +Reviewed by Andy Estes. + +As we're removing uses of PassRefPtr, we need to remove all python tests for PassRefPtr as well. + +* Scripts/webkitpy/style/checkers/cpp_unittest.py: +(PassPtrTest): Deleted. +(PassPtrTest.assert_pass_ptr_check): Deleted. +(PassPtrTest.test_pass_ref_ptr_in_function): Deleted. +(PassPtrTest.test_pass_other_type_ptr_in_function): Deleted. +(PassPtrTest.test_pass_ref_ptr_return_value): Deleted. +(PassPtrTest.test_ref_ptr_parameter_value): Deleted. +(PassPtrTest.test_ref_ptr_member_variable): Deleted. +(PassPtrTest.test_ref_ptr_member_variable.Foo): Deleted. + 2015-08-25 Andy Estes aes...@apple.com [iOS] run-webkit-tests fails if watchOS SDK is installed Modified: trunk/Tools/Scripts/webkitpy/style/checkers/cpp_unittest.py (188944 => 188945) --- trunk/Tools/Scripts/webkitpy/style/checkers/cpp_unittest.py 2015-08-26 05:17:34 UTC (rev 188944) +++ trunk/Tools/Scripts/webkitpy/style/checkers/cpp_unittest.py 2015-08-26 05:47:59 UTC (rev 188945) @@ -3617,88 +3617,6 @@ 'virtual method(s), one declared at line 3. [runtime/virtual] [4]']) -class PassPtrTest(CppStyleTestBase): -# For http://webkit.org/coding/RefPtr.html - -def assert_pass_ptr_check(self, code, expected_message): -Check warnings for Pass*Ptr are as expected. - -Args: - code: C++ source code expected to generate a warning message. - expected_message: Message expected to be generated by the C++ code. - -self.assertEqual(expected_message, - self.perform_pass_ptr_check(code)) - -def test_pass_ref_ptr_in_function(self): -self.assert_pass_ptr_check( -'int myFunction()\n' -'{\n' -'PassRefPtrType1 variable = variable2;\n' -'}', -'Local variables should never be PassRefPtr (see ' -'http://webkit.org/coding/RefPtr.html). [readability/pass_ptr] [5]') - -def test_pass_other_type_ptr_in_function(self): -self.assert_pass_ptr_check( -'int myFunction()\n' -'{\n' -'PassOtherTypePtrType1 variable;\n' -'}', -'Local variables should never be PassOtherTypePtr (see ' -'http://webkit.org/coding/RefPtr.html). [readability/pass_ptr] [5]') - -def test_pass_ref_ptr_return_value(self): -self.assert_pass_ptr_check( -'PassRefPtrType1\n' -'myFunction(int)\n' -'{\n' -'}', -'') -self.assert_pass_ptr_check( -'PassRefPtrType1 myFunction(int)\n' -'{\n' -'}', -'') -self.assert_pass_ptr_check( -'PassRefPtrType1 myFunction();\n', -'') -self.assert_pass_ptr_check( -'RefPtrType1 myFunction(int)\n' -'{\n' -'}', -'') - -def test_ref_ptr_parameter_value(self): -self.assert_pass_ptr_check( -'int myFunction(PassRefPtrType1)\n' -'{\n' -'}', -'') -self.assert_pass_ptr_check( -'int myFunction(RefPtrType1)\n' -'{\n' -'}', -'The parameter type should use PassRefPtr instead of RefPtr. [readability/pass_ptr] [5]') -self.assert_pass_ptr_check( -'int myFunction(RefPtrType1)\n' -'{\n' -'}', -'') -self.assert_pass_ptr_check( -'int myFunction(RefPtrType1*)\n' -'{\n' -'}', -'') - -def test_ref_ptr_member_variable(self): -
[webkit-changes] [188926] trunk/Source/JavaScriptCore
Title: [188926] trunk/Source/_javascript_Core Revision 188926 Author saambara...@gmail.com Date 2015-08-25 11:40:14 -0700 (Tue, 25 Aug 2015) Log Message Callee can be incorrectly overridden when it's captured https://bugs.webkit.org/show_bug.cgi?id=148400 Reviewed by Filip Pizlo. We now resort to always creating the function name scope when the function name is in scope. Because the bytecode generator now has a notion of local lexical scoping, this incurs no runtime penalty for function _expression_ names that aren't heap allocated. If they are heap allocated, this means we may now have one more scope on the runtime scope stack than before. This modification simplifies the callee initialization code and uses the lexical scoping constructs to implement this. This implementation also ensures that everything Just Works for function's with default parameter values. Before this patch, IIFE functions with default parameter values and a captured function name would crash JSC. * bytecompiler/BytecodeGenerator.cpp: (JSC::BytecodeGenerator::BytecodeGenerator): (JSC::BytecodeGenerator::pushLexicalScopeInternal): (JSC::BytecodeGenerator::popLexicalScopeInternal): (JSC::BytecodeGenerator::variable): (JSC::BytecodeGenerator::resolveType): (JSC::BytecodeGenerator::emitThrowTypeError): (JSC::BytecodeGenerator::emitPushFunctionNameScope): (JSC::BytecodeGenerator::emitReadOnlyExceptionIfNeeded): * bytecompiler/BytecodeGenerator.h: (JSC::Variable::isReadOnly): (JSC::Variable::isSpecial): (JSC::Variable::isConst): (JSC::Variable::setIsReadOnly): * bytecompiler/NodesCodegen.cpp: (JSC::PostfixNode::emitResolve): (JSC::PrefixNode::emitResolve): (JSC::ReadModifyResolveNode::emitBytecode): (JSC::AssignResolveNode::emitBytecode): (JSC::BindingNode::bindValue): * tests/stress/IIFE-es6-default-parameters.js: Added. (assert): (.): * tests/stress/IIFE-function-name-captured.js: Added. (assert): (.): Modified Paths trunk/Source/_javascript_Core/ChangeLog trunk/Source/_javascript_Core/bytecompiler/BytecodeGenerator.cpp trunk/Source/_javascript_Core/bytecompiler/BytecodeGenerator.h trunk/Source/_javascript_Core/bytecompiler/NodesCodegen.cpp Added Paths trunk/Source/_javascript_Core/tests/stress/IIFE-es6-default-parameters.js trunk/Source/_javascript_Core/tests/stress/IIFE-function-name-captured.js Diff Modified: trunk/Source/_javascript_Core/ChangeLog (188925 => 188926) --- trunk/Source/_javascript_Core/ChangeLog 2015-08-25 18:38:14 UTC (rev 188925) +++ trunk/Source/_javascript_Core/ChangeLog 2015-08-25 18:40:14 UTC (rev 188926) @@ -1,3 +1,51 @@ +2015-08-25 Saam barati sbar...@apple.com + +Callee can be incorrectly overridden when it's captured +https://bugs.webkit.org/show_bug.cgi?id=148400 + +Reviewed by Filip Pizlo. + +We now resort to always creating the function name scope +when the function name is in scope. Because the bytecode +generator now has a notion of local lexical scoping, +this incurs no runtime penalty for function _expression_ names +that aren't heap allocated. If they are heap allocated, +this means we may now have one more scope on the runtime +scope stack than before. This modification simplifies the +callee initialization code and uses the lexical scoping constructs +to implement this. This implementation also ensures +that everything Just Works for function's with default +parameter values. Before this patch, IIFE functions +with default parameter values and a captured function +name would crash JSC. + +* bytecompiler/BytecodeGenerator.cpp: +(JSC::BytecodeGenerator::BytecodeGenerator): +(JSC::BytecodeGenerator::pushLexicalScopeInternal): +(JSC::BytecodeGenerator::popLexicalScopeInternal): +(JSC::BytecodeGenerator::variable): +(JSC::BytecodeGenerator::resolveType): +(JSC::BytecodeGenerator::emitThrowTypeError): +(JSC::BytecodeGenerator::emitPushFunctionNameScope): +(JSC::BytecodeGenerator::emitReadOnlyExceptionIfNeeded): +* bytecompiler/BytecodeGenerator.h: +(JSC::Variable::isReadOnly): +(JSC::Variable::isSpecial): +(JSC::Variable::isConst): +(JSC::Variable::setIsReadOnly): +* bytecompiler/NodesCodegen.cpp: +(JSC::PostfixNode::emitResolve): +(JSC::PrefixNode::emitResolve): +(JSC::ReadModifyResolveNode::emitBytecode): +(JSC::AssignResolveNode::emitBytecode): +(JSC::BindingNode::bindValue): +* tests/stress/IIFE-es6-default-parameters.js: Added. +(assert): +(.): +* tests/stress/IIFE-function-name-captured.js: Added. +(assert): +(.): + 2015-08-24 Brian Burg bb...@apple.com Web Inspector: add protocol test for existing error handling performed by the backend Modified: trunk/Source/_javascript_Core/bytecompiler/BytecodeGenerator.cpp (188925 => 188926)
[webkit-changes] [188927] trunk/LayoutTests
Title: [188927] trunk/LayoutTests Revision 188927 Author mmaxfi...@apple.com Date 2015-08-25 12:07:54 -0700 (Tue, 25 Aug 2015) Log Message Test gardening rdar://problem/22420410 Unreviewed. Updating test expected results according to Kinsoku Shori. * css3/line-break-language-sensitive/line-break-auto-hyphens-expected.html: * css3/line-break-language-sensitive/line-break-auto-sound-marks-expected.html: Modified Paths trunk/LayoutTests/ChangeLog trunk/LayoutTests/css3/line-break-language-sensitive/line-break-auto-hyphens-expected.html trunk/LayoutTests/css3/line-break-language-sensitive/line-break-auto-hyphens.html trunk/LayoutTests/css3/line-break-language-sensitive/line-break-auto-sound-marks-expected.html trunk/LayoutTests/css3/line-break-language-sensitive/line-break-auto-sound-marks.html Diff Modified: trunk/LayoutTests/ChangeLog (188926 => 188927) --- trunk/LayoutTests/ChangeLog 2015-08-25 18:40:14 UTC (rev 188926) +++ trunk/LayoutTests/ChangeLog 2015-08-25 19:07:54 UTC (rev 188927) @@ -1,3 +1,15 @@ +2015-08-25 Myles C. Maxfield mmaxfi...@apple.com + +Test gardening +rdar://problem/22420410 + +Unreviewed. + +Updating test expected results according to Kinsoku Shori. + +* css3/line-break-language-sensitive/line-break-auto-hyphens-expected.html: +* css3/line-break-language-sensitive/line-break-auto-sound-marks-expected.html: + 2015-08-25 Chris Dumez cdu...@apple.com Unreviewed, fix typo introduced in r188917 Modified: trunk/LayoutTests/css3/line-break-language-sensitive/line-break-auto-hyphens-expected.html (188926 => 188927) --- trunk/LayoutTests/css3/line-break-language-sensitive/line-break-auto-hyphens-expected.html 2015-08-25 18:40:14 UTC (rev 188926) +++ trunk/LayoutTests/css3/line-break-language-sensitive/line-break-auto-hyphens-expected.html 2015-08-25 19:07:54 UTC (rev 188927) @@ -6,6 +6,7 @@ font-family: 'Lucida Grande'; font-size: 16pt; width: 4.1em; +display: inline-block; } div p { border: solid blue 1px; @@ -29,44 +30,44 @@ /div div lang=ja div -pnobr#x4e00;#x4e8c;#x4e09;#x56db;/nobrbr#x2010;/p +pnobr#x4e00;#x4e8c;#x4e09;/nobrbr#x56db;#x2010;/p /div div -pnobr#x4e00;#x4e8c;#x4e09;#x56db;/nobrbr#x2013;/p +pnobr#x4e00;#x4e8c;#x4e09;/nobrbr#x56db;#x2013;/p /div div -pnobr#x4e00;#x4e8c;#x4e09;#x56db;/nobrbr#x301c;/p +pnobr#x4e00;#x4e8c;#x4e09;/nobrbr#x56db;#x301c;/p /div div -pnobr#x4e00;#x4e8c;#x4e09;#x56db;/nobrbr#x30a0;/p +pnobr#x4e00;#x4e8c;#x4e09;/nobrbr#x56db;#x30a0;/p /div /div div lang=ko div -pnobr#x4e00;#x4e8c;#x4e09;#x56db;/nobrbr#x2010;/p +pnobr#x4e00;#x4e8c;#x4e09;/nobrbr#x56db;#x2010;/p /div div -pnobr#x4e00;#x4e8c;#x4e09;#x56db;/nobrbr#x2013;/p +pnobr#x4e00;#x4e8c;#x4e09;/nobrbr#x56db;#x2013;/p /div div -pnobr#x4e00;#x4e8c;#x4e09;#x56db;/nobrbr#x301c;/p +pnobr#x4e00;#x4e8c;#x4e09;/nobrbr#x56db;#x301c;/p /div div -pnobr#x4e00;#x4e8c;#x4e09;#x56db;/nobrbr#x30a0;/p +pnobr#x4e00;#x4e8c;#x4e09;/nobrbr#x56db;#x30a0;/p /div /div div lang=zh div -pnobr#x4e00;#x4e8c;#x4e09;#x56db;/nobrbr#x2010;/p +pnobr#x4e00;#x4e8c;#x4e09;/nobrbr#x56db;#x2010;/p /div div -pnobr#x4e00;#x4e8c;#x4e09;#x56db;/nobrbr#x2013;/p +pnobr#x4e00;#x4e8c;#x4e09;/nobrbr#x56db;#x2013;/p /div div -pnobr#x4e00;#x4e8c;#x4e09;#x56db;/nobrbr#x301c;/p +pnobr#x4e00;#x4e8c;#x4e09;/nobrbr#x56db;#x301c;/p /div div -pnobr#x4e00;#x4e8c;#x4e09;#x56db;/nobrbr#x30a0;/p +pnobr#x4e00;#x4e8c;#x4e09;/nobrbr#x56db;#x30a0;/p /div /div /body Modified: trunk/LayoutTests/css3/line-break-language-sensitive/line-break-auto-hyphens.html (188926 => 188927) --- trunk/LayoutTests/css3/line-break-language-sensitive/line-break-auto-hyphens.html 2015-08-25 18:40:14 UTC (rev 188926) +++ trunk/LayoutTests/css3/line-break-language-sensitive/line-break-auto-hyphens.html 2015-08-25 19:07:54 UTC (rev 188927) @@ -6,6 +6,7 @@ font-family: 'Lucida Grande'; font-size: 16pt; width: 4.1em; +display: inline-block; } div p { border: solid blue 1px; Modified: trunk/LayoutTests/css3/line-break-language-sensitive/line-break-auto-sound-marks-expected.html
[webkit-changes] [188931] trunk/Source/WebCore
Title: [188931] trunk/Source/WebCore Revision 188931 Author commit-qu...@webkit.org Date 2015-08-25 12:16:08 -0700 (Tue, 25 Aug 2015) Log Message IconDatabase: syncThreadMainLoop() is unlocking m_syncLock twice when thread termination is requested https://bugs.webkit.org/show_bug.cgi?id=148429 Patch by Carlos Garcia Campos cgar...@igalia.com on 2015-08-25 Reviewed by Filip Pizlo. The lock is released an locked on every loop iteration, and then unlocked again after the loop. There's an early break in the loop when thread termination is requested that happens after the lock is released but before is locked again, so that the unlock after the loop is trying to unlock the lock again. This was not a problem before, but the new Lock has an assertion to ensure that a lock is not released twice. * loader/icon/IconDatabase.cpp: (WebCore::IconDatabase::syncThreadMainLoop): Clean up the thread and return instead of breaking the loop when thread termination is requested. Modified Paths trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/loader/icon/IconDatabase.cpp Diff Modified: trunk/Source/WebCore/ChangeLog (188930 => 188931) --- trunk/Source/WebCore/ChangeLog 2015-08-25 19:14:55 UTC (rev 188930) +++ trunk/Source/WebCore/ChangeLog 2015-08-25 19:16:08 UTC (rev 188931) @@ -1,3 +1,23 @@ +2015-08-25 Carlos Garcia Campos cgar...@igalia.com + +IconDatabase: syncThreadMainLoop() is unlocking m_syncLock twice when thread termination is requested +https://bugs.webkit.org/show_bug.cgi?id=148429 + +Reviewed by Filip Pizlo. + +The lock is released an locked on every loop iteration, and then +unlocked again after the loop. There's an early break in the loop +when thread termination is requested that happens after the lock +is released but before is locked again, so that the unlock after +the loop is trying to unlock the lock again. This was not a +problem before, but the new Lock has an assertion to ensure that a +lock is not released twice. + +* loader/icon/IconDatabase.cpp: +(WebCore::IconDatabase::syncThreadMainLoop): Clean up the thread +and return instead of breaking the loop when thread termination is +requested. + 2015-08-25 Nan Wang n_w...@apple.com [Mac] accessibility/document-attributes.html fails Modified: trunk/Source/WebCore/loader/icon/IconDatabase.cpp (188930 => 188931) --- trunk/Source/WebCore/loader/icon/IconDatabase.cpp 2015-08-25 19:14:55 UTC (rev 188930) +++ trunk/Source/WebCore/loader/icon/IconDatabase.cpp 2015-08-25 19:16:08 UTC (rev 188931) @@ -1367,8 +1367,10 @@ } // Then, if the thread should be quitting, quit now! -if (m_threadTerminationRequested) -break; +if (m_threadTerminationRequested) { +cleanupSyncThread(); +return; +} { LockHolder locker(m_urlAndIconLock); ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [188924] trunk/Source/WebKit2
Title: [188924] trunk/Source/WebKit2 Revision 188924 Author bda...@apple.com Date 2015-08-25 11:19:10 -0700 (Tue, 25 Aug 2015) Log Message Long press gesture recognizer should adjust delay based on other recognizers https://bugs.webkit.org/show_bug.cgi?id=148402 -and corresponding- rdar://problem/22278723 Reviewed by Tim Horton. Call _setAdjustsDelayBasedOnOtherRecognizers with a value of YES. * UIProcess/ios/WKContentViewInteraction.mm: (-[WKContentView setupInteraction]): Modified Paths trunk/Source/WebKit2/ChangeLog trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm Diff Modified: trunk/Source/WebKit2/ChangeLog (188923 => 188924) --- trunk/Source/WebKit2/ChangeLog 2015-08-25 18:13:05 UTC (rev 188923) +++ trunk/Source/WebKit2/ChangeLog 2015-08-25 18:19:10 UTC (rev 188924) @@ -1,3 +1,16 @@ +2015-08-25 Beth Dakin bda...@apple.com + +Long press gesture recognizer should adjust delay based on other recognizers +https://bugs.webkit.org/show_bug.cgi?id=148402 +-and corresponding- +rdar://problem/22278723 + +Reviewed by Tim Horton. + +Call _setAdjustsDelayBasedOnOtherRecognizers with a value of YES. +* UIProcess/ios/WKContentViewInteraction.mm: +(-[WKContentView setupInteraction]): + 2015-08-24 Gyuyoung Kim gyuyoung@webkit.org Unreviewed, EFL and GTK build fix since r188895. Modified: trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm (188923 => 188924) --- trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2015-08-25 18:13:05 UTC (rev 188923) +++ trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2015-08-25 18:19:10 UTC (rev 188924) @@ -70,6 +70,9 @@ #import WebCore/TextIndicator.h #import WebCore/WebEvent.h #import WebKit/WebSelectionRect.h // FIXME: WK2 should not include WebKit headers! +#if __has_include(WebKitAdditions/WKContentViewInteraction.mm) +#import WebKitAdditions/WKContentViewInteraction.mm +#endif #import WebKitSystemInterfaceIOS.h #import wtf/RetainPtr.h @@ -342,6 +345,10 @@ _longPressGestureRecognizer = adoptNS([[UILongPressGestureRecognizer alloc] initWithTarget:self action:@selector(_longPressRecognized:)]); [_longPressGestureRecognizer setDelay:tapAndHoldDelay]; [_longPressGestureRecognizer setDelegate:self]; +#if __has_include(WebKitAdditions/WKContentViewInteraction.mm) +if ([_longPressGestureRecognizer respondsToSelector:@selector(_setAdjustsDelayBasedOnOtherRecognizers:)]) +[_longPressGestureRecognizer _setAdjustsDelayBasedOnOtherRecognizers:YES]; +#endif [self addGestureRecognizer:_longPressGestureRecognizer.get()]; #if HAVE(LINK_PREVIEW) ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [188923] trunk/Source/WebCore
Title: [188923] trunk/Source/WebCore Revision 188923 Author o...@webkit.org Date 2015-08-25 11:13:05 -0700 (Tue, 25 Aug 2015) Log Message Fix the !ENABLE(VIDEO) build after r188693 https://bugs.webkit.org/show_bug.cgi?id=148424 Reviewed by Tim Horton. * page/ChromeClient.h: Modified Paths trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/page/ChromeClient.h Diff Modified: trunk/Source/WebCore/ChangeLog (188922 => 188923) --- trunk/Source/WebCore/ChangeLog 2015-08-25 18:10:19 UTC (rev 188922) +++ trunk/Source/WebCore/ChangeLog 2015-08-25 18:13:05 UTC (rev 188923) @@ -1,3 +1,12 @@ +2015-08-25 Csaba Osztrogonác o...@webkit.org + +Fix the !ENABLE(VIDEO) build after r188693 +https://bugs.webkit.org/show_bug.cgi?id=148424 + +Reviewed by Tim Horton. + +* page/ChromeClient.h: + 2015-08-25 Eric Carlson eric.carl...@apple.com [iOS] Don't clear AVPlayerItem when pausing if AirPlay is active Modified: trunk/Source/WebCore/page/ChromeClient.h (188922 => 188923) --- trunk/Source/WebCore/page/ChromeClient.h 2015-08-25 18:10:19 UTC (rev 188922) +++ trunk/Source/WebCore/page/ChromeClient.h 2015-08-25 18:13:05 UTC (rev 188923) @@ -455,12 +455,11 @@ virtual void playbackTargetPickerClientStateDidChange(uint64_t /*contextId*/, MediaProducer::MediaStateFlags) { } #endif -#if ENABLE(VIDEO) virtual void imageOrMediaDocumentSizeChanged(const WebCore::IntSize) { } -#if USE(GSTREAMER) + +#if ENABLE(VIDEO) USE(GSTREAMER) virtual void requestInstallMissingMediaPlugins(const String /*details*/, const String /*description*/, MediaPlayerRequestInstallMissingPluginsCallback) { }; #endif -#endif protected: virtual ~ChromeClient() { } ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [188928] trunk
Title: [188928] trunk Revision 188928 Author commit-qu...@webkit.org Date 2015-08-25 12:10:29 -0700 (Tue, 25 Aug 2015) Log Message Function.prototype.toString is incorrect for ArrowFunction https://bugs.webkit.org/show_bug.cgi?id=148148 Source/_javascript_Core: Patch by Aleksandr Skachkov gskach...@gmail.com on 2015-08-25 Reviewed by Saam Barati. Added correct support of toString() method for arrow function. * parser/ASTBuilder.h: (JSC::ASTBuilder::createFunctionMetadata): (JSC::ASTBuilder::createArrowFunctionExpr): * parser/Nodes.cpp: (JSC::FunctionMetadataNode::FunctionMetadataNode): * parser/Nodes.h: * parser/Parser.cpp: (JSC::ParserLexerType::parseFunctionBody): (JSC::ParserLexerType::parseFunctionInfo): * parser/SyntaxChecker.h: (JSC::SyntaxChecker::createFunctionMetadata): * runtime/FunctionPrototype.cpp: (JSC::functionProtoFuncToString): * tests/stress/arrowfunction-tostring.js: Added. LayoutTests: Patch by Skachkov Oleksandr gskach...@gmail.com on 2015-08-25 Reviewed by Saam Barati. Added test of toString() method. * js/arrowfunction-tostring-expected.txt: Added. * js/arrowfunction-tostring.html: Added. * js/script-tests/arrowfunction-tostring.js: Added. Modified Paths trunk/LayoutTests/ChangeLog trunk/Source/_javascript_Core/ChangeLog trunk/Source/_javascript_Core/parser/ASTBuilder.h trunk/Source/_javascript_Core/parser/Nodes.cpp trunk/Source/_javascript_Core/parser/Nodes.h trunk/Source/_javascript_Core/parser/Parser.cpp trunk/Source/_javascript_Core/parser/SyntaxChecker.h trunk/Source/_javascript_Core/runtime/FunctionPrototype.cpp Added Paths trunk/LayoutTests/js/arrowfunction-tostring-expected.txt trunk/LayoutTests/js/arrowfunction-tostring.html trunk/LayoutTests/js/script-tests/arrowfunction-tostring.js trunk/Source/_javascript_Core/tests/stress/arrowfunction-tostring.js Diff Modified: trunk/LayoutTests/ChangeLog (188927 => 188928) --- trunk/LayoutTests/ChangeLog 2015-08-25 19:07:54 UTC (rev 188927) +++ trunk/LayoutTests/ChangeLog 2015-08-25 19:10:29 UTC (rev 188928) @@ -1,3 +1,16 @@ +2015-08-25 Skachkov Oleksandr gskach...@gmail.com + +Function.prototype.toString is incorrect for ArrowFunction +https://bugs.webkit.org/show_bug.cgi?id=148148 + +Reviewed by Saam Barati. + +Added test of toString() method. + +* js/arrowfunction-tostring-expected.txt: Added. +* js/arrowfunction-tostring.html: Added. +* js/script-tests/arrowfunction-tostring.js: Added. + 2015-08-25 Myles C. Maxfield mmaxfi...@apple.com Test gardening Added: trunk/LayoutTests/js/arrowfunction-tostring-expected.txt (0 => 188928) --- trunk/LayoutTests/js/arrowfunction-tostring-expected.txt (rev 0) +++ trunk/LayoutTests/js/arrowfunction-tostring-expected.txt 2015-08-25 19:10:29 UTC (rev 188928) @@ -0,0 +1,32 @@ +Tests for ES6 arrow function toString() method + +On success, you will see a series of PASS messages, followed by TEST COMPLETE. + + +var simpleArrowFunction = () = {} +PASS simpleArrowFunction.toString() is '() = {}' +PASS ((x) = { x + 1 }).toString() is '(x) = { x + 1 }' +PASS (x = x + 1).toString() is 'x = x + 1' +var f0 = x = x +PASS f0.toString() is 'x = x' +var f1 = () = this +PASS f1.toString() is '() = this' +var f2 = x = { return x; }; +PASS f2.toString() is '(x) = { return x; }' +var f3 = (x, y) = { return x + y; }; +PASS f3.toString() is '(x, y) = { return x + y; }' +function foo(x) { return x.toString()}; +PASS foo((x)=x) is '(x)=x' +var a = z = z*2, b = () = ({}); +PASS a.toString() is 'z = z*2' +PASS b.toString() is '() = ({})' +var arrExpr = [y=y + 1, x=x]; +PASS arrExpr[0].toString() is 'y=y + 1' +PASS arrExpr[1].toString() is 'x=x' +var arrBody = [y={ y + 1 }, x={ x }]; +PASS arrBody[0].toString() is 'y={ y + 1 }' +PASS arrBody[1].toString() is 'x={ x }' +PASS successfullyParsed is true + +TEST COMPLETE + Added: trunk/LayoutTests/js/arrowfunction-tostring.html (0 => 188928) --- trunk/LayoutTests/js/arrowfunction-tostring.html (rev 0) +++ trunk/LayoutTests/js/arrowfunction-tostring.html 2015-08-25 19:10:29 UTC (rev 188928) @@ -0,0 +1,10 @@ +!DOCTYPE HTML PUBLIC -//IETF//DTD HTML//EN +html +head +script src="" +/head +body +script src="" +script src="" +/body +/html Added: trunk/LayoutTests/js/script-tests/arrowfunction-tostring.js (0 => 188928) --- trunk/LayoutTests/js/script-tests/arrowfunction-tostring.js (rev 0) +++ trunk/LayoutTests/js/script-tests/arrowfunction-tostring.js 2015-08-25 19:10:29 UTC (rev 188928) @@ -0,0 +1,45 @@ +// Inspired by mozilla tests +description('Tests for ES6 arrow function toString() method'); + +debug('var simpleArrowFunction = () = {}'); +var simpleArrowFunction = () = {}; +shouldBe(simpleArrowFunction.toString(), '() = {}'); +shouldBe(((x) = { x + 1 }).toString(), '(x) = { x + 1 }'); +shouldBe((x = x + 1).toString(), 'x = x + 1'); + +debug('var f0 = x = x'); +var f0 = x = x; +shouldBe(f0.toString(),
[webkit-changes] [188930] trunk
Title: [188930] trunk Revision 188930 Author commit-qu...@webkit.org Date 2015-08-25 12:14:55 -0700 (Tue, 25 Aug 2015) Log Message [Mac] accessibility/document-attributes.html fails https://bugs.webkit.org/show_bug.cgi?id=116636 Patch by Nan Wang n_w...@apple.com on 2015-08-25 Reviewed by Chris Fleizach. Source/WebCore: Re-enabled accessibility/document-attributes.html test. * accessibility/mac/WebAccessibilityObjectWrapperMac.mm: (-[WebAccessibilityObjectWrapper accessibilityAttributeValue:]): Tools: Implemented documentURI() and documentEncoding(). * DumpRenderTree/mac/AccessibilityUIElementMac.mm: (AccessibilityUIElement::documentEncoding): (AccessibilityUIElement::documentURI): * WebKitTestRunner/InjectedBundle/mac/AccessibilityUIElementMac.mm: (WTR::AccessibilityUIElement::documentEncoding): (WTR::AccessibilityUIElement::documentURI): LayoutTests: * platform/mac/TestExpectations: Modified Paths trunk/LayoutTests/ChangeLog trunk/LayoutTests/platform/mac/TestExpectations trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm trunk/Tools/ChangeLog trunk/Tools/DumpRenderTree/mac/AccessibilityUIElementMac.mm trunk/Tools/WebKitTestRunner/InjectedBundle/mac/AccessibilityUIElementMac.mm Diff Modified: trunk/LayoutTests/ChangeLog (188929 => 188930) --- trunk/LayoutTests/ChangeLog 2015-08-25 19:13:39 UTC (rev 188929) +++ trunk/LayoutTests/ChangeLog 2015-08-25 19:14:55 UTC (rev 188930) @@ -1,3 +1,12 @@ +2015-08-25 Nan Wang n_w...@apple.com + +[Mac] accessibility/document-attributes.html fails +https://bugs.webkit.org/show_bug.cgi?id=116636 + +Reviewed by Chris Fleizach. + +* platform/mac/TestExpectations: + 2015-08-25 Skachkov Oleksandr gskach...@gmail.com Function.prototype.toString is incorrect for ArrowFunction Modified: trunk/LayoutTests/platform/mac/TestExpectations (188929 => 188930) --- trunk/LayoutTests/platform/mac/TestExpectations 2015-08-25 19:13:39 UTC (rev 188929) +++ trunk/LayoutTests/platform/mac/TestExpectations 2015-08-25 19:14:55 UTC (rev 188930) @@ -36,8 +36,6 @@ fast/dom/Window/slow-unload-handler.html fast/dom/Window/slow-unload-handler-only-frame-is-stopped.html -webkit.org/b/116636 accessibility/document-attributes.html [ Failure ] - # Accessibility tests for notifications that don't exist or aren't needed on Mac OS X. accessibility/aria-checkbox-sends-notification.html accessibility/aria-switch-sends-notification.html Modified: trunk/Source/WebCore/ChangeLog (188929 => 188930) --- trunk/Source/WebCore/ChangeLog 2015-08-25 19:13:39 UTC (rev 188929) +++ trunk/Source/WebCore/ChangeLog 2015-08-25 19:14:55 UTC (rev 188930) @@ -1,3 +1,15 @@ +2015-08-25 Nan Wang n_w...@apple.com + +[Mac] accessibility/document-attributes.html fails +https://bugs.webkit.org/show_bug.cgi?id=116636 + +Reviewed by Chris Fleizach. + +Re-enabled accessibility/document-attributes.html test. + +* accessibility/mac/WebAccessibilityObjectWrapperMac.mm: +(-[WebAccessibilityObjectWrapper accessibilityAttributeValue:]): + 2015-08-25 Csaba Osztrogonác o...@webkit.org Fix the !ENABLE(VIDEO) build after r188693 Modified: trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm (188929 => 188930) --- trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm 2015-08-25 19:13:39 UTC (rev 188929) +++ trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm 2015-08-25 19:14:55 UTC (rev 188930) @@ -233,6 +233,14 @@ #define NSAccessibilityIsMultiSelectableAttribute @AXIsMultiSelectable #endif +#ifndef NSAccessibilityDocumentURIAttribute +#define NSAccessibilityDocumentURIAttribute @AXDocumentURI +#endif + +#ifndef NSAccessibilityDocumentEncodingAttribute +#define NSAccessibilityDocumentEncodingAttribute @AXDocumentEncoding +#endif + #define NSAccessibilityDOMIdentifierAttribute @AXDOMIdentifier #define NSAccessibilityDOMClassListAttribute @AXDOMClassList @@ -3047,6 +3055,19 @@ if ([attributeName isEqualToString:NSAccessibilityIsMultiSelectableAttribute]) return [NSNumber numberWithBool:m_object-isMultiSelectable()]; +// Document attributes +if ([attributeName isEqualToString:NSAccessibilityDocumentURIAttribute]) { +if (Document* document = m_object-document()) +return document-documentURI(); +return nil; +} + +if ([attributeName isEqualToString:NSAccessibilityDocumentEncodingAttribute]) { +if (Document* document = m_object-document()) +return document-encoding(); +return nil; +} + return nil; } Modified: trunk/Tools/ChangeLog (188929 => 188930) --- trunk/Tools/ChangeLog 2015-08-25 19:13:39 UTC (rev 188929) +++ trunk/Tools/ChangeLog 2015-08-25 19:14:55 UTC (rev 188930) @@ -1,3 +1,19 @@ +2015-08-25 Nan Wang n_w...@apple.com + +[Mac]
[webkit-changes] [188925] trunk/LayoutTests
Title: [188925] trunk/LayoutTests Revision 188925 Author cdu...@apple.com Date 2015-08-25 11:38:14 -0700 (Tue, 25 Aug 2015) Log Message Unreviewed, fix typo introduced in r188917 * TestExpectations: Modified Paths trunk/LayoutTests/ChangeLog trunk/LayoutTests/TestExpectations Diff Modified: trunk/LayoutTests/ChangeLog (188924 => 188925) --- trunk/LayoutTests/ChangeLog 2015-08-25 18:19:10 UTC (rev 188924) +++ trunk/LayoutTests/ChangeLog 2015-08-25 18:38:14 UTC (rev 188925) @@ -1,3 +1,9 @@ +2015-08-25 Chris Dumez cdu...@apple.com + +Unreviewed, fix typo introduced in r188917 + +* TestExpectations: + 2015-08-24 Brent Fulgham bfulg...@apple.com Wheel events stop propagating when target element is removed from DOM Modified: trunk/LayoutTests/TestExpectations (188924 => 188925) --- trunk/LayoutTests/TestExpectations 2015-08-25 18:19:10 UTC (rev 188924) +++ trunk/LayoutTests/TestExpectations 2015-08-25 18:38:14 UTC (rev 188925) @@ -127,7 +127,7 @@ webkit.org/b/74144 fast/regions/universal-selector-children-to-the-same-region.html [ Skip ] webkit.org/b/74144 fast/regions/region-content-flown-into-region.html [ Skip ] -# These conformace tests are no longer in sync with the latest specification +# These conformance tests are no longer in sync with the latest specification # and expect compareDocumentPosition() to return: # DOCUMENT_POSITION_IMPLEMENTATION_SPECIFIC | DOCUMENT_POSITION_DISCONNECTED # for disconnected nodes (missing PRECEDING / FOLLOWING information). ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [188929] trunk
Title: [188929] trunk Revision 188929 Author mcatanz...@igalia.com Date 2015-08-25 12:13:39 -0700 (Tue, 25 Aug 2015) Log Message [GTK] r186800 broke the build on Ubuntu 14.04 https://bugs.webkit.org/show_bug.cgi?id=147559 Reviewed by Martin Robinson. * Source/cmake/FindGTK3.cmake: Always define GTK3_SUPPORTS_X11 and GTK3_SUPPORTS_WAYLAND. * Source/cmake/OptionsGTK.cmake: Autodetect support for X11 and Wayland backends. Modified Paths trunk/ChangeLog trunk/Source/cmake/FindGTK3.cmake trunk/Source/cmake/OptionsGTK.cmake Diff Modified: trunk/ChangeLog (188928 => 188929) --- trunk/ChangeLog 2015-08-25 19:10:29 UTC (rev 188928) +++ trunk/ChangeLog 2015-08-25 19:13:39 UTC (rev 188929) @@ -1,3 +1,13 @@ +2015-08-25 Michael Catanzaro mcatanz...@igalia.com + +[GTK] r186800 broke the build on Ubuntu 14.04 +https://bugs.webkit.org/show_bug.cgi?id=147559 + +Reviewed by Martin Robinson. + +* Source/cmake/FindGTK3.cmake: Always define GTK3_SUPPORTS_X11 and GTK3_SUPPORTS_WAYLAND. +* Source/cmake/OptionsGTK.cmake: Autodetect support for X11 and Wayland backends. + 2015-08-25 Per Arne Vollan pe...@outlook.com [Win] Build does not generate debug info. Modified: trunk/Source/cmake/FindGTK3.cmake (188928 => 188929) --- trunk/Source/cmake/FindGTK3.cmake 2015-08-25 19:10:29 UTC (rev 188928) +++ trunk/Source/cmake/FindGTK3.cmake 2015-08-25 19:13:39 UTC (rev 188929) @@ -52,11 +52,15 @@ pkg_check_modules(GTK3_X11 gtk+-x11-3.0) if (${GTK3_X11_VERSION} VERSION_EQUAL ${GTK3_VERSION}) set(GTK3_SUPPORTS_X11 TRUE) +else () +set(GTK3_SUPPORTS_X11 FALSE) endif () pkg_check_modules(GTK3_WAYLAND gtk+-wayland-3.0) if (${GTK3_WAYLAND_VERSION} VERSION_EQUAL ${GTK3_VERSION}) set(GTK3_SUPPORTS_WAYLAND TRUE) +else () +set(GTK3_SUPPORTS_WAYLAND FALSE) endif () if (NOT(${GTK3_VERSION} VERSION_LESS 3.14.0)) Modified: trunk/Source/cmake/OptionsGTK.cmake (188928 => 188929) --- trunk/Source/cmake/OptionsGTK.cmake 2015-08-25 19:10:29 UTC (rev 188928) +++ trunk/Source/cmake/OptionsGTK.cmake 2015-08-25 19:13:39 UTC (rev 188929) @@ -33,6 +33,8 @@ find_package(Cairo 1.10.2 REQUIRED) find_package(Fontconfig 2.8.0 REQUIRED) find_package(Freetype2 2.4.2 REQUIRED) +find_package(GTK3 3.6.0 REQUIRED) +find_package(GDK3 3.6.0 REQUIRED) find_package(HarfBuzz 0.9.2 REQUIRED) find_package(ICU REQUIRED) find_package(JPEG REQUIRED) @@ -47,6 +49,7 @@ find_package(WebP REQUIRED) find_package(ATSPI 2.5.3) find_package(EGL) +find_package(GTKUnixPrint) find_package(OpenGL) find_package(OpenGLES2) @@ -68,8 +71,8 @@ WEBKIT_OPTION_DEFINE(ENABLE_INTROSPECTION Whether to enable GObject introspection. PUBLIC ON) WEBKIT_OPTION_DEFINE(ENABLE_OPENGL Whether to use OpenGL. PUBLIC ON) WEBKIT_OPTION_DEFINE(ENABLE_PLUGIN_PROCESS_GTK2 Whether to build WebKitPluginProcess2 to load GTK2 based plugins. PUBLIC ON) -WEBKIT_OPTION_DEFINE(ENABLE_X11_TARGET Whether to enable support for the X11 windowing target. PUBLIC ON) -WEBKIT_OPTION_DEFINE(ENABLE_WAYLAND_TARGET Whether to enable support for the Wayland windowing target. PUBLIC ON) +WEBKIT_OPTION_DEFINE(ENABLE_X11_TARGET Whether to enable support for the X11 windowing target. PUBLIC ${GTK3_SUPPORTS_X11}) +WEBKIT_OPTION_DEFINE(ENABLE_WAYLAND_TARGET Whether to enable support for the Wayland windowing target. PUBLIC ${GTK3_SUPPORTS_WAYLAND}) WEBKIT_OPTION_DEFINE(USE_LIBNOTIFY Whether to enable the default web notification implementation. PUBLIC ON) WEBKIT_OPTION_DEFINE(USE_LIBHYPHEN Whether to enable the default automatic hyphenation implementation. PUBLIC ON) @@ -224,16 +227,6 @@ add_definitions(-DUSER_AGENT_GTK_MINOR_VERSION=1) add_definitions(-DWEBKITGTK_API_VERSION_STRING=${WEBKITGTK_API_VERSION}) -if (ENABLE_WAYLAND_TARGET) -set(GTK3_REQUIRED_VERSION 3.12.0) -else () -set(GTK3_REQUIRED_VERSION 3.6.0) -endif () - -find_package(GTK3 ${GTK3_REQUIRED_VERSION} REQUIRED) -find_package(GDK3 ${GTK3_REQUIRED_VERSION} REQUIRED) -find_package(GTKUnixPrint) - set(GTK_LIBRARIES ${GTK3_LIBRARIES}) set(GTK_INCLUDE_DIRS ${GTK3_INCLUDE_DIRS}) set(GDK_LIBRARIES ${GDK3_LIBRARIES}) @@ -424,6 +417,10 @@ message(FATAL_ERROR Recompile GTK+ with Wayland backend to use ENABLE_WAYLAND_TARGET) endif () +if (ENABLE_WAYLAND_TARGET AND GTK3_VERSION VERSION_LESS 3.12) +message(FATAL_ERROR GTK+ 3.12 is required to use ENABLE_WAYLAND_TARGET) +endif () + find_package(Wayland REQUIRED) endif () ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [188905] trunk/Source/WebCore
Title: [188905] trunk/Source/WebCore Revision 188905 Author cdu...@apple.com Date 2015-08-25 03:11:14 -0700 (Tue, 25 Aug 2015) Log Message Get rid of custom bindings for RequestAnimationFrameCallback.handleEvent() https://bugs.webkit.org/show_bug.cgi?id=148417 Reviewed by Sam Weinig. Get rid of custom bindings for RequestAnimationFrameCallback.handleEvent() by improving the bindings generator. In this case, the problem was that the bindings generator did not know how to convert a double parameter into a JSValue. The new code leverages the pre-existing NativeToJSValue subroutine to do the conversion instead of duplicating complex support here. * WebCore.xcodeproj/project.pbxproj: * bindings/js/JSRequestAnimationFrameCallbackCustom.cpp: Removed. * bindings/scripts/CodeGeneratorJS.pm: (GenerateCallbackImplementation): * bindings/scripts/test/JS/JSTestCallback.cpp: (WebCore::JSTestCallback::callbackWithArrayParam): (WebCore::JSTestCallback::callbackWithSerializedScriptValueParam): (WebCore::JSTestCallback::callbackWithStringList): (WebCore::JSTestCallback::callbackWithBoolean): (WebCore::JSTestCallback::callbackRequiresThisToPass): * dom/RequestAnimationFrameCallback.idl: Modified Paths trunk/Source/WebCore/CMakeLists.txt trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj trunk/Source/WebCore/bindings/js/JSBindingsAllInOne.cpp trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm trunk/Source/WebCore/bindings/scripts/test/JS/JSTestCallback.cpp trunk/Source/WebCore/dom/RequestAnimationFrameCallback.idl Removed Paths trunk/Source/WebCore/bindings/js/JSRequestAnimationFrameCallbackCustom.cpp Diff Modified: trunk/Source/WebCore/CMakeLists.txt (188904 => 188905) --- trunk/Source/WebCore/CMakeLists.txt 2015-08-25 05:31:49 UTC (rev 188904) +++ trunk/Source/WebCore/CMakeLists.txt 2015-08-25 10:11:14 UTC (rev 188905) @@ -1170,7 +1170,6 @@ bindings/js/JSReadableStreamControllerCustom.cpp bindings/js/JSReadableStreamCustom.cpp bindings/js/JSReadableStreamReaderCustom.cpp -bindings/js/JSRequestAnimationFrameCallbackCustom.cpp bindings/js/JSSQLResultSetRowListCustom.cpp bindings/js/JSSQLTransactionCustom.cpp bindings/js/JSSVGLengthCustom.cpp Modified: trunk/Source/WebCore/ChangeLog (188904 => 188905) --- trunk/Source/WebCore/ChangeLog 2015-08-25 05:31:49 UTC (rev 188904) +++ trunk/Source/WebCore/ChangeLog 2015-08-25 10:11:14 UTC (rev 188905) @@ -1,3 +1,28 @@ +2015-08-25 Chris Dumez cdu...@apple.com + +Get rid of custom bindings for RequestAnimationFrameCallback.handleEvent() +https://bugs.webkit.org/show_bug.cgi?id=148417 + +Reviewed by Sam Weinig. + +Get rid of custom bindings for RequestAnimationFrameCallback.handleEvent() +by improving the bindings generator. In this case, the problem was that the +bindings generator did not know how to convert a double parameter into a +JSValue. The new code leverages the pre-existing NativeToJSValue subroutine +to do the conversion instead of duplicating complex support here. + +* WebCore.xcodeproj/project.pbxproj: +* bindings/js/JSRequestAnimationFrameCallbackCustom.cpp: Removed. +* bindings/scripts/CodeGeneratorJS.pm: +(GenerateCallbackImplementation): +* bindings/scripts/test/JS/JSTestCallback.cpp: +(WebCore::JSTestCallback::callbackWithArrayParam): +(WebCore::JSTestCallback::callbackWithSerializedScriptValueParam): +(WebCore::JSTestCallback::callbackWithStringList): +(WebCore::JSTestCallback::callbackWithBoolean): +(WebCore::JSTestCallback::callbackRequiresThisToPass): +* dom/RequestAnimationFrameCallback.idl: + 2015-08-24 Jinyoung Hur hur@navercorp.com Clear cairo-gl surface for initialization Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj (188904 => 188905) --- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2015-08-25 05:31:49 UTC (rev 188904) +++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2015-08-25 10:11:14 UTC (rev 188905) @@ -18605,20 +18605,6 @@ ExcludedFromBuild Condition='$(Configuration)|$(Platform)'=='Production|Win32'true/ExcludedFromBuild ExcludedFromBuild Condition='$(Configuration)|$(Platform)'=='Production|x64'true/ExcludedFromBuild /ClCompile -ClCompile Include=..\bindings\js\JSRequestAnimationFrameCallbackCustom.cpp - ExcludedFromBuild Condition='$(Configuration)|$(Platform)'=='Debug|Win32'true/ExcludedFromBuild - ExcludedFromBuild Condition='$(Configuration)|$(Platform)'=='Debug|x64'true/ExcludedFromBuild - ExcludedFromBuild Condition='$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'true/ExcludedFromBuild - ExcludedFromBuild
[webkit-changes] [188906] releases/WebKitGTK/webkit-2.10/Source/WebCore
Title: [188906] releases/WebKitGTK/webkit-2.10/Source/WebCore Revision 188906 Author carlo...@webkit.org Date 2015-08-25 03:42:37 -0700 (Tue, 25 Aug 2015) Log Message Merge r188858 - Unreviewed. Fix cairo performance regression introduced in r188379. A missing break in a switch was making us to use High image interpolation quality by default. * platform/graphics/cairo/PlatformContextCairo.cpp: (WebCore::PlatformContextCairo::drawSurfaceToContext): Add the missing break. Modified Paths releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/graphics/cairo/PlatformContextCairo.cpp Diff Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog (188905 => 188906) --- releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog 2015-08-25 10:11:14 UTC (rev 188905) +++ releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog 2015-08-25 10:42:37 UTC (rev 188906) @@ -1,3 +1,14 @@ +2015-08-24 Carlos Garcia Campos cgar...@igalia.com + +Unreviewed. Fix cairo performance regression introduced in r188379. + +A missing break in a switch was making us to use High image +interpolation quality by default. + +* platform/graphics/cairo/PlatformContextCairo.cpp: +(WebCore::PlatformContextCairo::drawSurfaceToContext): Add the +missing break. + 2015-08-12 Anders Carlsson ander...@apple.com Use WTF::Optional in WindowFeatures Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/graphics/cairo/PlatformContextCairo.cpp (188905 => 188906) --- releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/graphics/cairo/PlatformContextCairo.cpp 2015-08-25 10:11:14 UTC (rev 188905) +++ releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/graphics/cairo/PlatformContextCairo.cpp 2015-08-25 10:42:37 UTC (rev 188906) @@ -200,6 +200,7 @@ case InterpolationMedium: case InterpolationDefault: cairo_pattern_set_filter(pattern.get(), CAIRO_FILTER_GOOD); +break; case InterpolationHigh: cairo_pattern_set_filter(pattern.get(), CAIRO_FILTER_BEST); break; ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [188933] trunk/Source/WebKit2
Title: [188933] trunk/Source/WebKit2 Revision 188933 Author bda...@apple.com Date 2015-08-25 15:01:18 -0700 (Tue, 25 Aug 2015) Log Message Speculative build fix. * UIProcess/ios/WKContentViewInteraction.mm: (-[WKContentView setupInteraction]): Modified Paths trunk/Source/WebKit2/ChangeLog trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm Diff Modified: trunk/Source/WebKit2/ChangeLog (188932 => 188933) --- trunk/Source/WebKit2/ChangeLog 2015-08-25 19:40:46 UTC (rev 188932) +++ trunk/Source/WebKit2/ChangeLog 2015-08-25 22:01:18 UTC (rev 188933) @@ -1,5 +1,12 @@ 2015-08-25 Beth Dakin bda...@apple.com +Speculative build fix. + +* UIProcess/ios/WKContentViewInteraction.mm: +(-[WKContentView setupInteraction]): + +2015-08-25 Beth Dakin bda...@apple.com + Long press gesture recognizer should adjust delay based on other recognizers https://bugs.webkit.org/show_bug.cgi?id=148402 -and corresponding- Modified: trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm (188932 => 188933) --- trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2015-08-25 19:40:46 UTC (rev 188932) +++ trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2015-08-25 22:01:18 UTC (rev 188933) @@ -345,7 +345,7 @@ _longPressGestureRecognizer = adoptNS([[UILongPressGestureRecognizer alloc] initWithTarget:self action:@selector(_longPressRecognized:)]); [_longPressGestureRecognizer setDelay:tapAndHoldDelay]; [_longPressGestureRecognizer setDelegate:self]; -#if __has_include(WebKitAdditions/WKContentViewInteraction.mm) +#if __has_include(WebKitAdditions/WKContentViewInteraction.mm) HAVE(LINK_PREVIEW) if ([_longPressGestureRecognizer respondsToSelector:@selector(_setAdjustsDelayBasedOnOtherRecognizers:)]) [_longPressGestureRecognizer _setAdjustsDelayBasedOnOtherRecognizers:YES]; #endif ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [188934] branches/jsc-tailcall/Source/JavaScriptCore
Title: [188934] branches/jsc-tailcall/Source/_javascript_Core Revision 188934 Author basile_clem...@apple.com Date 2015-08-25 15:09:26 -0700 (Tue, 25 Aug 2015) Log Message jsc-tailcall: Add an option to disable tail calls https://bugs.webkit.org/show_bug.cgi?id=148447 Reviewed by Michael Saboff. * bytecompiler/NodesCodegen.cpp: (JSC::FunctionNode::emitBytecode): * runtime/Options.h: Modified Paths branches/jsc-tailcall/Source/_javascript_Core/ChangeLog branches/jsc-tailcall/Source/_javascript_Core/bytecompiler/NodesCodegen.cpp branches/jsc-tailcall/Source/_javascript_Core/runtime/Options.h Diff Modified: branches/jsc-tailcall/Source/_javascript_Core/ChangeLog (188933 => 188934) --- branches/jsc-tailcall/Source/_javascript_Core/ChangeLog 2015-08-25 22:01:18 UTC (rev 188933) +++ branches/jsc-tailcall/Source/_javascript_Core/ChangeLog 2015-08-25 22:09:26 UTC (rev 188934) @@ -1,3 +1,14 @@ +2015-08-25 Basile Clement basile_clem...@apple.com + +jsc-tailcall: Add an option to disable tail calls +https://bugs.webkit.org/show_bug.cgi?id=148447 + +Reviewed by Michael Saboff. + +* bytecompiler/NodesCodegen.cpp: +(JSC::FunctionNode::emitBytecode): +* runtime/Options.h: + 2015-08-24 Michael Saboff msab...@apple.com jsc-tailcall: Specialized thunks need to save / restore callee save tag registers Modified: branches/jsc-tailcall/Source/_javascript_Core/bytecompiler/NodesCodegen.cpp (188933 => 188934) --- branches/jsc-tailcall/Source/_javascript_Core/bytecompiler/NodesCodegen.cpp 2015-08-25 22:01:18 UTC (rev 188933) +++ branches/jsc-tailcall/Source/_javascript_Core/bytecompiler/NodesCodegen.cpp 2015-08-25 22:09:26 UTC (rev 188934) @@ -3044,7 +3044,7 @@ generator.emitProfileControlFlow(startStartOffset()); generator.emitDebugHook(DidEnterCallFrame, startLine(), startStartOffset(), startLineStartOffset()); -if (isStrictMode() generator.constructorKind() == ConstructorKind::None) +if (Options::enableTailCalls() isStrictMode() generator.constructorKind() == ConstructorKind::None) emitStatementsBytecode(generator, generator.ignoredResult(), CanHaveTailCalls); else emitStatementsBytecode(generator, generator.ignoredResult()); Modified: branches/jsc-tailcall/Source/_javascript_Core/runtime/Options.h (188933 => 188934) --- branches/jsc-tailcall/Source/_javascript_Core/runtime/Options.h 2015-08-25 22:01:18 UTC (rev 188933) +++ branches/jsc-tailcall/Source/_javascript_Core/runtime/Options.h 2015-08-25 22:09:26 UTC (rev 188934) @@ -117,6 +117,7 @@ v(bool, forceProfilerBytecodeGeneration, false, nullptr) \ \ v(bool, enableFunctionDotArguments, true, nullptr) \ +v(bool, enableTailCalls, true, nullptr) \ \ /* showDisassembly implies showDFGDisassembly. */ \ v(bool, showDisassembly, false, dumps disassembly of all JIT compiled code upon compilation) \ ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [188932] trunk/Source/JavaScriptCore
Title: [188932] trunk/Source/_javascript_Core Revision 188932 Author saambara...@gmail.com Date 2015-08-25 12:40:46 -0700 (Tue, 25 Aug 2015) Log Message Lets rename codeOriginIndex to callSiteIndex and get rid of CallFrame::Location. https://bugs.webkit.org/show_bug.cgi?id=148213 Reviewed by Filip Pizlo. This patch introduces a struct called CallSiteIndex which is used as a wrapper for a 32-bit int to place things in the tag for ArgumentCount in the call frame. On 32-bit we place Instruction* into this slot for LLInt and Basline. For 32-bit DFG we place a an index into the code origin table in this slot. On 64-bit we place a bytecode offset into this slot for LLInt and Baseline. On 64-bit we place the index into the code origin table in this slot in the DFG/FTL. This patch also gets rid of the encoding scheme that describes if something is a bytecode index or a code origin table index. This information can always be determined based on the CodeBlock's' JITType. StructureStubInfo now also has a CallSiteIndex which it stores to the call frame when making a call. * bytecode/CodeBlock.h: (JSC::CodeBlock::hasCodeOrigins): (JSC::CodeBlock::canGetCodeOrigin): (JSC::CodeBlock::codeOrigin): (JSC::CodeBlock::addFrequentExitSite): * bytecode/StructureStubInfo.h: (JSC::StructureStubInfo::StructureStubInfo): * dfg/DFGCommonData.cpp: (JSC::DFG::CommonData::notifyCompilingStructureTransition): (JSC::DFG::CommonData::addCodeOrigin): (JSC::DFG::CommonData::shrinkToFit): * dfg/DFGCommonData.h: (JSC::DFG::CommonData::CommonData): * dfg/DFGJITCompiler.h: (JSC::DFG::JITCompiler::setEndOfCode): (JSC::DFG::JITCompiler::addCallSite): (JSC::DFG::JITCompiler::emitStoreCodeOrigin): * dfg/DFGOSRExitCompilerCommon.cpp: (JSC::DFG::reifyInlinedCallFrames): * dfg/DFGSpeculativeJIT.cpp: (JSC::DFG::SpeculativeJIT::compileIn): * dfg/DFGSpeculativeJIT32_64.cpp: (JSC::DFG::SpeculativeJIT::cachedGetById): (JSC::DFG::SpeculativeJIT::cachedPutById): * dfg/DFGSpeculativeJIT64.cpp: (JSC::DFG::SpeculativeJIT::cachedGetById): (JSC::DFG::SpeculativeJIT::cachedPutById): * ftl/FTLCompile.cpp: (JSC::FTL::mmAllocateDataSection): * ftl/FTLInlineCacheDescriptor.h: (JSC::FTL::InlineCacheDescriptor::InlineCacheDescriptor): (JSC::FTL::InlineCacheDescriptor::stackmapID): (JSC::FTL::InlineCacheDescriptor::callSiteIndex): (JSC::FTL::InlineCacheDescriptor::uid): (JSC::FTL::GetByIdDescriptor::GetByIdDescriptor): (JSC::FTL::PutByIdDescriptor::PutByIdDescriptor): (JSC::FTL::CheckInDescriptor::CheckInDescriptor): (JSC::FTL::InlineCacheDescriptor::codeOrigin): Deleted. * ftl/FTLLink.cpp: (JSC::FTL::link): * ftl/FTLLowerDFGToLLVM.cpp: (JSC::FTL::DFG::LowerDFGToLLVM::compilePutById): (JSC::FTL::DFG::LowerDFGToLLVM::compileIn): (JSC::FTL::DFG::LowerDFGToLLVM::getById): (JSC::FTL::DFG::LowerDFGToLLVM::callPreflight): * ftl/FTLSlowPathCall.cpp: (JSC::FTL::storeCodeOrigin): * interpreter/CallFrame.cpp: (JSC::CallFrame::currentVPC): (JSC::CallFrame::setCurrentVPC): (JSC::CallFrame::callSiteBitsAsBytecodeOffset): (JSC::CallFrame::bytecodeOffset): (JSC::CallFrame::codeOrigin): (JSC::CallFrame::topOfFrameInternal): (JSC::CallFrame::locationAsBytecodeOffset): Deleted. (JSC::CallFrame::setLocationAsBytecodeOffset): Deleted. (JSC::CallFrame::bytecodeOffsetFromCodeOriginIndex): Deleted. * interpreter/CallFrame.h: (JSC::CallSiteIndex::CallSiteIndex): (JSC::CallSiteIndex::bits): (JSC::ExecState::returnPCOffset): (JSC::ExecState::abstractReturnPC): (JSC::ExecState::topOfFrame): (JSC::ExecState::setCallerFrame): (JSC::ExecState::setScope): (JSC::ExecState::currentVPC): Deleted. (JSC::ExecState::setCurrentVPC): Deleted. * interpreter/CallFrameInlines.h: (JSC::CallFrame::callSiteBitsAreBytecodeOffset): (JSC::CallFrame::callSiteBitsAreCodeOriginIndex): (JSC::CallFrame::callSiteAsRawBits): (JSC::CallFrame::callSiteIndex): (JSC::CallFrame::hasActivation): (JSC::CallFrame::Location::encode): Deleted. (JSC::CallFrame::Location::decode): Deleted. (JSC::CallFrame::Location::encodeAsBytecodeOffset): Deleted. (JSC::CallFrame::Location::encodeAsBytecodeInstruction): Deleted. (JSC::CallFrame::Location::encodeAsCodeOriginIndex): Deleted. (JSC::CallFrame::Location::isBytecodeLocation): Deleted. (JSC::CallFrame::Location::isCodeOriginIndex): Deleted. (JSC::CallFrame::hasLocationAsBytecodeOffset): Deleted. (JSC::CallFrame::hasLocationAsCodeOriginIndex): Deleted. (JSC::CallFrame::locationAsRawBits): Deleted. (JSC::CallFrame::setLocationAsRawBits): Deleted. (JSC::CallFrame::locationAsBytecodeOffset): Deleted. (JSC::CallFrame::setLocationAsBytecodeOffset): Deleted. (JSC::CallFrame::locationAsCodeOriginIndex): Deleted. * interpreter/StackVisitor.cpp: (JSC::StackVisitor::readFrame): (JSC::StackVisitor::readNonInlinedFrame): (JSC::StackVisitor::Frame::print): * jit/JITCall.cpp: (JSC::JIT::compileOpCall): * jit/JITCall32_64.cpp: (JSC::JIT::compileOpCall): * jit/JITInlineCacheGenerator.cpp: (JSC::garbageStubInfo): (JSC::JITInlineCacheGenerator::JITInlineCacheGenerator):
[webkit-changes] [188939] trunk/Tools
Title: [188939] trunk/Tools Revision 188939 Author bfulg...@apple.com Date 2015-08-25 17:16:02 -0700 (Tue, 25 Aug 2015) Log Message [Win] Expose Inverted Colors option in WinLauncher https://bugs.webkit.org/show_bug.cgi?id=148451 Reviewed by Tim Horton. Add the ability to toggle the Inverted Colors preference in WinLauncher. * WinLauncher/Common.cpp: (ToggleMenuItem): Toggle the feature when the menu item is selected. (WndProc): Recognize the new menu option. * WinLauncher/WinLauncher.cpp: (WinLauncher::setToDefaultPreferences): Launch with Invert Colors turned off. * WinLauncher/WinLauncher.vcxproj/WinLauncherLib.rc: Add menu entry for Invert Colors. * WinLauncher/WinLauncher.vcxproj/WinLauncherLibResource.h: Modified Paths trunk/Tools/ChangeLog trunk/Tools/WinLauncher/Common.cpp trunk/Tools/WinLauncher/WinLauncher.cpp trunk/Tools/WinLauncher/WinLauncher.vcxproj/WinLauncherLib.rc trunk/Tools/WinLauncher/WinLauncher.vcxproj/WinLauncherLibResource.h Diff Modified: trunk/Tools/ChangeLog (188938 => 188939) --- trunk/Tools/ChangeLog 2015-08-25 23:45:12 UTC (rev 188938) +++ trunk/Tools/ChangeLog 2015-08-26 00:16:02 UTC (rev 188939) @@ -1,3 +1,24 @@ +2015-08-25 Brent Fulgham bfulg...@apple.com + +[Win] Expose Inverted Colors option in WinLauncher +https://bugs.webkit.org/show_bug.cgi?id=148451 + +Reviewed by Tim Horton. + +Add the ability to toggle the Inverted Colors preference +in WinLauncher. + +* WinLauncher/Common.cpp: +(ToggleMenuItem): Toggle the feature when the menu item +is selected. +(WndProc): Recognize the new menu option. +* WinLauncher/WinLauncher.cpp: +(WinLauncher::setToDefaultPreferences): Launch with Invert +Colors turned off. +* WinLauncher/WinLauncher.vcxproj/WinLauncherLib.rc: Add menu +entry for Invert Colors. +* WinLauncher/WinLauncher.vcxproj/WinLauncherLibResource.h: + 2015-08-25 Nan Wang n_w...@apple.com [Mac] accessibility/document-attributes.html fails Modified: trunk/Tools/WinLauncher/Common.cpp (188938 => 188939) --- trunk/Tools/WinLauncher/Common.cpp 2015-08-25 23:45:12 UTC (rev 188938) +++ trunk/Tools/WinLauncher/Common.cpp 2015-08-26 00:16:02 UTC (rev 188939) @@ -390,6 +390,9 @@ gWinLauncher-privatePreferences()-setShowDebugBorders(newState); gWinLauncher-privatePreferences()-setShowRepaintCounter(newState); break; +case IDM_INVERT_COLORS: +gWinLauncher-privatePreferences()-setShouldInvertColors(newState); +break; case IDM_DISABLE_IMAGES: gWinLauncher-standardPreferences()-setLoadsImagesAutomatically(!newState); break; @@ -488,6 +491,7 @@ case IDM_ACC_COMPOSITING: case IDM_WK_FULLSCREEN: case IDM_COMPOSITING_BORDERS: +case IDM_INVERT_COLORS: case IDM_DISABLE_IMAGES: case IDM_DISABLE_STYLES: case IDM_DISABLE_JAVASCRIPT: Modified: trunk/Tools/WinLauncher/WinLauncher.cpp (188938 => 188939) --- trunk/Tools/WinLauncher/WinLauncher.cpp 2015-08-25 23:45:12 UTC (rev 188938) +++ trunk/Tools/WinLauncher/WinLauncher.cpp 2015-08-26 00:16:02 UTC (rev 188939) @@ -191,6 +191,7 @@ m_prefsPrivate-setFullScreenEnabled(TRUE); m_prefsPrivate-setShowDebugBorders(FALSE); m_prefsPrivate-setShowRepaintCounter(FALSE); +m_prefsPrivate-setShouldInvertColors(FALSE); m_standardPreferences-setLoadsImagesAutomatically(TRUE); m_prefsPrivate-setAuthorAndUserStylesEnabled(TRUE); Modified: trunk/Tools/WinLauncher/WinLauncher.vcxproj/WinLauncherLib.rc (188938 => 188939) --- trunk/Tools/WinLauncher/WinLauncher.vcxproj/WinLauncherLib.rc 2015-08-25 23:45:12 UTC (rev 188938) +++ trunk/Tools/WinLauncher/WinLauncher.vcxproj/WinLauncherLib.rc 2015-08-26 00:16:02 UTC (rev 188939) @@ -48,6 +48,7 @@ MENUITEM Actual Size, IDM_ACTUAL_SIZE MENUITEM Zoom In\tCtrl++, IDM_ZOOM_IN MENUITEM Zoom Out\tCtrl+-,IDM_ZOOM_OUT +MENUITEM Invert Colors, IDM_INVERT_COLORS END POPUP History BEGIN Modified: trunk/Tools/WinLauncher/WinLauncher.vcxproj/WinLauncherLibResource.h (188938 => 188939) --- trunk/Tools/WinLauncher/WinLauncher.vcxproj/WinLauncherLibResource.h 2015-08-25 23:45:12 UTC (rev 188938) +++ trunk/Tools/WinLauncher/WinLauncher.vcxproj/WinLauncherLibResource.h 2015-08-26 00:16:02 UTC (rev 188939) @@ -22,6 +22,7 @@ #define IDM_DISABLE_STYLES 122 #define IDM_DISABLE_JAVASCRIPT 123 #define IDM_DISABLE_LOCAL_FILE_RESTRICTIONS 124 +#define IDM_INVERT_COLORS 125 #define IDR_MAINFRAME 128 #define IDD_CACHES 129 #define IDM_HISTORY_BACKWARD130 ___ webkit-changes mailing list webkit-changes@lists.webkit.org
[webkit-changes] [188936] branches/jsc-tailcall/Source/JavaScriptCore
Title: [188936] branches/jsc-tailcall/Source/_javascript_Core Revision 188936 Author basile_clem...@apple.com Date 2015-08-25 15:50:15 -0700 (Tue, 25 Aug 2015) Log Message jsc-tailcall: Get rid of FTLValueFormat https://bugs.webkit.org/show_bug.cgi?id=148448 Reviewed by Michael Saboff. FTL::ValueFormat is nothing more than DataFormat (and is actually slightly less). Let's get rid of it. * CMakeLists.txt: * _javascript_Core.vcxproj/_javascript_Core.vcxproj: * _javascript_Core.vcxproj/_javascript_Core.vcxproj.filters: * _javascript_Core.xcodeproj/project.pbxproj: * bytecode/DataFormat.cpp: Renamed from Source/_javascript_Core/ftl/FTLValueFormat.h. (WTF::printInternal): * bytecode/DataFormat.h: * ftl/FTLAvailableRecovery.h: (JSC::FTL::AvailableRecovery::AvailableRecovery): (JSC::FTL::AvailableRecovery::format): * ftl/FTLExitArgument.h: (JSC::FTL::ExitArgument::ExitArgument): (JSC::FTL::ExitArgument::operator!): (JSC::FTL::ExitArgument::format): (JSC::FTL::ExitArgument::withFormat): * ftl/FTLExitValue.cpp: (JSC::FTL::ExitValue::dataFormat): * ftl/FTLExitValue.h: (JSC::FTL::ExitValue::recovery): (JSC::FTL::ExitValue::recoveryFormat): * ftl/FTLFormattedValue.h: (JSC::FTL::FormattedValue::FormattedValue): (JSC::FTL::FormattedValue::operator!): (JSC::FTL::FormattedValue::format): (JSC::FTL::int32Value): (JSC::FTL::booleanValue): (JSC::FTL::jsValueValue): (JSC::FTL::doubleValue): * ftl/FTLLowerDFGToLLVM.cpp: (JSC::FTL::DFG::LowerDFGToLLVM::compileArithAddOrSub): (JSC::FTL::DFG::LowerDFGToLLVM::compileInvalidationPoint): (JSC::FTL::DFG::LowerDFGToLLVM::convertDoubleToInt32): (JSC::FTL::DFG::LowerDFGToLLVM::exitValueForNode): (JSC::FTL::DFG::LowerDFGToLLVM::exitArgument): (JSC::FTL::DFG::LowerDFGToLLVM::addAvailableRecovery): * ftl/FTLOSRExit.cpp: (JSC::FTL::OSRExit::OSRExit): * ftl/FTLOSRExit.h: * ftl/FTLOSRExitCompiler.cpp: (JSC::FTL::reboxAccordingToFormat): (JSC::FTL::compileRecovery): (JSC::FTL::compileStub): * ftl/FTLValueFormat.cpp: Removed. Modified Paths branches/jsc-tailcall/Source/_javascript_Core/CMakeLists.txt branches/jsc-tailcall/Source/_javascript_Core/ChangeLog branches/jsc-tailcall/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_Core.vcxproj branches/jsc-tailcall/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_Core.vcxproj.filters branches/jsc-tailcall/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj branches/jsc-tailcall/Source/_javascript_Core/bytecode/DataFormat.h branches/jsc-tailcall/Source/_javascript_Core/ftl/FTLAvailableRecovery.h branches/jsc-tailcall/Source/_javascript_Core/ftl/FTLExitArgument.h branches/jsc-tailcall/Source/_javascript_Core/ftl/FTLExitValue.cpp branches/jsc-tailcall/Source/_javascript_Core/ftl/FTLExitValue.h branches/jsc-tailcall/Source/_javascript_Core/ftl/FTLFormattedValue.h branches/jsc-tailcall/Source/_javascript_Core/ftl/FTLLowerDFGToLLVM.cpp branches/jsc-tailcall/Source/_javascript_Core/ftl/FTLOSRExit.cpp branches/jsc-tailcall/Source/_javascript_Core/ftl/FTLOSRExit.h branches/jsc-tailcall/Source/_javascript_Core/ftl/FTLOSRExitCompiler.cpp Added Paths branches/jsc-tailcall/Source/_javascript_Core/bytecode/DataFormat.cpp Removed Paths branches/jsc-tailcall/Source/_javascript_Core/ftl/FTLValueFormat.cpp branches/jsc-tailcall/Source/_javascript_Core/ftl/FTLValueFormat.h Diff Modified: branches/jsc-tailcall/Source/_javascript_Core/CMakeLists.txt (188935 => 188936) --- branches/jsc-tailcall/Source/_javascript_Core/CMakeLists.txt 2015-08-25 22:44:45 UTC (rev 188935) +++ branches/jsc-tailcall/Source/_javascript_Core/CMakeLists.txt 2015-08-25 22:50:15 UTC (rev 188936) @@ -85,6 +85,7 @@ bytecode/CodeType.cpp bytecode/ComplexGetStatus.cpp bytecode/ConstantStructureCheck.cpp +bytecode/DataFormat.cpp bytecode/DFGExitProfile.cpp bytecode/DeferredCompilationCallback.cpp bytecode/DeferredSourceDump.cpp @@ -895,7 +896,6 @@ ftl/FTLState.cpp ftl/FTLThunks.cpp ftl/FTLUnwindInfo.cpp -ftl/FTLValueFormat.cpp ftl/FTLValueRange.cpp llvm/InitializeLLVM.cpp Modified: branches/jsc-tailcall/Source/_javascript_Core/ChangeLog (188935 => 188936) --- branches/jsc-tailcall/Source/_javascript_Core/ChangeLog 2015-08-25 22:44:45 UTC (rev 188935) +++ branches/jsc-tailcall/Source/_javascript_Core/ChangeLog 2015-08-25 22:50:15 UTC (rev 188936) @@ -1,5 +1,59 @@ 2015-08-25 Basile Clement basile_clem...@apple.com +jsc-tailcall: Get rid of FTLValueFormat +https://bugs.webkit.org/show_bug.cgi?id=148448 + +Reviewed by Michael Saboff. + +FTL::ValueFormat is nothing more than DataFormat (and is actually +slightly less). Let's get rid of it. + +* CMakeLists.txt: +* _javascript_Core.vcxproj/_javascript_Core.vcxproj: +* _javascript_Core.vcxproj/_javascript_Core.vcxproj.filters: +* _javascript_Core.xcodeproj/project.pbxproj: +* bytecode/DataFormat.cpp: Renamed from
[webkit-changes] [188938] trunk
Title: [188938] trunk Revision 188938 Author commit-qu...@webkit.org Date 2015-08-25 16:45:12 -0700 (Tue, 25 Aug 2015) Log Message Unreviewed, rolling out r188919. https://bugs.webkit.org/show_bug.cgi?id=148452 broke build (Requested by alexchristensen on #webkit). Reverted changeset: [Win] Build does not generate debug info. https://bugs.webkit.org/show_bug.cgi?id=148431 http://trac.webkit.org/changeset/188919 Modified Paths trunk/ChangeLog trunk/Source/cmake/OptionsWin.cmake Diff Modified: trunk/ChangeLog (188937 => 188938) --- trunk/ChangeLog 2015-08-25 22:59:36 UTC (rev 188937) +++ trunk/ChangeLog 2015-08-25 23:45:12 UTC (rev 188938) @@ -1,3 +1,16 @@ +2015-08-25 Commit Queue commit-qu...@webkit.org + +Unreviewed, rolling out r188919. +https://bugs.webkit.org/show_bug.cgi?id=148452 + +broke build (Requested by alexchristensen on #webkit). + +Reverted changeset: + +[Win] Build does not generate debug info. +https://bugs.webkit.org/show_bug.cgi?id=148431 +http://trac.webkit.org/changeset/188919 + 2015-08-25 Michael Catanzaro mcatanz...@igalia.com [GTK] r186800 broke the build on Ubuntu 14.04 Modified: trunk/Source/cmake/OptionsWin.cmake (188937 => 188938) --- trunk/Source/cmake/OptionsWin.cmake 2015-08-25 22:59:36 UTC (rev 188937) +++ trunk/Source/cmake/OptionsWin.cmake 2015-08-25 23:45:12 UTC (rev 188938) @@ -136,11 +136,6 @@ /wd4291 /wd4305 /wd4309 /wd4344 /wd4355 /wd4389 /wd4396 /wd4481 /wd4503 /wd4505 /wd4510 /wd4512 /wd4530 /wd4610 /wd4702 /wd4706 /wd4800 /wd4819 /wd4951 /wd4952 /wd4996 /wd6011 /wd6031 /wd6211 /wd6246 /wd6255 /wd6387 /wd4456 /wd4458 ) - -# Create pdb files for debugging purposes, also for Release builds -add_definitions(/Zi) -set(CMAKE_SHARED_LINKER_FLAGS ${CMAKE_SHARED_LINKER_FLAGS} /DEBUG) - if (NOT ${CMAKE_GENERATOR} MATCHES Ninja) link_directories(${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CMAKE_BUILD_TYPE}) add_definitions(/MP) ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [188935] trunk
Title: [188935] trunk Revision 188935 Author za...@apple.com Date 2015-08-25 15:44:45 -0700 (Tue, 25 Aug 2015) Log Message Using the filter functional notation for background images results in wrong background-size rendering https://bugs.webkit.org/show_bug.cgi?id=148221 rdar://problem/22379518 Reviewed by Daniel Bates. Do not ignore the size argument, when the filter image is being drawn onto the context. When the size is ignored, we end up painting the image with its native size while the filter is applied on the size of the generated image. Source/WebCore: Test: fast/filter-image/background-filter-image.html * css/CSSFilterImageValue.cpp: (WebCore::CSSFilterImageValue::image): LayoutTests: * fast/filter-image/background-filter-image-expected.html: Added. * fast/filter-image/background-filter-image.html: Added. Modified Paths trunk/LayoutTests/ChangeLog trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/css/CSSFilterImageValue.cpp Added Paths trunk/LayoutTests/fast/filter-image/background-filter-image-expected.html trunk/LayoutTests/fast/filter-image/background-filter-image.html Diff Modified: trunk/LayoutTests/ChangeLog (188934 => 188935) --- trunk/LayoutTests/ChangeLog 2015-08-25 22:09:26 UTC (rev 188934) +++ trunk/LayoutTests/ChangeLog 2015-08-25 22:44:45 UTC (rev 188935) @@ -1,3 +1,18 @@ +2015-08-25 Zalan Bujtas za...@apple.com + +Using the filter functional notation for background images results in wrong background-size rendering +https://bugs.webkit.org/show_bug.cgi?id=148221 +rdar://problem/22379518 + +Reviewed by Daniel Bates. + +Do not ignore the size argument, when the filter image is being drawn onto the context. +When the size is ignored, we end up painting the image with its native size while the filter +is applied on the size of the generated image. + +* fast/filter-image/background-filter-image-expected.html: Added. +* fast/filter-image/background-filter-image.html: Added. + 2015-08-25 Nan Wang n_w...@apple.com [Mac] accessibility/document-attributes.html fails Added: trunk/LayoutTests/fast/filter-image/background-filter-image-expected.html (0 => 188935) --- trunk/LayoutTests/fast/filter-image/background-filter-image-expected.html (rev 0) +++ trunk/LayoutTests/fast/filter-image/background-filter-image-expected.html 2015-08-25 22:44:45 UTC (rev 188935) @@ -0,0 +1,16 @@ +!DOCTYPE html +html +head +titleThis tests that background images with filters scale properly./title +style + img { +width: 100px; +height: 100px; +filter: sepia(1); + } +/style +/head +body + img src="" +/body +/html Added: trunk/LayoutTests/fast/filter-image/background-filter-image.html (0 => 188935) --- trunk/LayoutTests/fast/filter-image/background-filter-image.html (rev 0) +++ trunk/LayoutTests/fast/filter-image/background-filter-image.html 2015-08-25 22:44:45 UTC (rev 188935) @@ -0,0 +1,17 @@ +!DOCTYPE html +html +head +titleThis tests that background images with filters scale properly./title +style + div { +background-image: filter(url(../replaced/resources/compass.jpg), sepia(1)); +background-size: 100px 100px; +width: 100px; +height: 100px; + } +/style +/head +body + div/div +/body +/html Modified: trunk/Source/WebCore/ChangeLog (188934 => 188935) --- trunk/Source/WebCore/ChangeLog 2015-08-25 22:09:26 UTC (rev 188934) +++ trunk/Source/WebCore/ChangeLog 2015-08-25 22:44:45 UTC (rev 188935) @@ -1,3 +1,20 @@ +2015-08-25 Zalan Bujtas za...@apple.com + +Using the filter functional notation for background images results in wrong background-size rendering +https://bugs.webkit.org/show_bug.cgi?id=148221 +rdar://problem/22379518 + +Reviewed by Daniel Bates. + +Do not ignore the size argument, when the filter image is being drawn onto the context. +When the size is ignored, we end up painting the image with its native size while the filter +is applied on the size of the generated image. + +Test: fast/filter-image/background-filter-image.html + +* css/CSSFilterImageValue.cpp: +(WebCore::CSSFilterImageValue::image): + 2015-08-25 Carlos Garcia Campos cgar...@igalia.com IconDatabase: syncThreadMainLoop() is unlocking m_syncLock twice when thread termination is requested Modified: trunk/Source/WebCore/css/CSSFilterImageValue.cpp (188934 => 188935) --- trunk/Source/WebCore/css/CSSFilterImageValue.cpp 2015-08-25 22:09:26 UTC (rev 188934) +++ trunk/Source/WebCore/css/CSSFilterImageValue.cpp 2015-08-25 22:44:45 UTC (rev 188935) @@ -123,12 +123,13 @@ std::unique_ptrImageBuffer texture = ImageBuffer::create(size); if (!texture) return Image::nullImage(); -texture-context()-drawImage(image, ColorSpaceDeviceRGB, IntPoint()); +FloatRect imageRect = FloatRect(FloatPoint(), size); +
[webkit-changes] [188907] releases/WebKitGTK/webkit-2.10
Title: [188907] releases/WebKitGTK/webkit-2.10 Revision 188907 Author carlo...@webkit.org Date 2015-08-25 05:40:25 -0700 (Tue, 25 Aug 2015) Log Message Merge r188400 - WTF should have a compact Condition object to use with Lock https://bugs.webkit.org/show_bug.cgi?id=147986 Reviewed by Geoffrey Garen. Source/WTF: Adds a condition variable implementation based on ParkingLot, called simply WTF::Condition. It can be used with WTF::Lock or actually any lock implementation. It should even work with WTF::SpinLock, WTF::Mutex, or std::mutex. Best of all, Condition only requires one byte. ParkingLot almost contained all of the functionality needed to implemenet wait/notify. We could have implemented Condition using a 32-bit (or even 64-bit) version that protects against a notify that happens just before we park. But, this changes the ParkingLot API to give us the ability to run some code between when ParkingLot enqueues the current thread and when it actually sleeps. This callback is called with no locks held, so it can call unlock() on any kind of lock, so long as that lock's unlock() method doesn't recurse into ParkingLot::parkConditionally(). That seems unlikely; unlock() is more likely to call ParkingLot::unparkOne() or unparkAll(). WTF::Lock will never call parkConditionally() inside unlock(), so WTF::Lock is definitely appropriate for use with Condition. Condition supports most of the API that std::condition_variable supports. It does some things to try to reduce footgun potential. The preferred timeout form is waitUntil() which takes an absolute time from the steady_clock. The only relative timeout form also takes a predicate callback, so it's impossible to write the subtly incorrect while (...) wait_for(...) idiom. This patch doesn't actually introduce any uses of WTF::Condition other than the unit tests. I'll start switching code over to using WTF::Condition in another patch. * WTF.vcxproj/WTF.vcxproj: * WTF.xcodeproj/project.pbxproj: * wtf/CMakeLists.txt: * wtf/Condition.h: Added. (WTF::Condition::Condition): (WTF::Condition::waitUntil): (WTF::Condition::waitFor): (WTF::Condition::wait): (WTF::Condition::notifyOne): (WTF::Condition::notifyAll): * wtf/Lock.cpp: (WTF::LockBase::unlockSlow): Make this useful assertion be a release assertion. It catches cases where you unlock the lock even though you don't hold it. * wtf/ParkingLot.cpp: (WTF::ParkingLot::parkConditionally): Add the beforeSleep() callback. (WTF::ParkingLot::unparkOne): * wtf/ParkingLot.h: (WTF::ParkingLot::compareAndPark): Tools: Add a test for WTF::Condition. * TestWebKitAPI/CMakeLists.txt: * TestWebKitAPI/TestWebKitAPI.vcxproj/TestWebKitAPI.vcxproj: * TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj: * TestWebKitAPI/Tests/WTF/Condition.cpp: Added. (TestWebKitAPI::TEST): * TestWebKitAPI/Tests/WTF/Lock.cpp: (TestWebKitAPI::runLockTest): Change the name of the thread. Modified Paths releases/WebKitGTK/webkit-2.10/Source/WTF/ChangeLog releases/WebKitGTK/webkit-2.10/Source/WTF/WTF.vcxproj/WTF.vcxproj releases/WebKitGTK/webkit-2.10/Source/WTF/WTF.xcodeproj/project.pbxproj releases/WebKitGTK/webkit-2.10/Source/WTF/wtf/CMakeLists.txt releases/WebKitGTK/webkit-2.10/Source/WTF/wtf/Lock.cpp releases/WebKitGTK/webkit-2.10/Source/WTF/wtf/ParkingLot.cpp releases/WebKitGTK/webkit-2.10/Source/WTF/wtf/ParkingLot.h releases/WebKitGTK/webkit-2.10/Tools/ChangeLog releases/WebKitGTK/webkit-2.10/Tools/TestWebKitAPI/CMakeLists.txt releases/WebKitGTK/webkit-2.10/Tools/TestWebKitAPI/TestWebKitAPI.vcxproj/TestWebKitAPI.vcxproj releases/WebKitGTK/webkit-2.10/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj releases/WebKitGTK/webkit-2.10/Tools/TestWebKitAPI/Tests/WTF/Lock.cpp Added Paths releases/WebKitGTK/webkit-2.10/Source/WTF/wtf/Condition.h releases/WebKitGTK/webkit-2.10/Tools/TestWebKitAPI/Tests/WTF/Condition.cpp Diff Modified: releases/WebKitGTK/webkit-2.10/Source/WTF/ChangeLog (188906 => 188907) --- releases/WebKitGTK/webkit-2.10/Source/WTF/ChangeLog 2015-08-25 10:42:37 UTC (rev 188906) +++ releases/WebKitGTK/webkit-2.10/Source/WTF/ChangeLog 2015-08-25 12:40:25 UTC (rev 188907) @@ -1,3 +1,51 @@ +2015-08-13 Filip Pizlo fpi...@apple.com + +WTF should have a compact Condition object to use with Lock +https://bugs.webkit.org/show_bug.cgi?id=147986 + +Reviewed by Geoffrey Garen. + +Adds a condition variable implementation based on ParkingLot, called simply WTF::Condition. +It can be used with WTF::Lock or actually any lock implementation. It should even work with +WTF::SpinLock, WTF::Mutex, or std::mutex. Best of all, Condition only requires one byte. + +ParkingLot almost contained all of the functionality needed to implemenet wait/notify. We +could have implemented Condition using a 32-bit (or even 64-bit) version that protects +against a notify that happens just before we park. But, this changes the ParkingLot API to +give us the
[webkit-changes] [188908] releases/WebKitGTK/webkit-2.10/Source
Title: [188908] releases/WebKitGTK/webkit-2.10/Source Revision 188908 Author carlo...@webkit.org Date 2015-08-25 05:41:31 -0700 (Tue, 25 Aug 2015) Log Message Merge r188499 - Use WTF::Lock and WTF::Condition instead of WTF::Mutex, WTF::ThreadCondition, std::mutex, and std::condition_variable https://bugs.webkit.org/show_bug.cgi?id=147999 Reviewed by Geoffrey Garen. Source/_javascript_Core: * API/JSVirtualMachine.mm: (initWrapperCache): (+[JSVMWrapperCache addWrapper:forJSContextGroupRef:]): (+[JSVMWrapperCache wrapperForJSContextGroupRef:]): (wrapperCacheMutex): Deleted. * bytecode/SamplingTool.cpp: (JSC::SamplingTool::doRun): (JSC::SamplingTool::notifyOfScope): * bytecode/SamplingTool.h: * dfg/DFGThreadData.h: * dfg/DFGWorklist.cpp: (JSC::DFG::Worklist::~Worklist): (JSC::DFG::Worklist::isActiveForVM): (JSC::DFG::Worklist::enqueue): (JSC::DFG::Worklist::compilationState): (JSC::DFG::Worklist::waitUntilAllPlansForVMAreReady): (JSC::DFG::Worklist::removeAllReadyPlansForVM): (JSC::DFG::Worklist::completeAllReadyPlansForVM): (JSC::DFG::Worklist::visitWeakReferences): (JSC::DFG::Worklist::removeDeadPlans): (JSC::DFG::Worklist::queueLength): (JSC::DFG::Worklist::dump): (JSC::DFG::Worklist::runThread): * dfg/DFGWorklist.h: * disassembler/Disassembler.cpp: * heap/CopiedSpace.cpp: (JSC::CopiedSpace::doneFillingBlock): (JSC::CopiedSpace::doneCopying): * heap/CopiedSpace.h: * heap/CopiedSpaceInlines.h: (JSC::CopiedSpace::recycleBorrowedBlock): (JSC::CopiedSpace::allocateBlockForCopyingPhase): * heap/GCThread.cpp: (JSC::GCThread::waitForNextPhase): (JSC::GCThread::gcThreadMain): * heap/GCThreadSharedData.cpp: (JSC::GCThreadSharedData::GCThreadSharedData): (JSC::GCThreadSharedData::~GCThreadSharedData): (JSC::GCThreadSharedData::startNextPhase): (JSC::GCThreadSharedData::endCurrentPhase): (JSC::GCThreadSharedData::didStartMarking): (JSC::GCThreadSharedData::didFinishMarking): * heap/GCThreadSharedData.h: * heap/HeapTimer.h: * heap/MachineStackMarker.cpp: (JSC::ActiveMachineThreadsManager::Locker::Locker): (JSC::ActiveMachineThreadsManager::add): (JSC::ActiveMachineThreadsManager::remove): (JSC::ActiveMachineThreadsManager::ActiveMachineThreadsManager): (JSC::MachineThreads::~MachineThreads): (JSC::MachineThreads::addCurrentThread): (JSC::MachineThreads::removeThreadIfFound): (JSC::MachineThreads::tryCopyOtherThreadStack): (JSC::MachineThreads::tryCopyOtherThreadStacks): (JSC::MachineThreads::gatherConservativeRoots): * heap/MachineStackMarker.h: * heap/SlotVisitor.cpp: (JSC::SlotVisitor::donateKnownParallel): (JSC::SlotVisitor::drain): (JSC::SlotVisitor::drainFromShared): (JSC::SlotVisitor::mergeOpaqueRoots): * heap/SlotVisitorInlines.h: (JSC::SlotVisitor::containsOpaqueRootTriState): * inspector/remote/RemoteInspectorDebuggableConnection.h: * inspector/remote/RemoteInspectorDebuggableConnection.mm: (Inspector::RemoteInspectorHandleRunSourceGlobal): (Inspector::RemoteInspectorQueueTaskOnGlobalQueue): (Inspector::RemoteInspectorInitializeGlobalQueue): (Inspector::RemoteInspectorHandleRunSourceWithInfo): (Inspector::RemoteInspectorDebuggableConnection::setup): (Inspector::RemoteInspectorDebuggableConnection::closeFromDebuggable): (Inspector::RemoteInspectorDebuggableConnection::close): (Inspector::RemoteInspectorDebuggableConnection::sendMessageToBackend): (Inspector::RemoteInspectorDebuggableConnection::queueTaskOnPrivateRunLoop): * interpreter/JSStack.cpp: (JSC::JSStack::JSStack): (JSC::JSStack::releaseExcessCapacity): (JSC::JSStack::addToCommittedByteCount): (JSC::JSStack::committedByteCount): (JSC::stackStatisticsMutex): Deleted. (JSC::JSStack::initializeThreading): Deleted. * interpreter/JSStack.h: (JSC::JSStack::gatherConservativeRoots): (JSC::JSStack::sanitizeStack): (JSC::JSStack::size): (JSC::JSStack::initializeThreading): Deleted. * jit/ExecutableAllocator.cpp: (JSC::DemandExecutableAllocator::DemandExecutableAllocator): (JSC::DemandExecutableAllocator::~DemandExecutableAllocator): (JSC::DemandExecutableAllocator::bytesAllocatedByAllAllocators): (JSC::DemandExecutableAllocator::bytesCommittedByAllocactors): (JSC::DemandExecutableAllocator::dumpProfileFromAllAllocators): (JSC::DemandExecutableAllocator::allocators): (JSC::DemandExecutableAllocator::allocatorsMutex): * jit/JITThunks.cpp: (JSC::JITThunks::ctiStub): * jit/JITThunks.h: * profiler/ProfilerDatabase.cpp: (JSC::Profiler::Database::ensureBytecodesFor): (JSC::Profiler::Database::notifyDestruction): * profiler/ProfilerDatabase.h: * runtime/InitializeThreading.cpp: (JSC::initializeThreading): * runtime/JSLock.cpp: (JSC::GlobalJSLock::GlobalJSLock): (JSC::GlobalJSLock::~GlobalJSLock): (JSC::JSLockHolder::JSLockHolder): (JSC::GlobalJSLock::initialize): Deleted. * runtime/JSLock.h: Source/WTF: Relanding after fixing a deadlock on Linux. * wtf/Condition.h: using WTF::Condition. * wtf/Lock.h: (WTF::LockBase::lock): (WTF::LockBase::tryLock): Add tryLock() because it turns out that we use it sometimes. (WTF::LockBase::try_lock): unique_lock needs
[webkit-changes] [188940] trunk/Tools
Title: [188940] trunk/Tools Revision 188940 Author gyuyoung@webkit.org Date 2015-08-25 18:02:54 -0700 (Tue, 25 Aug 2015) Log Message Remove PassRefPtr style check rule https://bugs.webkit.org/show_bug.cgi?id=148432 Reviewed by Andreas Kling. PassRefPtr is being removed. Thus style rule needs to be removed as well. * Scripts/webkitpy/style/checkers/cpp.py: (_check_parameter_name_against_text): Deleted. (check_function_definition_and_pass_ptr): Deleted. (check_function_definition): Deleted. (check_pass_ptr_usage): Deleted. (process_line): Deleted. (CppChecker): Deleted. Modified Paths trunk/Tools/ChangeLog trunk/Tools/Scripts/webkitpy/style/checkers/cpp.py Diff Modified: trunk/Tools/ChangeLog (188939 => 188940) --- trunk/Tools/ChangeLog 2015-08-26 00:16:02 UTC (rev 188939) +++ trunk/Tools/ChangeLog 2015-08-26 01:02:54 UTC (rev 188940) @@ -1,3 +1,20 @@ +2015-08-25 Gyuyoung Kim gyuyoung@webkit.org + +Remove PassRefPtr style check rule +https://bugs.webkit.org/show_bug.cgi?id=148432 + +Reviewed by Andreas Kling. + +PassRefPtr is being removed. Thus style rule needs to be removed as well. + +* Scripts/webkitpy/style/checkers/cpp.py: +(_check_parameter_name_against_text): Deleted. +(check_function_definition_and_pass_ptr): Deleted. +(check_function_definition): Deleted. +(check_pass_ptr_usage): Deleted. +(process_line): Deleted. +(CppChecker): Deleted. + 2015-08-25 Brent Fulgham bfulg...@apple.com [Win] Expose Inverted Colors option in WinLauncher Modified: trunk/Tools/Scripts/webkitpy/style/checkers/cpp.py (188939 => 188940) --- trunk/Tools/Scripts/webkitpy/style/checkers/cpp.py 2015-08-26 00:16:02 UTC (rev 188939) +++ trunk/Tools/Scripts/webkitpy/style/checkers/cpp.py 2015-08-26 01:02:54 UTC (rev 188940) @@ -1642,24 +1642,6 @@ return False return True - -def check_function_definition_and_pass_ptr(type_text, row, error): -Check that function definitions for use Pass*Ptr instead of *Ptr. - -Args: - type_text: A string containing the type. - row: The row number of the type. - error: The function to call with any errors found. - -match_ref_ptr = '(?=\W|^)RefPtr(?=\W)' -bad_type_usage = search(match_ref_ptr, type_text) -if not bad_type_usage or type_text.endswith('') or type_text.endswith('*'): -return -type_name = bad_type_usage.group(0) -error(row, 'readability/pass_ptr', 5, - 'The parameter type should use Pass%s instead of %s.' % (type_name, type_name)) - - def check_function_definition(filename, file_extension, clean_lines, line_number, function_state, error): Check that function definitions for style issues. @@ -1678,8 +1660,6 @@ parameter_list = function_state.parameter_list() for parameter in parameter_list: -check_function_definition_and_pass_ptr(parameter.type, parameter.row, error) - # Do checks specific to function declarations and parameter names. if not function_state.is_declaration or not parameter.name: continue @@ -1695,32 +1675,6 @@ continue # Since an error was noted for this name, move to the next parameter. -def check_pass_ptr_usage(clean_lines, line_number, function_state, error): -Check for proper usage of Pass*Ptr. - -Currently this is limited to detecting declarations of Pass*Ptr -variables inside of functions. - -Args: - clean_lines: A CleansedLines instance containing the file. - line_number: The number of the line to check. - function_state: Current function name and lines in body so far. - error: The function to call with any errors found. - -if not function_state.in_a_function: -return - -lines = clean_lines.lines -line = lines[line_number] -if line_number function_state.body_start_position.row: -matched_pass_ptr = match(r'^\s*Pass([A-Z][A-Za-z]*)Ptr', line) -if matched_pass_ptr: -type_name = 'Pass%sPtr' % matched_pass_ptr.group(1) -error(line_number, 'readability/pass_ptr', 5, - 'Local variables should never be %s (see ' - 'http://webkit.org/coding/RefPtr.html).' % type_name) - - def check_for_leaky_patterns(clean_lines, line_number, function_state, error): Check for constructs known to be leak prone. Args: @@ -3752,7 +3706,6 @@ if asm_state.is_in_asm(): # Ignore further checks because asm blocks formatted differently. return check_function_definition(filename, file_extension, clean_lines, line, function_state, error) -check_pass_ptr_usage(clean_lines, line, function_state, error) check_for_leaky_patterns(clean_lines, line, function_state, error) check_for_multiline_comments_and_strings(clean_lines, line, error) check_style(clean_lines, line, file_extension, class_state, file_state, enum_state, error) @@
[webkit-changes] [188941] trunk/LayoutTests
Title: [188941] trunk/LayoutTests Revision 188941 Author commit-qu...@webkit.org Date 2015-08-25 18:35:30 -0700 (Tue, 25 Aug 2015) Log Message AX: accessibility/mac/misspelled-attributed-string.html is flaky https://bugs.webkit.org/show_bug.cgi?id=148455 Patch by Nan Wang n_w...@apple.com on 2015-08-25 Reviewed by Chris Fleizach. Updated the test case to be more stable since the client's text checker might change over time. * accessibility/mac/misspelled-attributed-string-expected.txt: * accessibility/mac/misspelled-attributed-string.html: * platform/mac/TestExpectations: Modified Paths trunk/LayoutTests/ChangeLog trunk/LayoutTests/accessibility/mac/misspelled-attributed-string-expected.txt trunk/LayoutTests/accessibility/mac/misspelled-attributed-string.html trunk/LayoutTests/platform/mac/TestExpectations Diff Modified: trunk/LayoutTests/ChangeLog (188940 => 188941) --- trunk/LayoutTests/ChangeLog 2015-08-26 01:02:54 UTC (rev 188940) +++ trunk/LayoutTests/ChangeLog 2015-08-26 01:35:30 UTC (rev 188941) @@ -1,3 +1,17 @@ +2015-08-25 Nan Wang n_w...@apple.com + +AX: accessibility/mac/misspelled-attributed-string.html is flaky +https://bugs.webkit.org/show_bug.cgi?id=148455 + +Reviewed by Chris Fleizach. + +Updated the test case to be more stable since the client's text checker +might change over time. + +* accessibility/mac/misspelled-attributed-string-expected.txt: +* accessibility/mac/misspelled-attributed-string.html: +* platform/mac/TestExpectations: + 2015-08-25 Zalan Bujtas za...@apple.com Using the filter functional notation for background images results in wrong background-size rendering Modified: trunk/LayoutTests/accessibility/mac/misspelled-attributed-string-expected.txt (188940 => 188941) --- trunk/LayoutTests/accessibility/mac/misspelled-attributed-string-expected.txt 2015-08-26 01:02:54 UTC (rev 188940) +++ trunk/LayoutTests/accessibility/mac/misspelled-attributed-string-expected.txt 2015-08-26 01:35:30 UTC (rev 188941) @@ -1,4 +1,4 @@ -wrods is misspelled aa lotsi nowadays. euep. +wrods is misspelled aab lotsi nowadays. euep. This tests that misspelled words are correctly marked when asking for an attributed string. On success, you will see a series of PASS messages, followed by TEST COMPLETE. @@ -10,14 +10,14 @@ PASS text.attributedStringRangeIsMisspelled(6, 2) is false PASS text.stringForRange(9, 10) is 'misspelled' PASS text.attributedStringRangeIsMisspelled(9, 10) is false -PASS text.stringForRange(20, 2) is 'aa' -PASS text.attributedStringRangeIsMisspelled(20, 2) is true -PASS text.stringForRange(23, 5) is 'lotsi' -PASS text.attributedStringRangeIsMisspelled(23, 5) is true -PASS text.stringForRange(29, 8) is 'nowadays' -PASS text.attributedStringRangeIsMisspelled(29, 8) is false -PASS text.stringForRange(39, 5) is 'euep.' -PASS text.attributedStringRangeIsMisspelled(39, 5) is true +PASS text.stringForRange(20, 3) is 'aab' +PASS text.attributedStringRangeIsMisspelled(20, 3) is true +PASS text.stringForRange(24, 5) is 'lotsi' +PASS text.attributedStringRangeIsMisspelled(24, 5) is true +PASS text.stringForRange(30, 8) is 'nowadays' +PASS text.attributedStringRangeIsMisspelled(30, 8) is false +PASS text.stringForRange(40, 5) is 'euep.' +PASS text.attributedStringRangeIsMisspelled(40, 5) is true PASS successfullyParsed is true TEST COMPLETE Modified: trunk/LayoutTests/accessibility/mac/misspelled-attributed-string.html (188940 => 188941) --- trunk/LayoutTests/accessibility/mac/misspelled-attributed-string.html 2015-08-26 01:02:54 UTC (rev 188940) +++ trunk/LayoutTests/accessibility/mac/misspelled-attributed-string.html 2015-08-26 01:35:30 UTC (rev 188941) @@ -10,7 +10,7 @@ body div contenteditable=true id=content role=textbox -wrods is misspelled aa lotsi nowadays. euep. +wrods is misspelled aab lotsi nowadays. euep. /div @@ -46,21 +46,21 @@ shouldBe(text.stringForRange(9, 10), 'misspelled'); shouldBeFalse(text.attributedStringRangeIsMisspelled(9, 10)); -// aa -shouldBe(text.stringForRange(20, 2), 'aa'); -shouldBeTrue(text.attributedStringRangeIsMisspelled(20, 2)); +// aab +shouldBe(text.stringForRange(20, 3), 'aab'); +shouldBeTrue(text.attributedStringRangeIsMisspelled(20, 3)); // lotsi -shouldBe(text.stringForRange(23, 5), 'lotsi'); -shouldBeTrue(text.attributedStringRangeIsMisspelled(23, 5)); +shouldBe(text.stringForRange(24, 5), 'lotsi'); +shouldBeTrue(text.attributedStringRangeIsMisspelled(24, 5)); // nowadays -shouldBe(text.stringForRange(29, 8), 'nowadays'); -shouldBeFalse(text.attributedStringRangeIsMisspelled(29, 8)); +shouldBe(text.stringForRange(30, 8), 'nowadays'); +shouldBeFalse(text.attributedStringRangeIsMisspelled(30, 8)); // eue9 -shouldBe(text.stringForRange(39, 5), 'euep.'); -
[webkit-changes] [188942] trunk/Tools
Title: [188942] trunk/Tools Revision 188942 Author commit-qu...@webkit.org Date 2015-08-25 19:01:42 -0700 (Tue, 25 Aug 2015) Log Message iOS Simulator layout-tests fail to start while cleaning a directory structure if simulator is already running https://bugs.webkit.org/show_bug.cgi?id=148197 rdar://problem/22334382 Patch by Aakash Jain aakash_j...@apple.com on 2015-08-25 Reviewed by Daniel Bates. * BuildSlaveSupport/kill-old-processes: Add Simulator to the list of processes to kill (for iOS builders). * Scripts/webkitpy/port/ios.py: (IOSSimulatorPort): Converted bundle id com.apple.iphonesimulator to a variable SIMULATOR_BUNDLE_ID. (IOSSimulatorPort._quitIOSSimulator): Common function to quit iOS Simulator. (IOSSimulatorPort.clean_up_test_run): Quit the simulator during the cleanup. (IOSSimulatorPort.check_sys_deps): No need to quit the simulator here as its now being quit in reset_preferences(). (IOSSimulatorPort.reset_preferences): Quit the simulator before trying to delete associated data directory. Modified Paths trunk/Tools/BuildSlaveSupport/kill-old-processes trunk/Tools/ChangeLog trunk/Tools/Scripts/webkitpy/port/ios.py Diff Modified: trunk/Tools/BuildSlaveSupport/kill-old-processes (188941 => 188942) --- trunk/Tools/BuildSlaveSupport/kill-old-processes 2015-08-26 01:35:30 UTC (rev 188941) +++ trunk/Tools/BuildSlaveSupport/kill-old-processes 2015-08-26 02:01:42 UTC (rev 188942) @@ -85,6 +85,7 @@ WebKitTestRunner, WebProcess, xcodebuild, +Simulator # FIXME: Consider moving iOS-specific tasks to their own list. ] taskToKillUnix = [ Modified: trunk/Tools/ChangeLog (188941 => 188942) --- trunk/Tools/ChangeLog 2015-08-26 01:35:30 UTC (rev 188941) +++ trunk/Tools/ChangeLog 2015-08-26 02:01:42 UTC (rev 188942) @@ -1,3 +1,19 @@ +2015-08-25 Aakash Jain aakash_j...@apple.com + +iOS Simulator layout-tests fail to start while cleaning a directory structure if simulator is already running +https://bugs.webkit.org/show_bug.cgi?id=148197 +rdar://problem/22334382 + +Reviewed by Daniel Bates. + +* BuildSlaveSupport/kill-old-processes: Add Simulator to the list of processes to kill (for iOS builders). +* Scripts/webkitpy/port/ios.py: +(IOSSimulatorPort): Converted bundle id com.apple.iphonesimulator to a variable SIMULATOR_BUNDLE_ID. +(IOSSimulatorPort._quitIOSSimulator): Common function to quit iOS Simulator. +(IOSSimulatorPort.clean_up_test_run): Quit the simulator during the cleanup. +(IOSSimulatorPort.check_sys_deps): No need to quit the simulator here as its now being quit in reset_preferences(). +(IOSSimulatorPort.reset_preferences): Quit the simulator before trying to delete associated data directory. + 2015-08-25 Gyuyoung Kim gyuyoung@webkit.org Remove PassRefPtr style check rule Modified: trunk/Tools/Scripts/webkitpy/port/ios.py (188941 => 188942) --- trunk/Tools/Scripts/webkitpy/port/ios.py 2015-08-26 01:35:30 UTC (rev 188941) +++ trunk/Tools/Scripts/webkitpy/port/ios.py 2015-08-26 02:01:42 UTC (rev 188942) @@ -77,6 +77,8 @@ DEFAULT_ARCHITECTURE = 'x86_64' +SIMULATOR_BUNDLE_ID = 'com.apple.iphonesimulator' + relay_name = 'LayoutTestRelay' def __init__(self, *args, **kwargs): @@ -199,7 +201,7 @@ device_udid = self.testing_device.udid # FIXME: rdar://problem/20916140 Switch to using CoreSimulator.framework for launching and quitting iOS Simulator self._executive.run_command([ -'open', '-b', 'com.apple.iphonesimulator', +'open', '-b', self.SIMULATOR_BUNDLE_ID, '--args', '-CurrentDeviceUDID', device_udid]) Simulator.wait_until_device_is_in_state(device_udid, Simulator.DeviceState.BOOTED) @@ -208,8 +210,13 @@ _log.debug('Waiting {seconds} seconds for iOS Simulator to finish booting ...'.format(seconds=boot_delay)) time.sleep(boot_delay) +def _quit_ios_simulator(self): +# FIXME: rdar://problem/20916140 Switch to using CoreSimulator.framework for launching and quitting iOS Simulator +self._executive.run_command(['osascript', '-e', 'tell application id {0} to quit'.format(self.SIMULATOR_BUNDLE_ID)]) + def clean_up_test_run(self): super(IOSSimulatorPort, self).clean_up_test_run() +self._quit_ios_simulator() fifos = [path for path in os.listdir('/tmp') if re.search('org.webkit.(DumpRenderTree|WebKitTestRunner).*_(IN|OUT|ERROR)', path)] for fifo in fifos: try: @@ -239,13 +246,6 @@ return False testing_device = self.testing_device # May create a new simulator device -# testing_device will fail to boot if it is already booted. We assume that if testing_device -# is booted that it was booted by the iOS Simulator app (as opposed to simctl). So, quit the -# iOS Simulator app to shutdown testing_device. -