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

Side by Side Diff: content/renderer/render_widget.cc

Issue 2898583002: color: Fix color not being reset between layout tests (Closed)
Patch Set: Review feedbakc Created 3 years, 7 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 unified diff | Download patch
« no previous file with comments | « content/renderer/render_widget.h ('k') | content/test/layouttest_support.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/renderer/render_widget.h" 5 #include "content/renderer/render_widget.h"
6 6
7 #include <memory> 7 #include <memory>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/auto_reset.h" 10 #include "base/auto_reset.h"
(...skipping 1294 matching lines...) Expand 10 before | Expand all | Expand 10 after
1305 // Oopif status must be set before the LayerTreeHost is created. 1305 // Oopif status must be set before the LayerTreeHost is created.
1306 compositor_->SetIsForOopif(for_oopif_); 1306 compositor_->SetIsForOopif(for_oopif_);
1307 auto layer_tree_host = RenderWidgetCompositor::CreateLayerTreeHost( 1307 auto layer_tree_host = RenderWidgetCompositor::CreateLayerTreeHost(
1308 compositor_.get(), compositor_.get(), animation_host.get(), 1308 compositor_.get(), compositor_.get(), animation_host.get(),
1309 compositor_deps_, device_scale_factor_, screen_info_); 1309 compositor_deps_, device_scale_factor_, screen_info_);
1310 compositor_->Initialize(std::move(layer_tree_host), 1310 compositor_->Initialize(std::move(layer_tree_host),
1311 std::move(animation_host)); 1311 std::move(animation_host));
1312 1312
1313 compositor_->SetViewportSize(physical_backing_size_); 1313 compositor_->SetViewportSize(physical_backing_size_);
1314 OnDeviceScaleFactorChanged(); 1314 OnDeviceScaleFactorChanged();
1315 compositor_->SetRasterColorSpace(screen_info_.icc_profile.GetColorSpace()); 1315 compositor_->SetRasterColorSpace(
1316 screen_info_.icc_profile.GetParametricColorSpace());
1316 compositor_->SetContentSourceId(current_content_source_id_); 1317 compositor_->SetContentSourceId(current_content_source_id_);
1317 compositor_->SetLocalSurfaceId(local_surface_id_); 1318 compositor_->SetLocalSurfaceId(local_surface_id_);
1318 // For background pages and certain tests, we don't want to trigger 1319 // For background pages and certain tests, we don't want to trigger
1319 // CompositorFrameSink creation. 1320 // CompositorFrameSink creation.
1320 bool should_generate_frame_sink = 1321 bool should_generate_frame_sink =
1321 !compositor_never_visible_ && RenderThreadImpl::current(); 1322 !compositor_never_visible_ && RenderThreadImpl::current();
1322 if (!should_generate_frame_sink) 1323 if (!should_generate_frame_sink)
1323 compositor_->SetNeverVisible(); 1324 compositor_->SetNeverVisible();
1324 1325
1325 StartCompositor(); 1326 StartCompositor();
(...skipping 1014 matching lines...) Expand 10 before | Expand all | Expand 10 after
2340 // browser side (https://crbug.com/669219). 2341 // browser side (https://crbug.com/669219).
2341 // If there is no WebFrameWidget, then there will be no 2342 // If there is no WebFrameWidget, then there will be no
2342 // InputMethodControllers for a WebLocalFrame. 2343 // InputMethodControllers for a WebLocalFrame.
2343 return nullptr; 2344 return nullptr;
2344 } 2345 }
2345 return static_cast<blink::WebFrameWidget*>(GetWebWidget()) 2346 return static_cast<blink::WebFrameWidget*>(GetWebWidget())
2346 ->GetActiveWebInputMethodController(); 2347 ->GetActiveWebInputMethodController();
2347 } 2348 }
2348 2349
2349 } // namespace content 2350 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/render_widget.h ('k') | content/test/layouttest_support.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698