| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "web/DevToolsEmulator.h" | 5 #include "web/DevToolsEmulator.h" |
| 6 | 6 |
| 7 #include "core/frame/FrameHost.h" | 7 #include "core/frame/FrameHost.h" |
| 8 #include "core/frame/FrameView.h" | 8 #include "core/frame/FrameView.h" |
| 9 #include "core/frame/Settings.h" | 9 #include "core/frame/Settings.h" |
| 10 #include "core/frame/VisualViewport.h" | 10 #include "core/frame/VisualViewport.h" |
| (...skipping 326 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 337 m_originalDefaultMinimumPageScaleFactor, | 337 m_originalDefaultMinimumPageScaleFactor, |
| 338 m_originalDefaultMaximumPageScaleFactor); | 338 m_originalDefaultMaximumPageScaleFactor); |
| 339 // mainFrameImpl() could be null during cleanup or remote <-> local swap. | 339 // mainFrameImpl() could be null during cleanup or remote <-> local swap. |
| 340 if (m_webViewImpl->mainFrameImpl()) | 340 if (m_webViewImpl->mainFrameImpl()) |
| 341 m_webViewImpl->mainFrameImpl()->frameView()->layout(); | 341 m_webViewImpl->mainFrameImpl()->frameView()->layout(); |
| 342 } | 342 } |
| 343 | 343 |
| 344 float DevToolsEmulator::compositorDeviceScaleFactor() const { | 344 float DevToolsEmulator::compositorDeviceScaleFactor() const { |
| 345 if (m_deviceMetricsEnabled) | 345 if (m_deviceMetricsEnabled) |
| 346 return m_emulationParams.deviceScaleFactor; | 346 return m_emulationParams.deviceScaleFactor; |
| 347 return m_webViewImpl->page()->deviceScaleFactor(); | 347 return m_webViewImpl->page()->deviceScaleFactorDeprecated(); |
| 348 } | 348 } |
| 349 | 349 |
| 350 void DevToolsEmulator::forceViewport(const WebFloatPoint& position, | 350 void DevToolsEmulator::forceViewport(const WebFloatPoint& position, |
| 351 float scale) { | 351 float scale) { |
| 352 GraphicsLayer* containerLayer = | 352 GraphicsLayer* containerLayer = |
| 353 m_webViewImpl->page()->frameHost().visualViewport().containerLayer(); | 353 m_webViewImpl->page()->frameHost().visualViewport().containerLayer(); |
| 354 if (!m_viewportOverride) { | 354 if (!m_viewportOverride) { |
| 355 m_viewportOverride = ViewportOverride(); | 355 m_viewportOverride = ViewportOverride(); |
| 356 | 356 |
| 357 // Disable clipping on the visual viewport layer, to ensure the whole area | 357 // Disable clipping on the visual viewport layer, to ensure the whole area |
| (...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 531 m_lastPinchAnchorCss.reset(); | 531 m_lastPinchAnchorCss.reset(); |
| 532 m_lastPinchAnchorDip.reset(); | 532 m_lastPinchAnchorDip.reset(); |
| 533 } | 533 } |
| 534 return true; | 534 return true; |
| 535 } | 535 } |
| 536 | 536 |
| 537 return false; | 537 return false; |
| 538 } | 538 } |
| 539 | 539 |
| 540 } // namespace blink | 540 } // namespace blink |
| OLD | NEW |