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

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

Issue 889563002: Make RenderObject::style() return a const object (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Blind fix for Mac. Created 5 years, 10 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
OLDNEW
1 /** 1 /**
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 2000 Simon Hausmann <hausmann@kde.org> 3 * (C) 2000 Simon Hausmann <hausmann@kde.org>
4 * (C) 2000 Stefan Schimanski (1Stein@gmx.de) 4 * (C) 2000 Stefan Schimanski (1Stein@gmx.de)
5 * Copyright (C) 2004, 2005, 2006 Apple Computer, Inc. 5 * Copyright (C) 2004, 2005, 2006 Apple Computer, Inc.
6 * 6 *
7 * This library is free software; you can redistribute it and/or 7 * This library is free software; you can redistribute it and/or
8 * modify it under the terms of the GNU Library General Public 8 * modify it under the terms of the GNU Library General Public
9 * License as published by the Free Software Foundation; either 9 * License as published by the Free Software Foundation; either
10 * version 2 of the License, or (at your option) any later version. 10 * version 2 of the License, or (at your option) any later version.
(...skipping 541 matching lines...) Expand 10 before | Expand all | Expand 10 after
552 552
553 int splitPosition = axis.m_sizes[0]; 553 int splitPosition = axis.m_sizes[0];
554 for (size_t i = 1; i < size; ++i) { 554 for (size_t i = 1; i < size; ++i) {
555 if (position >= splitPosition && position < splitPosition + borderThickn ess) 555 if (position >= splitPosition && position < splitPosition + borderThickn ess)
556 return i; 556 return i;
557 splitPosition += borderThickness + axis.m_sizes[i]; 557 splitPosition += borderThickness + axis.m_sizes[i];
558 } 558 }
559 return noSplit; 559 return noSplit;
560 } 560 }
561 561
562 bool RenderFrameSet::isChildAllowed(RenderObject* child, RenderStyle*) const 562 bool RenderFrameSet::isChildAllowed(RenderObject* child, const RenderStyle*) con st
563 { 563 {
564 return child->isFrame() || child->isFrameSet(); 564 return child->isFrame() || child->isFrameSet();
565 } 565 }
566 566
567 CursorDirective RenderFrameSet::getCursor(const LayoutPoint& point, Cursor& curs or) const 567 CursorDirective RenderFrameSet::getCursor(const LayoutPoint& point, Cursor& curs or) const
568 { 568 {
569 IntPoint roundedPoint = roundedIntPoint(point); 569 IntPoint roundedPoint = roundedIntPoint(point);
570 if (canResizeRow(roundedPoint)) { 570 if (canResizeRow(roundedPoint)) {
571 cursor = rowResizeCursor(); 571 cursor = rowResizeCursor();
572 return SetCursor; 572 return SetCursor;
573 } 573 }
574 if (canResizeColumn(roundedPoint)) { 574 if (canResizeColumn(roundedPoint)) {
575 cursor = columnResizeCursor(); 575 cursor = columnResizeCursor();
576 return SetCursor; 576 return SetCursor;
577 } 577 }
578 return RenderBox::getCursor(point, cursor); 578 return RenderBox::getCursor(point, cursor);
579 } 579 }
580 580
581 } // namespace blink 581 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698