Merge 121450 - [chromium] Should schedule a commit when dropping contents textures

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 141 matching lines @@
         m_frameRateController->setActive(m_stateMachine.vsyncCallbackNeeded());
         return;
     }
 
     // This function can re-enter itself. For example, draw may call
     // setNeedsCommit. Proceeed with caution.
     CCSchedulerStateMachine::Action action;
     do {
         action = nextAction();
         m_stateMachine.updateState(action);
+        TRACE_EVENT1("cc", "CCScheduler::processScheduledActions()", "action", action);
 
         switch (action) {
         case CCSchedulerStateMachine::ACTION_NONE:
             break;
         case CCSchedulerStateMachine::ACTION_BEGIN_FRAME:
             m_client->scheduledActionBeginFrame();
             break;
         case CCSchedulerStateMachine::ACTION_BEGIN_UPDATE_MORE_RESOURCES:
             m_client->scheduledActionUpdateMoreResources();
             if (!m_client->hasMoreResourceUpdates()) {
@@ skipping 28 matching lines @@
             m_client->scheduledActionAcquireLayerTexturesForMainThread();
             break;
         }
     } while (action != CCSchedulerStateMachine::ACTION_NONE);
 
     // Activate or deactivate the frame rate controller.
     m_frameRateController->setActive(m_stateMachine.vsyncCallbackNeeded());
 }
 
 }