diff options
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/glue/webview_impl.cc | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/webkit/glue/webview_impl.cc b/webkit/glue/webview_impl.cc index 7959b6f..77d5442 100644 --- a/webkit/glue/webview_impl.cc +++ b/webkit/glue/webview_impl.cc @@ -187,7 +187,9 @@ class AutocompletePopupMenuClient : public WebCore::PopupMenuClient { } virtual int clientPaddingLeft() const { #if defined(OS_WIN) - return theme()->popupInternalPaddingLeft(text_field_->computedStyle()); + // Bug http://crbug.com/7708 seems to indicate the style can be NULL. + WebCore::RenderStyle* style = GetTextFieldStyle(); + return style ? theme()->popupInternalPaddingLeft(style) : 0; #else NOTIMPLEMENTED(); return 0; @@ -195,7 +197,9 @@ class AutocompletePopupMenuClient : public WebCore::PopupMenuClient { } virtual int clientPaddingRight() const { #if defined(OS_WIN) - return theme()->popupInternalPaddingRight(text_field_->computedStyle()); + // Bug http://crbug.com/7708 seems to indicate the style can be NULL. + WebCore::RenderStyle* style = GetTextFieldStyle(); + return style ? theme()->popupInternalPaddingRight(style) : 0; #else NOTIMPLEMENTED(); return 0; @@ -263,6 +267,17 @@ class AutocompletePopupMenuClient : public WebCore::PopupMenuClient { WebCore::HTMLInputElement* text_field() const { return text_field_.get(); } + + WebCore::RenderStyle* GetTextFieldStyle() const { + WebCore::RenderStyle* style = text_field_->computedStyle(); + if (!style) { + // It seems we can only have an NULL style in a TextField if the node is + // dettached, in which case we the popup shoud not be showing. + NOTREACHED() << "Please report this in http://crbug.com/7708 and include " + "the page you were visiting."; + } + return style; + } private: RefPtr<WebCore::HTMLInputElement> text_field_; |