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 266 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
277 | 277 |
278 enqueueScrollEvent(); | 278 enqueueScrollEvent(); |
279 | 279 |
280 mainFrame()->view()->didChangeScrollOffset(); | 280 mainFrame()->view()->didChangeScrollOffset(); |
281 valuesChanged = true; | 281 valuesChanged = true; |
282 } | 282 } |
283 | 283 |
284 if (!valuesChanged) | 284 if (!valuesChanged) |
285 return false; | 285 return false; |
286 | 286 |
287 probe::didUpdateLayout(mainFrame()); | 287 probe::didChangeViewport(mainFrame()); |
288 mainFrame()->loader().saveScrollState(); | 288 mainFrame()->loader().saveScrollState(); |
289 | 289 |
290 clampToBoundaries(); | 290 clampToBoundaries(); |
291 | 291 |
292 return true; | 292 return true; |
293 } | 293 } |
294 | 294 |
295 bool VisualViewport::magnifyScaleAroundAnchor(float magnifyDelta, | 295 bool VisualViewport::magnifyScaleAroundAnchor(float magnifyDelta, |
296 const FloatPoint& anchor) { | 296 const FloatPoint& anchor) { |
297 const float oldPageScale = scale(); | 297 const float oldPageScale = scale(); |
(...skipping 557 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
855 } else if (graphicsLayer == m_rootTransformLayer.get()) { | 855 } else if (graphicsLayer == m_rootTransformLayer.get()) { |
856 name = "Root Transform Layer"; | 856 name = "Root Transform Layer"; |
857 } else { | 857 } else { |
858 ASSERT_NOT_REACHED(); | 858 ASSERT_NOT_REACHED(); |
859 } | 859 } |
860 | 860 |
861 return name; | 861 return name; |
862 } | 862 } |
863 | 863 |
864 } // namespace blink | 864 } // namespace blink |
OLD | NEW |