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

Side by Side Diff: Source/WebCore/platform/graphics/DisplayRefreshMonitor.h

Issue 10391049: Merge 116319 - Unreviewed, rolling out r115525. (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1132/
Patch Set: Created 8 years, 7 months 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2010 Apple Inc. All rights reserved. 2 * Copyright (C) 2010 Apple Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
106 m_clients.remove(i); 106 m_clients.remove(i);
107 return true; 107 return true;
108 } 108 }
109 109
110 PlatformDisplayID displayID() const { return m_displayID; } 110 PlatformDisplayID displayID() const { return m_displayID; }
111 111
112 private: 112 private:
113 void notifyClients(); 113 void notifyClients();
114 static void refreshDisplayOnMainThread(void* data); 114 static void refreshDisplayOnMainThread(void* data);
115 115
116 double m_monotonicAnimationStartTime; 116 double m_timestamp;
117 bool m_active; 117 bool m_active;
118 bool m_scheduled; 118 bool m_scheduled;
119 bool m_previousFrameDone; 119 bool m_previousFrameDone;
120 PlatformDisplayID m_displayID; 120 PlatformDisplayID m_displayID;
121 DisplayRefreshMonitorManager* m_manager; 121 DisplayRefreshMonitorManager* m_manager;
122 Mutex m_mutex; 122 Mutex m_mutex;
123 Vector<DisplayRefreshMonitorClient*> m_clients; 123 Vector<DisplayRefreshMonitorClient*> m_clients;
124 #if PLATFORM(BLACKBERRY) 124 #if PLATFORM(BLACKBERRY)
125 public: 125 public:
126 void displayLinkFired(); 126 void displayLinkFired();
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
159 size_t findMonitor(PlatformDisplayID) const; 159 size_t findMonitor(PlatformDisplayID) const;
160 160
161 Vector<DisplayRefreshMonitor*> m_monitors; 161 Vector<DisplayRefreshMonitor*> m_monitors;
162 }; 162 };
163 163
164 } 164 }
165 165
166 #endif // USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR) 166 #endif // USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR)
167 167
168 #endif 168 #endif
OLDNEW
« no previous file with comments | « Source/WebCore/page/FrameView.cpp ('k') | Source/WebCore/platform/graphics/DisplayRefreshMonitor.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698