| Index: third_party/WebKit/Source/core/frame/Screen.cpp
|
| diff --git a/third_party/WebKit/Source/core/frame/Screen.cpp b/third_party/WebKit/Source/core/frame/Screen.cpp
|
| index 494822150f7a510d87ba2bc12ff8acd0ad357838..9c042ae2eb4eeb7a50e9fe0040120c05908f58b4 100644
|
| --- a/third_party/WebKit/Source/core/frame/Screen.cpp
|
| +++ b/third_party/WebKit/Source/core/frame/Screen.cpp
|
| @@ -46,9 +46,9 @@ Screen::Screen(LocalFrame* 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()) {
|
| @@ -60,9 +60,9 @@ int Screen::height() const
|
|
|
| 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()) {
|
| @@ -74,23 +74,23 @@ int Screen::width() const
|
|
|
| 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()) {
|
| @@ -102,9 +102,9 @@ int Screen::availLeft() const
|
|
|
| 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()) {
|
| @@ -116,9 +116,9 @@ int Screen::availTop() const
|
|
|
| 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()) {
|
| @@ -130,9 +130,9 @@ int Screen::availHeight() const
|
|
|
| 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()) {
|
|
|