Source/core/rendering/RenderSearchField.cpp - Issue 926193003: Move rendering/RenderBox to layout/LayoutBox.

Side by Side Diff: Source/core/rendering/RenderSearchField.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/rendering/RenderSearchField.h ('k') | Source/core/rendering/RenderView.h » ('j') | no next file with comments »

OLD	NEW
1 /**	1 /**

2 * Copyright (C) 2006, 2007, 2010 Apple Inc. All rights reserved.	2 * Copyright (C) 2006, 2007, 2010 Apple Inc. All rights reserved.

3 * (C) 2008 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/)	3 * (C) 2008 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/)

4 * Copyright (C) 2010 Google Inc. All rights reserved.	4 * Copyright (C) 2010 Google Inc. All rights reserved.

5 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).	5 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).

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 40 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
51 }	51 }

52	52

53 inline Element* RenderSearchField::cancelButtonElement() const	53 inline Element* RenderSearchField::cancelButtonElement() const

54 {	54 {

55 return inputElement()->closedShadowRoot()->getElementById(ShadowElementNames ::clearButton());	55 return inputElement()->closedShadowRoot()->getElementById(ShadowElementNames ::clearButton());

56 }	56 }

57	57

58 LayoutUnit RenderSearchField::computeControlLogicalHeight(LayoutUnit lineHeight, LayoutUnit nonContentHeight) const	58 LayoutUnit RenderSearchField::computeControlLogicalHeight(LayoutUnit lineHeight, LayoutUnit nonContentHeight) const

59 {	59 {

60 Element* searchDecoration = searchDecorationElement();	60 Element* searchDecoration = searchDecorationElement();

61 if (RenderBox* decorationRenderer = searchDecoration ? searchDecoration->ren derBox() : 0) {	61 if (LayoutBox* decorationRenderer = searchDecoration ? searchDecoration->lay outBox() : 0) {

62 decorationRenderer->updateLogicalHeight();	62 decorationRenderer->updateLogicalHeight();

63 nonContentHeight = max(nonContentHeight, decorationRenderer->borderAndPa ddingLogicalHeight() + decorationRenderer->marginLogicalHeight());	63 nonContentHeight = max(nonContentHeight, decorationRenderer->borderAndPa ddingLogicalHeight() + decorationRenderer->marginLogicalHeight());

64 lineHeight = max(lineHeight, decorationRenderer->logicalHeight());	64 lineHeight = max(lineHeight, decorationRenderer->logicalHeight());

65 }	65 }

66 Element* cancelButton = cancelButtonElement();	66 Element* cancelButton = cancelButtonElement();

67 if (RenderBox* cancelRenderer = cancelButton ? cancelButton->renderBox() : 0 ) {	67 if (LayoutBox* cancelRenderer = cancelButton ? cancelButton->layoutBox() : 0 ) {

68 cancelRenderer->updateLogicalHeight();	68 cancelRenderer->updateLogicalHeight();

69 nonContentHeight = max(nonContentHeight, cancelRenderer->borderAndPaddin gLogicalHeight() + cancelRenderer->marginLogicalHeight());	69 nonContentHeight = max(nonContentHeight, cancelRenderer->borderAndPaddin gLogicalHeight() + cancelRenderer->marginLogicalHeight());

70 lineHeight = max(lineHeight, cancelRenderer->logicalHeight());	70 lineHeight = max(lineHeight, cancelRenderer->logicalHeight());

71 }	71 }

72	72

73 return lineHeight + nonContentHeight;	73 return lineHeight + nonContentHeight;

74 }	74 }

75	75

76 LayoutUnit RenderSearchField::computeLogicalHeightLimit() const	76 LayoutUnit RenderSearchField::computeLogicalHeightLimit() const

77 {	77 {

78 return logicalHeight();	78 return logicalHeight();

79 }	79 }

80	80

81 void RenderSearchField::centerContainerIfNeeded(RenderBox* containerRenderer) co nst	81 void RenderSearchField::centerContainerIfNeeded(LayoutBox* containerRenderer) co nst

82 {	82 {

83 if (!containerRenderer)	83 if (!containerRenderer)

84 return;	84 return;

85	85

86 if (containerRenderer->logicalHeight() <= contentLogicalHeight())	86 if (containerRenderer->logicalHeight() <= contentLogicalHeight())

87 return;	87 return;

88	88

89 // A quirk for find-in-page box on Safari Windows.	89 // A quirk for find-in-page box on Safari Windows.

90 // http://webkit.org/b/63157	90 // http://webkit.org/b/63157

91 LayoutUnit logicalHeightDiff = containerRenderer->logicalHeight() - contentL ogicalHeight();	91 LayoutUnit logicalHeightDiff = containerRenderer->logicalHeight() - contentL ogicalHeight();

92 containerRenderer->setLogicalTop(containerRenderer->logicalTop() - (logicalH eightDiff / 2 + layoutMod(logicalHeightDiff, 2)));	92 containerRenderer->setLogicalTop(containerRenderer->logicalTop() - (logicalH eightDiff / 2 + layoutMod(logicalHeightDiff, 2)));

93 }	93 }

94	94

95 }	95 }

OLD	NEW