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

Side by Side Diff: Source/core/layout/LayoutBlock.cpp

Issue 1186523004: Rename adjustPaintInvalidationRect and related to addVisualOverflow (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 6 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
« no previous file with comments | « no previous file | Source/core/layout/LayoutTheme.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, 2011 Apple Inc. All rights reserved. 5 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
6 * Copyright (C) Research In Motion Limited 2010. All rights reserved. 6 * Copyright (C) Research In Motion Limited 2010. All rights reserved.
7 * 7 *
8 * This library is free software; you can redistribute it and/or 8 * This library is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Library General Public 9 * modify it under the terms of the GNU Library General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
(...skipping 1012 matching lines...) Expand 10 before | Expand all | Expand 10 after
1023 addOverflowFromChild(positionedObject, toLayoutSize(positionedObject ->location())); 1023 addOverflowFromChild(positionedObject, toLayoutSize(positionedObject ->location()));
1024 } 1024 }
1025 } 1025 }
1026 1026
1027 void LayoutBlock::addVisualOverflowFromTheme() 1027 void LayoutBlock::addVisualOverflowFromTheme()
1028 { 1028 {
1029 if (!style()->hasAppearance()) 1029 if (!style()->hasAppearance())
1030 return; 1030 return;
1031 1031
1032 IntRect inflatedRect = pixelSnappedBorderBoxRect(); 1032 IntRect inflatedRect = pixelSnappedBorderBoxRect();
1033 LayoutTheme::theme().adjustPaintInvalidationRect(this, inflatedRect); 1033 LayoutTheme::theme().addVisualOverflow(*this, inflatedRect);
1034 addVisualOverflow(LayoutRect(inflatedRect)); 1034 addVisualOverflow(LayoutRect(inflatedRect));
1035 } 1035 }
1036 1036
1037 bool LayoutBlock::createsNewFormattingContext() const 1037 bool LayoutBlock::createsNewFormattingContext() const
1038 { 1038 {
1039 return isInlineBlockOrInlineTable() || isFloatingOrOutOfFlowPositioned() || hasOverflowClip() || isFlexItemIncludingDeprecated() 1039 return isInlineBlockOrInlineTable() || isFloatingOrOutOfFlowPositioned() || hasOverflowClip() || isFlexItemIncludingDeprecated()
1040 || style()->specifiesColumns() || isLayoutFlowThread() || isTableCell() || isTableCaption() || isFieldset() || isWritingModeRoot() 1040 || style()->specifiesColumns() || isLayoutFlowThread() || isTableCell() || isTableCaption() || isFieldset() || isWritingModeRoot()
1041 || isDocumentElement() || isColumnSpanAll() || isGridItem(); 1041 || isDocumentElement() || isColumnSpanAll() || isGridItem();
1042 } 1042 }
1043 1043
(...skipping 1871 matching lines...) Expand 10 before | Expand all | Expand 10 after
2915 void LayoutBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Layout Object* obj) const 2915 void LayoutBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Layout Object* obj) const
2916 { 2916 {
2917 showLayoutObject(); 2917 showLayoutObject();
2918 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot Box()) 2918 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot Box())
2919 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa bel2, obj, 1); 2919 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa bel2, obj, 1);
2920 } 2920 }
2921 2921
2922 #endif 2922 #endif
2923 2923
2924 } // namespace blink 2924 } // namespace blink
OLDNEW
« no previous file with comments | « no previous file | Source/core/layout/LayoutTheme.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698