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

Side by Side Diff: Source/core/rendering/RenderImage.cpp

Issue 458383003: Oilpan: RenderImageResource::shutdown should be called earlier. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 4 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/rendering/RenderImage.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * (C) 2000 Dirk Mueller (mueller@kde.org) 4 * (C) 2000 Dirk Mueller (mueller@kde.org)
5 * (C) 2006 Allan Sandfeld Jensen (kde@carewolf.com) 5 * (C) 2006 Allan Sandfeld Jensen (kde@carewolf.com)
6 * (C) 2006 Samuel Weinig (sam.weinig@gmail.com) 6 * (C) 2006 Samuel Weinig (sam.weinig@gmail.com)
7 * Copyright (C) 2003, 2004, 2005, 2006, 2008, 2009, 2010, 2011 Apple Inc. All r ights reserved. 7 * Copyright (C) 2003, 2004, 2005, 2006, 2008, 2009, 2010, 2011 Apple Inc. All r ights reserved.
8 * Copyright (C) 2010 Google Inc. All rights reserved. 8 * Copyright (C) 2010 Google Inc. All rights reserved.
9 * Copyright (C) Research In Motion Limited 2011-2012. All rights reserved. 9 * Copyright (C) Research In Motion Limited 2011-2012. All rights reserved.
10 * 10 *
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 68
69 RenderImage* RenderImage::createAnonymous(Document* document) 69 RenderImage* RenderImage::createAnonymous(Document* document)
70 { 70 {
71 RenderImage* image = new RenderImage(0); 71 RenderImage* image = new RenderImage(0);
72 image->setDocumentForAnonymous(document); 72 image->setDocumentForAnonymous(document);
73 return image; 73 return image;
74 } 74 }
75 75
76 RenderImage::~RenderImage() 76 RenderImage::~RenderImage()
77 { 77 {
78 }
79
80 void RenderImage::destroy()
81 {
78 ASSERT(m_imageResource); 82 ASSERT(m_imageResource);
79 m_imageResource->shutdown(); 83 m_imageResource->shutdown();
84 RenderReplaced::destroy();
80 } 85 }
81 86
82 void RenderImage::setImageResource(PassOwnPtr<RenderImageResource> imageResource ) 87 void RenderImage::setImageResource(PassOwnPtr<RenderImageResource> imageResource )
83 { 88 {
84 ASSERT(!m_imageResource); 89 ASSERT(!m_imageResource);
85 m_imageResource = imageResource; 90 m_imageResource = imageResource;
86 m_imageResource->initialize(this); 91 m_imageResource->initialize(this);
87 } 92 }
88 93
89 // If we'll be displaying either alt text or an image, add some padding. 94 // If we'll be displaying either alt text or an image, add some padding.
(...skipping 533 matching lines...) Expand 10 before | Expand all | Expand 10 after
623 return 0; 628 return 0;
624 629
625 ImageResource* cachedImage = m_imageResource->cachedImage(); 630 ImageResource* cachedImage = m_imageResource->cachedImage();
626 if (cachedImage && cachedImage->image() && cachedImage->image()->isSVGImage( )) 631 if (cachedImage && cachedImage->image() && cachedImage->image()->isSVGImage( ))
627 return toSVGImage(cachedImage->image())->embeddedContentBox(); 632 return toSVGImage(cachedImage->image())->embeddedContentBox();
628 633
629 return 0; 634 return 0;
630 } 635 }
631 636
632 } // namespace blink 637 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderImage.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698