Chromium Code Reviews

Side by Side Diff: Source/core/rendering/RenderRegion.cpp

Issue 21430003: Implement interfaces in PaintInfo and make it a class. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@getterPaintInfo01
Patch Set: Fixed Linux compilation (hopefuly Windows too), addressing some reviewer's suggestions. Created 7 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff |
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2011 Adobe Systems Incorporated. All rights reserved. 2 * Copyright (C) 2011 Adobe Systems Incorporated. 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 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above 8 * 1. Redistributions of source code must retain the above
9 * copyright notice, this list of conditions and the following 9 * copyright notice, this list of conditions and the following
10 * disclaimer. 10 * disclaimer.
(...skipping 158 matching lines...)
169 { 169 {
170 if (style()->visibility() != VISIBLE) 170 if (style()->visibility() != VISIBLE)
171 return; 171 return;
172 172
173 RenderBlock::paintObject(paintInfo, paintOffset); 173 RenderBlock::paintObject(paintInfo, paintOffset);
174 174
175 // Delegate painting of content in region to RenderFlowThread. 175 // Delegate painting of content in region to RenderFlowThread.
176 // RenderFlowThread is a self painting layer (being a positioned object) who is painting its children, the collected objects. 176 // RenderFlowThread is a self painting layer (being a positioned object) who is painting its children, the collected objects.
177 // Since we do not want to paint the flow thread content multiple times (for each painting phase of the region object), 177 // Since we do not want to paint the flow thread content multiple times (for each painting phase of the region object),
178 // we allow the flow thread painting only for the selection and the foregrou nd phase. 178 // we allow the flow thread painting only for the selection and the foregrou nd phase.
179 if (!isValid() || (paintInfo.phase != PaintPhaseForeground && paintInfo.phas e != PaintPhaseSelection)) 179 if (!isValid() || (paintInfo.getPhase() != PaintPhaseForeground && paintInfo .getPhase() != PaintPhaseSelection))
180 return; 180 return;
181 181
182 setRegionObjectsRegionStyle(); 182 setRegionObjectsRegionStyle();
183 m_flowThread->paintFlowThreadPortionInRegion(paintInfo, this, flowThreadPort ionRect(), flowThreadPortionOverflowRect(), LayoutPoint(paintOffset.x() + border Left() + paddingLeft(), paintOffset.y() + borderTop() + paddingTop())); 183 m_flowThread->paintFlowThreadPortionInRegion(paintInfo, this, flowThreadPort ionRect(), flowThreadPortionOverflowRect(), LayoutPoint(paintOffset.x() + border Left() + paddingLeft(), paintOffset.y() + borderTop() + paddingTop()));
184 restoreRegionObjectsOriginalStyle(); 184 restoreRegionObjectsOriginalStyle();
185 } 185 }
186 186
187 // Hit Testing 187 // Hit Testing
188 bool RenderRegion::hitTestFlowThreadContents(const HitTestRequest& request, HitT estResult& result, const HitTestLocation& locationInContainer, const LayoutPoint & accumulatedOffset, HitTestAction action) 188 bool RenderRegion::hitTestFlowThreadContents(const HitTestRequest& request, HitT estResult& result, const HitTestLocation& locationInContainer, const LayoutPoint & accumulatedOffset, HitTestAction action)
189 { 189 {
(...skipping 452 matching lines...)
642 642
643 LayoutUnit autoHeight = hasOverrideHeight() ? overrideLogicalContentHeight() : computedAutoHeight(); 643 LayoutUnit autoHeight = hasOverrideHeight() ? overrideLogicalContentHeight() : computedAutoHeight();
644 644
645 LayoutUnit newLogicalHeight = autoHeight + borderAndPaddingLogicalHeight(); 645 LayoutUnit newLogicalHeight = autoHeight + borderAndPaddingLogicalHeight();
646 ASSERT(newLogicalHeight < LayoutUnit::max() / 2); 646 ASSERT(newLogicalHeight < LayoutUnit::max() / 2);
647 if (newLogicalHeight > logicalHeight()) 647 if (newLogicalHeight > logicalHeight())
648 setLogicalHeight(newLogicalHeight); 648 setLogicalHeight(newLogicalHeight);
649 } 649 }
650 650
651 } // namespace WebCore 651 } // namespace WebCore
OLDNEW

Powered by Google App Engine