Replace deviceWidth and deviceHeight to screenRect

[Title] Replace deviceWidth and deviceHeight to screenRect
[Issue] N/A
[Problem] When entered fullscreen, the font size is too small and abnormal.
[Cause] deviceWidth and deviceHeight value is changed by another patch.
[Solution] we should change to screenRect, because it is no longer used.

Change-Id: Id83857c9b59d7537f5d74ffc3e20f5d89f6b09ef

diff --git a/Source/WebCore/css/StyleResolver.cpp b/Source/WebCore/css/StyleResolver.cpp
index a62c158..18b53b3 100644 (file)
--- a/Source/WebCore/css/StyleResolver.cpp
+++ b/Source/WebCore/css/StyleResolver.cpp
@@ -862,14 +862,15 @@ static void ensureDefaultStyleSheetsForElement(Element* element)
 #endif
 
 #if ENABLE(TIZEN_FULLSCREEN_API) && ENABLE(TIZEN_MEDIA_CONTROL_USER_AGENT_SHEET)
-    Settings* settings = element->document()->settings();
-    if (settings && element->document()->webkitIsFullScreen() && element->isMediaElement()) {
-        if (!fullscreenHorizontalStyleSheet && settings->deviceWidth() > settings->deviceHeight()) {
+    Page* page = element->document()->page();
+    if (page && page->mainFrame() && page->mainFrame()->view() && element->document()->webkitIsFullScreen() && element->isMediaElement()) {
+        FloatRect screenRect = WebCore::screenRect(page->mainFrame()->view());
+        if (!fullscreenHorizontalStyleSheet && screenRect.width() > screenRect.height()) {
             fullscreenHorizontalStyleSheet = parseUASheet(RenderTheme::defaultTheme()->extraFullScreenHorizontalStyleSheet());
             defaultStyle->addRulesFromSheet(fullscreenHorizontalStyleSheet, screenEval());
             defaultQuirksStyle->addRulesFromSheet(fullscreenHorizontalStyleSheet, screenEval());
             fullscreenVerticalStyleSheet = 0;
-        } else if (!fullscreenVerticalStyleSheet && settings->deviceWidth() < settings->deviceHeight()) {
+        } else if (!fullscreenVerticalStyleSheet && screenRect.width() < screenRect.height()) {
             fullscreenVerticalStyleSheet = parseUASheet(RenderTheme::defaultTheme()->extraFullScreenVerticalStyleSheet());
             defaultStyle->addRulesFromSheet(fullscreenVerticalStyleSheet, screenEval());
             defaultQuirksStyle->addRulesFromSheet(fullscreenVerticalStyleSheet, screenEval());

diff --git a/Source/WebCore/html/shadow/MediaControlRootElement.cpp b/Source/WebCore/html/shadow/MediaControlRootElement.cpp
index c1763c4..e6c4752 100644 (file)
--- a/Source/WebCore/html/shadow/MediaControlRootElement.cpp
+++ b/Source/WebCore/html/shadow/MediaControlRootElement.cpp
@@ -43,7 +43,9 @@
 #endif
 
 #if ENABLE(TIZEN_FULLSCREEN_API)
-#include "Settings.h"
+#include "Frame.h"
+#include "FrameView.h"
+#include "PlatformScreen.h"
 #endif
 
 using namespace std;
@@ -52,7 +54,7 @@ namespace WebCore {
 
 static const double timeWithoutMouseMovementBeforeHidingControls = 3;
 #if ENABLE(TIZEN_FULLSCREEN_API)
-const IntSize compareResolution(720, 1280);
+const FloatSize compareResolution(720.0f, 1280.0f);
 #endif
 
 MediaControlRootElement::MediaControlRootElement(Document* document)
@@ -521,14 +523,17 @@ void MediaControlRootElement::changedVolume()
 #if ENABLE(TIZEN_FULLSCREEN_API)
 void MediaControlRootElement::updateMediaControlScale()
 {
-    if (!document()->page())
+    Page* page = document()->page();
+    if (!page)
         return;
 
-    double scaleFactor = 1 / document()->page()->chrome()->contentsScaleFactor();
-    if (Settings* settings = document()->settings()) {
-        int compareWidth = (settings->deviceWidth() > settings->deviceHeight()) ? compareResolution.height() : compareResolution.width();
-        if (settings->deviceWidth() != compareWidth)
-            scaleFactor *= (settings->deviceWidth() / static_cast<double>(compareWidth));
+    float scaleFactor = 1 / page->chrome()->contentsScaleFactor();
+    if (page->mainFrame() && page->mainFrame()->view()) {
+        FloatRect screenRect = WebCore::screenRect(page->mainFrame()->view());
+
+        float compareWidth = (screenRect.width() > screenRect.height()) ? compareResolution.height() : compareResolution.width();
+        if (screenRect.width() != compareWidth)
+            scaleFactor *= (screenRect.width() / compareWidth);
     }
 
     m_panel->setInlineStyleProperty(CSSPropertyWebkitTransform, "scale(" + String::number(scaleFactor) + ", " + String::number(scaleFactor) + ")", false);