mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-03-21 06:20:55 +01:00
2ba756d3e1
- Restore CefRenderHandler::OnScrollOffsetChanged. - Add new RT_PING and RT_SERVICE_WORKER resource type values. - The resource type for image sub-resource loads has changed from RT_IMAGE to RT_PREFETCH (this is a regression, see http://crbug.com/415253#c23). - Add a patch to fix a crash in Scheduler::swapQueuesRunPendingTasks* (http://crbug.com/415478). - Add documentation for cef_key_event_type_t values. git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@1846 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
62 lines
2.5 KiB
Diff
62 lines
2.5 KiB
Diff
diff --git compositor/io_surface_layer_mac.mm compositor/io_surface_layer_mac.mm
|
|
index bdb3abf..523d372 100644
|
|
--- compositor/io_surface_layer_mac.mm
|
|
+++ compositor/io_surface_layer_mac.mm
|
|
@@ -435,7 +435,7 @@ void IOSurfaceLayerHelper::TimerFired() {
|
|
logging::LOG_ERROR,
|
|
"IOSurfaceLayer",
|
|
std::string("No texture to draw, clearing to white"));
|
|
- glClearColor(1, 1, 1, 1);
|
|
+ glClearColor(0, 0, 0, 0);
|
|
glClear(GL_COLOR_BUFFER_BIT);
|
|
}
|
|
|
|
|
|
diff --git renderer_host/compositing_iosurface_mac.mm renderer_host/compositing_iosurface_mac.mm
|
|
index ba67fc9..2c6a410 100644
|
|
--- renderer_host/compositing_iosurface_mac.mm
|
|
+++ renderer_host/compositing_iosurface_mac.mm
|
|
@@ -168,7 +168,7 @@ bool CompositingIOSurfaceMac::DrawIOSurface(
|
|
CHECK_AND_SAVE_GL_ERROR();
|
|
} else {
|
|
// Should match the clear color of RenderWidgetHostViewMac.
|
|
- glClearColor(1.0f, 1.0f, 1.0f, 1.0f);
|
|
+ glClearColor(0, 0, 0, 0);
|
|
glClear(GL_COLOR_BUFFER_BIT);
|
|
}
|
|
|
|
diff --git renderer_host/render_widget_host_view_aura.cc renderer_host/render_widget_host_view_aura.cc
|
|
index a59880e..e57a421 100644
|
|
--- renderer_host/render_widget_host_view_aura.cc
|
|
+++ renderer_host/render_widget_host_view_aura.cc
|
|
@@ -1622,8 +1622,14 @@ void RenderWidgetHostViewAura::OnPaint(gfx::Canvas* canvas) {
|
|
// For non-opaque windows, we don't draw anything, since we depend on the
|
|
// canvas coming from the compositor to already be initialized as
|
|
// transparent.
|
|
- if (window_->layer()->fills_bounds_opaquely())
|
|
- canvas->DrawColor(SK_ColorWHITE);
|
|
+ if (window_->layer()->fills_bounds_opaquely()) {
|
|
+ if (host_->IsRenderView()) {
|
|
+ canvas->DrawColor(GetContentClient()->browser()->GetBaseBackgroundColor(
|
|
+ RenderViewHost::From(host_)));
|
|
+ } else {
|
|
+ canvas->DrawColor(SK_ColorWHITE);
|
|
+ }
|
|
+ }
|
|
}
|
|
|
|
void RenderWidgetHostViewAura::OnDeviceScaleFactorChanged(
|
|
diff --git renderer_host/render_widget_host_view_mac.mm renderer_host/render_widget_host_view_mac.mm
|
|
index 0d4d03c..8615203 100644
|
|
--- renderer_host/render_widget_host_view_mac.mm
|
|
+++ renderer_host/render_widget_host_view_mac.mm
|
|
@@ -541,7 +541,7 @@ RenderWidgetHostViewMac::RenderWidgetHostViewMac(RenderWidgetHost* widget)
|
|
// draw.
|
|
background_layer_.reset([[CALayer alloc] init]);
|
|
[background_layer_
|
|
- setBackgroundColor:CGColorGetConstantColor(kCGColorWhite)];
|
|
+ setBackgroundColor:CGColorGetConstantColor(kCGColorClear)];
|
|
[cocoa_view_ setLayer:background_layer_];
|
|
[cocoa_view_ setWantsLayer:YES];
|
|
|