Merge 112446 - [chromium] Scheduler should not tell FrameRateController to begin a frame when we do…

Source/WebCore/platform/graphics/chromium/cc/CCScheduler.cpp

 /*
  * Copyright (C) 2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
  *     notice, this list of conditions and the following disclaimer in the
@@ skipping 145 matching lines @@
                 // then we will ack the update at the next draw.
                 m_updateMoreResourcesPending = false;
                 m_stateMachine.beginUpdateMoreResourcesComplete(false);
             } else
                 m_updateMoreResourcesPending = true;
             break;
         case CCSchedulerStateMachine::ACTION_COMMIT:
             m_client->scheduledActionCommit();
             break;
         case CCSchedulerStateMachine::ACTION_DRAW_IF_POSSIBLE: {
-            bool drawSuccess = m_client->scheduledActionDrawAndSwapIfPossible();
-            m_stateMachine.didDrawIfPossibleCompleted(drawSuccess);
-            if (drawSuccess)
+            CCScheduledActionDrawAndSwapResult result = m_client->scheduledActionDrawAndSwapIfPossible();
+            m_stateMachine.didDrawIfPossibleCompleted(result.didDraw);
+            if (result.didSwap)
                 m_frameRateController->didBeginFrame();
             break;
         }
-        case CCSchedulerStateMachine::ACTION_DRAW_FORCED:
-            m_client->scheduledActionDrawAndSwapForced();
-            m_frameRateController->didBeginFrame();
+        case CCSchedulerStateMachine::ACTION_DRAW_FORCED: {
+            CCScheduledActionDrawAndSwapResult result = m_client->scheduledActionDrawAndSwapForced();
+            if (result.didSwap)
+                m_frameRateController->didBeginFrame();
             break;
-        case CCSchedulerStateMachine::ACTION_BEGIN_CONTEXT_RECREATION:
+        } case CCSchedulerStateMachine::ACTION_BEGIN_CONTEXT_RECREATION:
             m_client->scheduledActionBeginContextRecreation();
             break;
         }
     } while (action != CCSchedulerStateMachine::ACTION_NONE);
 
     // Activate or deactivate the frame rate controller.
     m_frameRateController->setActive(m_stateMachine.vsyncCallbackNeeded());
 }
 
 }