Fix some bugs in paint manager. Some of the class members were not getting

initialized in the constructor.

Also, when a manual callback was executed, if a regular fluch happened to come
in the intervening time, we would cause an assertion failure because it would
always try to paint. Now when we get the callback, we can ignore it if there is
already a flush pending.

Original review=http://codereview.chromium.org/4886004/

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@66082 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 7 insertions, 3 deletions

diff --git a/ppapi/cpp/paint_manager.cc b/ppapi/cpp/paint_manager.cc
index 87c0750..a20cd0c 100644
--- a/ppapi/cpp/paint_manager.cc
+++ b/ppapi/cpp/paint_manager.cc
@@ -15,7 +15,9 @@ PaintManager::PaintManager()
     : 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 @@ PaintManager::PaintManager(Instance* instance,
     : 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 @@ void PaintManager::OnManualCallbackComplete(int32_t) {
   // 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();
 }