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

Side by Side Diff: third_party/WebKit/Source/web/LinkHighlightImpl.cpp

Issue 1413373007: CC AnimationHost: Fix LinkHighlights detach scope. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. Created 5 years, 1 month 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 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
95 } 95 }
96 m_contentLayer->layer()->setDrawsContent(true); 96 m_contentLayer->layer()->setDrawsContent(true);
97 m_contentLayer->layer()->setOpacity(1); 97 m_contentLayer->layer()->setOpacity(1);
98 m_geometryNeedsUpdate = true; 98 m_geometryNeedsUpdate = true;
99 updateGeometry(); 99 updateGeometry();
100 } 100 }
101 101
102 LinkHighlightImpl::~LinkHighlightImpl() 102 LinkHighlightImpl::~LinkHighlightImpl()
103 { 103 {
104 if (m_compositorPlayer) { 104 if (m_compositorPlayer) {
105 m_compositorPlayer->detachLayer(); 105 if (m_compositorPlayer->isLayerAttached())
106 m_compositorPlayer->detachLayer();
106 if (m_owningWebViewImpl->linkHighlightsTimeline()) 107 if (m_owningWebViewImpl->linkHighlightsTimeline())
107 m_owningWebViewImpl->linkHighlightsTimeline()->playerDestroyed(*this ); 108 m_owningWebViewImpl->linkHighlightsTimeline()->playerDestroyed(*this );
108 m_compositorPlayer->setAnimationDelegate(nullptr); 109 m_compositorPlayer->setAnimationDelegate(nullptr);
109 } 110 }
110 m_compositorPlayer.clear(); 111 m_compositorPlayer.clear();
111 112
112 clearGraphicsLayerLinkHighlightPointer(); 113 clearGraphicsLayerLinkHighlightPointer();
113 releaseResources(); 114 releaseResources();
114 } 115 }
115 116
(...skipping 262 matching lines...) Expand 10 before | Expand all | Expand 10 after
378 { 379 {
379 return clipLayer(); 380 return clipLayer();
380 } 381 }
381 382
382 WebCompositorAnimationPlayer* LinkHighlightImpl::compositorPlayer() const 383 WebCompositorAnimationPlayer* LinkHighlightImpl::compositorPlayer() const
383 { 384 {
384 return m_compositorPlayer.get(); 385 return m_compositorPlayer.get();
385 } 386 }
386 387
387 } // namespace blink 388 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698