| 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 0b37b6ac957857ab7b22cb0db0e00273230e8487..7ca96b55b74ba42ce0af49d812821773e35e79f2 100644
|
| --- a/third_party/WebKit/Source/core/dom/Document.h
|
| +++ b/third_party/WebKit/Source/core/dom/Document.h
|
| @@ -566,8 +566,8 @@
|
| void close(ExceptionState&);
|
| // This is used internally and does not handle exceptions.
|
| void close();
|
| -
|
| - void CheckCompleted();
|
| + // implicitClose() actually does the work of closing the input stream.
|
| + void ImplicitClose();
|
|
|
| bool DispatchBeforeUnloadEvent(ChromeClient&,
|
| bool is_reload,
|
| @@ -680,6 +680,9 @@
|
| 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;
|
| @@ -1047,6 +1050,9 @@
|
| bool LoadEventStillNeeded() const {
|
| return load_event_progress_ == kLoadEventNotRun;
|
| }
|
| + bool ProcessingLoadEvent() const {
|
| + return load_event_progress_ == kLoadEventInProgress;
|
| + }
|
| bool LoadEventFinished() const {
|
| return load_event_progress_ >= kLoadEventCompleted;
|
| }
|
| @@ -1157,6 +1163,7 @@
|
| }
|
| HTMLImportLoader* ImportLoader() const;
|
|
|
| + bool HaveImportsLoaded() const;
|
| void DidLoadAllImports();
|
|
|
| void AdjustFloatQuadsForScrollAndAbsoluteZoom(Vector<FloatQuad>&,
|
| @@ -1365,10 +1372,6 @@
|
| void UpdateStyleInvalidationIfNeeded();
|
| void UpdateStyle();
|
| void NotifyLayoutTreeOfSubtreeChanges();
|
| -
|
| - // ImplicitClose() actually does the work of closing the input stream.
|
| - void ImplicitClose();
|
| - bool ShouldComplete();
|
|
|
| void DetachParser();
|
|
|
| @@ -1434,8 +1437,6 @@
|
|
|
| void RunExecutionContextTask(std::unique_ptr<ExecutionContextTask>,
|
| bool instrumenting);
|
| -
|
| - bool HaveImportsLoaded() const;
|
|
|
| DocumentLifecycle lifecycle_;
|
|
|
|
|