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 mainFrame()->view()->updateScrollbars(); | |
|
bokan
2016/10/31 15:25:09
VisualViewport shouldn't be talking to FrameView,
ymalik
2016/11/03 18:49:12
Yes you're right.
I have RFV::didUpdateVisualView
| |
| 300 | |
| 299 return true; | 301 return true; |
| 300 } | 302 } |
| 301 | 303 |
| 302 bool VisualViewport::magnifyScaleAroundAnchor(float magnifyDelta, | 304 bool VisualViewport::magnifyScaleAroundAnchor(float magnifyDelta, |
| 303 const FloatPoint& anchor) { | 305 const FloatPoint& anchor) { |
| 304 const float oldPageScale = scale(); | 306 const float oldPageScale = scale(); |
| 305 const float newPageScale = | 307 const float newPageScale = |
| 306 frameHost().chromeClient().clampPageScaleFactorToLimits(magnifyDelta * | 308 frameHost().chromeClient().clampPageScaleFactorToLimits(magnifyDelta * |
| 307 oldPageScale); | 309 oldPageScale); |
| 308 if (newPageScale == oldPageScale) | 310 if (newPageScale == oldPageScale) |
| (...skipping 515 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 824 } else if (graphicsLayer == m_rootTransformLayer.get()) { | 826 } else if (graphicsLayer == m_rootTransformLayer.get()) { |
| 825 name = "Root Transform Layer"; | 827 name = "Root Transform Layer"; |
| 826 } else { | 828 } else { |
| 827 ASSERT_NOT_REACHED(); | 829 ASSERT_NOT_REACHED(); |
| 828 } | 830 } |
| 829 | 831 |
| 830 return name; | 832 return name; |
| 831 } | 833 } |
| 832 | 834 |
| 833 } // namespace blink | 835 } // namespace blink |
| OLD | NEW |