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

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

Issue 889563002: Make RenderObject::style() return a const object (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Blind fix for Mac. Created 5 years, 10 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
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 314 matching lines...) Expand 10 before | Expand all | Expand 10 after
325 SizesAttributeParser parser = SizesAttributeParser(MediaValuesDynamic::c reate(document()), sizes); 325 SizesAttributeParser parser = SizesAttributeParser(MediaValuesDynamic::c reate(document()), sizes);
326 float effectiveSize = parser.length(); 326 float effectiveSize = parser.length();
327 ImageCandidate candidate = bestFitSourceForSrcsetAttribute(document().de vicePixelRatio(), effectiveSize, source->fastGetAttribute(srcsetAttr), &document ()); 327 ImageCandidate candidate = bestFitSourceForSrcsetAttribute(document().de vicePixelRatio(), effectiveSize, source->fastGetAttribute(srcsetAttr), &document ());
328 if (candidate.isEmpty()) 328 if (candidate.isEmpty())
329 continue; 329 continue;
330 return candidate; 330 return candidate;
331 } 331 }
332 return ImageCandidate(); 332 return ImageCandidate();
333 } 333 }
334 334
335 RenderObject* HTMLImageElement::createRenderer(RenderStyle* style) 335 RenderObject* HTMLImageElement::createRenderer(const RenderStyle* style)
336 { 336 {
337 if (style->hasContent()) 337 if (style->hasContent())
338 return RenderObject::createObject(this, style); 338 return RenderObject::createObject(this, style);
339 339
340 if (m_useFallbackContent) 340 if (m_useFallbackContent)
341 return new RenderBlockFlow(this); 341 return new RenderBlockFlow(this);
342 342
343 RenderImage* image = new RenderImage(this); 343 RenderImage* image = new RenderImage(this);
344 image->setImageResource(RenderImageResource::create()); 344 image->setImageResource(RenderImageResource::create());
345 image->setImageDevicePixelRatio(m_imageDevicePixelRatio); 345 image->setImageDevicePixelRatio(m_imageDevicePixelRatio);
(...skipping 371 matching lines...) Expand 10 before | Expand all | Expand 10 after
717 } 717 }
718 718
719 void HTMLImageElement::setUseFallbackContent() 719 void HTMLImageElement::setUseFallbackContent()
720 { 720 {
721 m_useFallbackContent = true; 721 m_useFallbackContent = true;
722 if (document().inStyleRecalc()) 722 if (document().inStyleRecalc())
723 return; 723 return;
724 ensureUserAgentShadowRoot(); 724 ensureUserAgentShadowRoot();
725 } 725 }
726 } 726 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698