sky/engine/core/rendering/RenderBlock.cpp - Issue 953673002: Delete RenderLayerModelObject.

Side by Side Diff: sky/engine/core/rendering/RenderBlock.cpp

Issue 953673002: Delete RenderLayerModelObject. (Closed) Base URL: git@github.com:domokit/mojo.git@master

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:

« no previous file with comments | « sky/engine/core/rendering/RenderBlock.h ('k') | sky/engine/core/rendering/RenderBox.h » ('j') | no next file with comments »

OLD	NEW
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 1538 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1549 return RenderBox::localCaretRect(inlineBox, caretOffset, extraWidthToEnd OfLine);	1549 return RenderBox::localCaretRect(inlineBox, caretOffset, extraWidthToEnd OfLine);

1550	1550

1551 LayoutRect caretRect = localCaretRectForEmptyElement(width(), textIndentOffs et());	1551 LayoutRect caretRect = localCaretRectForEmptyElement(width(), textIndentOffs et());

1552	1552

1553 if (extraWidthToEndOfLine)	1553 if (extraWidthToEndOfLine)

1554 *extraWidthToEndOfLine = width() - caretRect.maxX();	1554 *extraWidthToEndOfLine = width() - caretRect.maxX();

1555	1555

1556 return caretRect;	1556 return caretRect;

1557 }	1557 }

1558	1558

1559 void RenderBlock::addFocusRingRects(Vector<IntRect>& rects, const LayoutPoint& a dditionalOffset, const RenderLayerModelObject* paintContainer) const	1559 void RenderBlock::addFocusRingRects(Vector<IntRect>& rects, const LayoutPoint& a dditionalOffset, const RenderBox* paintContainer) const

1560 {	1560 {

1561 if (width() && height())	1561 if (width() && height())

1562 rects.append(pixelSnappedIntRect(additionalOffset, size()));	1562 rects.append(pixelSnappedIntRect(additionalOffset, size()));

1563	1563

1564 if (!hasOverflowClip()) {	1564 if (!hasOverflowClip()) {

1565 for (RootInlineBox* curr = firstRootBox(); curr; curr = curr->nextRootBo x()) {	1565 for (RootInlineBox* curr = firstRootBox(); curr; curr = curr->nextRootBo x()) {

1566 LayoutUnit top = std::max<LayoutUnit>(curr->lineTop(), curr->top());	1566 LayoutUnit top = std::max<LayoutUnit>(curr->lineTop(), curr->top());

1567 LayoutUnit bottom = std::min<LayoutUnit>(curr->lineBottom(), curr->t op() + curr->height());	1567 LayoutUnit bottom = std::min<LayoutUnit>(curr->lineBottom(), curr->t op() + curr->height());

1568 LayoutRect rect(additionalOffset.x() + curr->x(), additionalOffset.y () + top, curr->width(), bottom - top);	1568 LayoutRect rect(additionalOffset.x() + curr->x(), additionalOffset.y () + top, curr->width(), bottom - top);

1569 if (!rect.isEmpty())	1569 if (!rect.isEmpty())

(...skipping 153 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1723 void RenderBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Render Object* obj) const	1723 void RenderBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Render Object* obj) const

1724 {	1724 {

1725 showRenderObject();	1725 showRenderObject();

1726 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot Box())	1726 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot Box())

1727 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa bel2, obj, 1);	1727 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa bel2, obj, 1);

1728 }	1728 }

1729	1729

1730 #endif	1730 #endif

1731	1731

1732 } // namespace blink	1732 } // namespace blink

OLD	NEW