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

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

Issue 899163003: Move rendering/RenderObject to layout/LayoutObject. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: 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
« no previous file with comments | « Source/core/html/HTMLImageElement.h ('k') | Source/core/html/HTMLInputElement.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 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(const RenderStyle& style) 335 LayoutObject* HTMLImageElement::createRenderer(const RenderStyle& style)
336 { 336 {
337 if (style.hasContent()) 337 if (style.hasContent())
338 return RenderObject::createObject(this, style); 338 return LayoutObject::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);
346 return image; 346 return image;
347 } 347 }
348 348
(...skipping 167 matching lines...) Expand 10 before | Expand all | Expand 10 after
516 } 516 }
517 517
518 void HTMLImageElement::setWidth(int value) 518 void HTMLImageElement::setWidth(int value)
519 { 519 {
520 setIntegralAttribute(widthAttr, value); 520 setIntegralAttribute(widthAttr, value);
521 } 521 }
522 522
523 int HTMLImageElement::x() const 523 int HTMLImageElement::x() const
524 { 524 {
525 document().updateLayoutIgnorePendingStylesheets(); 525 document().updateLayoutIgnorePendingStylesheets();
526 RenderObject* r = renderer(); 526 LayoutObject* r = renderer();
527 if (!r) 527 if (!r)
528 return 0; 528 return 0;
529 529
530 // FIXME: This doesn't work correctly with transforms. 530 // FIXME: This doesn't work correctly with transforms.
531 FloatPoint absPos = r->localToAbsolute(); 531 FloatPoint absPos = r->localToAbsolute();
532 return absPos.x(); 532 return absPos.x();
533 } 533 }
534 534
535 int HTMLImageElement::y() const 535 int HTMLImageElement::y() const
536 { 536 {
537 document().updateLayoutIgnorePendingStylesheets(); 537 document().updateLayoutIgnorePendingStylesheets();
538 RenderObject* r = renderer(); 538 LayoutObject* r = renderer();
539 if (!r) 539 if (!r)
540 return 0; 540 return 0;
541 541
542 // FIXME: This doesn't work correctly with transforms. 542 // FIXME: This doesn't work correctly with transforms.
543 FloatPoint absPos = r->localToAbsolute(); 543 FloatPoint absPos = r->localToAbsolute();
544 return absPos.y(); 544 return absPos.y();
545 } 545 }
546 546
547 bool HTMLImageElement::complete() const 547 bool HTMLImageElement::complete() const
548 { 548 {
(...skipping 168 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
« no previous file with comments | « Source/core/html/HTMLImageElement.h ('k') | Source/core/html/HTMLInputElement.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698