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

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

Issue 192863004: Use outlineBox if we have an outline (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fixed Mac test (neutral change => same amount of invalidation but in one instead of 2) Created 6 years, 9 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
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 272 matching lines...) Expand 10 before | Expand all | Expand 10 after
283 // It is expected that the caller will call this function independent of the value of paintInfo.phase. 283 // It is expected that the caller will call this function independent of the value of paintInfo.phase.
284 static void paintAsInlineBlock(RenderObject*, PaintInfo&, const LayoutPoint& ); 284 static void paintAsInlineBlock(RenderObject*, PaintInfo&, const LayoutPoint& );
285 protected: 285 protected:
286 virtual void willBeDestroyed() OVERRIDE; 286 virtual void willBeDestroyed() OVERRIDE;
287 287
288 void dirtyForLayoutFromPercentageHeightDescendants(SubtreeLayoutScope&); 288 void dirtyForLayoutFromPercentageHeightDescendants(SubtreeLayoutScope&);
289 289
290 virtual void layout() OVERRIDE; 290 virtual void layout() OVERRIDE;
291 virtual bool updateImageLoadingPriorities() OVERRIDE FINAL; 291 virtual bool updateImageLoadingPriorities() OVERRIDE FINAL;
292 292
293 void layoutPositionedObjects(bool relayoutChildren, bool fixedPositionObject sOnly = false); 293 enum PositionedLayoutBehavior {
294 DefaultLayout,
295 LayoutOnlyFixedPositionedObjects,
296 ForcedLayoutAfterContainingBlockMoved
297 };
298
299 void layoutPositionedObjects(bool relayoutChildren, PositionedLayoutBehavior = DefaultLayout);
294 void markFixedPositionObjectForLayoutIfNeeded(RenderObject* child, SubtreeLa youtScope&); 300 void markFixedPositionObjectForLayoutIfNeeded(RenderObject* child, SubtreeLa youtScope&);
295 301
296 LayoutUnit marginIntrinsicLogicalWidthForChild(RenderBox* child) const; 302 LayoutUnit marginIntrinsicLogicalWidthForChild(RenderBox* child) const;
297 303
298 int beforeMarginInLineDirection(LineDirectionMode) const; 304 int beforeMarginInLineDirection(LineDirectionMode) const;
299 305
300 virtual bool supportsPartialLayout() const OVERRIDE { return true; }; 306 virtual bool supportsPartialLayout() const OVERRIDE { return true; };
301 307
302 virtual void paint(PaintInfo&, const LayoutPoint&) OVERRIDE; 308 virtual void paint(PaintInfo&, const LayoutPoint&) OVERRIDE;
303 virtual void paintObject(PaintInfo&, const LayoutPoint&) OVERRIDE; 309 virtual void paintObject(PaintInfo&, const LayoutPoint&) OVERRIDE;
(...skipping 276 matching lines...) Expand 10 before | Expand all | Expand 10 after
580 return false; 586 return false;
581 } 587 }
582 return true; 588 return true;
583 } 589 }
584 590
585 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderBlock, isRenderBlock()); 591 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderBlock, isRenderBlock());
586 592
587 } // namespace WebCore 593 } // namespace WebCore
588 594
589 #endif // RenderBlock_h 595 #endif // RenderBlock_h
OLDNEW
« no previous file with comments | « LayoutTests/platform/win/fast/repaint/float-overflow-right-expected.txt ('k') | Source/core/rendering/RenderBlock.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698