summaryrefslogtreecommitdiffstats
path: root/content/renderer/renderer_webkitplatformsupport_impl.cc
diff options
context:
space:
mode:
authorabarth@chromium.org <abarth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-06-07 00:08:52 +0000
committerabarth@chromium.org <abarth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-06-07 00:08:52 +0000
commit2cd9313ebd117e1bc4fae6a9570ad46566186ef3 (patch)
tree55496ed99bdf8b7d87fb13abcd27450d9d92fdf3 /content/renderer/renderer_webkitplatformsupport_impl.cc
parent77a595ece63c7b0e6e1473a078372b4dc661b61e (diff)
downloadchromium_src-2cd9313ebd117e1bc4fae6a9570ad46566186ef3.zip
chromium_src-2cd9313ebd117e1bc4fae6a9570ad46566186ef3.tar.gz
chromium_src-2cd9313ebd117e1bc4fae6a9570ad46566186ef3.tar.bz2
Revert of Call RenderViewImpl::SetScreenOrientationForTesting to make sure that events are not sent when orieā€¦ (https://codereview.chromium.org/302553007/)
Reason for revert: Caused every LayoutTest to ASSERT in every configuration. Original issue's description: > Call RenderViewImpl::SetScreenOrientationForTesting from MockScreenOrientationController::UpdateScreenOrientation() to make sure that events are not sent when orientation is locked. > > Existing implementation calls SetScreenOrientationForTesting and sends screen > orientation events even when the test screen orientation is locked. > > BUG=162827 > > Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=275535 TBR=jochen@chromium.org,ch.dumez@samsung.com,mlamouri@chromium.org,sl.ostapenko@samsung.com NOTREECHECKS=true NOTRY=true BUG=162827 Review URL: https://codereview.chromium.org/323663002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@275566 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/renderer/renderer_webkitplatformsupport_impl.cc')
-rw-r--r--content/renderer/renderer_webkitplatformsupport_impl.cc5
1 files changed, 1 insertions, 4 deletions
diff --git a/content/renderer/renderer_webkitplatformsupport_impl.cc b/content/renderer/renderer_webkitplatformsupport_impl.cc
index 611137c..cd8628f 100644
--- a/content/renderer/renderer_webkitplatformsupport_impl.cc
+++ b/content/renderer/renderer_webkitplatformsupport_impl.cc
@@ -7,7 +7,6 @@
#include "base/command_line.h"
#include "base/files/file_path.h"
#include "base/lazy_instance.h"
-#include "base/logging.h"
#include "base/memory/shared_memory.h"
#include "base/message_loop/message_loop_proxy.h"
#include "base/metrics/histogram.h"
@@ -1084,7 +1083,6 @@ void RendererWebKitPlatformSupportImpl::SetMockDeviceMotionDataForTesting(
// static
void RendererWebKitPlatformSupportImpl::ResetMockScreenOrientationForTesting()
{
- DCHECK(!(g_test_screen_orientation_controller == 0));
g_test_screen_orientation_controller.Get().ResetData();
}
@@ -1179,10 +1177,9 @@ void RendererWebKitPlatformSupportImpl::unlockOrientation() {
// static
void RendererWebKitPlatformSupportImpl::SetMockScreenOrientationForTesting(
- RenderView* render_view,
blink::WebScreenOrientationType orientation) {
g_test_screen_orientation_controller.Get()
- .UpdateDeviceOrientation(render_view, orientation);
+ .UpdateDeviceOrientation(orientation);
}
//------------------------------------------------------------------------------