Make createWindow (mostly) work with OOPIF

Source/core/frame/Screen.cpp

 /*
  * Copyright (C) 2007 Apple Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 17 matching lines @@
 
 
 #include "config.h"
 #include "core/frame/Screen.h"
 
 #include "core/frame/FrameHost.h"
 #include "core/frame/FrameView.h"
 #include "core/frame/LocalFrame.h"
 #include "core/frame/Settings.h"
 #include "core/inspector/InspectorInstrumentation.h"
+#include "core/page/Chrome.h"
 #include "platform/PlatformScreen.h"
 
 namespace blink {
 
 Screen::Screen(LocalFrame* frame)
     : DOMWindowProperty(frame)
 {
 }
 
 unsigned Screen::height() const
@@ skipping 28 matching lines @@
     if (!m_frame)
         return 0;
     return static_cast<unsigned>(screenDepth(m_frame->view()));
 }
 
 int Screen::availLeft() const
 {
     if (!m_frame)
         return 0;
     FrameHost* host = m_frame->host();
-    if (host && host->settings().reportScreenSizeInPhysicalPixelsQuirk())
-        return lroundf(screenAvailableRect(m_frame->view()).x() * host->deviceScaleFactor());
-    return static_cast<int>(screenAvailableRect(m_frame->view()).x());
+    if (!host)
+        return 0;
+    if (host->settings().reportScreenSizeInPhysicalPixelsQuirk())
+        return lroundf(screenAvailableRect(host->chrome()).x() * host->deviceScaleFactor());
+    return static_cast<int>(screenAvailableRect(host->chrome()).x());
 }
 
 int Screen::availTop() const
 {
     if (!m_frame)
         return 0;
     FrameHost* host = m_frame->host();
-    if (host && host->settings().reportScreenSizeInPhysicalPixelsQuirk())
-        return lroundf(screenAvailableRect(m_frame->view()).y() * host->deviceScaleFactor());
-    return static_cast<int>(screenAvailableRect(m_frame->view()).y());
+    if (!host)
+        return 0;
+    if (host->settings().reportScreenSizeInPhysicalPixelsQuirk())
+        return lroundf(screenAvailableRect(host->chrome()).y() * host->deviceScaleFactor());
+    return static_cast<int>(screenAvailableRect(host->chrome()).y());
 }
 
 unsigned Screen::availHeight() const
 {
     if (!m_frame)
         return 0;
     FrameHost* host = m_frame->host();
-    if (host && host->settings().reportScreenSizeInPhysicalPixelsQuirk())
-        return lroundf(screenAvailableRect(m_frame->view()).height() * host->deviceScaleFactor());
-    return static_cast<unsigned>(screenAvailableRect(m_frame->view()).height());
+    if (!host)
+        return 0;
+    if (host->settings().reportScreenSizeInPhysicalPixelsQuirk())
+        return lroundf(screenAvailableRect(host->chrome()).height() * host->deviceScaleFactor());
+    return static_cast<unsigned>(screenAvailableRect(host->chrome()).height());
 }
 
 unsigned Screen::availWidth() const
 {
     if (!m_frame)
         return 0;
     FrameHost* host = m_frame->host();
-    if (host && host->settings().reportScreenSizeInPhysicalPixelsQuirk())
-        return lroundf(screenAvailableRect(m_frame->view()).width() * host->deviceScaleFactor());
-    return static_cast<unsigned>(screenAvailableRect(m_frame->view()).width());
+    if (!host)
+        return 0;
+    if (host->settings().reportScreenSizeInPhysicalPixelsQuirk())
+        return lroundf(screenAvailableRect(host->chrome()).width() * host->deviceScaleFactor());
+    return static_cast<unsigned>(screenAvailableRect(host->chrome()).width());
 }
 
 DEFINE_TRACE(Screen)
 {
     HeapSupplementable<Screen>::trace(visitor);
     DOMWindowProperty::trace(visitor);
 }
 
 } // namespace blink