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

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

Issue 1162383003: C++11: Replace 0 with nullptr where applicable in layout code. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Add one more file. Created 5 years, 6 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/LayoutImage.cpp ('k') | Source/core/layout/LayoutInline.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 *
(...skipping 15 matching lines...) Expand all
26 */ 26 */
27 27
28 #include "config.h" 28 #include "config.h"
29 #include "core/layout/LayoutImageResource.h" 29 #include "core/layout/LayoutImageResource.h"
30 30
31 #include "core/layout/LayoutImage.h" 31 #include "core/layout/LayoutImage.h"
32 32
33 namespace blink { 33 namespace blink {
34 34
35 LayoutImageResource::LayoutImageResource() 35 LayoutImageResource::LayoutImageResource()
36 : m_layoutObject(0) 36 : m_layoutObject(nullptr)
37 , m_cachedImage(0) 37 , m_cachedImage(nullptr)
38 { 38 {
39 } 39 }
40 40
41 LayoutImageResource::~LayoutImageResource() 41 LayoutImageResource::~LayoutImageResource()
42 { 42 {
43 } 43 }
44 44
45 void LayoutImageResource::initialize(LayoutObject* layoutObject) 45 void LayoutImageResource::initialize(LayoutObject* layoutObject)
46 { 46 {
47 ASSERT(!m_layoutObject); 47 ASSERT(!m_layoutObject);
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
99 { 99 {
100 if (!m_cachedImage) 100 if (!m_cachedImage)
101 return LayoutSize(); 101 return LayoutSize();
102 LayoutSize size = m_cachedImage->imageSizeForLayoutObject(m_layoutObject, mu ltiplier, type); 102 LayoutSize size = m_cachedImage->imageSizeForLayoutObject(m_layoutObject, mu ltiplier, type);
103 if (m_layoutObject && m_layoutObject->isLayoutImage()) 103 if (m_layoutObject && m_layoutObject->isLayoutImage())
104 size.scale(toLayoutImage(m_layoutObject)->imageDevicePixelRatio()); 104 size.scale(toLayoutImage(m_layoutObject)->imageDevicePixelRatio());
105 return size; 105 return size;
106 } 106 }
107 107
108 } // namespace blink 108 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/layout/LayoutImage.cpp ('k') | Source/core/layout/LayoutInline.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698