Index: content/browser/renderer_host/render_widget_host_view_mac.mm |
diff --git a/content/browser/renderer_host/render_widget_host_view_mac.mm b/content/browser/renderer_host/render_widget_host_view_mac.mm |
index 35ae6f4b039f8efcc64525ee3cf1a652446c8ea9..bcbbe12b8e688e2af40150cf9c309dc6fd915919 100644 |
--- a/content/browser/renderer_host/render_widget_host_view_mac.mm |
+++ b/content/browser/renderer_host/render_widget_host_view_mac.mm |
@@ -421,30 +421,7 @@ RenderWidgetHostImpl* RenderWidgetHostViewMac::GetHost() { |
void RenderWidgetHostViewMac::SchedulePaintInRect( |
const gfx::Rect& damage_rect_in_dip) { |
- if (browser_compositor_lock_) |
- browser_compositor_damaged_during_lock_ = true; |
- else |
- [browser_compositor_view_ compositor]->ScheduleFullRedraw(); |
-} |
- |
-void RenderWidgetHostViewMac::DelegatedCompositorDidSwapBuffers() { |
- // If this view is not visible then do not lock the compositor, because the |
- // wait for the surface to be drawn will time out. |
- NSWindow* window = [cocoa_view_ window]; |
- if (!window) |
- return; |
- if (window && [window respondsToSelector:@selector(occlusionState)]) { |
- bool window_is_occluded = |
- !([window occlusionState] & NSWindowOcclusionStateVisible); |
- if (window_is_occluded) |
- return; |
- } |
- browser_compositor_lock_ = |
- [browser_compositor_view_ compositor]->GetCompositorLock(); |
-} |
- |
-void RenderWidgetHostViewMac::DelegatedCompositorAbortedSwapBuffers() { |
- PostReleaseBrowserCompositorLock(); |
+ [browser_compositor_view_ compositor]->ScheduleFullRedraw(); |
} |
bool RenderWidgetHostViewMac::IsVisible() { |
@@ -800,23 +777,6 @@ void RenderWidgetHostViewMac::UpdateDisplayLink() { |
} |
} |
-void RenderWidgetHostViewMac::PostReleaseBrowserCompositorLock() { |
- base::MessageLoop::current()->PostTask(FROM_HERE, |
- base::Bind(&RenderWidgetHostViewMac::ReleaseBrowserCompositorLock, |
- weak_factory_.GetWeakPtr())); |
-} |
- |
-void RenderWidgetHostViewMac::ReleaseBrowserCompositorLock() { |
- if (!browser_compositor_view_) |
- return; |
- |
- browser_compositor_lock_ = NULL; |
- if (browser_compositor_damaged_during_lock_) { |
- browser_compositor_damaged_during_lock_ = false; |
- [browser_compositor_view_ compositor]->ScheduleFullRedraw(); |
- } |
-} |
- |
void RenderWidgetHostViewMac::SendVSyncParametersToRenderer() { |
if (!render_widget_host_ || !display_link_) |
return; |
@@ -867,7 +827,6 @@ void RenderWidgetHostViewMac::WasHidden() { |
// Any pending frames will not be displayed until this is shown again. Ack |
// them now. |
SendPendingSwapAck(); |
- PostReleaseBrowserCompositorLock(); |
// If we have a renderer, then inform it that we are being hidden so it can |
// reduce its resource utilization. |
@@ -1080,7 +1039,6 @@ void RenderWidgetHostViewMac::Destroy() { |
// Delete the delegated frame state, which will reach back into |
// render_widget_host_. |
- browser_compositor_lock_ = NULL; |
[browser_compositor_view_ resetClient]; |
delegated_frame_host_.reset(); |
root_layer_.reset(); |
@@ -1783,8 +1741,8 @@ void RenderWidgetHostViewMac::OnSwapCompositorFrame( |
if (frame->delegated_frame_data) { |
if (!browser_compositor_view_) { |
- browser_compositor_view_.reset([[BrowserCompositorViewMac alloc] |
- initWithSuperview:cocoa_view_ withClient:this]); |
+ browser_compositor_view_.reset( |
+ [[BrowserCompositorViewMac alloc] initWithSuperview:cocoa_view_]); |
root_layer_.reset(new ui::Layer(ui::LAYER_TEXTURED)); |
delegated_frame_host_.reset(new DelegatedFrameHost(this)); |
[browser_compositor_view_ compositor]->SetRootLayer(root_layer_.get()); |
@@ -2313,13 +2271,6 @@ SkBitmap::Config RenderWidgetHostViewMac::PreferredReadbackFormat() { |
} |
//////////////////////////////////////////////////////////////////////////////// |
-// BrowserCompositorViewMacClient, public: |
- |
-void RenderWidgetHostViewMac::BrowserCompositorDidDrawFrame() { |
- PostReleaseBrowserCompositorLock(); |
-} |
- |
-//////////////////////////////////////////////////////////////////////////////// |
// CompositingIOSurfaceLayerClient, public: |
void RenderWidgetHostViewMac::AcceleratedLayerDidDrawFrame(bool succeeded) { |