Changeset 216643 in webkit
- Timestamp:
- May 10, 2017 5:33:33 PM (7 years ago)
- Location:
- trunk
- Files:
-
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r216641 r216643 1 2017-05-10 Andy Estes <aestes@apple.com> 2 3 REGRESSION (r167845): ASSERT(!m_renderView.needsLayout()) in svg/custom/bug79798.html 4 https://bugs.webkit.org/show_bug.cgi?id=132297 5 6 Reviewed by Simon Fraser. 7 8 * http/tests/navigation/keyboard-events-during-provisional-navigation-expected.txt: 9 * http/tests/navigation/keyboard-events-during-provisional-subframe-navigation-expected.txt: 10 * http/tests/navigation/resources/keyboard-events-test.js: 11 (runTest): 12 * platform/ios-wk2/TestExpectations: 13 * platform/wk2/TestExpectations: 14 1 15 2017-05-09 Sam Weinig <sam@webkit.org> 2 16 -
trunk/LayoutTests/http/tests/navigation/keyboard-events-during-provisional-navigation-expected.txt
r216599 r216643 6 6 CONSOLE MESSAGE: line 30: Active element after pressing tab: [object HTMLInputElement]. 7 7 CONSOLE MESSAGE: line 32: Pressing "a". 8 CONSOLE MESSAGE: line 42: Setting marked text to "b".9 CONSOLE MESSAGE: line 45: Inserting text "c".10 CONSOLE MESSAGE: line 4 8: Input element value after text input events: "".8 CONSOLE MESSAGE: line 35: Setting marked text to "b". 9 CONSOLE MESSAGE: line 38: Inserting text "c". 10 CONSOLE MESSAGE: line 41: Input element value after text input events: "". 11 11 CONSOLE MESSAGE: line 18: Pressing "z" with access key modifiers should navigate to resources/keyboard-events-after-navigation.html. 12 12 CONSOLE MESSAGE: line 6: Finished navigating to resources/keyboard-events-after-navigation.html. … … 25 25 CONSOLE MESSAGE: line 5: inputevent dispatched (isTrusted: true). 26 26 CONSOLE MESSAGE: line 5: keyupevent dispatched (isTrusted: true). 27 CONSOLE MESSAGE: line 42: Setting marked text to "b".27 CONSOLE MESSAGE: line 35: Setting marked text to "b". 28 28 CONSOLE MESSAGE: line 5: compositionstartevent dispatched (isTrusted: true). 29 29 CONSOLE MESSAGE: line 5: compositionupdateevent dispatched (isTrusted: true). 30 30 CONSOLE MESSAGE: line 5: beforeinputevent dispatched (isTrusted: true). 31 31 CONSOLE MESSAGE: line 5: inputevent dispatched (isTrusted: true). 32 CONSOLE MESSAGE: line 45: Inserting text "c".32 CONSOLE MESSAGE: line 38: Inserting text "c". 33 33 CONSOLE MESSAGE: line 5: beforeinputevent dispatched (isTrusted: true). 34 34 CONSOLE MESSAGE: line 5: inputevent dispatched (isTrusted: true). … … 37 37 CONSOLE MESSAGE: line 5: inputevent dispatched (isTrusted: true). 38 38 CONSOLE MESSAGE: line 5: compositionendevent dispatched (isTrusted: true). 39 CONSOLE MESSAGE: line 4 8: Input element value after text input events: "ac".39 CONSOLE MESSAGE: line 41: Input element value after text input events: "ac". 40 40 -
trunk/LayoutTests/http/tests/navigation/keyboard-events-during-provisional-subframe-navigation-expected.txt
r216614 r216643 6 6 CONSOLE MESSAGE: line 30: Active element after pressing tab: [object HTMLInputElement]. 7 7 CONSOLE MESSAGE: line 32: Pressing "a". 8 CONSOLE MESSAGE: line 38: Input element value after text input events: "". 8 CONSOLE MESSAGE: line 35: Setting marked text to "b". 9 CONSOLE MESSAGE: line 38: Inserting text "c". 10 CONSOLE MESSAGE: line 41: Input element value after text input events: "". 9 11 CONSOLE MESSAGE: line 20: Pressing "z" with access key modifiers should navigate to resources/keyboard-events-after-navigation.html. 10 12 CONSOLE MESSAGE: line 6: Finished navigating to resources/keyboard-events-after-navigation.html. … … 23 25 CONSOLE MESSAGE: line 5: inputevent dispatched (isTrusted: true). 24 26 CONSOLE MESSAGE: line 5: keyupevent dispatched (isTrusted: true). 25 CONSOLE MESSAGE: line 42: Setting marked text to "b".27 CONSOLE MESSAGE: line 35: Setting marked text to "b". 26 28 CONSOLE MESSAGE: line 5: compositionstartevent dispatched (isTrusted: true). 27 29 CONSOLE MESSAGE: line 5: compositionupdateevent dispatched (isTrusted: true). 28 30 CONSOLE MESSAGE: line 5: beforeinputevent dispatched (isTrusted: true). 29 31 CONSOLE MESSAGE: line 5: inputevent dispatched (isTrusted: true). 30 CONSOLE MESSAGE: line 45: Inserting text "c".32 CONSOLE MESSAGE: line 38: Inserting text "c". 31 33 CONSOLE MESSAGE: line 5: beforeinputevent dispatched (isTrusted: true). 32 34 CONSOLE MESSAGE: line 5: inputevent dispatched (isTrusted: true). … … 35 37 CONSOLE MESSAGE: line 5: inputevent dispatched (isTrusted: true). 36 38 CONSOLE MESSAGE: line 5: compositionendevent dispatched (isTrusted: true). 37 CONSOLE MESSAGE: line 4 8: Input element value after text input events: "ac".39 CONSOLE MESSAGE: line 41: Input element value after text input events: "ac". 38 40 -
trunk/LayoutTests/http/tests/navigation/resources/keyboard-events-test.js
r216599 r216643 33 33 eventSender.keyDown("a"); 34 34 35 // FIXME: Composition events trigger assertions when performed in subframes.36 // See <https://webkit.org/b/132297>.37 if (window !== window.top) {38 console.log("Input element value after text input events: \"" + textInput.value + "\".");39 return;40 }41 42 35 console.log("Setting marked text to \"b\"."); 43 36 textInputController.setMarkedText("b", 0, 1); -
trunk/LayoutTests/platform/ios-wk2/TestExpectations
r216633 r216643 270 270 271 271 # SVG tests that fail due to an assert failure: 272 webkit.org/b/132297 [ Debug ] svg/custom/bug79798.html [ Skip ]273 272 svg/custom/image-with-prefix-in-webarchive.svg 274 273 -
trunk/LayoutTests/platform/wk2/TestExpectations
r216337 r216643 193 193 194 194 webkit.org/b/127683 http/tests/navigation/new-window-redirect-history.html [ Skip ] 195 196 webkit.org/b/132297 svg/custom/bug79798.html [ Skip ]197 195 198 196 # Causes next test to crash only on WebKit2 -
trunk/Source/WebCore/ChangeLog
r216642 r216643 1 2017-05-10 Andy Estes <aestes@apple.com> 2 3 REGRESSION (r167845): ASSERT(!m_renderView.needsLayout()) in svg/custom/bug79798.html 4 https://bugs.webkit.org/show_bug.cgi?id=132297 5 6 Reviewed by Simon Fraser. 7 8 We don't know why m_renderView needs layout in this case, but we know that we don't need to 9 assert if the client hasn't set the ScrollableInnerFrameTrigger compositing trigger. 10 11 * rendering/RenderLayerCompositor.cpp: 12 (WebCore::RenderLayerCompositor::requiresCompositingForScrollableFrame): 13 1 14 2017-05-10 Ryan Haddad <ryanhaddad@apple.com> 2 15 -
trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp
r216535 r216643 2465 2465 bool RenderLayerCompositor::requiresCompositingForScrollableFrame() const 2466 2466 { 2467 if (isMainFrameCompositor()) 2468 return false; 2469 2470 if (!(m_compositingTriggers & ChromeClient::ScrollableInnerFrameTrigger)) 2471 return false; 2472 2467 2473 // Need this done first to determine overflow. 2468 2474 ASSERT(!m_renderView.needsLayout()); 2469 if (isMainFrameCompositor())2470 return false;2471 2472 if (!(m_compositingTriggers & ChromeClient::ScrollableInnerFrameTrigger))2473 return false;2474 2475 2475 return m_renderView.frameView().isScrollable(); 2476 2476 }
Note: See TracChangeset
for help on using the changeset viewer.