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

Side by Side Diff: Source/core/layout/LayoutFrameSet.cpp

Issue 926193003: Move rendering/RenderBox to layout/LayoutBox. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: 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
« no previous file with comments | « Source/core/layout/LayoutFrameSet.h ('k') | Source/core/layout/LayoutHTMLCanvas.cpp » ('j') | 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) 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 22 matching lines...) Expand all
33 #include "core/layout/PaintInfo.h" 33 #include "core/layout/PaintInfo.h"
34 #include "core/page/EventHandler.h" 34 #include "core/page/EventHandler.h"
35 #include "core/paint/FrameSetPainter.h" 35 #include "core/paint/FrameSetPainter.h"
36 #include "core/rendering/RenderView.h" 36 #include "core/rendering/RenderView.h"
37 #include "platform/Cursor.h" 37 #include "platform/Cursor.h"
38 #include "platform/graphics/GraphicsContext.h" 38 #include "platform/graphics/GraphicsContext.h"
39 39
40 namespace blink { 40 namespace blink {
41 41
42 LayoutFrameSet::LayoutFrameSet(HTMLFrameSetElement* frameSet) 42 LayoutFrameSet::LayoutFrameSet(HTMLFrameSetElement* frameSet)
43 : RenderBox(frameSet) 43 : LayoutBox(frameSet)
44 , m_isResizing(false) 44 , m_isResizing(false)
45 , m_isChildResizing(false) 45 , m_isChildResizing(false)
46 { 46 {
47 setInline(false); 47 setInline(false);
48 } 48 }
49 49
50 LayoutFrameSet::~LayoutFrameSet() 50 LayoutFrameSet::~LayoutFrameSet()
51 { 51 {
52 } 52 }
53 53
(...skipping 319 matching lines...) Expand 10 before | Expand all | Expand 10 after
373 m_rows.resize(rows); 373 m_rows.resize(rows);
374 m_cols.resize(cols); 374 m_cols.resize(cols);
375 } 375 }
376 376
377 LayoutUnit borderThickness = frameSet()->border(); 377 LayoutUnit borderThickness = frameSet()->border();
378 layOutAxis(m_rows, frameSet()->rowLengths(), size().height() - (rows - 1) * borderThickness); 378 layOutAxis(m_rows, frameSet()->rowLengths(), size().height() - (rows - 1) * borderThickness);
379 layOutAxis(m_cols, frameSet()->colLengths(), size().width() - (cols - 1) * b orderThickness); 379 layOutAxis(m_cols, frameSet()->colLengths(), size().width() - (cols - 1) * b orderThickness);
380 380
381 positionFrames(); 381 positionFrames();
382 382
383 RenderBox::layout(); 383 LayoutBox::layout();
384 384
385 computeEdgeInfo(); 385 computeEdgeInfo();
386 386
387 updateLayerTransformAfterLayout(); 387 updateLayerTransformAfterLayout();
388 388
389 clearNeedsLayout(); 389 clearNeedsLayout();
390 } 390 }
391 391
392 static void clearNeedsLayoutOnHiddenFrames(RenderBox* frame) 392 static void clearNeedsLayoutOnHiddenFrames(LayoutBox* frame)
393 { 393 {
394 for (; frame; frame = frame->nextSiblingBox()) { 394 for (; frame; frame = frame->nextSiblingBox()) {
395 frame->setWidth(0); 395 frame->setWidth(0);
396 frame->setHeight(0); 396 frame->setHeight(0);
397 frame->clearNeedsLayout(); 397 frame->clearNeedsLayout();
398 clearNeedsLayoutOnHiddenFrames(frame->firstChildBox()); 398 clearNeedsLayoutOnHiddenFrames(frame->firstChildBox());
399 } 399 }
400 } 400 }
401 401
402 void LayoutFrameSet::positionFrames() 402 void LayoutFrameSet::positionFrames()
403 { 403 {
404 RenderBox* child = firstChildBox(); 404 LayoutBox* child = firstChildBox();
405 if (!child) 405 if (!child)
406 return; 406 return;
407 407
408 int rows = frameSet()->totalRows(); 408 int rows = frameSet()->totalRows();
409 int cols = frameSet()->totalCols(); 409 int cols = frameSet()->totalCols();
410 410
411 int borderThickness = frameSet()->border(); 411 int borderThickness = frameSet()->border();
412 LayoutSize size; 412 LayoutSize size;
413 LayoutPoint position; 413 LayoutPoint position;
414 for (int r = 0; r < rows; r++) { 414 for (int r = 0; r < rows; r++) {
(...skipping 149 matching lines...) Expand 10 before | Expand all | Expand 10 after
564 { 564 {
565 IntPoint roundedPoint = roundedIntPoint(point); 565 IntPoint roundedPoint = roundedIntPoint(point);
566 if (canResizeRow(roundedPoint)) { 566 if (canResizeRow(roundedPoint)) {
567 cursor = rowResizeCursor(); 567 cursor = rowResizeCursor();
568 return SetCursor; 568 return SetCursor;
569 } 569 }
570 if (canResizeColumn(roundedPoint)) { 570 if (canResizeColumn(roundedPoint)) {
571 cursor = columnResizeCursor(); 571 cursor = columnResizeCursor();
572 return SetCursor; 572 return SetCursor;
573 } 573 }
574 return RenderBox::getCursor(point, cursor); 574 return LayoutBox::getCursor(point, cursor);
575 } 575 }
576 576
577 } // namespace blink 577 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/layout/LayoutFrameSet.h ('k') | Source/core/layout/LayoutHTMLCanvas.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698