diff options
Diffstat (limited to 'chromium/third_party/blink/renderer/controller')
4 files changed, 13 insertions, 12 deletions
diff --git a/chromium/third_party/blink/renderer/controller/blink_initializer.cc b/chromium/third_party/blink/renderer/controller/blink_initializer.cc index 07881f0cb51..e0cf6228c24 100644 --- a/chromium/third_party/blink/renderer/controller/blink_initializer.cc +++ b/chromium/third_party/blink/renderer/controller/blink_initializer.cc @@ -48,13 +48,13 @@ #include "third_party/blink/renderer/controller/dev_tools_frontend_impl.h" #include "third_party/blink/renderer/core/animation/animation_clock.h" #include "third_party/blink/renderer/core/dom/document.h" +#include "third_party/blink/renderer/core/execution_context/agent.h" #include "third_party/blink/renderer/core/frame/display_cutout_client_impl.h" #include "third_party/blink/renderer/core/frame/local_frame.h" #include "third_party/blink/renderer/platform/bindings/microtask.h" #include "third_party/blink/renderer/platform/bindings/v8_per_isolate_data.h" #include "third_party/blink/renderer/platform/disk_data_allocator.h" #include "third_party/blink/renderer/platform/heap/heap.h" -#include "third_party/blink/renderer/platform/instrumentation/histogram.h" #include "third_party/blink/renderer/platform/scheduler/public/thread.h" #include "third_party/blink/renderer/platform/wtf/assertions.h" #include "third_party/blink/renderer/platform/wtf/functional.h" @@ -112,11 +112,6 @@ void InitializeCommon(Platform* platform, mojo::BinderMap* binders) { const size_t kMB = 1024 * 1024; for (size_t size = 512 * kMB; size >= 32 * kMB; size -= 16 * kMB) { if (base::ReserveAddressSpace(size)) { - // Report successful reservation. - DEFINE_STATIC_LOCAL(CustomCountHistogram, reservation_size_histogram, - ("Renderer4.ReservedMemory", 32, 512, 32)); - reservation_size_histogram.Count(size / kMB); - break; } } @@ -178,6 +173,11 @@ void CreateMainThreadAndInitialize(Platform* platform, InitializeCommon(platform, binders); } +// Function defined in third_party/blink/public/web/blink.h. +void SetIsCrossOriginIsolated(bool value) { + Agent::SetIsCrossOriginIsolated(value); +} + void BlinkInitializer::RegisterInterfaces(mojo::BinderMap& binders) { ModulesInitializer::RegisterInterfaces(binders); Thread* main_thread = Thread::MainThread(); diff --git a/chromium/third_party/blink/renderer/controller/dev_tools_frontend_impl.cc b/chromium/third_party/blink/renderer/controller/dev_tools_frontend_impl.cc index 7076f115386..246687036bd 100644 --- a/chromium/third_party/blink/renderer/controller/dev_tools_frontend_impl.cc +++ b/chromium/third_party/blink/renderer/controller/dev_tools_frontend_impl.cc @@ -132,7 +132,7 @@ void DevToolsFrontendImpl::DestroyOnHostGone() { GetSupplementable()->RemoveSupplement<DevToolsFrontendImpl>(); } -void DevToolsFrontendImpl::Trace(Visitor* visitor) { +void DevToolsFrontendImpl::Trace(Visitor* visitor) const { visitor->Trace(devtools_host_); visitor->Trace(host_); visitor->Trace(receiver_); diff --git a/chromium/third_party/blink/renderer/controller/dev_tools_frontend_impl.h b/chromium/third_party/blink/renderer/controller/dev_tools_frontend_impl.h index 6ef2b40e526..d59e50ab9cb 100644 --- a/chromium/third_party/blink/renderer/controller/dev_tools_frontend_impl.h +++ b/chromium/third_party/blink/renderer/controller/dev_tools_frontend_impl.h @@ -69,7 +69,7 @@ class DevToolsFrontendImpl final mojo::PendingAssociatedReceiver<mojom::blink::DevToolsFrontend>); ~DevToolsFrontendImpl() override; void DidClearWindowObject(); - void Trace(Visitor*) override; + void Trace(Visitor*) const override; private: void DestroyOnHostGone(); @@ -87,11 +87,11 @@ class DevToolsFrontendImpl final Member<DevToolsHost> devtools_host_; String api_script_; HeapMojoAssociatedRemote<mojom::blink::DevToolsFrontendHost, - HeapMojoWrapperMode::kWithoutContextObserver> + HeapMojoWrapperMode::kForceWithoutContextObserver> host_; HeapMojoAssociatedReceiver<mojom::blink::DevToolsFrontend, DevToolsFrontendImpl, - HeapMojoWrapperMode::kWithoutContextObserver> + HeapMojoWrapperMode::kForceWithoutContextObserver> receiver_; DISALLOW_COPY_AND_ASSIGN(DevToolsFrontendImpl); diff --git a/chromium/third_party/blink/renderer/controller/oom_intervention_impl_test.cc b/chromium/third_party/blink/renderer/controller/oom_intervention_impl_test.cc index 7fc38dd1f29..88fd3fb0c0e 100644 --- a/chromium/third_party/blink/renderer/controller/oom_intervention_impl_test.cc +++ b/chromium/third_party/blink/renderer/controller/oom_intervention_impl_test.cc @@ -17,6 +17,7 @@ #include "third_party/blink/renderer/controller/crash_memory_metrics_reporter_impl.h" #include "third_party/blink/renderer/core/exported/web_view_impl.h" #include "third_party/blink/renderer/core/frame/frame_test_helpers.h" +#include "third_party/blink/renderer/core/frame/local_dom_window.h" #include "third_party/blink/renderer/core/frame/local_frame.h" #include "third_party/blink/renderer/core/frame/web_local_frame_impl.h" #include "third_party/blink/renderer/core/html/html_element.h" @@ -314,9 +315,9 @@ TEST_F(OomInterventionImplTest, V2DetectionV8PurgeMemory) { WebViewImpl* web_view = web_view_helper_.InitializeAndLoad("about:blank"); Page* page = web_view->MainFrameImpl()->GetFrame()->GetPage(); auto* frame = To<LocalFrame>(page->MainFrame()); - EXPECT_FALSE(frame->GetDocument()->IsContextDestroyed()); + EXPECT_FALSE(frame->DomWindow()->IsContextDestroyed()); RunDetection(true, true, true); - EXPECT_TRUE(frame->GetDocument()->IsContextDestroyed()); + EXPECT_TRUE(frame->DomWindow()->IsContextDestroyed()); } TEST_F(OomInterventionImplTest, ReducedMemoryMetricReporting) { |