content/shell/renderer/test_runner/mock_screen_orientation_client.h - Issue 596623002: Fix orientation change callbacks to go through WebLocalFrame.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/shell/renderer/test_runner/mock_screen_orientation_client.h

Issue 596623002: Fix orientation change callbacks to go through WebLocalFrame. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: 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 side-by-side diff with in-line comments

Download patch

« content/renderer/render_view_impl.cc ('K') | « content/renderer/render_view_impl.cc ('k') | content/shell/renderer/test_runner/mock_screen_orientation_client.cc » ('j') | content/shell/renderer/webkit_test_runner.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/shell/renderer/test_runner/mock_screen_orientation_client.h

diff --git a/content/shell/renderer/test_runner/mock_screen_orientation_client.h b/content/shell/renderer/test_runner/mock_screen_orientation_client.h

index 147bb2be631cf8a1227417b4d80b72cb1bf0e728..99fb1119a7da3064148af7c902061c944585d120 100644

--- a/content/shell/renderer/test_runner/mock_screen_orientation_client.h

+++ b/content/shell/renderer/test_runner/mock_screen_orientation_client.h

@@ -12,7 +12,7 @@

#include "third_party/WebKit/public/platform/WebScreenOrientationType.h"

namespace blink {

-class WebFrame;

+class WebLocalFrame;

}

namespace content {

@@ -23,16 +23,16 @@ class MockScreenOrientationClient : public blink::WebScreenOrientationClient {

virtual ~MockScreenOrientationClient();

void ResetData();

- void UpdateDeviceOrientation(blink::WebFrame*,

- blink::WebScreenOrientationType);

+ void UpdateDeviceOrientation(blink::WebLocalFrame* main_frame,

+ blink::WebScreenOrientationType orientation);

blink::WebScreenOrientationType CurrentOrientationType() const;

unsigned CurrentOrientationAngle() const;

private:

// From blink::WebScreenOrientationClient.

- virtual void lockOrientation(blink::WebScreenOrientationLockType,

- blink::WebLockOrientationCallback*);

+ virtual void lockOrientation(blink::WebScreenOrientationLockType orientation,

+ blink::WebLockOrientationCallback* callback);

virtual void unlockOrientation();

void UpdateLockSync(blink::WebScreenOrientationLockType,

@@ -44,7 +44,7 @@ class MockScreenOrientationClient : public blink::WebScreenOrientationClient {

blink::WebScreenOrientationType SuitableOrientationForCurrentLock();

static unsigned OrientationTypeToAngle(blink::WebScreenOrientationType);

- blink::WebFrame* main_frame_;

+ blink::WebLocalFrame* main_frame_;

blink::WebScreenOrientationLockType current_lock_;

blink::WebScreenOrientationType device_orientation_;

blink::WebScreenOrientationType current_orientation_;