Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(61)

Side by Side Diff: Source/WebCore/loader/MainResourceLoader.cpp

Issue 9375012: Merge 106662 - inspector/debugger/pause-in-inline-script.html asserts in chromium debug (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1025/
Patch Set: Created 8 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « Source/WebCore/inspector/InspectorInstrumentation.cpp ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2006, 2007, 2008, 2009 Apple Inc. All rights reserved. 2 * Copyright (C) 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
3 * Copyright (C) 2008 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/) 3 * Copyright (C) 2008 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/)
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 8 *
9 * 1. Redistributions of source code must retain the above copyright 9 * 1. Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 451 matching lines...) Expand 10 before | Expand all | Expand 10 after
462 m_timeOfLastDataReceived = monotonicallyIncreasingTime(); 462 m_timeOfLastDataReceived = monotonicallyIncreasingTime();
463 463
464 ResourceLoader::didReceiveData(data, length, encodedDataLength, allAtOnce); 464 ResourceLoader::didReceiveData(data, length, encodedDataLength, allAtOnce);
465 } 465 }
466 466
467 void MainResourceLoader::didFinishLoading(double finishTime) 467 void MainResourceLoader::didFinishLoading(double finishTime)
468 { 468 {
469 // There is a bug in CFNetwork where callbacks can be dispatched even when l oads are deferred. 469 // There is a bug in CFNetwork where callbacks can be dispatched even when l oads are deferred.
470 // See <rdar://problem/6304600> for more details. 470 // See <rdar://problem/6304600> for more details.
471 #if !USE(CF) 471 #if !USE(CF)
472 ASSERT(shouldLoadAsEmptyDocument(frameLoader()->activeDocumentLoader()->url( )) || !defersLoading()); 472 ASSERT(shouldLoadAsEmptyDocument(frameLoader()->activeDocumentLoader()->url( )) || !defersLoading() || InspectorInstrumentation::isDebuggerPaused(m_frame.get ()));
473 #endif 473 #endif
474 474
475 // The additional processing can do anything including possibly removing the last 475 // The additional processing can do anything including possibly removing the last
476 // reference to this object. 476 // reference to this object.
477 RefPtr<MainResourceLoader> protect(this); 477 RefPtr<MainResourceLoader> protect(this);
478 RefPtr<DocumentLoader> dl = documentLoader(); 478 RefPtr<DocumentLoader> dl = documentLoader();
479 479
480 if (m_loadingMultipartContent) 480 if (m_loadingMultipartContent)
481 dl->maybeFinishLoadingMultipartContent(); 481 dl->maybeFinishLoadingMultipartContent();
482 482
(...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after
631 startDataLoadTimer(); 631 startDataLoadTimer();
632 else { 632 else {
633 ResourceRequest r(m_initialRequest); 633 ResourceRequest r(m_initialRequest);
634 m_initialRequest = ResourceRequest(); 634 m_initialRequest = ResourceRequest();
635 loadNow(r); 635 loadNow(r);
636 } 636 }
637 } 637 }
638 } 638 }
639 639
640 } 640 }
OLDNEW
« no previous file with comments | « Source/WebCore/inspector/InspectorInstrumentation.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698