Chromium Code Reviews| 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 278 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 289 } | 289 } |
| 290 | 290 |
| 291 if (!valuesChanged) | 291 if (!valuesChanged) |
| 292 return false; | 292 return false; |
| 293 | 293 |
| 294 InspectorInstrumentation::didUpdateLayout(mainFrame()); | 294 InspectorInstrumentation::didUpdateLayout(mainFrame()); |
| 295 mainFrame()->loader().saveScrollState(); | 295 mainFrame()->loader().saveScrollState(); |
| 296 | 296 |
| 297 clampToBoundaries(); | 297 clampToBoundaries(); |
| 298 | 298 |
| 299 // TODO(ymalik): VisualViewport shouldn't be talking to FrameView and this | |
| 300 // should happen through RootFrameViewport. | |
| 301 mainFrame()->view()->updateScrollbars(); | |
|
bokan
2016/11/03 19:59:59
We don't need this anymore since you added it to R
ymalik
2016/11/04 18:54:17
Oops, forgot to remove. Thanks.
| |
| 302 | |
| 299 return true; | 303 return true; |
| 300 } | 304 } |
| 301 | 305 |
| 302 bool VisualViewport::magnifyScaleAroundAnchor(float magnifyDelta, | 306 bool VisualViewport::magnifyScaleAroundAnchor(float magnifyDelta, |
| 303 const FloatPoint& anchor) { | 307 const FloatPoint& anchor) { |
| 304 const float oldPageScale = scale(); | 308 const float oldPageScale = scale(); |
| 305 const float newPageScale = | 309 const float newPageScale = |
| 306 frameHost().chromeClient().clampPageScaleFactorToLimits(magnifyDelta * | 310 frameHost().chromeClient().clampPageScaleFactorToLimits(magnifyDelta * |
| 307 oldPageScale); | 311 oldPageScale); |
| 308 if (newPageScale == oldPageScale) | 312 if (newPageScale == oldPageScale) |
| (...skipping 530 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 839 } else if (graphicsLayer == m_rootTransformLayer.get()) { | 843 } else if (graphicsLayer == m_rootTransformLayer.get()) { |
| 840 name = "Root Transform Layer"; | 844 name = "Root Transform Layer"; |
| 841 } else { | 845 } else { |
| 842 ASSERT_NOT_REACHED(); | 846 ASSERT_NOT_REACHED(); |
| 843 } | 847 } |
| 844 | 848 |
| 845 return name; | 849 return name; |
| 846 } | 850 } |
| 847 | 851 |
| 848 } // namespace blink | 852 } // namespace blink |
| OLD | NEW |