Chromium Code Reviews| Index: chrome/browser/jankometer.cc |
| diff --git a/chrome/browser/jankometer.cc b/chrome/browser/jankometer.cc |
| index eeb4a18efb3a7bdabb9eedae914b31d64a626fda..e75c101dec1969587447ccb1f62ec52518c0d056 100644 |
| --- a/chrome/browser/jankometer.cc |
| +++ b/chrome/browser/jankometer.cc |
| @@ -304,9 +304,9 @@ class UIJankObserver : public base::RefCountedThreadSafe<UIJankObserver>, |
| } |
| #if defined(OS_WIN) |
| - virtual void WillProcessMessage(const MSG& msg) { |
| + virtual base::EventStatus WillProcessEvent(const MSG& msg) OVERRIDE { |
|
msw
2011/09/27 01:16:46
You could make this signature cross platform, and
oshima
2011/09/27 02:12:12
Update signature. Sharing signature made the code
|
| if (!helper_.MessageWillBeMeasured()) |
| - return; |
| + return base::EVENT_CONTINUE; |
| // GetMessageTime returns a LONG (signed 32-bit) and GetTickCount returns |
| // a DWORD (unsigned 32-bit). They both wrap around when the time is longer |
| // than they can hold. I'm not sure if GetMessageTime wraps around to 0, |
| @@ -322,11 +322,19 @@ class UIJankObserver : public base::RefCountedThreadSafe<UIJankObserver>, |
| base::TimeDelta::FromMilliseconds(cur_time - cur_message_issue_time); |
| helper_.StartProcessingTimers(queueing_time); |
| + return base::EVENT_CONTINUE; |
| } |
| - virtual void DidProcessMessage(const MSG& msg) { |
| + virtual void DidProcessEvent(const MSG& msg) OVERRIDE { |
| helper_.EndProcessingTimers(); |
| } |
| +#elif defined(TOUCH_UI) || defined(USE_AURA) |
| + virtual base::EventStatus WillProcessEvent( |
| + const base::NativeEvent& event) OVERRIDE { |
| + return base::EVENT_CONTINUE; |
| + } |
| + virtual void DidProcessEvent(const base::NativeEvent& event) OVERRIDE { |
| + } |
| #elif defined(TOOLKIT_USES_GTK) |
| virtual void WillProcessEvent(GdkEvent* event) { |
| if (!helper_.MessageWillBeMeasured()) |