Commit 04177634 authored by Kent Tamura's avatar Kent Tamura Committed by Commit Bot

Use foo.mojom-blink-forward.h instead of foo.mojom-blink.h in headers related...

Use foo.mojom-blink-forward.h instead of foo.mojom-blink.h in headers related to execution_context.h

This CL has no behavior changes.

Bug: 242216
Change-Id: I8e2f01fbb1aed4ba70d7e52ee48019367b5bc1e8
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1777781
Auto-Submit: Kent Tamura <tkent@chromium.org>
Commit-Queue: Takuto Ikuta <tikuta@chromium.org>
Reviewed-by: default avatarTakuto Ikuta <tikuta@chromium.org>
Cr-Commit-Position: refs/heads/master@{#692004}
parent dc1c8575
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
#define THIRD_PARTY_BLINK_RENDERER_CORE_EXECUTION_CONTEXT_CONTEXT_LIFECYCLE_NOTIFIER_H_ #define THIRD_PARTY_BLINK_RENDERER_CORE_EXECUTION_CONTEXT_CONTEXT_LIFECYCLE_NOTIFIER_H_
#include "base/macros.h" #include "base/macros.h"
#include "third_party/blink/public/mojom/frame/lifecycle.mojom-blink.h" #include "third_party/blink/public/mojom/frame/lifecycle.mojom-blink-forward.h"
#include "third_party/blink/renderer/core/core_export.h" #include "third_party/blink/renderer/core/core_export.h"
#include "third_party/blink/renderer/platform/lifecycle_notifier.h" #include "third_party/blink/renderer/platform/lifecycle_notifier.h"
......
...@@ -57,6 +57,7 @@ ExecutionContext::ExecutionContext(v8::Isolate* isolate, ...@@ -57,6 +57,7 @@ ExecutionContext::ExecutionContext(v8::Isolate* isolate,
: isolate_(isolate), : isolate_(isolate),
circular_sequential_id_(0), circular_sequential_id_(0),
in_dispatch_error_event_(false), in_dispatch_error_event_(false),
lifecycle_state_(mojom::FrameLifecycleState::kRunning),
is_context_destroyed_(false), is_context_destroyed_(false),
csp_delegate_(MakeGarbageCollected<ExecutionContextCSPDelegate>(*this)), csp_delegate_(MakeGarbageCollected<ExecutionContextCSPDelegate>(*this)),
agent_(agent), agent_(agent),
...@@ -155,6 +156,10 @@ bool ExecutionContext::DispatchErrorEventInternal( ...@@ -155,6 +156,10 @@ bool ExecutionContext::DispatchErrorEventInternal(
return error_event->defaultPrevented(); return error_event->defaultPrevented();
} }
bool ExecutionContext::IsContextPaused() const {
return lifecycle_state_ != mojom::FrameLifecycleState::kRunning;
}
int ExecutionContext::CircularSequentialID() { int ExecutionContext::CircularSequentialID() {
++circular_sequential_id_; ++circular_sequential_id_;
if (circular_sequential_id_ > ((1U << 31) - 1U)) if (circular_sequential_id_ > ((1U << 31) - 1U))
......
...@@ -35,7 +35,9 @@ ...@@ -35,7 +35,9 @@
#include "base/macros.h" #include "base/macros.h"
#include "base/optional.h" #include "base/optional.h"
#include "base/unguessable_token.h" #include "base/unguessable_token.h"
#include "third_party/blink/public/mojom/frame/lifecycle.mojom-blink.h" #include "services/network/public/mojom/referrer_policy.mojom-blink-forward.h"
#include "third_party/blink/public/mojom/frame/document_interface_broker.mojom-blink-forward.h"
#include "third_party/blink/public/mojom/frame/lifecycle.mojom-blink-forward.h"
#include "third_party/blink/renderer/bindings/core/v8/sanitize_script_errors.h" #include "third_party/blink/renderer/bindings/core/v8/sanitize_script_errors.h"
#include "third_party/blink/renderer/core/core_export.h" #include "third_party/blink/renderer/core/core_export.h"
#include "third_party/blink/renderer/core/execution_context/context_lifecycle_notifier.h" #include "third_party/blink/renderer/core/execution_context/context_lifecycle_notifier.h"
...@@ -57,20 +59,8 @@ namespace service_manager { ...@@ -57,20 +59,8 @@ namespace service_manager {
class InterfaceProvider; class InterfaceProvider;
} }
namespace network {
namespace mojom {
enum class ReferrerPolicy : int32_t;
} // namespace mojom
} // namespace network
namespace blink { namespace blink {
namespace mojom {
namespace blink {
class DocumentInterfaceBroker;
} // namespace blink
} // namespace mojom
class Agent; class Agent;
class BrowserInterfaceBrokerProxy; class BrowserInterfaceBrokerProxy;
class ConsoleMessage; class ConsoleMessage;
...@@ -234,9 +224,7 @@ class CORE_EXPORT ExecutionContext : public ContextLifecycleNotifier, ...@@ -234,9 +224,7 @@ class CORE_EXPORT ExecutionContext : public ContextLifecycleNotifier,
virtual void TasksWerePaused() {} virtual void TasksWerePaused() {}
virtual void TasksWereUnpaused() {} virtual void TasksWereUnpaused() {}
bool IsContextPaused() const { bool IsContextPaused() const;
return lifecycle_state_ != mojom::FrameLifecycleState::kRunning;
}
bool IsContextDestroyed() const { return is_context_destroyed_; } bool IsContextDestroyed() const { return is_context_destroyed_; }
mojom::FrameLifecycleState ContextPauseState() const { mojom::FrameLifecycleState ContextPauseState() const {
return lifecycle_state_; return lifecycle_state_;
...@@ -347,8 +335,7 @@ class CORE_EXPORT ExecutionContext : public ContextLifecycleNotifier, ...@@ -347,8 +335,7 @@ class CORE_EXPORT ExecutionContext : public ContextLifecycleNotifier,
bool in_dispatch_error_event_; bool in_dispatch_error_event_;
HeapVector<Member<ErrorEvent>> pending_exceptions_; HeapVector<Member<ErrorEvent>> pending_exceptions_;
mojom::FrameLifecycleState lifecycle_state_ = mojom::FrameLifecycleState lifecycle_state_;
mojom::FrameLifecycleState::kRunning;
bool is_context_destroyed_; bool is_context_destroyed_;
Member<PublicURLManager> public_url_manager_; Member<PublicURLManager> public_url_manager_;
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
#define THIRD_PARTY_BLINK_RENDERER_CORE_FEATURE_POLICY_FEATURE_POLICY_PARSER_DELEGATE_H_ #define THIRD_PARTY_BLINK_RENDERER_CORE_FEATURE_POLICY_FEATURE_POLICY_PARSER_DELEGATE_H_
#include "third_party/blink/public/mojom/feature_policy/feature_policy.mojom-blink.h" #include "third_party/blink/public/mojom/feature_policy/feature_policy.mojom-blink.h"
#include "third_party/blink/renderer/core/frame/web_feature.h" #include "third_party/blink/renderer/core/frame/web_feature_forward.h"
#include "third_party/blink/renderer/platform/runtime_enabled_features.h" #include "third_party/blink/renderer/platform/runtime_enabled_features.h"
namespace blink { namespace blink {
......
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
#include <memory> #include <memory>
#include <utility> #include <utility>
#include "third_party/blink/public/mojom/devtools/console_message.mojom-blink.h"
#include "third_party/blink/renderer/core/script/layered_api.h" #include "third_party/blink/renderer/core/script/layered_api.h"
#include "third_party/blink/renderer/core/script/modulator.h" #include "third_party/blink/renderer/core/script/modulator.h"
#include "third_party/blink/renderer/core/script/parsed_specifier.h" #include "third_party/blink/renderer/core/script/parsed_specifier.h"
......
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
#include "third_party/blink/renderer/core/script/modulator_impl_base.h" #include "third_party/blink/renderer/core/script/modulator_impl_base.h"
#include "third_party/blink/public/mojom/devtools/console_message.mojom-blink.h"
#include "third_party/blink/public/platform/task_type.h" #include "third_party/blink/public/platform/task_type.h"
#include "third_party/blink/renderer/bindings/core/v8/script_promise_resolver.h" #include "third_party/blink/renderer/bindings/core/v8/script_promise_resolver.h"
#include "third_party/blink/renderer/core/execution_context/execution_context.h" #include "third_party/blink/renderer/core/execution_context/execution_context.h"
......
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
#include "third_party/blink/renderer/platform/loader/allowed_by_nosniff.h" #include "third_party/blink/renderer/platform/loader/allowed_by_nosniff.h"
#include "third_party/blink/public/mojom/devtools/console_message.mojom-blink.h"
#include "third_party/blink/public/mojom/web_feature/web_feature.mojom-blink.h" #include "third_party/blink/public/mojom/web_feature/web_feature.mojom-blink.h"
#include "third_party/blink/renderer/platform/instrumentation/use_counter.h" #include "third_party/blink/renderer/platform/instrumentation/use_counter.h"
#include "third_party/blink/renderer/platform/loader/fetch/console_logger.h" #include "third_party/blink/renderer/platform/loader/fetch/console_logger.h"
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
#ifndef THIRD_PARTY_BLINK_RENDERER_PLATFORM_LOADER_FETCH_CONSOLE_LOGGER_H_ #ifndef THIRD_PARTY_BLINK_RENDERER_PLATFORM_LOADER_FETCH_CONSOLE_LOGGER_H_
#define THIRD_PARTY_BLINK_RENDERER_PLATFORM_LOADER_FETCH_CONSOLE_LOGGER_H_ #define THIRD_PARTY_BLINK_RENDERER_PLATFORM_LOADER_FETCH_CONSOLE_LOGGER_H_
#include "third_party/blink/public/mojom/devtools/console_message.mojom-blink.h" #include "third_party/blink/public/mojom/devtools/console_message.mojom-blink-forward.h"
#include "third_party/blink/renderer/platform/heap/handle.h" #include "third_party/blink/renderer/platform/heap/handle.h"
#include "third_party/blink/renderer/platform/platform_export.h" #include "third_party/blink/renderer/platform/platform_export.h"
#include "third_party/blink/renderer/platform/wtf/forward.h" #include "third_party/blink/renderer/platform/wtf/forward.h"
......
...@@ -36,6 +36,7 @@ ...@@ -36,6 +36,7 @@
#include "services/network/public/cpp/request_mode.h" #include "services/network/public/cpp/request_mode.h"
#include "third_party/blink/public/common/loader/request_destination.h" #include "third_party/blink/public/common/loader/request_destination.h"
#include "third_party/blink/public/common/mime_util/mime_util.h" #include "third_party/blink/public/common/mime_util/mime_util.h"
#include "third_party/blink/public/mojom/devtools/console_message.mojom-blink.h"
#include "third_party/blink/public/mojom/fetch/fetch_api_request.mojom-blink.h" #include "third_party/blink/public/mojom/fetch/fetch_api_request.mojom-blink.h"
#include "third_party/blink/public/mojom/web_feature/web_feature.mojom-blink.h" #include "third_party/blink/public/mojom/web_feature/web_feature.mojom-blink.h"
#include "third_party/blink/public/platform/interface_provider.h" #include "third_party/blink/public/platform/interface_provider.h"
......
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
#include "base/numerics/safe_conversions.h" #include "base/numerics/safe_conversions.h"
#include "base/strings/string_number_conversions.h" #include "base/strings/string_number_conversions.h"
#include "base/time/default_clock.h" #include "base/time/default_clock.h"
#include "third_party/blink/public/mojom/devtools/console_message.mojom-blink.h"
#include "third_party/blink/public/platform/platform.h" #include "third_party/blink/public/platform/platform.h"
#include "third_party/blink/renderer/platform/instrumentation/histogram.h" #include "third_party/blink/renderer/platform/instrumentation/histogram.h"
#include "third_party/blink/renderer/platform/loader/fetch/console_logger.h" #include "third_party/blink/renderer/platform/loader/fetch/console_logger.h"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment