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

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

Issue 1694263003: Add Image::updateConcreteSize() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@refactor-size-calculation-in
Patch Set: Pull test for now, needs changes in upcoming CL to pass. Address nits. Created 4 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 * 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 622 matching lines...) Expand 10 before | Expand all | Expand 10 after
633 } 633 }
634 634
635 bool HTMLImageElement::wouldTaintOrigin(SecurityOrigin* destinationSecurityOrigi n) const 635 bool HTMLImageElement::wouldTaintOrigin(SecurityOrigin* destinationSecurityOrigi n) const
636 { 636 {
637 ImageResource* image = cachedImage(); 637 ImageResource* image = cachedImage();
638 if (!image) 638 if (!image)
639 return false; 639 return false;
640 return !image->isAccessAllowed(destinationSecurityOrigin); 640 return !image->isAccessAllowed(destinationSecurityOrigin);
641 } 641 }
642 642
643 void HTMLImageElement::updateConcreteObjectSize(const FloatSize& defaultObjectSi ze)
644 {
645 ImageResource* image = cachedImage();
646 if (!image)
647 return;
648
649 return image->updateConcreteObjectSize(LayoutSize(defaultObjectSize));
650 }
651
643 FloatSize HTMLImageElement::elementSize() const 652 FloatSize HTMLImageElement::elementSize() const
644 { 653 {
645 ImageResource* image = cachedImage(); 654 ImageResource* image = cachedImage();
646 if (!image) 655 if (!image)
647 return FloatSize(); 656 return FloatSize();
648 657
649 return FloatSize(image->imageSize(LayoutObject::shouldRespectImageOrientatio n(layoutObject()), 1.0f)); 658 return FloatSize(image->imageSize(LayoutObject::shouldRespectImageOrientatio n(layoutObject()), 1.0f));
650 } 659 }
651 660
652 FloatSize HTMLImageElement::defaultDestinationSize() const 661 FloatSize HTMLImageElement::defaultDestinationSize() const
(...skipping 159 matching lines...) Expand 10 before | Expand all | Expand 10 after
812 { 821 {
813 ImageResource* image = cachedImage(); 822 ImageResource* image = cachedImage();
814 if (!image) 823 if (!image)
815 return IntSize(); 824 return IntSize();
816 LayoutSize lSize = image->imageSize(LayoutObject::shouldRespectImageOrientat ion(layoutObject()), 1.0f); 825 LayoutSize lSize = image->imageSize(LayoutObject::shouldRespectImageOrientat ion(layoutObject()), 1.0f);
817 ASSERT(lSize.fraction().isZero()); 826 ASSERT(lSize.fraction().isZero());
818 return IntSize(lSize.width(), lSize.height()); 827 return IntSize(lSize.width(), lSize.height());
819 } 828 }
820 829
821 } // namespace blink 830 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698