Use WebViewClient instead of BlinkPlatform for screen lock.

Source/modules/screen_orientation/ScreenOrientation.cpp

Index: Source/modules/screen_orientation/ScreenOrientation.cpp
diff --git a/Source/modules/screen_orientation/ScreenOrientation.cpp b/Source/modules/screen_orientation/ScreenOrientation.cpp
index 504fda15eaa2df75458e48db0fe92d019ee14df8..211395523adad830d18c349b1b49c5fa393864fe 100644
--- a/Source/modules/screen_orientation/ScreenOrientation.cpp
+++ b/Source/modules/screen_orientation/ScreenOrientation.cpp
@@ -13,9 +13,9 @@
 #include "core/frame/DOMWindow.h"
 #include "core/frame/LocalFrame.h"
 #include "core/frame/Screen.h"
+#include "core/page/Page.h"
 #include "modules/screen_orientation/LockOrientationCallback.h"
 #include "modules/screen_orientation/ScreenOrientationController.h"
-#include "public/platform/Platform.h"
 #include "public/platform/WebScreenOrientationType.h"
 
 // This code assumes that WebScreenOrientationType values are included in WebScreenOrientationLockType.
@@ -101,6 +101,13 @@ Document* ScreenOrientation::document() const
     return m_associatedDOMWindow->document();
 }
 
+Page* ScreenOrientation::page() const
+{
+    if (!frame())
+        return 0;
+    return frame()->page();
+}
+
 ScreenOrientation& ScreenOrientation::from(Screen& screen)
 {
     ScreenOrientation* supplement = static_cast<ScreenOrientation*>(WillBeHeapSupplement<Screen>::from(screen, supplementName()));
@@ -118,11 +125,11 @@ ScreenOrientation::~ScreenOrientation()
 const AtomicString& ScreenOrientation::orientation(Screen& screen)
 {
     ScreenOrientation& screenOrientation = ScreenOrientation::from(screen);
-    if (!screenOrientation.document()) {
+    if (!screenOrientation.page()) {
         // FIXME: we should try to return a better guess, like the latest known value.
         return orientationTypeToString(blink::WebScreenOrientationPortraitPrimary);
     }
-    ScreenOrientationController& controller = ScreenOrientationController::from(*screenOrientation.document());
+    ScreenOrientationController& controller = ScreenOrientationController::from(*screenOrientation.page());

[eseidel, 2014/06/03 20:57:49]

I would just have an accessor for the controller instead and then it's a detail
as to if Page or FrameHost is used to access it.

You're right that currently Page is probably used, but it's unclear if Page is
movign to the other side of the embedder or not.  It was planned to (and
FrameHost was going to stay), but it's possible dcheng has revised that plan
since I was involved with OOPI.

[dcheng, 2014/06/03 21:02:04]

I don't think it's clear what the plan is yet so just doing this is probably the
simplest approach for now. I believe we'll have frame tree mirroring working in
a week or two, and rendering soon after that. At that point, people could try
out OOPI and see how it explodes their feature.

     return orientationTypeToString(controller.orientation());
 }
 
@@ -134,7 +141,7 @@ ScriptPromise ScreenOrientation::lockOrientation(ScriptState* state, Screen& scr
     ScreenOrientation& screenOrientation = ScreenOrientation::from(screen);
     Document* document = screenOrientation.document();
 
-    if (!document) {
+    if (!document || !screenOrientation.page()) {
         RefPtrWillBeRawPtr<DOMException> exception = DOMException::create(InvalidStateError, "The object is no longer associated to a document.");
         resolver->reject(exception);
         return promise;
@@ -146,13 +153,17 @@ ScriptPromise ScreenOrientation::lockOrientation(ScriptState* state, Screen& scr
         return promise;
     }
 
-    blink::Platform::current()->lockOrientation(stringToOrientationLock(lockString), new LockOrientationCallback(resolver));
+    ScreenOrientationController::from(*screenOrientation.page()).lockOrientation(stringToOrientationLock(lockString), new LockOrientationCallback(resolver));
     return promise;
 }
 
 void ScreenOrientation::unlockOrientation(Screen& screen)
 {
-    blink::Platform::current()->unlockOrientation();
+    ScreenOrientation& screenOrientation = ScreenOrientation::from(screen);
+    if (!screenOrientation.page())
+        return;
+
+    ScreenOrientationController::from(*screenOrientation.page()).unlockOrientation();
 }
 
 } // namespace WebCore