| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2011, 2012 Google Inc. All rights reserved. | 2 * Copyright (C) 2011, 2012 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 3005 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3016 { | 3016 { |
| 3017 ASSERT(page()); | 3017 ASSERT(page()); |
| 3018 return page()->frameHost().visualViewport().visibleRect().location(); | 3018 return page()->frameHost().visualViewport().visibleRect().location(); |
| 3019 } | 3019 } |
| 3020 | 3020 |
| 3021 WebFloatPoint WebViewImpl::pinchViewportOffset() const | 3021 WebFloatPoint WebViewImpl::pinchViewportOffset() const |
| 3022 { | 3022 { |
| 3023 return visualViewportOffset(); | 3023 return visualViewportOffset(); |
| 3024 } | 3024 } |
| 3025 | 3025 |
| 3026 WebFloatSize WebViewImpl::visualViewportSize() const |
| 3027 { |
| 3028 ASSERT(page()); |
| 3029 return page()->frameHost().visualViewport().visibleRect().size(); |
| 3030 } |
| 3031 |
| 3026 void WebViewImpl::scrollAndRescaleViewports(float scaleFactor, | 3032 void WebViewImpl::scrollAndRescaleViewports(float scaleFactor, |
| 3027 const IntPoint& mainFrameOrigin, | 3033 const IntPoint& mainFrameOrigin, |
| 3028 const FloatPoint& visualViewportOrigin) | 3034 const FloatPoint& visualViewportOrigin) |
| 3029 { | 3035 { |
| 3030 if (!page()) | 3036 if (!page()) |
| 3031 return; | 3037 return; |
| 3032 | 3038 |
| 3033 if (!mainFrameImpl()) | 3039 if (!mainFrameImpl()) |
| 3034 return; | 3040 return; |
| 3035 | 3041 |
| (...skipping 1386 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4422 if (m_pageColorOverlay) | 4428 if (m_pageColorOverlay) |
| 4423 m_pageColorOverlay->update(); | 4429 m_pageColorOverlay->update(); |
| 4424 if (InspectorOverlay* overlay = inspectorOverlay()) { | 4430 if (InspectorOverlay* overlay = inspectorOverlay()) { |
| 4425 PageOverlay* inspectorPageOverlay = overlay->pageOverlay(); | 4431 PageOverlay* inspectorPageOverlay = overlay->pageOverlay(); |
| 4426 if (inspectorPageOverlay) | 4432 if (inspectorPageOverlay) |
| 4427 inspectorPageOverlay->update(); | 4433 inspectorPageOverlay->update(); |
| 4428 } | 4434 } |
| 4429 } | 4435 } |
| 4430 | 4436 |
| 4431 } // namespace blink | 4437 } // namespace blink |
| OLD | NEW |