| Index: third_party/WebKit/Source/core/layout/LayoutListBox.cpp
|
| diff --git a/third_party/WebKit/Source/core/layout/LayoutListBox.cpp b/third_party/WebKit/Source/core/layout/LayoutListBox.cpp
|
| index 614957fa3d58c88aac9735f2d26abd772656979d..7d4a09b205f2bd9fce82466576bdc6bfb04c36a1 100644
|
| --- a/third_party/WebKit/Source/core/layout/LayoutListBox.cpp
|
| +++ b/third_party/WebKit/Source/core/layout/LayoutListBox.cpp
|
| @@ -96,14 +96,14 @@ unsigned LayoutListBox::size() const
|
|
|
| LayoutUnit LayoutListBox::defaultItemHeight() const
|
| {
|
| - return style()->fontMetrics().height() + defaultPaddingBottom;
|
| + return LayoutUnit(style()->fontMetrics().height() + defaultPaddingBottom);
|
| }
|
|
|
| LayoutUnit LayoutListBox::itemHeight() const
|
| {
|
| HTMLSelectElement* select = selectElement();
|
| if (!select)
|
| - return 0;
|
| + return LayoutUnit();
|
| Element* baseItem = ElementTraversal::firstChild(*select);
|
| if (!baseItem)
|
| return defaultItemHeight();
|
|
|