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

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

Issue 1033943002: Rename LayoutStyle to papayawhip (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: ensureComputedStyle Created 5 years, 8 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 | « Source/core/html/HTMLImageElement.h ('k') | Source/core/html/HTMLImageFallbackHelper.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 * (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 315 matching lines...) Expand 10 before | Expand all | Expand 10 after
326 SizesAttributeParser parser = SizesAttributeParser(MediaValuesDynamic::c reate(document()), sizes); 326 SizesAttributeParser parser = SizesAttributeParser(MediaValuesDynamic::c reate(document()), sizes);
327 float effectiveSize = parser.length(); 327 float effectiveSize = parser.length();
328 ImageCandidate candidate = bestFitSourceForSrcsetAttribute(document().de vicePixelRatio(), effectiveSize, source->fastGetAttribute(srcsetAttr), &document ()); 328 ImageCandidate candidate = bestFitSourceForSrcsetAttribute(document().de vicePixelRatio(), effectiveSize, source->fastGetAttribute(srcsetAttr), &document ());
329 if (candidate.isEmpty()) 329 if (candidate.isEmpty())
330 continue; 330 continue;
331 return candidate; 331 return candidate;
332 } 332 }
333 return ImageCandidate(); 333 return ImageCandidate();
334 } 334 }
335 335
336 LayoutObject* HTMLImageElement::createLayoutObject(const LayoutStyle& style) 336 LayoutObject* HTMLImageElement::createLayoutObject(const ComputedStyle& style)
337 { 337 {
338 if (style.hasContent()) 338 if (style.hasContent())
339 return LayoutObject::createObject(this, style); 339 return LayoutObject::createObject(this, style);
340 340
341 if (m_useFallbackContent) 341 if (m_useFallbackContent)
342 return new LayoutBlockFlow(this); 342 return new LayoutBlockFlow(this);
343 343
344 LayoutImage* image = new LayoutImage(this); 344 LayoutImage* image = new LayoutImage(this);
345 image->setImageResource(LayoutImageResource::create()); 345 image->setImageResource(LayoutImageResource::create());
346 image->setImageDevicePixelRatio(m_imageDevicePixelRatio); 346 image->setImageDevicePixelRatio(m_imageDevicePixelRatio);
(...skipping 352 matching lines...) Expand 10 before | Expand all | Expand 10 after
699 void HTMLImageElement::reattachFallbackContent() 699 void HTMLImageElement::reattachFallbackContent()
700 { 700 {
701 // This can happen inside of attach() in the middle of a recalcStyle so we n eed to 701 // This can happen inside of attach() in the middle of a recalcStyle so we n eed to
702 // reattach synchronously here. 702 // reattach synchronously here.
703 if (document().inStyleRecalc()) 703 if (document().inStyleRecalc())
704 reattach(); 704 reattach();
705 else 705 else
706 lazyReattachIfAttached(); 706 lazyReattachIfAttached();
707 } 707 }
708 708
709 PassRefPtr<LayoutStyle> HTMLImageElement::customStyleForLayoutObject() 709 PassRefPtr<ComputedStyle> HTMLImageElement::customStyleForLayoutObject()
710 { 710 {
711 RefPtr<LayoutStyle> newStyle = originalStyleForLayoutObject(); 711 RefPtr<ComputedStyle> newStyle = originalStyleForLayoutObject();
712 712
713 if (!m_useFallbackContent) 713 if (!m_useFallbackContent)
714 return newStyle; 714 return newStyle;
715 715
716 RefPtr<LayoutStyle> style = LayoutStyle::clone(*newStyle); 716 RefPtr<ComputedStyle> style = ComputedStyle::clone(*newStyle);
717 return HTMLImageFallbackHelper::customStyleForAltText(*this, style); 717 return HTMLImageFallbackHelper::customStyleForAltText(*this, style);
718 } 718 }
719 719
720 void HTMLImageElement::setUseFallbackContent() 720 void HTMLImageElement::setUseFallbackContent()
721 { 721 {
722 m_useFallbackContent = true; 722 m_useFallbackContent = true;
723 if (document().inStyleRecalc()) 723 if (document().inStyleRecalc())
724 return; 724 return;
725 EventDispatchForbiddenScope::AllowUserAgentEvents allowEvents; 725 EventDispatchForbiddenScope::AllowUserAgentEvents allowEvents;
726 ensureClosedShadowRoot(); 726 ensureClosedShadowRoot();
727 } 727 }
728 728
729 bool HTMLImageElement::isOpaque() const 729 bool HTMLImageElement::isOpaque() const
730 { 730 {
731 Image* image = const_cast<HTMLImageElement*>(this)->imageContents(); 731 Image* image = const_cast<HTMLImageElement*>(this)->imageContents();
732 return image && image->currentFrameKnownToBeOpaque(); 732 return image && image->currentFrameKnownToBeOpaque();
733 } 733 }
734 734
735 } 735 }
OLDNEW
« no previous file with comments | « Source/core/html/HTMLImageElement.h ('k') | Source/core/html/HTMLImageFallbackHelper.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698