| Index: third_party/WebKit/Source/core/testing/Internals.cpp
|
| diff --git a/third_party/WebKit/Source/core/testing/Internals.cpp b/third_party/WebKit/Source/core/testing/Internals.cpp
|
| index 825503e5eef2d5bcaf59d1fc7305585e83bdd018..9a9f805b326316706d49dae5a171aa813d2625c3 100644
|
| --- a/third_party/WebKit/Source/core/testing/Internals.cpp
|
| +++ b/third_party/WebKit/Source/core/testing/Internals.cpp
|
| @@ -2601,7 +2601,13 @@ int Internals::selectPopupItemStyleFontHeight(Node* node, int itemIndex) {
|
| return false;
|
| const ComputedStyle* itemStyle =
|
| select.itemComputedStyle(*select.listItems()[itemIndex]);
|
| - return itemStyle ? itemStyle->font().getFontMetrics().height() : 0;
|
| +
|
| + if (itemStyle) {
|
| + const SimpleFontData* fontData = itemStyle->font().primaryFont();
|
| + DCHECK(fontData);
|
| + return fontData ? fontData->getFontMetrics().height() : 0;
|
| + }
|
| + return 0;
|
| }
|
|
|
| void Internals::resetTypeAheadSession(HTMLSelectElement* select) {
|
|
|