diff options
| author | philipj <philipj@opera.com> | 2015-12-01 11:37:07 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-12-01 19:38:08 +0000 |
| commit | 3dc774386c244b27cc5a28b1df033e1981639141 (patch) | |
| tree | ed0ad048f566ca5fd20d9ef4ab577771f5eeb8ce | |
| parent | f1dc4448c5f7822f73f1687bd46a702ec4ac4010 (diff) | |
| download | chromium_src-3dc774386c244b27cc5a28b1df033e1981639141.zip chromium_src-3dc774386c244b27cc5a28b1df033e1981639141.tar.gz chromium_src-3dc774386c244b27cc5a28b1df033e1981639141.tar.bz2 | |
Drop [LegacyInterfaceTypeChecking] for PagePopupController
This is an internal API, used only by web/resources/listPicker.js,
where document is passed as an argument, which is not null.
BUG=561338
Review URL: https://codereview.chromium.org/1485123002
Cr-Commit-Position: refs/heads/master@{#362479}
| -rw-r--r-- | third_party/WebKit/Source/core/page/PagePopupController.cpp | 6 | ||||
| -rw-r--r-- | third_party/WebKit/Source/core/page/PagePopupController.idl | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/third_party/WebKit/Source/core/page/PagePopupController.cpp b/third_party/WebKit/Source/core/page/PagePopupController.cpp index be06d09..8bb10ab 100644 --- a/third_party/WebKit/Source/core/page/PagePopupController.cpp +++ b/third_party/WebKit/Source/core/page/PagePopupController.cpp @@ -70,9 +70,9 @@ void PagePopupController::closePopup() void PagePopupController::selectFontsFromOwnerDocument(Document* targetDocument) { - if (!targetDocument || !m_popupClient) - return; - m_popupClient->selectFontsFromOwnerDocument(*targetDocument); + ASSERT(targetDocument); + if (m_popupClient) + m_popupClient->selectFontsFromOwnerDocument(*targetDocument); } String PagePopupController::localizeNumberString(const String& numberString) diff --git a/third_party/WebKit/Source/core/page/PagePopupController.idl b/third_party/WebKit/Source/core/page/PagePopupController.idl index 86d8a9f..28051d0 100644 --- a/third_party/WebKit/Source/core/page/PagePopupController.idl +++ b/third_party/WebKit/Source/core/page/PagePopupController.idl @@ -36,7 +36,7 @@ void setValueAndClosePopup(long numberValue, DOMString stringValue); void setValue(DOMString value); void closePopup(); - [LegacyInterfaceTypeChecking] void selectFontsFromOwnerDocument(Document targetDocument); + void selectFontsFromOwnerDocument(Document targetDocument); DOMString localizeNumberString(DOMString numberString); DOMString formatMonth(long year, long zeroBaseMonth); DOMString formatShortMonth(long year, long zeroBaseMonth); |