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

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

Issue 397723006: Move RenderBlockFlow::constructTextRun out. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/rendering/EllipsisBox.cpp ('k') | Source/core/rendering/RenderBlockFlow.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) 2007 David Smith (catfish.man@gmail.com) 4 * (C) 2007 David Smith (catfish.man@gmail.com)
5 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All r ights reserved. 5 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All r ights 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 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 class RenderRubyRun; 47 class RenderRubyRun;
48 48
49 template <class Run> class BidiRunList; 49 template <class Run> class BidiRunList;
50 typedef WTF::ListHashSet<RenderBox*, 16> TrackedRendererListHashSet; 50 typedef WTF::ListHashSet<RenderBox*, 16> TrackedRendererListHashSet;
51 typedef WTF::HashMap<const RenderBlock*, OwnPtr<TrackedRendererListHashSet> > Tr ackedDescendantsMap; 51 typedef WTF::HashMap<const RenderBlock*, OwnPtr<TrackedRendererListHashSet> > Tr ackedDescendantsMap;
52 typedef WTF::HashMap<const RenderBox*, OwnPtr<HashSet<RenderBlock*> > > TrackedC ontainerMap; 52 typedef WTF::HashMap<const RenderBox*, OwnPtr<HashSet<RenderBlock*> > > TrackedC ontainerMap;
53 typedef Vector<WordMeasurement, 64> WordMeasurements; 53 typedef Vector<WordMeasurement, 64> WordMeasurements;
54 54
55 enum ContainingBlockState { NewContainingBlock, SameContainingBlock }; 55 enum ContainingBlockState { NewContainingBlock, SameContainingBlock };
56 56
57 enum TextRunFlag {
58 DefaultTextRunFlags = 0,
59 RespectDirection = 1 << 0,
60 RespectDirectionOverride = 1 << 1
61 };
62
63 typedef unsigned TextRunFlags;
64
65 class RenderBlock : public RenderBox { 57 class RenderBlock : public RenderBox {
66 public: 58 public:
67 friend class LineLayoutState; 59 friend class LineLayoutState;
68 60
69 protected: 61 protected:
70 explicit RenderBlock(ContainerNode*); 62 explicit RenderBlock(ContainerNode*);
71 virtual ~RenderBlock(); 63 virtual ~RenderBlock();
72 64
73 public: 65 public:
74 RenderObject* firstChild() const { ASSERT(children() == virtualChildren()); return children()->firstChild(); } 66 RenderObject* firstChild() const { ASSERT(children() == virtualChildren()); return children()->firstChild(); }
(...skipping 464 matching lines...) Expand 10 before | Expand all | Expand 10 after
539 // FIXME: This is temporary as we move code that accesses block flow 531 // FIXME: This is temporary as we move code that accesses block flow
540 // member variables out of RenderBlock and into RenderBlockFlow. 532 // member variables out of RenderBlock and into RenderBlockFlow.
541 friend class RenderBlockFlow; 533 friend class RenderBlockFlow;
542 }; 534 };
543 535
544 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderBlock, isRenderBlock()); 536 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderBlock, isRenderBlock());
545 537
546 } // namespace WebCore 538 } // namespace WebCore
547 539
548 #endif // RenderBlock_h 540 #endif // RenderBlock_h
OLDNEW
« no previous file with comments | « Source/core/rendering/EllipsisBox.cpp ('k') | Source/core/rendering/RenderBlockFlow.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698