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

Unified Diff: third_party/WebKit/Source/core/loader/DocumentLoader.cpp

Issue 2700293002: DevTools: do not use RAII for sync native breakpoints, reuse AsyncTask where possible. (Closed)
Patch Set: Introduce progress monitor Created 3 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 side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/core/loader/DocumentLoader.cpp
diff --git a/third_party/WebKit/Source/core/loader/DocumentLoader.cpp b/third_party/WebKit/Source/core/loader/DocumentLoader.cpp
index c527aa4cdb4991379ed1ef089b62b86059076e64..b7cbd22960a6b4f7b1f7c75f39808a101f534f86 100644
--- a/third_party/WebKit/Source/core/loader/DocumentLoader.cpp
+++ b/third_party/WebKit/Source/core/loader/DocumentLoader.cpp
@@ -29,6 +29,7 @@
#include "core/loader/DocumentLoader.h"
+#include <memory>
caseq 2017/02/21 21:04:27 add empty line
#include "core/dom/Document.h"
#include "core/dom/WeakIdentifierMap.h"
#include "core/events/Event.h"
@@ -42,6 +43,7 @@
#include "core/html/parser/TextResourceDecoder.h"
#include "core/inspector/ConsoleMessage.h"
#include "core/inspector/InspectorInstrumentation.h"
+#include "core/inspector/MainThreadDebugger.h"
#include "core/loader/FrameFetchContext.h"
#include "core/loader/FrameLoader.h"
#include "core/loader/FrameLoaderClient.h"
@@ -74,7 +76,6 @@
#include "wtf/Assertions.h"
#include "wtf/AutoReset.h"
#include "wtf/text/WTFString.h"
-#include <memory>
namespace blink {
@@ -311,7 +312,7 @@ void DocumentLoader::notifyFinished(Resource* resource) {
void DocumentLoader::finishedLoading(double finishTime) {
DCHECK(m_frame->loader().stateMachine()->creatingInitialEmptyDocument() ||
!m_frame->page()->suspended() ||
- InspectorInstrumentation::isDebuggerPaused(m_frame));
+ MainThreadDebugger::instance()->isPaused());
double responseEndTime = finishTime;
if (!responseEndTime)

Powered by Google App Engine
This is Rietveld 408576698