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

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

Issue 935283002: Rename {Author,UserAgent}ShadowRoot to {Open,Closed}ShadowRoot. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fix inspector tests 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/RenderFileUploadControl.cpp ('k') | Source/core/svg/SVGElement.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) 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 29 matching lines...) Expand all
40 { 40 {
41 ASSERT(element->type() == InputTypeNames::search); 41 ASSERT(element->type() == InputTypeNames::search);
42 } 42 }
43 43
44 RenderSearchField::~RenderSearchField() 44 RenderSearchField::~RenderSearchField()
45 { 45 {
46 } 46 }
47 47
48 inline Element* RenderSearchField::searchDecorationElement() const 48 inline Element* RenderSearchField::searchDecorationElement() const
49 { 49 {
50 return inputElement()->userAgentShadowRoot()->getElementById(ShadowElementNa mes::searchDecoration()); 50 return inputElement()->closedShadowRoot()->getElementById(ShadowElementNames ::searchDecoration());
51 } 51 }
52 52
53 inline Element* RenderSearchField::cancelButtonElement() const 53 inline Element* RenderSearchField::cancelButtonElement() const
54 { 54 {
55 return inputElement()->userAgentShadowRoot()->getElementById(ShadowElementNa mes::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 (RenderBox* decorationRenderer = searchDecoration ? searchDecoration->ren derBox() : 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 }
(...skipping 20 matching lines...) Expand all
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 }
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderFileUploadControl.cpp ('k') | Source/core/svg/SVGElement.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698