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

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

Issue 1993713002: Move line painting to BlockFlowPainter. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Invoke BlockFlowPainter from BlockPainter instead. Created 4 years, 7 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 2827 matching lines...) Expand 10 before | Expand all | Expand 10 after
2838 startOfContinuations = inlineElementContinuation->node()->layoutObject() ; 2838 startOfContinuations = inlineElementContinuation->node()->layoutObject() ;
2839 } else if (LayoutObject* firstChild = this->firstChild()) { 2839 } else if (LayoutObject* firstChild = this->firstChild()) {
2840 // This block is the anonymous containing block of an inline element con tinuation. 2840 // This block is the anonymous containing block of an inline element con tinuation.
2841 if (firstChild->isElementContinuation()) 2841 if (firstChild->isElementContinuation())
2842 startOfContinuations = firstChild->node()->layoutObject(); 2842 startOfContinuations = firstChild->node()->layoutObject();
2843 } 2843 }
2844 if (startOfContinuations && startOfContinuations->styleRef().outlineStyleIsA uto()) 2844 if (startOfContinuations && startOfContinuations->styleRef().outlineStyleIsA uto())
2845 startOfContinuations->invalidateDisplayItemClient(*startOfContinuations) ; 2845 startOfContinuations->invalidateDisplayItemClient(*startOfContinuations) ;
2846 } 2846 }
2847 2847
2848 void LayoutBlockFlow::paintFloats(const PaintInfo& paintInfo, const LayoutPoint& paintOffset) const
2849 {
2850 BlockFlowPainter(*this).paintFloats(paintInfo, paintOffset);
2851 }
2852
2853 void LayoutBlockFlow::clipOutFloatingObjects(const LayoutBlock* rootBlock, ClipS cope& clipScope, 2848 void LayoutBlockFlow::clipOutFloatingObjects(const LayoutBlock* rootBlock, ClipS cope& clipScope,
2854 const LayoutPoint& rootBlockPhysicalPosition, const LayoutSize& offsetFromRo otBlock) const 2849 const LayoutPoint& rootBlockPhysicalPosition, const LayoutSize& offsetFromRo otBlock) const
2855 { 2850 {
2856 if (!m_floatingObjects) 2851 if (!m_floatingObjects)
2857 return; 2852 return;
2858 2853
2859 const FloatingObjectSet& floatingObjectSet = m_floatingObjects->set(); 2854 const FloatingObjectSet& floatingObjectSet = m_floatingObjects->set();
2860 FloatingObjectSetIterator end = floatingObjectSet.end(); 2855 FloatingObjectSetIterator end = floatingObjectSet.end();
2861 for (FloatingObjectSetIterator it = floatingObjectSet.begin(); it != end; ++ it) { 2856 for (FloatingObjectSetIterator it = floatingObjectSet.begin(); it != end; ++ it) {
2862 const FloatingObject& floatingObject = *it->get(); 2857 const FloatingObject& floatingObject = *it->get();
(...skipping 983 matching lines...) Expand 10 before | Expand all | Expand 10 after
3846 if (!rect.isEmpty()) 3841 if (!rect.isEmpty())
3847 rects.append(rect); 3842 rects.append(rect);
3848 } 3843 }
3849 } 3844 }
3850 3845
3851 if (inlineElementContinuation) 3846 if (inlineElementContinuation)
3852 inlineElementContinuation->addOutlineRects(rects, additionalOffset + (in lineElementContinuation->containingBlock()->location() - location()), includeBlo ckOverflows); 3847 inlineElementContinuation->addOutlineRects(rects, additionalOffset + (in lineElementContinuation->containingBlock()->location() - location()), includeBlo ckOverflows);
3853 } 3848 }
3854 3849
3855 } // namespace blink 3850 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutBlockFlow.h ('k') | third_party/WebKit/Source/core/layout/LayoutText.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698