Source/WebCore/rendering/RenderQuote.h - Issue 10916347: Merge 127381

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

Issue 10916347: Merge 127381 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1229/

Patch Set: Created 8 years, 3 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:

« no previous file with comments | « Source/WebCore/rendering/RenderCounter.cpp ('k') | Source/WebCore/rendering/RenderQuote.cpp » ('j') | no next file with comments »

OLD	NEW
1 /*	1 /*

2 * Copyright (C) 2011 Nokia Inc. All rights reserved.	2 * Copyright (C) 2011 Nokia Inc. All rights reserved.

3 * Copyright (C) 2012 Google Inc. All rights reserved.	3 * Copyright (C) 2012 Google 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 24 matching lines...) Expand all Loading...
35 RenderQuote(Document*, const QuoteType);	35 RenderQuote(Document*, const QuoteType);

36 virtual ~RenderQuote();	36 virtual ~RenderQuote();

37 void attachQuote();	37 void attachQuote();

38 void detachQuote();	38 void detachQuote();

39	39

40 private:	40 private:

41 virtual void willBeDestroyed() OVERRIDE;	41 virtual void willBeDestroyed() OVERRIDE;

42 virtual const char* renderName() const OVERRIDE { return "RenderQuote"; };	42 virtual const char* renderName() const OVERRIDE { return "RenderQuote"; };

43 virtual bool isQuote() const OVERRIDE { return true; };	43 virtual bool isQuote() const OVERRIDE { return true; };

44 virtual PassRefPtr<StringImpl> originalText() const OVERRIDE;	44 virtual PassRefPtr<StringImpl> originalText() const OVERRIDE;

	45

	46 virtual void updateText() OVERRIDE;

45 virtual void computePreferredLogicalWidths(float leadWidth) OVERRIDE;	47 virtual void computePreferredLogicalWidths(float leadWidth) OVERRIDE;

46	48

47 // We don't override insertedIntoTree to call attachQuote() as it would be a ttached	49 // We don't override insertedIntoTree to call attachQuote() as it would be a ttached

48 // too early and get the wrong depth since generated content is inserted int o anonymous	50 // too early and get the wrong depth since generated content is inserted int o anonymous

49 // renderers before going into the main render tree. Once we can ensure that insertIntoTree,	51 // renderers before going into the main render tree. Once we can ensure that insertIntoTree,

50 // is called on an attached tree, we should override it here.	52 // is called on an attached tree, we should override it here.

51	53

52 virtual void willBeRemovedFromTree() OVERRIDE;	54 virtual void willBeRemovedFromTree() OVERRIDE;

53	55

54 const QuotesData* quotesData() const;	56 const QuotesData* quotesData() const;

(...skipping 12 matching lines...) Expand all Loading...
67 ASSERT(!object \|\| object->isQuote());	69 ASSERT(!object \|\| object->isQuote());

68 return static_cast<RenderQuote*>(object);	70 return static_cast<RenderQuote*>(object);

69 }	71 }

70	72

71 // This will catch anyone doing an unnecessary cast.	73 // This will catch anyone doing an unnecessary cast.

72 void toRenderQuote(const RenderQuote*);	74 void toRenderQuote(const RenderQuote*);

73	75

74 } // namespace WebCore	76 } // namespace WebCore

75	77

76 #endif // RenderQuote_h	78 #endif // RenderQuote_h

OLD	NEW