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

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

Issue 2727853002: [css-display] Support display: contents pseudo-elements.
Patch Set: Add missing nullcheck (whoops). Created 3 years, 9 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
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. 7 * Copyright (C) 2003, 2004, 2005, 2006, 2008, 2009, 2010, 2011 Apple Inc.
8 * All rights reserved. 8 * All rights reserved.
9 * Copyright (C) 2010 Google Inc. All rights reserved. 9 * Copyright (C) 2010 Google Inc. All rights reserved.
10 * Copyright (C) Research In Motion Limited 2011-2012. All rights reserved. 10 * Copyright (C) Research In Motion Limited 2011-2012. All rights reserved.
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 namespace blink { 43 namespace blink {
44 44
45 using namespace HTMLNames; 45 using namespace HTMLNames;
46 46
47 LayoutImage::LayoutImage(Element* element) 47 LayoutImage::LayoutImage(Element* element)
48 : LayoutReplaced(element, LayoutSize()), 48 : LayoutReplaced(element, LayoutSize()),
49 m_didIncrementVisuallyNonEmptyPixelCount(false), 49 m_didIncrementVisuallyNonEmptyPixelCount(false),
50 m_isGeneratedContent(false), 50 m_isGeneratedContent(false),
51 m_imageDevicePixelRatio(1.0f) {} 51 m_imageDevicePixelRatio(1.0f) {}
52 52
53 LayoutImage* LayoutImage::createAnonymous(Document* document) { 53 LayoutImage* LayoutImage::createAnonymous(PseudoElement& pseudo) {
54 LayoutImage* image = new LayoutImage(nullptr); 54 LayoutImage* image = new LayoutImage(nullptr);
55 image->setDocumentForAnonymous(document); 55 image->setPseudoForAnonymous(pseudo);
56 return image; 56 return image;
57 } 57 }
58 58
59 LayoutImage::~LayoutImage() {} 59 LayoutImage::~LayoutImage() {}
60 60
61 void LayoutImage::willBeDestroyed() { 61 void LayoutImage::willBeDestroyed() {
62 ASSERT(m_imageResource); 62 ASSERT(m_imageResource);
63 m_imageResource->shutdown(); 63 m_imageResource->shutdown();
64 LayoutReplaced::willBeDestroyed(); 64 LayoutReplaced::willBeDestroyed();
65 } 65 }
(...skipping 257 matching lines...) Expand 10 before | Expand all | Expand 10 after
323 323
324 ImageResourceContent* cachedImage = m_imageResource->cachedImage(); 324 ImageResourceContent* cachedImage = m_imageResource->cachedImage();
325 if (cachedImage && cachedImage->getImage() && 325 if (cachedImage && cachedImage->getImage() &&
326 cachedImage->getImage()->isSVGImage()) 326 cachedImage->getImage()->isSVGImage())
327 return toSVGImage(cachedImage->getImage())->embeddedReplacedContent(); 327 return toSVGImage(cachedImage->getImage())->embeddedReplacedContent();
328 328
329 return nullptr; 329 return nullptr;
330 } 330 }
331 331
332 } // namespace blink 332 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698