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