diff options
| author | davemoore@chromium.org <davemoore@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-21 07:55:22 +0000 |
|---|---|---|
| committer | davemoore@chromium.org <davemoore@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-21 07:55:22 +0000 |
| commit | 5e6972e121f5eb8d1739dd1c5989d4236a0f0987 (patch) | |
| tree | 36ed77e73056e8c10273e1987708acbd67c8ab3d /mojo/services/native_viewport | |
| parent | ba38880824fe0f56403a3fb09eb13f9ce4d6ec7b (diff) | |
| download | chromium_src-5e6972e121f5eb8d1739dd1c5989d4236a0f0987.zip chromium_src-5e6972e121f5eb8d1739dd1c5989d4236a0f0987.tar.gz chromium_src-5e6972e121f5eb8d1739dd1c5989d4236a0f0987.tar.bz2 | |
Mojo: Fix some incorrect DCHECKS
BUG=None
R=ben@chromium.org
Review URL: https://codereview.chromium.org/107873003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@242273 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'mojo/services/native_viewport')
| -rw-r--r-- | mojo/services/native_viewport/native_viewport_android.cc | 2 | ||||
| -rw-r--r-- | mojo/services/native_viewport/native_viewport_service.cc | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/mojo/services/native_viewport/native_viewport_android.cc b/mojo/services/native_viewport/native_viewport_android.cc index de24084..89e100d 100644 --- a/mojo/services/native_viewport/native_viewport_android.cc +++ b/mojo/services/native_viewport/native_viewport_android.cc @@ -65,7 +65,7 @@ void NativeViewportAndroid::SurfaceCreated(JNIEnv* env, } void NativeViewportAndroid::SurfaceDestroyed(JNIEnv* env, jobject obj) { - DCHECK(!window_); + DCHECK(window_); ReleaseWindow(); } diff --git a/mojo/services/native_viewport/native_viewport_service.cc b/mojo/services/native_viewport/native_viewport_service.cc index b219bd0..af7ce8d 100644 --- a/mojo/services/native_viewport/native_viewport_service.cc +++ b/mojo/services/native_viewport/native_viewport_service.cc @@ -90,11 +90,12 @@ class NativeViewportService::NativeViewportImpl if (waiting_for_event_ack_ && IsRateLimitedEventType(ui_event)) return false; + pending_event_timestamp_ = ui_event->time_stamp().ToInternalValue(); AllocationScope scope; Event::Builder event; event.set_action(ui_event->type()); - event.set_time_stamp(ui_event->time_stamp().ToInternalValue()); + event.set_time_stamp(pending_event_timestamp_); if (ui_event->IsMouseEvent() || ui_event->IsTouchEvent()) { ui::LocatedEvent* located_event = |