Make DOMWindowProperty::m_frame private

third_party/WebKit/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 28 matching lines @@
 
 namespace blink {
 
 Screen::Screen(LocalFrame* frame)
     : DOMWindowProperty(frame)
 {
 }
 
 int Screen::height() const
 {
-    if (!m_frame)
+    if (!frame())
         return 0;
-    FrameHost* host = m_frame->host();
+    FrameHost* host = frame()->host();
     if (!host)
         return 0;
     if (host->settings().reportScreenSizeInPhysicalPixelsQuirk()) {
         WebScreenInfo screenInfo = host->chromeClient().screenInfo();
         return lroundf(screenInfo.rect.height * screenInfo.deviceScaleFactor);
     }
     return host->chromeClient().screenInfo().rect.height;
 }
 
 int Screen::width() const
 {
-    if (!m_frame)
+    if (!frame())
         return 0;
-    FrameHost* host = m_frame->host();
+    FrameHost* host = frame()->host();
     if (!host)
         return 0;
     if (host->settings().reportScreenSizeInPhysicalPixelsQuirk()) {
         WebScreenInfo screenInfo = host->chromeClient().screenInfo();
         return lroundf(screenInfo.rect.width * screenInfo.deviceScaleFactor);
     }
     return host->chromeClient().screenInfo().rect.width;
 }
 
 unsigned Screen::colorDepth() const
 {
-    if (!m_frame || !m_frame->host())
+    if (!frame() || !frame()->host())
         return 0;
-    return static_cast<unsigned>(m_frame->host()->chromeClient().screenInfo().depth);
+    return static_cast<unsigned>(frame()->host()->chromeClient().screenInfo().depth);
 }
 
 unsigned Screen::pixelDepth() const
 {
-    if (!m_frame)
+    if (!frame())
         return 0;
-    return static_cast<unsigned>(m_frame->host()->chromeClient().screenInfo().depth);
+    return static_cast<unsigned>(frame()->host()->chromeClient().screenInfo().depth);
 }
 
 int Screen::availLeft() const
 {
-    if (!m_frame)
+    if (!frame())
         return 0;
-    FrameHost* host = m_frame->host();
+    FrameHost* host = frame()->host();
     if (!host)
         return 0;
     if (host->settings().reportScreenSizeInPhysicalPixelsQuirk()) {
         WebScreenInfo screenInfo = host->chromeClient().screenInfo();
         return lroundf(screenInfo.availableRect.x * screenInfo.deviceScaleFactor);
     }
     return static_cast<int>(host->chromeClient().screenInfo().availableRect.x);
 }
 
 int Screen::availTop() const
 {
-    if (!m_frame)
+    if (!frame())
         return 0;
-    FrameHost* host = m_frame->host();
+    FrameHost* host = frame()->host();
     if (!host)
         return 0;
     if (host->settings().reportScreenSizeInPhysicalPixelsQuirk()) {
         WebScreenInfo screenInfo = host->chromeClient().screenInfo();
         return lroundf(screenInfo.availableRect.y * screenInfo.deviceScaleFactor);
     }
     return static_cast<int>(host->chromeClient().screenInfo().availableRect.y);
 }
 
 int Screen::availHeight() const
 {
-    if (!m_frame)
+    if (!frame())
         return 0;
-    FrameHost* host = m_frame->host();
+    FrameHost* host = frame()->host();
     if (!host)
         return 0;
     if (host->settings().reportScreenSizeInPhysicalPixelsQuirk()) {
         WebScreenInfo screenInfo = host->chromeClient().screenInfo();
         return lroundf(screenInfo.availableRect.height * screenInfo.deviceScaleFactor);
     }
     return host->chromeClient().screenInfo().availableRect.height;
 }
 
 int Screen::availWidth() const
 {
-    if (!m_frame)
+    if (!frame())
         return 0;
-    FrameHost* host = m_frame->host();
+    FrameHost* host = frame()->host();
     if (!host)
         return 0;
     if (host->settings().reportScreenSizeInPhysicalPixelsQuirk()) {
         WebScreenInfo screenInfo = host->chromeClient().screenInfo();
         return lroundf(screenInfo.availableRect.width * screenInfo.deviceScaleFactor);
     }
     return host->chromeClient().screenInfo().availableRect.width;
 }
 
 DEFINE_TRACE(Screen)
 {
     DOMWindowProperty::trace(visitor);
     Supplementable<Screen>::trace(visitor);
 }
 
 } // namespace blink