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

Side by Side Diff: Source/core/layout/LayoutImageResourceStyleImage.cpp

Issue 923953002: Move rendering/RenderImage* to layout/LayoutImage* (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 10 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
« no previous file with comments | « Source/core/layout/LayoutImageResourceStyleImage.h ('k') | Source/core/layout/LayoutObject.h » ('j') | 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 * Copyright (C) 1999 Antti Koivisto <koivisto@kde.org> 3 * Copyright (C) 1999 Antti Koivisto <koivisto@kde.org>
4 * Copyright (C) 2000 Dirk Mueller <mueller@kde.org> 4 * Copyright (C) 2000 Dirk Mueller <mueller@kde.org>
5 * Copyright (C) 2006 Allan Sandfeld Jensen <kde@carewolf.com> 5 * Copyright (C) 2006 Allan Sandfeld Jensen <kde@carewolf.com>
6 * Copyright (C) 2006 Samuel Weinig <sam.weinig@gmail.com> 6 * Copyright (C) 2006 Samuel Weinig <sam.weinig@gmail.com>
7 * Copyright (C) 2003, 2004, 2005, 2006, 2008, 2009, 2010 Apple Inc. All rights reserved. 7 * Copyright (C) 2003, 2004, 2005, 2006, 2008, 2009, 2010 Apple Inc. All rights reserved.
8 * Copyright (C) 2010 Google Inc. All rights reserved. 8 * Copyright (C) 2010 Google Inc. All rights reserved.
9 * Copyright (C) 2010 Patrick Gansterer <paroga@paroga.com> 9 * Copyright (C) 2010 Patrick Gansterer <paroga@paroga.com>
10 * 10 *
11 * This library is free software; you can redistribute it and/or 11 * This library is free software; you can redistribute it and/or
12 * modify it under the terms of the GNU Library General Public 12 * modify it under the terms of the GNU Library General Public
13 * License as published by the Free Software Foundation; either 13 * License as published by the Free Software Foundation; either
14 * version 2 of the License, or (at your option) any later version. 14 * version 2 of the License, or (at your option) any later version.
15 * 15 *
16 * This library is distributed in the hope that it will be useful, 16 * This library is distributed in the hope that it will be useful,
17 * but WITHOUT ANY WARRANTY; without even the implied warranty of 17 * but WITHOUT ANY WARRANTY; without even the implied warranty of
18 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 18 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
19 * Library General Public License for more details. 19 * Library General Public License for more details.
20 * 20 *
21 * You should have received a copy of the GNU Library General Public License 21 * You should have received a copy of the GNU Library General Public License
22 * along with this library; see the file COPYING.LIB. If not, write to 22 * along with this library; see the file COPYING.LIB. If not, write to
23 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 23 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
24 * Boston, MA 02110-1301, USA. 24 * Boston, MA 02110-1301, USA.
25 * 25 *
26 */ 26 */
27 27
28 #include "config.h" 28 #include "config.h"
29 #include "core/rendering/RenderImageResourceStyleImage.h" 29 #include "core/layout/LayoutImageResourceStyleImage.h"
30 30
31 #include "core/fetch/ImageResource.h" 31 #include "core/fetch/ImageResource.h"
32 #include "core/layout/LayoutObject.h" 32 #include "core/layout/LayoutObject.h"
33 #include "core/layout/style/StyleFetchedImage.h" 33 #include "core/layout/style/StyleFetchedImage.h"
34 34
35 namespace blink { 35 namespace blink {
36 36
37 RenderImageResourceStyleImage::RenderImageResourceStyleImage(StyleImage* styleIm age) 37 LayoutImageResourceStyleImage::LayoutImageResourceStyleImage(StyleImage* styleIm age)
38 : m_styleImage(styleImage) 38 : m_styleImage(styleImage)
39 { 39 {
40 ASSERT(m_styleImage); 40 ASSERT(m_styleImage);
41 } 41 }
42 42
43 RenderImageResourceStyleImage::~RenderImageResourceStyleImage() 43 LayoutImageResourceStyleImage::~LayoutImageResourceStyleImage()
44 { 44 {
45 } 45 }
46 46
47 void RenderImageResourceStyleImage::initialize(LayoutObject* renderer) 47 void LayoutImageResourceStyleImage::initialize(LayoutObject* renderer)
48 { 48 {
49 RenderImageResource::initialize(renderer); 49 LayoutImageResource::initialize(renderer);
50 50
51 if (m_styleImage->isImageResource()) 51 if (m_styleImage->isImageResource())
52 m_cachedImage = toStyleFetchedImage(m_styleImage)->cachedImage(); 52 m_cachedImage = toStyleFetchedImage(m_styleImage)->cachedImage();
53 53
54 m_styleImage->addClient(m_renderer); 54 m_styleImage->addClient(m_renderer);
55 } 55 }
56 56
57 void RenderImageResourceStyleImage::shutdown() 57 void LayoutImageResourceStyleImage::shutdown()
58 { 58 {
59 ASSERT(m_renderer); 59 ASSERT(m_renderer);
60 m_styleImage->removeClient(m_renderer); 60 m_styleImage->removeClient(m_renderer);
61 m_cachedImage = 0; 61 m_cachedImage = 0;
62 } 62 }
63 63
64 PassRefPtr<Image> RenderImageResourceStyleImage::image(int width, int height) co nst 64 PassRefPtr<Image> LayoutImageResourceStyleImage::image(int width, int height) co nst
65 { 65 {
66 // Generated content may trigger calls to image() while we're still pending, don't assert but gracefully exit. 66 // Generated content may trigger calls to image() while we're still pending, don't assert but gracefully exit.
67 if (m_styleImage->isPendingImage()) 67 if (m_styleImage->isPendingImage())
68 return nullptr; 68 return nullptr;
69 return m_styleImage->image(m_renderer, IntSize(width, height)); 69 return m_styleImage->image(m_renderer, IntSize(width, height));
70 } 70 }
71 71
72 void RenderImageResourceStyleImage::setContainerSizeForRenderer(const IntSize& s ize) 72 void LayoutImageResourceStyleImage::setContainerSizeForRenderer(const IntSize& s ize)
73 { 73 {
74 ASSERT(m_renderer); 74 ASSERT(m_renderer);
75 m_styleImage->setContainerSizeForRenderer(m_renderer, size, m_renderer->styl e()->effectiveZoom()); 75 m_styleImage->setContainerSizeForRenderer(m_renderer, size, m_renderer->styl e()->effectiveZoom());
76 } 76 }
77 77
78 } // namespace blink 78 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/layout/LayoutImageResourceStyleImage.h ('k') | Source/core/layout/LayoutObject.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698