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

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

Issue 22909005: Remove unneeded const on updateOffsetIfNeeded method. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 4 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
« no previous file with comments | « Source/core/rendering/RenderBlock.h ('k') | no next file » | 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 4229 matching lines...) Expand 10 before | Expand all | Expand 10 after
4240 return true; 4240 return true;
4241 4241
4242 // The bottom of the object overlaps the float 4242 // The bottom of the object overlaps the float
4243 if (objectBottom > objectTop && objectBottom > floatTop && objectBottom <= f loatBottom) 4243 if (objectBottom > objectTop && objectBottom > floatTop && objectBottom <= f loatBottom)
4244 return true; 4244 return true;
4245 4245
4246 return false; 4246 return false;
4247 } 4247 }
4248 4248
4249 template<> 4249 template<>
4250 bool RenderBlock::FloatIntervalSearchAdapter<RenderBlock::FloatingObject::FloatL eft>::updateOffsetIfNeeded(const FloatingObject* floatingObject) const 4250 bool RenderBlock::FloatIntervalSearchAdapter<RenderBlock::FloatingObject::FloatL eft>::updateOffsetIfNeeded(const FloatingObject* floatingObject)
4251 { 4251 {
4252 LayoutUnit logicalRight = m_renderer->logicalRightForFloat(floatingObject); 4252 LayoutUnit logicalRight = m_renderer->logicalRightForFloat(floatingObject);
4253 if (logicalRight > m_offset) { 4253 if (logicalRight > m_offset) {
4254 m_offset = logicalRight; 4254 m_offset = logicalRight;
esprehn 2013/08/12 23:18:33 wtf, how was this const if it wrote to m_offset?
4255 return true; 4255 return true;
4256 } 4256 }
4257 return false; 4257 return false;
4258 } 4258 }
4259 4259
4260 template<> 4260 template<>
4261 bool RenderBlock::FloatIntervalSearchAdapter<RenderBlock::FloatingObject::FloatR ight>::updateOffsetIfNeeded(const FloatingObject* floatingObject) const 4261 bool RenderBlock::FloatIntervalSearchAdapter<RenderBlock::FloatingObject::FloatR ight>::updateOffsetIfNeeded(const FloatingObject* floatingObject)
4262 { 4262 {
4263 LayoutUnit logicalLeft = m_renderer->logicalLeftForFloat(floatingObject); 4263 LayoutUnit logicalLeft = m_renderer->logicalLeftForFloat(floatingObject);
4264 if (logicalLeft < m_offset) { 4264 if (logicalLeft < m_offset) {
4265 m_offset = logicalLeft; 4265 m_offset = logicalLeft;
4266 return true; 4266 return true;
4267 } 4267 }
4268 return false; 4268 return false;
4269 } 4269 }
4270 4270
4271 template <RenderBlock::FloatingObject::Type FloatTypeValue> 4271 template <RenderBlock::FloatingObject::Type FloatTypeValue>
(...skipping 3899 matching lines...) Expand 10 before | Expand all | Expand 10 after
8171 8171
8172 String ValueToString<RenderBlock::FloatingObject*>::string(const RenderBlock::Fl oatingObject* floatingObject) 8172 String ValueToString<RenderBlock::FloatingObject*>::string(const RenderBlock::Fl oatingObject* floatingObject)
8173 { 8173 {
8174 return String::format("%p (%dx%d %dx%d)", floatingObject, floatingObject->fr ameRect().pixelSnappedX(), floatingObject->frameRect().pixelSnappedY(), floating Object->frameRect().pixelSnappedMaxX(), floatingObject->frameRect().pixelSnapped MaxY()); 8174 return String::format("%p (%dx%d %dx%d)", floatingObject, floatingObject->fr ameRect().pixelSnappedX(), floatingObject->frameRect().pixelSnappedY(), floating Object->frameRect().pixelSnappedMaxX(), floatingObject->frameRect().pixelSnapped MaxY());
8175 } 8175 }
8176 8176
8177 8177
8178 #endif 8178 #endif
8179 8179
8180 } // namespace WebCore 8180 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderBlock.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698