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

Side by Side Diff: Source/web/LinkHighlight.cpp

Issue 23834010: Change WebLayer::addAnimation to transfer ownership of WebAnimation. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Change GraphicsLayer and LinkHighlight to clarify ownership transfer Created 7 years, 3 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) 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2012 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 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. 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 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 253 matching lines...) Expand 10 before | Expand all | Expand 10 after
264 OwnPtr<WebFloatAnimationCurve> curve = adoptPtr(compositorSupport->createFlo atAnimationCurve()); 264 OwnPtr<WebFloatAnimationCurve> curve = adoptPtr(compositorSupport->createFlo atAnimationCurve());
265 265
266 curve->add(WebFloatKeyframe(0, startOpacity)); 266 curve->add(WebFloatKeyframe(0, startOpacity));
267 // Make sure we have displayed for at least minPreFadeDuration before starti ng to fade out. 267 // Make sure we have displayed for at least minPreFadeDuration before starti ng to fade out.
268 float extraDurationRequired = std::max(0.f, minPreFadeDuration - static_cast <float>(monotonicallyIncreasingTime() - m_startTime)); 268 float extraDurationRequired = std::max(0.f, minPreFadeDuration - static_cast <float>(monotonicallyIncreasingTime() - m_startTime));
269 if (extraDurationRequired) 269 if (extraDurationRequired)
270 curve->add(WebFloatKeyframe(extraDurationRequired, startOpacity)); 270 curve->add(WebFloatKeyframe(extraDurationRequired, startOpacity));
271 // For layout tests we don't fade out. 271 // For layout tests we don't fade out.
272 curve->add(WebFloatKeyframe(fadeDuration + extraDurationRequired, WebKit::la youtTestMode() ? startOpacity : 0)); 272 curve->add(WebFloatKeyframe(fadeDuration + extraDurationRequired, WebKit::la youtTestMode() ? startOpacity : 0));
273 273
274 m_animation = adoptPtr(compositorSupport->createAnimation(*curve, WebAnimati on::TargetPropertyOpacity)); 274 OwnPtr<WebAnimation> animation = adoptPtr(compositorSupport->createAnimation (*curve, WebAnimation::TargetPropertyOpacity));
275 275
276 m_contentLayer->layer()->setDrawsContent(true); 276 m_contentLayer->layer()->setDrawsContent(true);
277 m_contentLayer->layer()->addAnimation(m_animation.get()); 277 m_contentLayer->layer()->addAnimation(animation.get());
jamesr 2013/09/20 18:52:14 this would be clearer if you wrote this line "anim
dshwang 2013/09/20 19:03:58 Ditto.
278 animation.clear();
278 279
279 invalidate(); 280 invalidate();
280 m_owningWebViewImpl->scheduleAnimation(); 281 m_owningWebViewImpl->scheduleAnimation();
281 } 282 }
282 283
283 void LinkHighlight::clearGraphicsLayerLinkHighlightPointer() 284 void LinkHighlight::clearGraphicsLayerLinkHighlightPointer()
284 { 285 {
285 if (m_currentGraphicsLayer) { 286 if (m_currentGraphicsLayer) {
286 m_currentGraphicsLayer->removeLinkHighlight(this); 287 m_currentGraphicsLayer->removeLinkHighlight(this);
287 m_currentGraphicsLayer = 0; 288 m_currentGraphicsLayer = 0;
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
334 // Make sure we update geometry on the next callback from WebViewImpl::layou t(). 335 // Make sure we update geometry on the next callback from WebViewImpl::layou t().
335 m_geometryNeedsUpdate = true; 336 m_geometryNeedsUpdate = true;
336 } 337 }
337 338
338 WebLayer* LinkHighlight::layer() 339 WebLayer* LinkHighlight::layer()
339 { 340 {
340 return clipLayer(); 341 return clipLayer();
341 } 342 }
342 343
343 } // namespace WeKit 344 } // namespace WeKit
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698