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

Unified Diff: third_party/WebKit/Source/core/dom/Document.h

Issue 2809733003: Move most of FrameLoader::CheckCompleted() to Document (Closed)
Patch Set: Fix failing android test Created 3 years, 8 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/dom/Document.h
diff --git a/third_party/WebKit/Source/core/dom/Document.h b/third_party/WebKit/Source/core/dom/Document.h
index 7ca96b55b74ba42ce0af49d812821773e35e79f2..0b37b6ac957857ab7b22cb0db0e00273230e8487 100644
--- a/third_party/WebKit/Source/core/dom/Document.h
+++ b/third_party/WebKit/Source/core/dom/Document.h
@@ -566,8 +566,8 @@ class CORE_EXPORT Document : public ContainerNode,
void close(ExceptionState&);
// This is used internally and does not handle exceptions.
void close();
- // implicitClose() actually does the work of closing the input stream.
- void ImplicitClose();
+
+ void CheckCompleted();
bool DispatchBeforeUnloadEvent(ChromeClient&,
bool is_reload,
@@ -680,9 +680,6 @@ class CORE_EXPORT Document : public ContainerNode,
enum ParsingState { kParsing, kInDOMContentLoaded, kFinishedParsing };
void SetParsingState(ParsingState);
bool Parsing() const { return parsing_state_ == kParsing; }
- bool IsInDOMContentLoaded() const {
- return parsing_state_ == kInDOMContentLoaded;
- }
bool HasFinishedParsing() const { return parsing_state_ == kFinishedParsing; }
bool ShouldScheduleLayout() const;
@@ -1050,9 +1047,6 @@ class CORE_EXPORT Document : public ContainerNode,
bool LoadEventStillNeeded() const {
return load_event_progress_ == kLoadEventNotRun;
}
- bool ProcessingLoadEvent() const {
- return load_event_progress_ == kLoadEventInProgress;
- }
bool LoadEventFinished() const {
return load_event_progress_ >= kLoadEventCompleted;
}
@@ -1163,7 +1157,6 @@ class CORE_EXPORT Document : public ContainerNode,
}
HTMLImportLoader* ImportLoader() const;
- bool HaveImportsLoaded() const;
void DidLoadAllImports();
void AdjustFloatQuadsForScrollAndAbsoluteZoom(Vector<FloatQuad>&,
@@ -1373,6 +1366,10 @@ class CORE_EXPORT Document : public ContainerNode,
void UpdateStyle();
void NotifyLayoutTreeOfSubtreeChanges();
+ // ImplicitClose() actually does the work of closing the input stream.
+ void ImplicitClose();
+ bool ShouldComplete();
+
void DetachParser();
void BeginLifecycleUpdatesIfRenderingReady();
@@ -1438,6 +1435,8 @@ class CORE_EXPORT Document : public ContainerNode,
void RunExecutionContextTask(std::unique_ptr<ExecutionContextTask>,
bool instrumenting);
+ bool HaveImportsLoaded() const;
+
DocumentLifecycle lifecycle_;
bool has_nodes_with_placeholder_style_;

Powered by Google App Engine
This is Rietveld 408576698