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

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

Issue 2014493002: Rename OwnPtr::clear() to reset() in web/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 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 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
96 m_geometryNeedsUpdate = true; 96 m_geometryNeedsUpdate = true;
97 } 97 }
98 98
99 LinkHighlightImpl::~LinkHighlightImpl() 99 LinkHighlightImpl::~LinkHighlightImpl()
100 { 100 {
101 if (m_compositorPlayer->isLayerAttached()) 101 if (m_compositorPlayer->isLayerAttached())
102 m_compositorPlayer->detachLayer(); 102 m_compositorPlayer->detachLayer();
103 if (m_owningWebViewImpl->linkHighlightsTimeline()) 103 if (m_owningWebViewImpl->linkHighlightsTimeline())
104 m_owningWebViewImpl->linkHighlightsTimeline()->playerDestroyed(*this); 104 m_owningWebViewImpl->linkHighlightsTimeline()->playerDestroyed(*this);
105 m_compositorPlayer->setAnimationDelegate(nullptr); 105 m_compositorPlayer->setAnimationDelegate(nullptr);
106 m_compositorPlayer.clear(); 106 m_compositorPlayer.reset();
107 107
108 clearGraphicsLayerLinkHighlightPointer(); 108 clearGraphicsLayerLinkHighlightPointer();
109 releaseResources(); 109 releaseResources();
110 } 110 }
111 111
112 WebContentLayer* LinkHighlightImpl::contentLayer() 112 WebContentLayer* LinkHighlightImpl::contentLayer()
113 { 113 {
114 return m_contentLayer.get(); 114 return m_contentLayer.get();
115 } 115 }
116 116
(...skipping 261 matching lines...) Expand 10 before | Expand all | Expand 10 after
378 { 378 {
379 return clipLayer(); 379 return clipLayer();
380 } 380 }
381 381
382 CompositorAnimationPlayer* LinkHighlightImpl::compositorPlayer() const 382 CompositorAnimationPlayer* LinkHighlightImpl::compositorPlayer() const
383 { 383 {
384 return m_compositorPlayer.get(); 384 return m_compositorPlayer.get();
385 } 385 }
386 386
387 } // namespace blink 387 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/web/InspectorOverlay.cpp ('k') | third_party/WebKit/Source/web/WebDataSourceImpl.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698