OLD | NEW |
1 /* | 1 /* |
2 * This file is part of the select element layoutObject in WebCore. | 2 * This file is part of the select element layoutObject in WebCore. |
3 * | 3 * |
4 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). | 4 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). |
5 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. | 5 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. |
6 * All rights reserved. | 6 * All rights reserved. |
7 * (C) 2009 Torch Mobile Inc. All rights reserved. | 7 * (C) 2009 Torch Mobile Inc. All rights reserved. |
8 * (http://www.torchmobile.com/) | 8 * (http://www.torchmobile.com/) |
9 * | 9 * |
10 * This library is free software; you can redistribute it and/or | 10 * This library is free software; you can redistribute it and/or |
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
63 if (m_innerBlock) { | 63 if (m_innerBlock) { |
64 ASSERT(firstChild() == m_innerBlock); | 64 ASSERT(firstChild() == m_innerBlock); |
65 ASSERT(!m_innerBlock->nextSibling()); | 65 ASSERT(!m_innerBlock->nextSibling()); |
66 return; | 66 return; |
67 } | 67 } |
68 | 68 |
69 // Create an anonymous block. | 69 // Create an anonymous block. |
70 ASSERT(!firstChild()); | 70 ASSERT(!firstChild()); |
71 m_innerBlock = createAnonymousBlock(); | 71 m_innerBlock = createAnonymousBlock(); |
72 | 72 |
73 m_buttonText = new LayoutText(&document(), StringImpl::empty); | 73 m_buttonText = LayoutText::createEmptyAnonymous(document()); |
74 // We need to set the text explicitly though it was specified in the | 74 // We need to set the text explicitly though it was specified in the |
75 // constructor because LayoutText doesn't refer to the text | 75 // constructor because LayoutText doesn't refer to the text |
76 // specified in the constructor in a case of re-transforming. | 76 // specified in the constructor in a case of re-transforming. |
77 m_buttonText->setStyle(mutableStyle()); | 77 m_buttonText->setStyle(mutableStyle()); |
78 m_innerBlock->addChild(m_buttonText); | 78 m_innerBlock->addChild(m_buttonText); |
79 | 79 |
80 adjustInnerStyle(); | 80 adjustInnerStyle(); |
81 LayoutFlexibleBox::addChild(m_innerBlock); | 81 LayoutFlexibleBox::addChild(m_innerBlock); |
82 } | 82 } |
83 | 83 |
(...skipping 230 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
314 | 314 |
315 LayoutUnit LayoutMenuList::clientPaddingLeft() const { | 315 LayoutUnit LayoutMenuList::clientPaddingLeft() const { |
316 return paddingLeft() + m_innerBlock->paddingLeft(); | 316 return paddingLeft() + m_innerBlock->paddingLeft(); |
317 } | 317 } |
318 | 318 |
319 LayoutUnit LayoutMenuList::clientPaddingRight() const { | 319 LayoutUnit LayoutMenuList::clientPaddingRight() const { |
320 return paddingRight() + m_innerBlock->paddingRight(); | 320 return paddingRight() + m_innerBlock->paddingRight(); |
321 } | 321 } |
322 | 322 |
323 } // namespace blink | 323 } // namespace blink |
OLD | NEW |