| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2009 Apple Inc. All rights reserved. | 2 * Copyright (C) 2009 Apple 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 | 5 * modification, are permitted provided that the following conditions |
| 6 * are met: | 6 * are met: |
| 7 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
| 8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
| 9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
| 10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
| (...skipping 1025 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1036 else | 1036 else |
| 1037 m_layer->layer()->setScrollClient(this); | 1037 m_layer->layer()->setScrollClient(this); |
| 1038 } | 1038 } |
| 1039 | 1039 |
| 1040 void GraphicsLayer::paint(GraphicsContext& context, const IntRect& clip) | 1040 void GraphicsLayer::paint(GraphicsContext& context, const IntRect& clip) |
| 1041 { | 1041 { |
| 1042 paintGraphicsLayerContents(context, clip); | 1042 paintGraphicsLayerContents(context, clip); |
| 1043 } | 1043 } |
| 1044 | 1044 |
| 1045 | 1045 |
| 1046 void GraphicsLayer::notifyAnimationStarted(double monotonicTime, WebCompositorAn
imation::TargetProperty) | 1046 void GraphicsLayer::notifyAnimationStarted(double monotonicTime, int group) |
| 1047 { | 1047 { |
| 1048 if (m_client) | 1048 if (m_client) |
| 1049 m_client->notifyAnimationStarted(this, monotonicTime); | 1049 m_client->notifyAnimationStarted(this, monotonicTime, group); |
| 1050 } | 1050 } |
| 1051 | 1051 |
| 1052 void GraphicsLayer::notifyAnimationFinished(double, WebCompositorAnimation::Targ
etProperty) | 1052 void GraphicsLayer::notifyAnimationFinished(double, int) |
| 1053 { | 1053 { |
| 1054 // Do nothing. | |
| 1055 } | 1054 } |
| 1056 | 1055 |
| 1057 void GraphicsLayer::didScroll() | 1056 void GraphicsLayer::didScroll() |
| 1058 { | 1057 { |
| 1059 if (m_scrollableArea) { | 1058 if (m_scrollableArea) { |
| 1060 DoublePoint newPosition = m_scrollableArea->minimumScrollPosition() + to
DoubleSize(m_layer->layer()->scrollPositionDouble()); | 1059 DoublePoint newPosition = m_scrollableArea->minimumScrollPosition() + to
DoubleSize(m_layer->layer()->scrollPositionDouble()); |
| 1061 // FIXME: Remove the toFloatPoint(). crbug.com/414283. | 1060 // FIXME: Remove the toFloatPoint(). crbug.com/414283. |
| 1062 m_scrollableArea->scrollToOffsetWithoutAnimation(toFloatPoint(newPositio
n)); | 1061 m_scrollableArea->scrollToOffsetWithoutAnimation(toFloatPoint(newPositio
n)); |
| 1063 } | 1062 } |
| 1064 } | 1063 } |
| 1065 | 1064 |
| 1066 } // namespace blink | 1065 } // namespace blink |
| 1067 | 1066 |
| 1068 #ifndef NDEBUG | 1067 #ifndef NDEBUG |
| 1069 void showGraphicsLayerTree(const blink::GraphicsLayer* layer) | 1068 void showGraphicsLayerTree(const blink::GraphicsLayer* layer) |
| 1070 { | 1069 { |
| 1071 if (!layer) | 1070 if (!layer) |
| 1072 return; | 1071 return; |
| 1073 | 1072 |
| 1074 String output = layer->layerTreeAsText(blink::LayerTreeIncludesDebugInfo); | 1073 String output = layer->layerTreeAsText(blink::LayerTreeIncludesDebugInfo); |
| 1075 fprintf(stderr, "%s\n", output.utf8().data()); | 1074 fprintf(stderr, "%s\n", output.utf8().data()); |
| 1076 } | 1075 } |
| 1077 #endif | 1076 #endif |
| OLD | NEW |