Make it possible to set the display mode from the WebView API

Source/core/css/MediaValues.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 "core/css/MediaValues.h"
 
 #include "core/css/CSSHelper.h"
 #include "core/css/MediaValuesCached.h"
 #include "core/css/MediaValuesDynamic.h"
@@ skipping 87 matching lines @@
 }
 
 const String MediaValues::calculateMediaType(LocalFrame* frame) const
 {
     ASSERT(frame);
     if (!frame->view())
         return emptyAtom;
     return frame->view()->mediaType();
 }
 
-DisplayMode MediaValues::calculateDisplayMode(LocalFrame* frame) const
+WebDisplayMode MediaValues::calculateDisplayMode(LocalFrame* frame) const
 {
     ASSERT(frame);
-    DisplayMode mode = frame->host()->settings().displayModeOverride();
+    WebDisplayMode mode = frame->host()->settings().displayModeOverride();
 
-    if (mode != DisplayModeUndefined)
+    if (mode != WebDisplayModeUndefined)
         return mode;
 
-    return DisplayModeBrowser;
+    if (!frame->view())
+        return WebDisplayModeBrowser;
+
+    return frame->view()->displayMode();
 }
 
 bool MediaValues::calculateThreeDEnabled(LocalFrame* frame) const
 {
     ASSERT(frame && frame->contentRenderer() && frame->contentRenderer()->compositor());
     bool threeDEnabled = false;
     if (RenderView* view = frame->contentRenderer())
         threeDEnabled = view->compositor()->hasAcceleratedCompositing();
     return threeDEnabled;
 }
@@ skipping 86 matching lines @@
 }
 
 LocalFrame* MediaValues::frameFrom(Document& document)
 {
     Document* executingDocument = document.importsController() ? document.importsController()->master() : &document;
     ASSERT(executingDocument);
     return executingDocument->frame();
 }
 
 } // namespace