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

Side by Side Diff: third_party/WebKit/Source/core/layout/LayoutBlockFlow.cpp

Issue 1569293003: Revert of ObjectPainter::paintAsStackingContext() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 11 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2013 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 2080 matching lines...) Expand 10 before | Expand all | Expand 10 after
2091 2091
2092 invalidatePaintRectangle(paintInvalidationRect); // We need to do a part ial paint invalidation of our content. 2092 invalidatePaintRectangle(paintInvalidationRect); // We need to do a part ial paint invalidation of our content.
2093 if (hasReflection()) 2093 if (hasReflection())
2094 invalidatePaintRectangle(reflectedRect(paintInvalidationRect)); 2094 invalidatePaintRectangle(reflectedRect(paintInvalidationRect));
2095 } 2095 }
2096 2096
2097 m_paintInvalidationLogicalTop = 0; 2097 m_paintInvalidationLogicalTop = 0;
2098 m_paintInvalidationLogicalBottom = 0; 2098 m_paintInvalidationLogicalBottom = 0;
2099 } 2099 }
2100 2100
2101 void LayoutBlockFlow::paintFloats(const PaintInfo& paintInfo, const LayoutPoint& paintOffset) const 2101 void LayoutBlockFlow::paintFloats(const PaintInfo& paintInfo, const LayoutPoint& paintOffset, bool preservePhase) const
2102 { 2102 {
2103 BlockFlowPainter(*this).paintFloats(paintInfo, paintOffset); 2103 BlockFlowPainter(*this).paintFloats(paintInfo, paintOffset, preservePhase);
2104 } 2104 }
2105 2105
2106 void LayoutBlockFlow::paintSelection(const PaintInfo& paintInfo, const LayoutPoi nt& paintOffset) const 2106 void LayoutBlockFlow::paintSelection(const PaintInfo& paintInfo, const LayoutPoi nt& paintOffset) const
2107 { 2107 {
2108 BlockFlowPainter(*this).paintSelection(paintInfo, paintOffset); 2108 BlockFlowPainter(*this).paintSelection(paintInfo, paintOffset);
2109 } 2109 }
2110 2110
2111 void LayoutBlockFlow::clipOutFloatingObjects(const LayoutBlock* rootBlock, ClipS cope& clipScope, 2111 void LayoutBlockFlow::clipOutFloatingObjects(const LayoutBlock* rootBlock, ClipS cope& clipScope,
2112 const LayoutPoint& rootBlockPhysicalPosition, const LayoutSize& offsetFromRo otBlock) const 2112 const LayoutPoint& rootBlockPhysicalPosition, const LayoutSize& offsetFromRo otBlock) const
2113 { 2113 {
(...skipping 1010 matching lines...) Expand 10 before | Expand all | Expand 10 after
3124 FrameView* frameView = document().view(); 3124 FrameView* frameView = document().view();
3125 LayoutUnit top = (style()->position() == FixedPosition) ? 0 : frameView->scr ollOffset().height(); 3125 LayoutUnit top = (style()->position() == FixedPosition) ? 0 : frameView->scr ollOffset().height();
3126 int visibleHeight = frameView->visibleContentRect(IncludeScrollbars).height( ); 3126 int visibleHeight = frameView->visibleContentRect(IncludeScrollbars).height( );
3127 if (size().height() < visibleHeight) 3127 if (size().height() < visibleHeight)
3128 top += (visibleHeight - size().height()) / 2; 3128 top += (visibleHeight - size().height()) / 2;
3129 setY(top); 3129 setY(top);
3130 dialog->setCentered(top); 3130 dialog->setCentered(top);
3131 } 3131 }
3132 3132
3133 } // namespace blink 3133 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutBlockFlow.h ('k') | third_party/WebKit/Source/core/paint/BlockFlowPainter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698