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

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

Issue 463633002: Revert "Cleanup deadcode in Rendering" (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebase Created 6 years, 4 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/rendering/RenderBlock.cpp ('k') | Source/core/rendering/RenderListMarker.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 * (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 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 const RenderImageResource* imageResource() const { return m_imageResource.ge t(); } 46 const RenderImageResource* imageResource() const { return m_imageResource.ge t(); }
47 ImageResource* cachedImage() const { return m_imageResource ? m_imageResourc e->cachedImage() : 0; } 47 ImageResource* cachedImage() const { return m_imageResource ? m_imageResourc e->cachedImage() : 0; }
48 48
49 bool setImageSizeForAltText(ImageResource* newImage = 0); 49 bool setImageSizeForAltText(ImageResource* newImage = 0);
50 50
51 void updateAltText(); 51 void updateAltText();
52 52
53 HTMLMapElement* imageMap() const; 53 HTMLMapElement* imageMap() const;
54 void areaElementFocusChanged(HTMLAreaElement*); 54 void areaElementFocusChanged(HTMLAreaElement*);
55 55
56 void highQualityRepaintTimerFired(Timer<RenderImage>*);
57
56 void setIsGeneratedContent(bool generated = true) { m_isGeneratedContent = g enerated; } 58 void setIsGeneratedContent(bool generated = true) { m_isGeneratedContent = g enerated; }
57 59
58 bool isGeneratedContent() const { return m_isGeneratedContent; } 60 bool isGeneratedContent() const { return m_isGeneratedContent; }
59 61
60 String altText() const { return m_altText; } 62 String altText() const { return m_altText; }
61 63
62 inline void setImageDevicePixelRatio(float factor) { m_imageDevicePixelRatio = factor; } 64 inline void setImageDevicePixelRatio(float factor) { m_imageDevicePixelRatio = factor; }
63 float imageDevicePixelRatio() const { return m_imageDevicePixelRatio; } 65 float imageDevicePixelRatio() const { return m_imageDevicePixelRatio; }
64 66
65 virtual void intrinsicSizeChanged() OVERRIDE 67 virtual void intrinsicSizeChanged() OVERRIDE
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
114 float m_imageDevicePixelRatio; 116 float m_imageDevicePixelRatio;
115 117
116 friend class RenderImageScaleObserver; 118 friend class RenderImageScaleObserver;
117 }; 119 };
118 120
119 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderImage, isRenderImage()); 121 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderImage, isRenderImage());
120 122
121 } // namespace blink 123 } // namespace blink
122 124
123 #endif // RenderImage_h 125 #endif // RenderImage_h
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderBlock.cpp ('k') | Source/core/rendering/RenderListMarker.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698