| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2013 Google Inc. All rights reserved. | 2 * Copyright (C) 2013 Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 112 Deprecation& FrameHost::deprecation() | 112 Deprecation& FrameHost::deprecation() |
| 113 { | 113 { |
| 114 return m_page->deprecation(); | 114 return m_page->deprecation(); |
| 115 } | 115 } |
| 116 | 116 |
| 117 const Deprecation& FrameHost::deprecation() const | 117 const Deprecation& FrameHost::deprecation() const |
| 118 { | 118 { |
| 119 return m_page->deprecation(); | 119 return m_page->deprecation(); |
| 120 } | 120 } |
| 121 | 121 |
| 122 float FrameHost::deviceScaleFactor() const | 122 float FrameHost::deviceScaleFactorDeprecated() const |
| 123 { | 123 { |
| 124 return m_page->deviceScaleFactor(); | 124 return m_page->deviceScaleFactor(); |
| 125 } | 125 } |
| 126 | 126 |
| 127 RootScroller* FrameHost::rootScroller() | 127 RootScroller* FrameHost::rootScroller() |
| 128 { | 128 { |
| 129 // RootScroller only makes sense if we're in the process where the main | 129 // RootScroller only makes sense if we're in the process where the main |
| 130 // frame is local. | 130 // frame is local. |
| 131 if (!m_page->mainFrame() || !m_page->mainFrame()->isLocalFrame()) | 131 if (!m_page->mainFrame() || !m_page->mainFrame()->isLocalFrame()) |
| 132 return nullptr; | 132 return nullptr; |
| (...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 272 | 272 |
| 273 FrameView* rootView = page().deprecatedLocalMainFrame()->view(); | 273 FrameView* rootView = page().deprecatedLocalMainFrame()->view(); |
| 274 | 274 |
| 275 if (!rootView) | 275 if (!rootView) |
| 276 return; | 276 return; |
| 277 | 277 |
| 278 rootView->setNeedsLayout(); | 278 rootView->setNeedsLayout(); |
| 279 } | 279 } |
| 280 | 280 |
| 281 } // namespace blink | 281 } // namespace blink |
| OLD | NEW |