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

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

Issue 706953003: Delete unused methods/arguments from RenderBlockFlow. (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
« no previous file with comments | « sky/engine/core/rendering/PaintPhase.h ('k') | sky/engine/core/rendering/RenderBlock.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 * (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 300 matching lines...) Expand 10 before | Expand all | Expand 10 after
311 void addChildToContinuation(RenderObject* newChild, RenderObject* beforeChil d); 311 void addChildToContinuation(RenderObject* newChild, RenderObject* beforeChil d);
312 virtual void addChildIgnoringContinuation(RenderObject* newChild, RenderObje ct* beforeChild) override; 312 virtual void addChildIgnoringContinuation(RenderObject* newChild, RenderObje ct* beforeChild) override;
313 313
314 void addChildIgnoringAnonymousColumnBlocks(RenderObject* newChild, RenderObj ect* beforeChild = 0); 314 void addChildIgnoringAnonymousColumnBlocks(RenderObject* newChild, RenderObj ect* beforeChild = 0);
315 315
316 void insertIntoTrackedRendererMaps(RenderBox* descendant, TrackedDescendants Map*&, TrackedContainerMap*&); 316 void insertIntoTrackedRendererMaps(RenderBox* descendant, TrackedDescendants Map*&, TrackedContainerMap*&);
317 static void removeFromTrackedRendererMaps(RenderBox* descendant, TrackedDesc endantsMap*&, TrackedContainerMap*&); 317 static void removeFromTrackedRendererMaps(RenderBox* descendant, TrackedDesc endantsMap*&, TrackedContainerMap*&);
318 318
319 Node* nodeForHitTest() const; 319 Node* nodeForHitTest() const;
320 320
321 // FIXME-BLOCKFLOW: Remove virtualizaion when all callers have moved to Rend erBlockFlow
322 virtual void paintFloats(PaintInfo&, const LayoutPoint&, bool) { }
323 void paintContents(PaintInfo&, const LayoutPoint&); 321 void paintContents(PaintInfo&, const LayoutPoint&);
324 void paintSelection(PaintInfo&, const LayoutPoint&); 322 void paintSelection(PaintInfo&, const LayoutPoint&);
325 void paintCarets(PaintInfo&, const LayoutPoint&); 323 void paintCarets(PaintInfo&, const LayoutPoint&);
326 324
327 bool hasCaret() const; 325 bool hasCaret() const;
328 326
329 bool hitTestContents(const HitTestRequest&, HitTestResult&, const HitTestLoc ation& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestAction) ; 327 bool hitTestContents(const HitTestRequest&, HitTestResult&, const HitTestLoc ation& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestAction) ;
330 // FIXME-BLOCKFLOW: Remove virtualizaion when all callers have moved to Rend erBlockFlow
331 virtual bool hitTestFloats(const HitTestRequest&, HitTestResult&, const HitT estLocation&, const LayoutPoint&) { return false; }
332 328
333 virtual bool isPointInOverflowControl(HitTestResult&, const LayoutPoint& loc ationInContainer, const LayoutPoint& accumulatedOffset); 329 virtual bool isPointInOverflowControl(HitTestResult&, const LayoutPoint& loc ationInContainer, const LayoutPoint& accumulatedOffset);
334 330
335 void computeBlockPreferredLogicalWidths(LayoutUnit& minLogicalWidth, LayoutU nit& maxLogicalWidth) const; 331 void computeBlockPreferredLogicalWidths(LayoutUnit& minLogicalWidth, LayoutU nit& maxLogicalWidth) const;
336 332
337 // Obtains the nearest enclosing block (including this block) that contribut es a first-line style to our inline 333 // Obtains the nearest enclosing block (including this block) that contribut es a first-line style to our inline
338 // children. 334 // children.
339 virtual RenderBlock* firstLineBlock() const override; 335 virtual RenderBlock* firstLineBlock() const override;
340 336
341 virtual LayoutRect rectWithOutlineForPaintInvalidation(const RenderLayerMode lObject* paintInvalidationContainer, LayoutUnit outlineWidth, const PaintInvalid ationState* = 0) const override final; 337 virtual LayoutRect rectWithOutlineForPaintInvalidation(const RenderLayerMode lObject* paintInvalidationContainer, LayoutUnit outlineWidth, const PaintInvalid ationState* = 0) const override final;
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
407 // FIXME: This is temporary as we move code that accesses block flow 403 // FIXME: This is temporary as we move code that accesses block flow
408 // member variables out of RenderBlock and into RenderBlockFlow. 404 // member variables out of RenderBlock and into RenderBlockFlow.
409 friend class RenderBlockFlow; 405 friend class RenderBlockFlow;
410 }; 406 };
411 407
412 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderBlock, isRenderBlock()); 408 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderBlock, isRenderBlock());
413 409
414 } // namespace blink 410 } // namespace blink
415 411
416 #endif // RenderBlock_h 412 #endif // RenderBlock_h
OLDNEW
« no previous file with comments | « sky/engine/core/rendering/PaintPhase.h ('k') | sky/engine/core/rendering/RenderBlock.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698