Changeset 189164 in webkit
- Timestamp:
- Aug 31, 2015 1:33:21 AM (9 years ago)
- Location:
- trunk
- Files:
-
- 10 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r189163 r189164 1 2015-08-31 Antti Koivisto <antti@apple.com> 2 3 REGRESSION (r188820): fast/dom/HTMLObjectElement/object-as-frame.html is flaky 4 https://bugs.webkit.org/show_bug.cgi?id=148533 5 6 Reviewed by Chris Dumez. 7 8 * TestExpectations: 9 10 Unskip. 11 12 * fast/dom/HTMLObjectElement/object-as-frame.html: 13 14 Use more logical text in the data url. 15 16 * http/tests/loading/basic-auth-resend-wrong-credentials-expected.txt: 17 * http/tests/loading/basic-credentials-sent-automatically-expected.txt: 18 * platform/wk2/http/tests/loading/basic-auth-resend-wrong-credentials-expected.txt: 19 * platform/wk2/http/tests/loading/basic-credentials-sent-automatically-expected.txt: 20 * webarchive/loading/object-expected.txt: 21 22 Update test results. 23 1 24 2015-08-30 Chris Fleizach <cfleizach@apple.com> 2 25 -
trunk/LayoutTests/TestExpectations
r189159 r189164 583 583 584 584 webkit.org/b/148026 [ Debug ] animations/restart-after-scroll.html [ Skip ] 585 586 webkit.org/b/148533 fast/dom/HTMLObjectElement/object-as-frame.html [ Pass Failure ] -
trunk/LayoutTests/fast/dom/HTMLObjectElement/object-as-frame.html
r155265 r189164 48 48 49 49 <iframe name="frame" src="data:text/html,Old contents of iframe"></iframe> 50 <object name="obj" type="text/html" data="data:text/html, New contents of frame"></object>50 <object name="obj" type="text/html" data="data:text/html,Old contents of object"></object> 51 51 52 52 </body> -
trunk/LayoutTests/http/tests/loading/basic-auth-resend-wrong-credentials-expected.txt
r153903 r189164 6 6 frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame 7 7 frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame 8 main frame - didHandleOnloadEventsForFrame9 8 frame "<!--framePath //<!--frame1-->-->" - didStartProvisionalLoadForFrame 10 9 frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame … … 14 13 frame "<!--framePath //<!--frame1-->-->" - didFinishDocumentLoadForFrame 15 14 frame "<!--framePath //<!--frame1-->-->" - didHandleOnloadEventsForFrame 15 main frame - didHandleOnloadEventsForFrame 16 16 frame "<!--framePath //<!--frame1-->-->" - didFinishLoadForFrame 17 17 main frame - didFinishLoadForFrame -
trunk/LayoutTests/http/tests/loading/basic-credentials-sent-automatically-expected.txt
r153903 r189164 6 6 frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame 7 7 frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame 8 main frame - didHandleOnloadEventsForFrame9 8 frame "<!--framePath //<!--frame1-->-->" - didStartProvisionalLoadForFrame 10 9 frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame … … 24 23 frame "<!--framePath //<!--frame3-->-->" - didFinishDocumentLoadForFrame 25 24 frame "<!--framePath //<!--frame3-->-->" - didHandleOnloadEventsForFrame 25 main frame - didHandleOnloadEventsForFrame 26 26 frame "<!--framePath //<!--frame3-->-->" - didFinishLoadForFrame 27 27 main frame - didFinishLoadForFrame -
trunk/LayoutTests/platform/wk2/http/tests/loading/basic-auth-resend-wrong-credentials-expected.txt
r173760 r189164 6 6 frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame 7 7 frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame 8 main frame - didHandleOnloadEventsForFrame9 8 frame "<!--framePath //<!--frame1-->-->" - didStartProvisionalLoadForFrame 10 9 frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame … … 14 13 frame "<!--framePath //<!--frame1-->-->" - didFinishDocumentLoadForFrame 15 14 frame "<!--framePath //<!--frame1-->-->" - didHandleOnloadEventsForFrame 15 main frame - didHandleOnloadEventsForFrame 16 16 frame "<!--framePath //<!--frame1-->-->" - didFinishLoadForFrame 17 17 main frame - didFinishLoadForFrame -
trunk/LayoutTests/platform/wk2/http/tests/loading/basic-credentials-sent-automatically-expected.txt
r173760 r189164 6 6 frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame 7 7 frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame 8 main frame - didHandleOnloadEventsForFrame9 8 frame "<!--framePath //<!--frame1-->-->" - didStartProvisionalLoadForFrame 10 9 frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame … … 24 23 frame "<!--framePath //<!--frame3-->-->" - didFinishDocumentLoadForFrame 25 24 frame "<!--framePath //<!--frame3-->-->" - didHandleOnloadEventsForFrame 25 main frame - didHandleOnloadEventsForFrame 26 26 frame "<!--framePath //<!--frame3-->-->" - didFinishLoadForFrame 27 27 main frame - didFinishLoadForFrame -
trunk/LayoutTests/webarchive/loading/object-expected.txt
r169472 r189164 7 7 main frame - didCancelClientRedirectForFrame 8 8 main frame - didCommitLoadForFrame 9 main frame - didHandleOnloadEventsForFrame10 9 frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame 11 10 main frame - didFinishDocumentLoadForFrame … … 13 12 frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame 14 13 frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame 14 main frame - didHandleOnloadEventsForFrame 15 15 frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame 16 16 main frame - didFinishLoadForFrame -
trunk/Source/WebCore/ChangeLog
r189161 r189164 1 2015-08-31 Antti Koivisto <antti@apple.com> 2 3 REGRESSION (r188820): fast/dom/HTMLObjectElement/object-as-frame.html is flaky 4 https://bugs.webkit.org/show_bug.cgi?id=148533 5 6 Reviewed by Chris Dumez. 7 8 <object> element may cause document load event fire too early. By making data URL 9 loading faster r188820 made this condition more likely to trigger in this test. 10 11 * loader/SubframeLoader.cpp: 12 (WebCore::SubframeLoader::loadSubframe): 13 14 Post-parsing style recalc may trigger loads for <object> elements. If all other loads have already 15 completed this may cause load event to fire synchronously from the initial empty document construction. 16 17 Fix by preventing load events during subframe initialization. They will be fired if needed by the 18 subsequent explicit call to FrameLoader::checkCompleted. 19 1 20 2015-08-30 Ryuan Choi <ryuan.choi@navercorp.com> 2 21 -
trunk/Source/WebCore/loader/SubframeLoader.cpp
r187891 r189164 321 321 322 322 String referrerToUse = SecurityPolicy::generateReferrerHeader(ownerElement.document().referrerPolicy(), url, referrer); 323 324 // Prevent initial empty document load from triggering load events. 325 m_frame.document()->incrementLoadEventDelayCount(); 326 323 327 RefPtr<Frame> frame = m_frame.loader().client().createFrame(url, name, &ownerElement, referrerToUse, allowsScrolling, marginWidth, marginHeight); 328 329 m_frame.document()->decrementLoadEventDelayCount(); 324 330 325 331 if (!frame) {
Note: See TracChangeset
for help on using the changeset viewer.