Use WebViewClient instead of BlinkPlatform for screen lock.

Source/modules/screen_orientation/ScreenOrientationController.cpp

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 #include "modules/screen_orientation/ScreenOrientationController.h"
 
 #include "core/dom/Document.h"
 #include "core/frame/DOMWindow.h"
 #include "core/frame/FrameView.h"
 #include "core/frame/LocalFrame.h"
 #include "core/frame/Screen.h"
 #include "core/page/Page.h"
 #include "platform/LayoutTestSupport.h"
 #include "platform/PlatformScreen.h"
+#include "public/platform/Platform.h"
+#include "public/platform/WebScreenOrientationClient.h"
 
 namespace WebCore {
 
 ScreenOrientationController::~ScreenOrientationController()
 {
 }
 
-ScreenOrientationController& ScreenOrientationController::from(Document& document)
+void ScreenOrientationController::provideTo(Page& page, blink::WebScreenOrientationClient* client)
 {
-    ScreenOrientationController* controller = static_cast<ScreenOrientationController*>(DocumentSupplement::from(document, supplementName()));
-    if (!controller) {
-        controller = new ScreenOrientationController(document);
-        DocumentSupplement::provideTo(document, supplementName(), adoptPtrWillBeNoop(controller));
-    }
-    return *controller;
+    ScreenOrientationController* controller = new ScreenOrientationController(page, client);
+    WillBeHeapSupplement<Page>::provideTo(page, supplementName(), adoptPtrWillBeNoop(controller));
 }
 
-ScreenOrientationController::ScreenOrientationController(Document& document)
-    : PageLifecycleObserver(document.page())
-    , m_document(document)
+ScreenOrientationController& ScreenOrientationController::from(Page& page)
+{
+    return *static_cast<ScreenOrientationController*>(WillBeHeapSupplement<Page>::from(page, supplementName()));
+}
+
+ScreenOrientationController::ScreenOrientationController(Page& page, blink::WebScreenOrientationClient* client)
+    : PageLifecycleObserver(&page)
     , m_overrideOrientation(blink::WebScreenOrientationUndefined)
+    , m_client(client)
 {
 }
 
 const char* ScreenOrientationController::supplementName()
 {
     return "ScreenOrientationController";
 }
 
 // Compute the screen orientation using the orientation angle and the screen width / height.
 blink::WebScreenOrientationType ScreenOrientationController::computeOrientation(FrameView* view)
@@ skipping 20 matching lines @@
         ASSERT_NOT_REACHED();
         return blink::WebScreenOrientationPortraitPrimary;
     }
 }
 
 void ScreenOrientationController::pageVisibilityChanged()
 {
     if (page() && page()->visibilityState() == PageVisibilityStateVisible) {
         blink::WebScreenOrientationType oldOrientation = m_overrideOrientation;
         m_overrideOrientation = blink::WebScreenOrientationUndefined;
-        LocalFrame* mainFrame = m_document.frame();
+        LocalFrame* mainFrame = page()->mainFrame();
         if (mainFrame && oldOrientation != orientation())
             mainFrame->sendOrientationChangeEvent();
     } else if (m_overrideOrientation == blink::WebScreenOrientationUndefined) {
         // The page is no longer visible, store the last know screen orientation
         // so that we keep returning this orientation until the page becomes
         // visible again.
         m_overrideOrientation = orientation();
     }
 }
 
 blink::WebScreenOrientationType ScreenOrientationController::orientation() const
 {
     if (m_overrideOrientation != blink::WebScreenOrientationUndefined) {
         // The page is not visible, keep returning the last known screen orientation.
         ASSERT(!page() || page()->visibilityState() != PageVisibilityStateVisible);
         return m_overrideOrientation;
     }
 
-    LocalFrame* mainFrame = m_document.frame();
+    ASSERT(page());

[Inactive, 2014/06/03 18:04:53]

Why is this safe? This assertion above seems to hint that page() can return null
here. I think we should have a null check:
LocalFrame* mainFrame = page() ? page()->mainFrame() : 0;

[mlamouri (slow - plz ping), 2014/06/03 19:49:30]

Done.

+    LocalFrame* mainFrame = page()->mainFrame();
     if (!mainFrame)
         return blink::WebScreenOrientationPortraitPrimary;
     blink::WebScreenOrientationType orientationType = screenOrientationType(mainFrame->view());
     if (orientationType == blink::WebScreenOrientationUndefined) {
         // The embedder could not provide us with an orientation, deduce it ourselves.
         orientationType = computeOrientation(mainFrame->view());
     }
     ASSERT(orientationType != blink::WebScreenOrientationUndefined);
     return orientationType;
 }
 
+void ScreenOrientationController::lockOrientation(blink::WebScreenOrientationLockType orientation, blink::WebLockOrientationCallback* callback)
+{
+    if (!m_client) {
+        // FIXME: temporary until the content layer gets updated.
+        blink::Platform::current()->lockOrientation(orientation, callback);
+        return;
+    }
+
+    m_client->lockOrientation(orientation, callback);
+}
+
+void ScreenOrientationController::unlockOrientation()
+{
+    if (!m_client) {
+        // FIXME: temporary until the content layer gets updated.
+        blink::Platform::current()->unlockOrientation();
+        return;
+    }
+
+    m_client->unlockOrientation();
+}
+
 } // namespace WebCore