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

Side by Side Diff: sky/engine/core/rendering/RenderBlock.h

Issue 689733003: Remove most of FloatingObject. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years, 1 month 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
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.
11 * 11 *
12 * This library is distributed in the hope that it will be useful, 12 * This library is distributed in the hope that it will be useful,
13 * but WITHOUT ANY WARRANTY; without even the implied warranty of 13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
15 * Library General Public License for more details. 15 * Library General Public License for more details.
16 * 16 *
17 * You should have received a copy of the GNU Library General Public License 17 * You should have received a copy of the GNU Library General Public License
18 * along with this library; see the file COPYING.LIB. If not, write to 18 * along with this library; see the file COPYING.LIB. If not, write to
19 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 19 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
20 * Boston, MA 02110-1301, USA. 20 * Boston, MA 02110-1301, USA.
21 */ 21 */
22 22
23 #ifndef RenderBlock_h 23 #ifndef RenderBlock_h
24 #define RenderBlock_h 24 #define RenderBlock_h
25 25
26 #include "core/rendering/FloatingObjects.h"
27 #include "core/rendering/GapRects.h" 26 #include "core/rendering/GapRects.h"
28 #include "core/rendering/RenderBox.h" 27 #include "core/rendering/RenderBox.h"
29 #include "core/rendering/RenderLineBoxList.h" 28 #include "core/rendering/RenderLineBoxList.h"
30 #include "core/rendering/RootInlineBox.h" 29 #include "core/rendering/RootInlineBox.h"
31 #include "core/rendering/style/ShapeValue.h" 30 #include "core/rendering/style/ShapeValue.h"
32 #include "platform/text/TextBreakIterator.h" 31 #include "platform/text/TextBreakIterator.h"
33 #include "platform/text/TextRun.h" 32 #include "platform/text/TextRun.h"
34 #include "wtf/ListHashSet.h" 33 #include "wtf/ListHashSet.h"
35 #include "wtf/OwnPtr.h" 34 #include "wtf/OwnPtr.h"
36 35
(...skipping 318 matching lines...) Expand 10 before | Expand all | Expand 10 after
355 bool isSelectionRoot() const; 354 bool isSelectionRoot() const;
356 GapRects selectionGaps(RenderBlock* rootBlock, const LayoutPoint& rootBlockP hysicalPosition, const LayoutSize& offsetFromRootBlock, 355 GapRects selectionGaps(RenderBlock* rootBlock, const LayoutPoint& rootBlockP hysicalPosition, const LayoutSize& offsetFromRootBlock,
357 LayoutUnit& lastLogicalTop, LayoutUnit& lastLogicalLe ft, LayoutUnit& lastLogicalRight, const PaintInfo* = 0); 356 LayoutUnit& lastLogicalTop, LayoutUnit& lastLogicalLe ft, LayoutUnit& lastLogicalRight, const PaintInfo* = 0);
358 GapRects blockSelectionGaps(RenderBlock* rootBlock, const LayoutPoint& rootB lockPhysicalPosition, const LayoutSize& offsetFromRootBlock, 357 GapRects blockSelectionGaps(RenderBlock* rootBlock, const LayoutPoint& rootB lockPhysicalPosition, const LayoutSize& offsetFromRootBlock,
359 LayoutUnit& lastLogicalTop, LayoutUnit& lastLogi calLeft, LayoutUnit& lastLogicalRight, const PaintInfo*); 358 LayoutUnit& lastLogicalTop, LayoutUnit& lastLogi calLeft, LayoutUnit& lastLogicalRight, const PaintInfo*);
360 LayoutRect blockSelectionGap(RenderBlock* rootBlock, const LayoutPoint& root BlockPhysicalPosition, const LayoutSize& offsetFromRootBlock, 359 LayoutRect blockSelectionGap(RenderBlock* rootBlock, const LayoutPoint& root BlockPhysicalPosition, const LayoutSize& offsetFromRootBlock,
361 LayoutUnit lastLogicalTop, LayoutUnit lastLogic alLeft, LayoutUnit lastLogicalRight, LayoutUnit logicalBottom, const PaintInfo*) ; 360 LayoutUnit lastLogicalTop, LayoutUnit lastLogic alLeft, LayoutUnit lastLogicalRight, LayoutUnit logicalBottom, const PaintInfo*) ;
362 virtual LayoutUnit logicalLeftSelectionOffset(RenderBlock* rootBlock, Layout Unit position); 361 virtual LayoutUnit logicalLeftSelectionOffset(RenderBlock* rootBlock, Layout Unit position);
363 virtual LayoutUnit logicalRightSelectionOffset(RenderBlock* rootBlock, Layou tUnit position); 362 virtual LayoutUnit logicalRightSelectionOffset(RenderBlock* rootBlock, Layou tUnit position);
364 363
365 // FIXME-BLOCKFLOW: Remove virtualizaion when all callers have moved to Rend erBlockFlow
366 virtual void clipOutFloatingObjects(RenderBlock*, const PaintInfo*, const La youtPoint&, const LayoutSize&) { };
367
368 virtual void absoluteRects(Vector<IntRect>&, const LayoutPoint& accumulatedO ffset) const override; 364 virtual void absoluteRects(Vector<IntRect>&, const LayoutPoint& accumulatedO ffset) const override;
369 virtual void absoluteQuads(Vector<FloatQuad>&) const override; 365 virtual void absoluteQuads(Vector<FloatQuad>&) const override;
370 366
371 void paintContinuationOutlines(PaintInfo&, const LayoutPoint&); 367 void paintContinuationOutlines(PaintInfo&, const LayoutPoint&);
372 368
373 virtual LayoutRect localCaretRect(InlineBox*, int caretOffset, LayoutUnit* e xtraWidthToEndOfLine = 0) override final; 369 virtual LayoutRect localCaretRect(InlineBox*, int caretOffset, LayoutUnit* e xtraWidthToEndOfLine = 0) override final;
374 370
375 void markLinesDirtyInBlockRange(LayoutUnit logicalTop, LayoutUnit logicalBot tom, RootInlineBox* highest = 0); 371 void markLinesDirtyInBlockRange(LayoutUnit logicalTop, LayoutUnit logicalBot tom, RootInlineBox* highest = 0);
376 372
377 Position positionForBox(InlineBox*, bool start = true) const; 373 Position positionForBox(InlineBox*, bool start = true) const;
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
417 // FIXME: This is temporary as we move code that accesses block flow 413 // FIXME: This is temporary as we move code that accesses block flow
418 // member variables out of RenderBlock and into RenderBlockFlow. 414 // member variables out of RenderBlock and into RenderBlockFlow.
419 friend class RenderBlockFlow; 415 friend class RenderBlockFlow;
420 }; 416 };
421 417
422 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderBlock, isRenderBlock()); 418 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderBlock, isRenderBlock());
423 419
424 } // namespace blink 420 } // namespace blink
425 421
426 #endif // RenderBlock_h 422 #endif // RenderBlock_h
OLDNEW
« no previous file with comments | « sky/engine/core/rendering/FloatingObjects.cpp ('k') | sky/engine/core/rendering/RenderBlock.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698