| 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 198 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 209 FloatPoint clampedOffset(clampOffsetToBoundaries(location)); | 209 FloatPoint clampedOffset(clampOffsetToBoundaries(location)); |
| 210 | 210 |
| 211 if (clampedOffset != m_offset) { | 211 if (clampedOffset != m_offset) { |
| 212 m_offset = clampedOffset; | 212 m_offset = clampedOffset; |
| 213 scrollAnimator()->setCurrentPosition(m_offset); | 213 scrollAnimator()->setCurrentPosition(m_offset); |
| 214 | 214 |
| 215 // SVG runs with accelerated compositing disabled so no ScrollingCoordin
ator. | 215 // SVG runs with accelerated compositing disabled so no ScrollingCoordin
ator. |
| 216 if (ScrollingCoordinator* coordinator = frameHost().page().scrollingCoor
dinator()) | 216 if (ScrollingCoordinator* coordinator = frameHost().page().scrollingCoor
dinator()) |
| 217 coordinator->scrollableAreaScrollLayerDidChange(this); | 217 coordinator->scrollableAreaScrollLayerDidChange(this); |
| 218 | 218 |
| 219 if (Document* document = mainFrame()->document()) | 219 if (!frameHost().settings().inertVisualViewport()) { |
| 220 document->enqueueScrollEventForNode(document); | 220 if (Document* document = mainFrame()->document()) |
| 221 document->enqueueScrollEventForNode(document); |
| 222 } |
| 221 | 223 |
| 222 mainFrame()->loader().client()->didChangeScrollOffset(); | 224 mainFrame()->loader().client()->didChangeScrollOffset(); |
| 223 valuesChanged = true; | 225 valuesChanged = true; |
| 224 } | 226 } |
| 225 | 227 |
| 226 if (!valuesChanged) | 228 if (!valuesChanged) |
| 227 return; | 229 return; |
| 228 | 230 |
| 229 InspectorInstrumentation::didUpdateLayout(mainFrame()); | 231 InspectorInstrumentation::didUpdateLayout(mainFrame()); |
| 230 mainFrame()->loader().saveScrollState(); | 232 mainFrame()->loader().saveScrollState(); |
| (...skipping 504 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 735 } else if (graphicsLayer == m_rootTransformLayer) { | 737 } else if (graphicsLayer == m_rootTransformLayer) { |
| 736 name = "Root Transform Layer"; | 738 name = "Root Transform Layer"; |
| 737 } else { | 739 } else { |
| 738 ASSERT_NOT_REACHED(); | 740 ASSERT_NOT_REACHED(); |
| 739 } | 741 } |
| 740 | 742 |
| 741 return name; | 743 return name; |
| 742 } | 744 } |
| 743 | 745 |
| 744 } // namespace blink | 746 } // namespace blink |
| OLD | NEW |