Merge 112360 - [chromium] Route monotonic clock up from compositor

Source/WebCore/platform/graphics/chromium/cc/CCThreadProxy.h

 /*
  * 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 76 matching lines @@
     virtual void scheduledActionUpdateMoreResources();
     virtual void scheduledActionCommit();
     virtual void scheduledActionBeginContextRecreation();
 
 private:
     explicit CCThreadProxy(CCLayerTreeHost*);
     friend class CCThreadProxyContextRecreationTimer;
 
     // Set on impl thread, read on main thread.
     struct BeginFrameAndCommitState {
-        BeginFrameAndCommitState() : frameBeginTime() { }
-        double frameBeginTime;
+        BeginFrameAndCommitState() : monotonicFrameBeginTime() { }
+        double monotonicFrameBeginTime;
         OwnPtr<CCScrollAndScaleSet> scrollInfo;
     };
     OwnPtr<BeginFrameAndCommitState> m_pendingBeginFrameRequest;
 
     // Called on main thread
     void beginFrame();
     void didCommitAndDrawFrame();
     void didCompleteSwapBuffers();
     void setAnimationEvents(PassOwnPtr<CCAnimationEventsVector>, double wallClockTime);
     void beginContextRecreation();
@@ skipping 57 matching lines @@
     CCCompletionEvent* m_commitCompletionEventOnImplThread;
     OwnPtr<CCTextureUpdater> m_currentTextureUpdaterOnImplThread;
 
     // Set when the next draw should post didCommitAndDrawFrame to the main thread.
     bool m_nextFrameIsNewlyCommittedFrameOnImplThread;
 };
 
 }
 
 #endif