Commit 905e17db authored by Nate Chapin's avatar Nate Chapin Committed by Commit Bot

Document should not be a ConsoleLogger

Bug: 1029822
Change-Id: Ib16193b5bab4aa6d5b807d067843f67670bf87e4
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2087984
Commit-Queue: Nate Chapin <japhet@chromium.org>
Reviewed-by: default avatarKentaro Hara <haraken@chromium.org>
Cr-Commit-Position: refs/heads/master@{#751056}
parent 3297cfbe
...@@ -7235,15 +7235,6 @@ void Document::AddConsoleMessage(ConsoleMessage* message, ...@@ -7235,15 +7235,6 @@ void Document::AddConsoleMessage(ConsoleMessage* message,
domWindow()->AddConsoleMessage(message, discard_duplicates); domWindow()->AddConsoleMessage(message, discard_duplicates);
} }
void Document::AddConsoleMessageImpl(mojom::ConsoleMessageSource source,
mojom::ConsoleMessageLevel level,
const String& message,
bool discard_duplicates) {
AddConsoleMessage(
MakeGarbageCollected<ConsoleMessage>(source, level, message),
discard_duplicates);
}
void Document::AddInspectorIssue(InspectorIssue* issue) { void Document::AddInspectorIssue(InspectorIssue* issue) {
Page* page = GetPage(); Page* page = GetPage();
......
...@@ -272,7 +272,6 @@ using ExplicitlySetAttrElementsMap = ...@@ -272,7 +272,6 @@ using ExplicitlySetAttrElementsMap =
// the user in a frame and an execution context for JavaScript code. // the user in a frame and an execution context for JavaScript code.
class CORE_EXPORT Document : public ContainerNode, class CORE_EXPORT Document : public ContainerNode,
public TreeScope, public TreeScope,
public ConsoleLogger,
public UseCounter, public UseCounter,
public FeaturePolicyParserDelegate, public FeaturePolicyParserDelegate,
public Supplementable<Document> { public Supplementable<Document> {
...@@ -1443,10 +1442,6 @@ class CORE_EXPORT Document : public ContainerNode, ...@@ -1443,10 +1442,6 @@ class CORE_EXPORT Document : public ContainerNode,
void AddConsoleMessage(ConsoleMessage* message, void AddConsoleMessage(ConsoleMessage* message,
bool discard_duplicates = false); bool discard_duplicates = false);
void AddConsoleMessageImpl(mojom::ConsoleMessageSource,
mojom::ConsoleMessageLevel,
const String& message,
bool discard_duplicates) final;
void AddInspectorIssue(InspectorIssue*); void AddInspectorIssue(InspectorIssue*);
LocalFrame* ExecutingFrame(); LocalFrame* ExecutingFrame();
......
...@@ -271,8 +271,8 @@ ResourceFetcher* FrameFetchContext::CreateFetcherForCommittedDocument( ...@@ -271,8 +271,8 @@ ResourceFetcher* FrameFetchContext::CreateFetcherForCommittedDocument(
frame.GetTaskRunner(TaskType::kNetworking), frame.GetTaskRunner(TaskType::kNetworking),
MakeGarbageCollected<LoaderFactoryForFrame>(frame_or_imported_document)); MakeGarbageCollected<LoaderFactoryForFrame>(frame_or_imported_document));
init.use_counter = MakeGarbageCollected<DetachableUseCounter>(&document); init.use_counter = MakeGarbageCollected<DetachableUseCounter>(&document);
init.console_logger = init.console_logger = MakeGarbageCollected<DetachableConsoleLogger>(
MakeGarbageCollected<DetachableConsoleLogger>(&document); document.GetExecutionContext());
// Frame loading should normally start with |kTight| throttling, as the // Frame loading should normally start with |kTight| throttling, as the
// frame will be in layout-blocking state until the <body> tag is inserted // frame will be in layout-blocking state until the <body> tag is inserted
init.initial_throttling_policy = init.initial_throttling_policy =
...@@ -307,7 +307,8 @@ ResourceFetcher* FrameFetchContext::CreateFetcherForImportedDocument( ...@@ -307,7 +307,8 @@ ResourceFetcher* FrameFetchContext::CreateFetcherForImportedDocument(
document->GetTaskRunner(blink::TaskType::kNetworking), document->GetTaskRunner(blink::TaskType::kNetworking),
MakeGarbageCollected<LoaderFactoryForFrame>(frame_or_imported_document)); MakeGarbageCollected<LoaderFactoryForFrame>(frame_or_imported_document));
init.use_counter = MakeGarbageCollected<DetachableUseCounter>(document); init.use_counter = MakeGarbageCollected<DetachableUseCounter>(document);
init.console_logger = MakeGarbageCollected<DetachableConsoleLogger>(document); init.console_logger = MakeGarbageCollected<DetachableConsoleLogger>(
document->GetExecutionContext());
init.frame_scheduler = frame.GetFrameScheduler(); init.frame_scheduler = frame.GetFrameScheduler();
auto* fetcher = MakeGarbageCollected<ResourceFetcher>(init); auto* fetcher = MakeGarbageCollected<ResourceFetcher>(init);
fetcher->SetResourceLoadObserver( fetcher->SetResourceLoadObserver(
......
...@@ -23,9 +23,9 @@ PendingImportMap* PendingImportMap::CreateInline(ScriptElementBase& element, ...@@ -23,9 +23,9 @@ PendingImportMap* PendingImportMap::CreateInline(ScriptElementBase& element,
Modulator* modulator = Modulator::From(script_state); Modulator* modulator = Modulator::From(script_state);
ScriptValue error_to_rethrow; ScriptValue error_to_rethrow;
ImportMap* import_map = ImportMap* import_map = ImportMap::Parse(
ImportMap::Parse(*modulator, import_map_text, base_url, *modulator, import_map_text, base_url,
*context_document, &error_to_rethrow); *context_document->GetExecutionContext(), &error_to_rethrow);
return MakeGarbageCollected<PendingImportMap>( return MakeGarbageCollected<PendingImportMap>(
script_state, element, import_map, error_to_rethrow, *context_document); script_state, element, import_map, error_to_rethrow, *context_document);
} }
......
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