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

Side by Side Diff: cc/scheduler/scheduler_state_machine.h

Issue 1139613003: cc: Avoid deadlock with the UI thread and NPAPI in more cases (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: get rid of complicated imminent logic Created 5 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
OLDNEW
1 // Copyright 2011 The Chromium Authors. All rights reserved. 1 // Copyright 2011 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 #ifndef CC_SCHEDULER_SCHEDULER_STATE_MACHINE_H_ 5 #ifndef CC_SCHEDULER_SCHEDULER_STATE_MACHINE_H_
6 #define CC_SCHEDULER_SCHEDULER_STATE_MACHINE_H_ 6 #define CC_SCHEDULER_SCHEDULER_STATE_MACHINE_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 254 matching lines...) Expand 10 before | Expand all | Expand 10 after
265 265
266 bool ShouldTriggerBeginImplFrameDeadlineImmediately() const; 266 bool ShouldTriggerBeginImplFrameDeadlineImmediately() const;
267 267
268 // True if we need to force activations to make forward progress. 268 // True if we need to force activations to make forward progress.
269 bool PendingActivationsShouldBeForced() const; 269 bool PendingActivationsShouldBeForced() const;
270 270
271 bool ShouldAnimate() const; 271 bool ShouldAnimate() const;
272 bool ShouldBeginOutputSurfaceCreation() const; 272 bool ShouldBeginOutputSurfaceCreation() const;
273 bool ShouldDraw() const; 273 bool ShouldDraw() const;
274 bool ShouldActivatePendingTree() const; 274 bool ShouldActivatePendingTree() const;
275 bool SendingBeginMainFrameMightCauseDeadlock() const;
275 bool ShouldSendBeginMainFrame() const; 276 bool ShouldSendBeginMainFrame() const;
276 bool ShouldCommit() const; 277 bool ShouldCommit() const;
277 bool ShouldPrepareTiles() const; 278 bool ShouldPrepareTiles() const;
278 bool ShouldInvalidateOutputSurface() const; 279 bool ShouldInvalidateOutputSurface() const;
279 280
280 void UpdateStateOnAnimate(); 281 void UpdateStateOnAnimate();
281 void UpdateStateOnSendBeginMainFrame(); 282 void UpdateStateOnSendBeginMainFrame();
282 void UpdateStateOnCommit(bool commit_had_no_updates); 283 void UpdateStateOnCommit(bool commit_had_no_updates);
283 void UpdateStateOnActivation(); 284 void UpdateStateOnActivation();
284 void UpdateStateOnDraw(bool did_request_swap); 285 void UpdateStateOnDraw(bool did_request_swap);
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
340 bool did_request_swap_in_last_frame_; 341 bool did_request_swap_in_last_frame_;
341 bool did_perform_swap_in_last_draw_; 342 bool did_perform_swap_in_last_draw_;
342 343
343 private: 344 private:
344 DISALLOW_COPY_AND_ASSIGN(SchedulerStateMachine); 345 DISALLOW_COPY_AND_ASSIGN(SchedulerStateMachine);
345 }; 346 };
346 347
347 } // namespace cc 348 } // namespace cc
348 349
349 #endif // CC_SCHEDULER_SCHEDULER_STATE_MACHINE_H_ 350 #endif // CC_SCHEDULER_SCHEDULER_STATE_MACHINE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698