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

Side by Side Diff: content/shell/renderer/test_runner/mock_screen_orientation_client.cc

Issue 596623002: Fix orientation change callbacks to go through WebLocalFrame. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove DCHECKs Created 6 years, 3 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 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/shell/renderer/test_runner/mock_screen_orientation_client.h" 5 #include "content/shell/renderer/test_runner/mock_screen_orientation_client.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/message_loop/message_loop.h" 9 #include "base/message_loop/message_loop.h"
10 #include "third_party/WebKit/public/web/WebFrame.h" 10 #include "third_party/WebKit/public/web/WebLocalFrame.h"
11 11
12 namespace content { 12 namespace content {
13 13
14 MockScreenOrientationClient::MockScreenOrientationClient() 14 MockScreenOrientationClient::MockScreenOrientationClient()
15 : main_frame_(NULL), 15 : main_frame_(NULL),
16 current_lock_(blink::WebScreenOrientationLockDefault), 16 current_lock_(blink::WebScreenOrientationLockDefault),
17 device_orientation_(blink::WebScreenOrientationPortraitPrimary), 17 device_orientation_(blink::WebScreenOrientationPortraitPrimary),
18 current_orientation_(blink::WebScreenOrientationPortraitPrimary) { 18 current_orientation_(blink::WebScreenOrientationPortraitPrimary) {
19 } 19 }
20 20
21 MockScreenOrientationClient::~MockScreenOrientationClient() { 21 MockScreenOrientationClient::~MockScreenOrientationClient() {
22 } 22 }
23 23
24 void MockScreenOrientationClient::ResetData() { 24 void MockScreenOrientationClient::ResetData() {
25 current_lock_ = blink::WebScreenOrientationLockDefault; 25 current_lock_ = blink::WebScreenOrientationLockDefault;
26 device_orientation_ = blink::WebScreenOrientationPortraitPrimary; 26 device_orientation_ = blink::WebScreenOrientationPortraitPrimary;
27 current_orientation_ = blink::WebScreenOrientationPortraitPrimary; 27 current_orientation_ = blink::WebScreenOrientationPortraitPrimary;
28 } 28 }
29 29
30 void MockScreenOrientationClient::UpdateDeviceOrientation( 30 void MockScreenOrientationClient::UpdateDeviceOrientation(
31 blink::WebFrame* main_frame, 31 blink::WebLocalFrame* main_frame,
32 blink::WebScreenOrientationType orientation) { 32 blink::WebScreenOrientationType orientation) {
33 main_frame_ = main_frame; 33 main_frame_ = main_frame;
34 if (device_orientation_ == orientation) 34 if (device_orientation_ == orientation)
35 return; 35 return;
36 device_orientation_ = orientation; 36 device_orientation_ = orientation;
37 if (!IsOrientationAllowedByCurrentLock(orientation)) 37 if (!IsOrientationAllowedByCurrentLock(orientation))
38 return; 38 return;
39 UpdateScreenOrientation(orientation); 39 UpdateScreenOrientation(orientation);
40 } 40 }
41 41
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
152 case blink::WebScreenOrientationLockLandscape: 152 case blink::WebScreenOrientationLockLandscape:
153 return blink::WebScreenOrientationLandscapePrimary; 153 return blink::WebScreenOrientationLandscapePrimary;
154 case blink::WebScreenOrientationLockLandscapeSecondary: 154 case blink::WebScreenOrientationLockLandscapeSecondary:
155 return blink::WebScreenOrientationLandscapePrimary; 155 return blink::WebScreenOrientationLandscapePrimary;
156 default: 156 default:
157 return blink::WebScreenOrientationPortraitPrimary; 157 return blink::WebScreenOrientationPortraitPrimary;
158 } 158 }
159 } 159 }
160 160
161 } // namespace content 161 } // namespace content
OLDNEW
« no previous file with comments | « content/shell/renderer/test_runner/mock_screen_orientation_client.h ('k') | content/shell/renderer/webkit_test_runner.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698