Changeset 13149 for trunk/WebCore/rendering/RenderBlock.h
- Timestamp:
- 03/05/06 18:53:41 (3 years ago)
- Files:
-
- 1 modified
-
trunk/WebCore/rendering/RenderBlock.h (modified) (4 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebCore/rendering/RenderBlock.h
r12953 r13149 219 219 220 220 virtual bool hasSelectedChildren() const { return m_selectionState != SelectionNone; } 221 virtual SelectionState selectionState() const { return m_selectionState; }221 virtual SelectionState selectionState() const { return static_cast<SelectionState>(m_selectionState); } 222 222 virtual void setSelectionState(SelectionState s); 223 223 … … 283 283 }; 284 284 285 FloatingObject(Type _type) {285 FloatingObject(Type type) { 286 286 node = 0; 287 287 startY = 0; 288 288 endY = 0; 289 type = _type;289 m_type = type; 290 290 left = 0; 291 291 width = 0; 292 292 noPaint = false; 293 293 } 294 295 Type type() { return static_cast<Type>(m_type); } 294 296 295 297 RenderObject* node; … … 298 300 int left; 299 301 int width; 300 Type type : 1; // left or right aligned302 unsigned m_type : 1; // Type (left or right aligned) 301 303 bool noPaint : 1; 302 304 }; … … 408 410 409 411 bool m_childrenInline : 1; 410 bool m_firstLine : 1;411 EClear m_clearStatus : 2;412 bool m_firstLine : 1; 413 unsigned m_clearStatus : 2; // EClear 412 414 bool m_topMarginQuirk : 1; 413 415 bool m_bottomMarginQuirk : 1; 414 416 bool m_hasMarkupTruncation : 1; 415 SelectionState m_selectionState : 3;417 unsigned m_selectionState : 3; // SelectionState 416 418 417 419 int m_maxTopPosMargin;