Move Location to DOMWindow

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 29 matching lines @@
 
 namespace blink {
 
 Screen::Screen(LocalFrame* frame)
     : DOMWindowProperty(frame)
 {
 }
 
 unsigned Screen::height() const
 {
-    if (!m_frame)
+    if (!localFrame())
         return 0;
-    FrameHost* host = m_frame->host();
+    FrameHost* host = localFrame()->host();
     if (host && host->settings().reportScreenSizeInPhysicalPixelsQuirk())
-        return lroundf(screenRect(m_frame->view()).height() * host->deviceScaleFactor());
-    return static_cast<unsigned>(screenRect(m_frame->view()).height());
+        return lroundf(screenRect(localFrame()->view()).height() * host->deviceScaleFactor());
+    return static_cast<unsigned>(screenRect(localFrame()->view()).height());
 }
 
 unsigned Screen::width() const
 {
-    if (!m_frame)
+    if (!localFrame())
         return 0;
-    FrameHost* host = m_frame->host();
+    FrameHost* host = localFrame()->host();
     if (host && host->settings().reportScreenSizeInPhysicalPixelsQuirk())
-        return lroundf(screenRect(m_frame->view()).width() * host->deviceScaleFactor());
-    return static_cast<unsigned>(screenRect(m_frame->view()).width());
+        return lroundf(screenRect(localFrame()->view()).width() * host->deviceScaleFactor());
+    return static_cast<unsigned>(screenRect(localFrame()->view()).width());
 }
 
 unsigned Screen::colorDepth() const
 {
-    if (!m_frame)
+    if (!localFrame())
         return 0;
-    return static_cast<unsigned>(screenDepth(m_frame->view()));
+    return static_cast<unsigned>(screenDepth(localFrame()->view()));
 }
 
 unsigned Screen::pixelDepth() const
 {
-    if (!m_frame)
+    if (!localFrame())
         return 0;
-    return static_cast<unsigned>(screenDepth(m_frame->view()));
+    return static_cast<unsigned>(screenDepth(localFrame()->view()));
 }
 
 int Screen::availLeft() const
 {
-    if (!m_frame)
+    if (!localFrame())
         return 0;
-    FrameHost* host = m_frame->host();
+    FrameHost* host = localFrame()->host();
     if (host && host->settings().reportScreenSizeInPhysicalPixelsQuirk())
-        return lroundf(screenAvailableRect(m_frame->view()).x() * host->deviceScaleFactor());
-    return static_cast<int>(screenAvailableRect(m_frame->view()).x());
+        return lroundf(screenAvailableRect(localFrame()->view()).x() * host->deviceScaleFactor());
+    return static_cast<int>(screenAvailableRect(localFrame()->view()).x());
 }
 
 int Screen::availTop() const
 {
-    if (!m_frame)
+    if (!localFrame())
         return 0;
-    FrameHost* host = m_frame->host();
+    FrameHost* host = localFrame()->host();
     if (host && host->settings().reportScreenSizeInPhysicalPixelsQuirk())
-        return lroundf(screenAvailableRect(m_frame->view()).y() * host->deviceScaleFactor());
-    return static_cast<int>(screenAvailableRect(m_frame->view()).y());
+        return lroundf(screenAvailableRect(localFrame()->view()).y() * host->deviceScaleFactor());
+    return static_cast<int>(screenAvailableRect(localFrame()->view()).y());
 }
 
 unsigned Screen::availHeight() const
 {
-    if (!m_frame)
+    if (!localFrame())
         return 0;
-    FrameHost* host = m_frame->host();
+    FrameHost* host = localFrame()->host();
     if (host && host->settings().reportScreenSizeInPhysicalPixelsQuirk())
-        return lroundf(screenAvailableRect(m_frame->view()).height() * host->deviceScaleFactor());
-    return static_cast<unsigned>(screenAvailableRect(m_frame->view()).height());
+        return lroundf(screenAvailableRect(localFrame()->view()).height() * host->deviceScaleFactor());
+    return static_cast<unsigned>(screenAvailableRect(localFrame()->view()).height());
 }
 
 unsigned Screen::availWidth() const
 {
-    if (!m_frame)
+    if (!localFrame())
         return 0;
-    FrameHost* host = m_frame->host();
+    FrameHost* host = localFrame()->host();
     if (host && host->settings().reportScreenSizeInPhysicalPixelsQuirk())
-        return lroundf(screenAvailableRect(m_frame->view()).width() * host->deviceScaleFactor());
-    return static_cast<unsigned>(screenAvailableRect(m_frame->view()).width());
+        return lroundf(screenAvailableRect(localFrame()->view()).width() * host->deviceScaleFactor());
+    return static_cast<unsigned>(screenAvailableRect(localFrame()->view()).width());
 }
 
 void Screen::trace(Visitor* visitor)
 {
 #if ENABLE(OILPAN)
     HeapSupplementable<Screen>::trace(visitor);
 #endif
     DOMWindowProperty::trace(visitor);
 }
 
 } // namespace blink