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

Unified Diff: Source/core/animation/CompositorAnimationsTest.cpp

Issue 869323003: Oilpan: move RenderObjects off heap. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: minor fixes Created 5 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | Source/core/dom/FirstLetterPseudoElement.h » ('j') | Source/core/layout/LayoutTableSection.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/animation/CompositorAnimationsTest.cpp
diff --git a/Source/core/animation/CompositorAnimationsTest.cpp b/Source/core/animation/CompositorAnimationsTest.cpp
index 4cc6e91e1464e049dc9b4f36e09b1587557454c2..f8f16e7d0b718e260633f292744147617e50f453 100644
--- a/Source/core/animation/CompositorAnimationsTest.cpp
+++ b/Source/core/animation/CompositorAnimationsTest.cpp
@@ -256,18 +256,14 @@ public:
class RenderObjectProxy : public RenderObject {
public:
- static PassOwnPtrWillBeRawPtr<RenderObjectProxy> create(Node* node)
+ static PassOwnPtr<RenderObjectProxy> create(Node* node)
{
- return adoptPtrWillBeNoop(new RenderObjectProxy(node));
- }
-
- static void dispose(PassOwnPtrWillBeRawPtr<RenderObjectProxy> object)
tkent 2015/02/04 00:50:44 Don't remove this function. This is not specific
sof 2015/02/04 08:44:31 Added back again (the use of destroy() was added a
- {
- object.leakPtr()->destroy();
+ return adoptPtr(new RenderObjectProxy(node));
}
const char* renderName() const override { return nullptr; }
void layout() override { }
+
private:
explicit RenderObjectProxy(Node* node)
: RenderObject(node)
@@ -1202,7 +1198,7 @@ TEST_F(AnimationCompositorAnimationsTest, CancelIncompatibleCompositorAnimations
RefPtrWillBePersistent<Element> element = m_document->createElement("shared", ASSERT_NO_EXCEPTION);
- OwnPtrWillBePersistent<RenderObjectProxy> renderer = RenderObjectProxy::create(element.get());
+ OwnPtr<RenderObjectProxy> renderer = RenderObjectProxy::create(element.get());
element->setRenderer(renderer.get());
AnimatableValueKeyframeVector keyFrames;
@@ -1242,7 +1238,7 @@ TEST_F(AnimationCompositorAnimationsTest, CancelIncompatibleCompositorAnimations
simulateFrame(1.);
element->setRenderer(nullptr);
- RenderObjectProxy::dispose(renderer.release());
+ renderer = nullptr;
player1.release();
player2.release();
« no previous file with comments | « no previous file | Source/core/dom/FirstLetterPseudoElement.h » ('j') | Source/core/layout/LayoutTableSection.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698