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

Side by Side Diff: content/browser/renderer_host/browser_compositor_view_mac.mm

Issue 2815073002: Revert of Remove CompositorObserver::OnCompositingEnded() (Closed)
Patch Set: Fix CompositorObservers test Created 3 years, 8 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/browser/renderer_host/browser_compositor_view_mac.h" 5 #include "content/browser/renderer_host/browser_compositor_view_mac.h"
6 6
7 #include <stdint.h> 7 #include <stdint.h>
8 8
9 #include <utility> 9 #include <utility>
10 10
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
79 void Suspend(); 79 void Suspend();
80 void Unsuspend(); 80 void Unsuspend();
81 81
82 private: 82 private:
83 RecyclableCompositorMac(); 83 RecyclableCompositorMac();
84 84
85 // ui::CompositorObserver implementation: 85 // ui::CompositorObserver implementation:
86 void OnCompositingDidCommit(ui::Compositor* compositor) override; 86 void OnCompositingDidCommit(ui::Compositor* compositor) override;
87 void OnCompositingStarted(ui::Compositor* compositor, 87 void OnCompositingStarted(ui::Compositor* compositor,
88 base::TimeTicks start_time) override {} 88 base::TimeTicks start_time) override {}
89 void OnCompositingEnded(ui::Compositor* compositor) override {}
89 void OnCompositingLockStateChanged(ui::Compositor* compositor) override {} 90 void OnCompositingLockStateChanged(ui::Compositor* compositor) override {}
90 void OnCompositingShuttingDown(ui::Compositor* compositor) override {} 91 void OnCompositingShuttingDown(ui::Compositor* compositor) override {}
91 92
92 std::unique_ptr<ui::AcceleratedWidgetMac> accelerated_widget_mac_; 93 std::unique_ptr<ui::AcceleratedWidgetMac> accelerated_widget_mac_;
93 ui::Compositor compositor_; 94 ui::Compositor compositor_;
94 std::unique_ptr<ui::CompositorLock> compositor_suspended_lock_; 95 std::unique_ptr<ui::CompositorLock> compositor_suspended_lock_;
95 96
96 DISALLOW_COPY_AND_ASSIGN(RecyclableCompositorMac); 97 DISALLOW_COPY_AND_ASSIGN(RecyclableCompositorMac);
97 }; 98 };
98 99
(...skipping 339 matching lines...) Expand 10 before | Expand all | Expand 10 after
438 void BrowserCompositorMac::OnBeginFrame(const cc::BeginFrameArgs& args) { 439 void BrowserCompositorMac::OnBeginFrame(const cc::BeginFrameArgs& args) {
439 client_->BrowserCompositorMacSendBeginFrame(args); 440 client_->BrowserCompositorMacSendBeginFrame(args);
440 } 441 }
441 442
442 bool BrowserCompositorMac::IsAutoResizeEnabled() const { 443 bool BrowserCompositorMac::IsAutoResizeEnabled() const {
443 NOTREACHED(); 444 NOTREACHED();
444 return false; 445 return false;
445 } 446 }
446 447
447 } // namespace content 448 } // namespace content
OLDNEW
« no previous file with comments | « ash/mus/non_client_frame_controller_unittest.cc ('k') | content/browser/renderer_host/delegated_frame_host.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698