Index: content/renderer/renderer_webkitplatformsupport_impl.cc |
diff --git a/content/renderer/renderer_webkitplatformsupport_impl.cc b/content/renderer/renderer_webkitplatformsupport_impl.cc |
index 433cca128460c80fe3c84eeac8fa56c3714c8fa0..0bedb1a4e4c63a8ce48923ee8c55acc39b3b87f7 100644 |
--- a/content/renderer/renderer_webkitplatformsupport_impl.cc |
+++ b/content/renderer/renderer_webkitplatformsupport_impl.cc |
@@ -1080,7 +1080,10 @@ void RendererWebKitPlatformSupportImpl::SetMockDeviceMotionDataForTesting( |
// static |
void RendererWebKitPlatformSupportImpl::ResetMockScreenOrientationForTesting() |
{ |
- g_test_screen_orientation_controller.Get().ResetData(); |
+ if (!(g_test_screen_orientation_controller == 0)) { |
mlamouri (slow - plz ping)
2014/05/30 09:07:57
Why do you need a null check that you didn't need
ostap
2014/05/30 15:21:43
Done.
ostap
2014/06/10 18:02:52
Actually, now Reset is always called on every layo
|
+ g_test_screen_orientation_controller.Get().ResetData(); |
+ g_test_screen_orientation_controller.Get().ResetRenderView(); |
mlamouri (slow - plz ping)
2014/05/30 09:07:57
Is there a reason why ResetRenderView() should be
ostap
2014/05/30 15:21:43
Done.
|
+ } |
} |
//------------------------------------------------------------------------------ |
@@ -1164,9 +1167,10 @@ void RendererWebKitPlatformSupportImpl::unlockOrientation() { |
// static |
void RendererWebKitPlatformSupportImpl::SetMockScreenOrientationForTesting( |
+ RenderView* render_view, |
blink::WebScreenOrientationType orientation) { |
g_test_screen_orientation_controller.Get() |
- .UpdateDeviceOrientation(orientation); |
+ .UpdateDeviceOrientation(render_view, orientation); |
} |
//------------------------------------------------------------------------------ |