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

Unified Diff: ppapi/cpp/paint_manager.cc

Issue 4886004: Fix some bugs in paint manager. Some of the class members were not getting... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 10 years, 1 month 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ppapi/cpp/paint_manager.cc
===================================================================
--- ppapi/cpp/paint_manager.cc (revision 66000)
+++ ppapi/cpp/paint_manager.cc (working copy)
@@ -15,7 +15,9 @@
: instance_(NULL),
client_(NULL),
is_always_opaque_(false),
- callback_factory_(NULL) {
+ callback_factory_(NULL),
+ manual_callback_pending_(false),
+ flush_pending_(false) {
// Set the callback object outside of the initializer list to avoid a
// compiler warning about using "this" in an initializer list.
callback_factory_.Initialize(this);
@@ -27,7 +29,9 @@
: instance_(instance),
client_(client),
is_always_opaque_(is_always_opaque),
- callback_factory_(NULL) {
+ callback_factory_(NULL),
+ manual_callback_pending_(false),
+ flush_pending_(false) {
// Set the callback object outside of the initializer list to avoid a
// compiler warning about using "this" in an initializer list.
callback_factory_.Initialize(this);
@@ -167,7 +171,7 @@
// invalid regions. Even though we only schedule this callback when something
// is pending, a Flush callback could have come in before this callback was
// executed and that could have cleared the queue.
- if (aggregator_.HasPendingUpdate())
+ if (aggregator_.HasPendingUpdate() && !flush_pending_)
DoPaint();
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698