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

Side by Side Diff: Source/core/html/HTMLImageElement.cpp

Issue 1134903002: content: shouldn't prevent fallback content on an image getting displayed (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Updated 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 | « LayoutTests/fast/replaced/image-map-on-image-with-inline-content-data-expected.txt ('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) 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 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2010 Apple Inc. All rights reserv ed. 4 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2010 Apple Inc. All rights reserv ed.
5 * Copyright (C) 2010 Google Inc. All rights reserved. 5 * Copyright (C) 2010 Google 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 312 matching lines...) Expand 10 before | Expand all | Expand 10 after
323 ImageCandidate candidate = bestFitSourceForSrcsetAttribute(document().de vicePixelRatio(), sourceSize(*source), source->fastGetAttribute(srcsetAttr), &do cument()); 323 ImageCandidate candidate = bestFitSourceForSrcsetAttribute(document().de vicePixelRatio(), sourceSize(*source), source->fastGetAttribute(srcsetAttr), &do cument());
324 if (candidate.isEmpty()) 324 if (candidate.isEmpty())
325 continue; 325 continue;
326 return candidate; 326 return candidate;
327 } 327 }
328 return ImageCandidate(); 328 return ImageCandidate();
329 } 329 }
330 330
331 LayoutObject* HTMLImageElement::createLayoutObject(const ComputedStyle& style) 331 LayoutObject* HTMLImageElement::createLayoutObject(const ComputedStyle& style)
332 { 332 {
333 if (m_useFallbackContent)
334 return new LayoutBlockFlow(this);
335
333 if (style.hasContent()) 336 if (style.hasContent())
334 return LayoutObject::createObject(this, style); 337 return LayoutObject::createObject(this, style);
335 338
336 if (m_useFallbackContent)
337 return new LayoutBlockFlow(this);
338
339 LayoutImage* image = new LayoutImage(this); 339 LayoutImage* image = new LayoutImage(this);
340 image->setImageResource(LayoutImageResource::create()); 340 image->setImageResource(LayoutImageResource::create());
341 image->setImageDevicePixelRatio(m_imageDevicePixelRatio); 341 image->setImageDevicePixelRatio(m_imageDevicePixelRatio);
342 return image; 342 return image;
343 } 343 }
344 344
345 void HTMLImageElement::attach(const AttachContext& context) 345 void HTMLImageElement::attach(const AttachContext& context)
346 { 346 {
347 HTMLElement::attach(context); 347 HTMLElement::attach(context);
348 348
(...skipping 380 matching lines...) Expand 10 before | Expand all | Expand 10 after
729 ensureUserAgentShadowRoot(); 729 ensureUserAgentShadowRoot();
730 } 730 }
731 731
732 bool HTMLImageElement::isOpaque() const 732 bool HTMLImageElement::isOpaque() const
733 { 733 {
734 Image* image = const_cast<HTMLImageElement*>(this)->imageContents(); 734 Image* image = const_cast<HTMLImageElement*>(this)->imageContents();
735 return image && image->currentFrameKnownToBeOpaque(); 735 return image && image->currentFrameKnownToBeOpaque();
736 } 736 }
737 737
738 } 738 }
OLDNEW
« no previous file with comments | « LayoutTests/fast/replaced/image-map-on-image-with-inline-content-data-expected.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698