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

Side by Side Diff: Source/core/style/StyleFetchedImage.cpp

Issue 1129533002: Oilpan: fix build after r194911. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: adjust position of Document clearing Created 5 years, 7 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/style/StyleFetchedImage.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) 2000 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 2000 Lars Knoll (knoll@kde.org)
3 * (C) 2000 Antti Koivisto (koivisto@kde.org) 3 * (C) 2000 Antti Koivisto (koivisto@kde.org)
4 * (C) 2000 Dirk Mueller (mueller@kde.org) 4 * (C) 2000 Dirk Mueller (mueller@kde.org)
5 * Copyright (C) 2003, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. 5 * Copyright (C) 2003, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
6 * 6 *
7 * This library is free software; you can redistribute it and/or 7 * This library is free software; you can redistribute it and/or
8 * modify it under the terms of the GNU Library General Public 8 * modify it under the terms of the GNU Library General Public
9 * License as published by the Free Software Foundation; either 9 * License as published by the Free Software Foundation; either
10 * version 2 of the License, or (at your option) any later version. 10 * version 2 of the License, or (at your option) any later version.
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
99 m_image->addClient(layoutObject); 99 m_image->addClient(layoutObject);
100 } 100 }
101 101
102 void StyleFetchedImage::removeClient(LayoutObject* layoutObject) 102 void StyleFetchedImage::removeClient(LayoutObject* layoutObject)
103 { 103 {
104 m_image->removeClient(layoutObject); 104 m_image->removeClient(layoutObject);
105 } 105 }
106 106
107 void StyleFetchedImage::notifyFinished(Resource* resource) 107 void StyleFetchedImage::notifyFinished(Resource* resource)
108 { 108 {
109 if (m_image && m_image->image() && m_image->image()->isSVGImage()) 109 if (m_document && m_image && m_image->image() && m_image->image()->isSVGImag e())
110 toSVGImage(m_image->image())->updateUseCounters(*m_document); 110 toSVGImage(m_image->image())->updateUseCounters(*m_document);
111 // Oilpan: do not prolong the Document's lifetime.
112 m_document.clear();
111 } 113 }
112 114
113 PassRefPtr<Image> StyleFetchedImage::image(LayoutObject* layoutObject, const Int Size&) const 115 PassRefPtr<Image> StyleFetchedImage::image(LayoutObject* layoutObject, const Int Size&) const
114 { 116 {
115 return m_image->imageForLayoutObject(layoutObject); 117 return m_image->imageForLayoutObject(layoutObject);
116 } 118 }
117 119
118 bool StyleFetchedImage::knownToBeOpaque(const LayoutObject* layoutObject) const 120 bool StyleFetchedImage::knownToBeOpaque(const LayoutObject* layoutObject) const
119 { 121 {
120 return m_image->currentFrameKnownToBeOpaque(layoutObject); 122 return m_image->currentFrameKnownToBeOpaque(layoutObject);
121 } 123 }
122 124
123 } 125 }
OLDNEW
« no previous file with comments | « Source/core/style/StyleFetchedImage.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698