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

Side by Side Diff: Source/core/rendering/RenderImage.h

Issue 114323004: Simplify RenderImage::imageDimensionsChanged() (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Updated Created 6 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 | « no previous file | Source/core/rendering/RenderImage.cpp » ('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 * (C) 2006 Allan Sandfeld Jensen (kde@carewolf.com) 4 * (C) 2006 Allan Sandfeld Jensen (kde@carewolf.com)
5 * (C) 2006 Samuel Weinig (sam.weinig@gmail.com) 5 * (C) 2006 Samuel Weinig (sam.weinig@gmail.com)
6 * Copyright (C) 2004, 2005, 2006, 2007, 2009, 2010, 2011 Apple Inc. All rights reserved. 6 * Copyright (C) 2004, 2005, 2006, 2007, 2009, 2010, 2011 Apple Inc. All rights reserved.
7 * 7 *
8 * This library is free software; you can redistribute it and/or 8 * This library is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Library General Public 9 * modify it under the terms of the GNU Library General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
96 virtual bool computeBackgroundIsKnownToBeObscured() OVERRIDE FINAL; 96 virtual bool computeBackgroundIsKnownToBeObscured() OVERRIDE FINAL;
97 97
98 virtual LayoutUnit minimumReplacedHeight() const OVERRIDE; 98 virtual LayoutUnit minimumReplacedHeight() const OVERRIDE;
99 99
100 virtual void notifyFinished(Resource*) OVERRIDE FINAL; 100 virtual void notifyFinished(Resource*) OVERRIDE FINAL;
101 virtual bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const HitTes tLocation& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestAct ion) OVERRIDE FINAL; 101 virtual bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const HitTes tLocation& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestAct ion) OVERRIDE FINAL;
102 102
103 virtual bool boxShadowShouldBeAppliedToBackground(BackgroundBleedAvoidance, InlineFlowBox*) const OVERRIDE FINAL; 103 virtual bool boxShadowShouldBeAppliedToBackground(BackgroundBleedAvoidance, InlineFlowBox*) const OVERRIDE FINAL;
104 104
105 IntSize imageSizeForError(ImageResource*) const; 105 IntSize imageSizeForError(ImageResource*) const;
106 void imageDimensionsChanged(bool imageSizeChanged, const IntRect* = 0); 106 void repaintOrMarkForLayout(bool imageSizeChanged, const IntRect* = 0);
107 bool updateIntrinsicSizeIfNeeded(const LayoutSize&, bool imageSizeChanged); 107 void updateIntrinsicSizeIfNeeded(const LayoutSize&);
108 // Update the size of the image to be rendered. Object-fit may cause this to be different from the CSS box's content rect. 108 // Update the size of the image to be rendered. Object-fit may cause this to be different from the CSS box's content rect.
109 void updateInnerContentRect(); 109 void updateInnerContentRect();
110 110
111 void paintAreaElementFocusRing(PaintInfo&); 111 void paintAreaElementFocusRing(PaintInfo&);
112 112
113 // Text to display as long as the image isn't available. 113 // Text to display as long as the image isn't available.
114 String m_altText; 114 String m_altText;
115 OwnPtr<RenderImageResource> m_imageResource; 115 OwnPtr<RenderImageResource> m_imageResource;
116 bool m_didIncrementVisuallyNonEmptyPixelCount; 116 bool m_didIncrementVisuallyNonEmptyPixelCount;
117 bool m_isGeneratedContent; 117 bool m_isGeneratedContent;
118 float m_imageDevicePixelRatio; 118 float m_imageDevicePixelRatio;
119 119
120 friend class RenderImageScaleObserver; 120 friend class RenderImageScaleObserver;
121 }; 121 };
122 122
123 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderImage, isRenderImage()); 123 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderImage, isRenderImage());
124 124
125 } // namespace WebCore 125 } // namespace WebCore
126 126
127 #endif // RenderImage_h 127 #endif // RenderImage_h
OLDNEW
« no previous file with comments | « no previous file | Source/core/rendering/RenderImage.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698