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

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

Issue 1431193004: Reland of Make LayoutImageResource::image() parameter explicit (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 1 month 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) 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 *
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 m_styleImage->addClient(m_layoutObject); 54 m_styleImage->addClient(m_layoutObject);
55 } 55 }
56 56
57 void LayoutImageResourceStyleImage::shutdown() 57 void LayoutImageResourceStyleImage::shutdown()
58 { 58 {
59 ASSERT(m_layoutObject); 59 ASSERT(m_layoutObject);
60 m_styleImage->removeClient(m_layoutObject); 60 m_styleImage->removeClient(m_layoutObject);
61 m_cachedImage = 0; 61 m_cachedImage = 0;
62 } 62 }
63 63
64 PassRefPtr<Image> LayoutImageResourceStyleImage::image(int width, int height) co nst 64 PassRefPtr<Image> LayoutImageResourceStyleImage::image(const IntSize& size) cons t
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_layoutObject, IntSize(width, height)); 69 return m_styleImage->image(m_layoutObject, size);
70 } 70 }
71 71
72 void LayoutImageResourceStyleImage::setContainerSizeForLayoutObject(const IntSiz e& size) 72 void LayoutImageResourceStyleImage::setContainerSizeForLayoutObject(const IntSiz e& size)
73 { 73 {
74 ASSERT(m_layoutObject); 74 ASSERT(m_layoutObject);
75 m_styleImage->setContainerSizeForLayoutObject(m_layoutObject, size, m_layout Object->style()->effectiveZoom()); 75 m_styleImage->setContainerSizeForLayoutObject(m_layoutObject, size, m_layout Object->style()->effectiveZoom());
76 } 76 }
77 77
78 DEFINE_TRACE(LayoutImageResourceStyleImage) 78 DEFINE_TRACE(LayoutImageResourceStyleImage)
79 { 79 {
80 visitor->trace(m_styleImage); 80 visitor->trace(m_styleImage);
81 LayoutImageResource::trace(visitor); 81 LayoutImageResource::trace(visitor);
82 } 82 }
83 83
84 } // namespace blink 84 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698