| Index: third_party/WebKit/Source/web/ExternalPopupMenu.cpp
|
| diff --git a/third_party/WebKit/Source/web/ExternalPopupMenu.cpp b/third_party/WebKit/Source/web/ExternalPopupMenu.cpp
|
| index 7f397c2da8b95f213994e4bc5e15eb8307b554d9..70ea218ae0d8df4a61f6f863981b20e21f900047 100644
|
| --- a/third_party/WebKit/Source/web/ExternalPopupMenu.cpp
|
| +++ b/third_party/WebKit/Source/web/ExternalPopupMenu.cpp
|
| @@ -258,7 +258,9 @@ void ExternalPopupMenu::getPopupMenuInfo(WebPopupMenuInfo& info,
|
| const ComputedStyle& menuStyle = ownerElement.computedStyle()
|
| ? *ownerElement.computedStyle()
|
| : *ownerElement.ensureComputedStyle();
|
| - info.itemHeight = menuStyle.font().getFontMetrics().height();
|
| + const SimpleFontData* fontData = menuStyle.font().primaryFont();
|
| + DCHECK(fontData);
|
| + info.itemHeight = fontData ? fontData->getFontMetrics().height() : 0;
|
| info.itemFontSize =
|
| static_cast<int>(menuStyle.font().getFontDescription().computedSize());
|
| info.selectedIndex = toExternalPopupMenuItemIndex(
|
|
|