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

Side by Side Diff: Source/WebCore/rendering/RenderReplaced.h

Issue 7292017: Merge 90068 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/782/
Patch Set: Created 9 years, 5 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
« no previous file with comments | « Source/WebCore/rendering/RenderBlock.cpp ('k') | Source/WebCore/rendering/RenderReplaced.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 * Copyright (C) 2004, 2005, 2006, 2007, 2009 Apple Inc. All rights reserved. 3 * Copyright (C) 2004, 2005, 2006, 2007, 2009 Apple Inc. All rights reserved.
4 * 4 *
5 * This library is free software; you can redistribute it and/or 5 * This library is free software; you can redistribute it and/or
6 * modify it under the terms of the GNU Library General Public 6 * modify it under the terms of the GNU Library General Public
7 * License as published by the Free Software Foundation; either 7 * License as published by the Free Software Foundation; either
8 * version 2 of the License, or (at your option) any later version. 8 * version 2 of the License, or (at your option) any later version.
9 * 9 *
10 * This library is distributed in the hope that it will be useful, 10 * This library is distributed in the hope that it will be useful,
(...skipping 14 matching lines...) Expand all
25 #include "RenderBox.h" 25 #include "RenderBox.h"
26 26
27 namespace WebCore { 27 namespace WebCore {
28 28
29 class RenderReplaced : public RenderBox { 29 class RenderReplaced : public RenderBox {
30 public: 30 public:
31 RenderReplaced(Node*); 31 RenderReplaced(Node*);
32 RenderReplaced(Node*, const IntSize& intrinsicSize); 32 RenderReplaced(Node*, const IntSize& intrinsicSize);
33 virtual ~RenderReplaced(); 33 virtual ~RenderReplaced();
34 34
35 virtual void destroy();
36
35 protected: 37 protected:
36 virtual void layout(); 38 virtual void layout();
37 39
38 virtual IntSize intrinsicSize() const; 40 virtual IntSize intrinsicSize() const;
39 41
40 virtual int computeReplacedLogicalWidth(bool includeMaxWidth = true) const; 42 virtual int computeReplacedLogicalWidth(bool includeMaxWidth = true) const;
41 virtual int computeReplacedLogicalHeight() const; 43 virtual int computeReplacedLogicalHeight() const;
42 virtual int minimumReplacedHeight() const { return 0; } 44 virtual int minimumReplacedHeight() const { return 0; }
43 45
44 virtual void setSelectionState(SelectionState); 46 virtual void setSelectionState(SelectionState);
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
76 78
77 virtual IntRect selectionRectForRepaint(RenderBoxModelObject* repaintContain er, bool clipToVisibleContent = true); 79 virtual IntRect selectionRectForRepaint(RenderBoxModelObject* repaintContain er, bool clipToVisibleContent = true);
78 80
79 IntSize m_intrinsicSize; 81 IntSize m_intrinsicSize;
80 bool m_hasIntrinsicSize; 82 bool m_hasIntrinsicSize;
81 }; 83 };
82 84
83 } 85 }
84 86
85 #endif 87 #endif
OLDNEW
« no previous file with comments | « Source/WebCore/rendering/RenderBlock.cpp ('k') | Source/WebCore/rendering/RenderReplaced.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698