Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(484)

Side by Side Diff: third_party/WebKit/Source/platform/graphics/GraphicsLayer.cpp

Issue 1587073011: Plumb NotifyAnimationAborted from the compositor to blink animation delegate. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: initialize aborted_ in unittest Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 1195 matching lines...) Expand 10 before | Expand all | Expand 10 after
1206 if (m_client) 1206 if (m_client)
1207 m_client->notifyAnimationStarted(this, monotonicTime, group); 1207 m_client->notifyAnimationStarted(this, monotonicTime, group);
1208 } 1208 }
1209 1209
1210 void GraphicsLayer::notifyAnimationFinished(double, int group) 1210 void GraphicsLayer::notifyAnimationFinished(double, int group)
1211 { 1211 {
1212 if (m_scrollableArea) 1212 if (m_scrollableArea)
1213 m_scrollableArea->notifyCompositorAnimationFinished(group); 1213 m_scrollableArea->notifyCompositorAnimationFinished(group);
1214 } 1214 }
1215 1215
1216 void GraphicsLayer::notifyAnimationAborted(double, int group)
1217 {
1218 if (m_scrollableArea)
1219 m_scrollableArea->notifyCompositorAnimationAborted(group);
1220 }
1221
1216 void GraphicsLayer::didScroll() 1222 void GraphicsLayer::didScroll()
1217 { 1223 {
1218 if (m_scrollableArea) { 1224 if (m_scrollableArea) {
1219 DoublePoint newPosition = m_scrollableArea->minimumScrollPosition() + to DoubleSize(m_layer->layer()->scrollPositionDouble()); 1225 DoublePoint newPosition = m_scrollableArea->minimumScrollPosition() + to DoubleSize(m_layer->layer()->scrollPositionDouble());
1220 1226
1221 // FrameView::setScrollPosition doesn't work for compositor commits (int eracts poorly with programmatic scroll animations) 1227 // FrameView::setScrollPosition doesn't work for compositor commits (int eracts poorly with programmatic scroll animations)
1222 // so we need to use the ScrollableArea version. The FrameView method sh ould go away soon anyway. 1228 // so we need to use the ScrollableArea version. The FrameView method sh ould go away soon anyway.
1223 m_scrollableArea->ScrollableArea::setScrollPosition(newPosition, Composi torScroll); 1229 m_scrollableArea->ScrollableArea::setScrollPosition(newPosition, Composi torScroll);
1224 } 1230 }
1225 } 1231 }
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
1258 { 1264 {
1259 if (!layer) { 1265 if (!layer) {
1260 fprintf(stderr, "Cannot showGraphicsLayerTree for (nil).\n"); 1266 fprintf(stderr, "Cannot showGraphicsLayerTree for (nil).\n");
1261 return; 1267 return;
1262 } 1268 }
1263 1269
1264 String output = layer->layerTreeAsText(blink::LayerTreeIncludesDebugInfo); 1270 String output = layer->layerTreeAsText(blink::LayerTreeIncludesDebugInfo);
1265 fprintf(stderr, "%s\n", output.utf8().data()); 1271 fprintf(stderr, "%s\n", output.utf8().data());
1266 } 1272 }
1267 #endif 1273 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698