Merge "ExternalPopupMenu should recreate its popup only if a SELECT subtree is updated" to M51

third_party/WebKit/Source/core/html/HTMLSelectElement.h

Index: third_party/WebKit/Source/core/html/HTMLSelectElement.h
diff --git a/third_party/WebKit/Source/core/html/HTMLSelectElement.h b/third_party/WebKit/Source/core/html/HTMLSelectElement.h
index 19ae08d8cb96f67cd95d3974ce7eed2711b5a7a9..c39e8ab27e1f7baa3e3cc55d28be2843cae6995b 100644
--- a/third_party/WebKit/Source/core/html/HTMLSelectElement.h
+++ b/third_party/WebKit/Source/core/html/HTMLSelectElement.h
@@ -152,6 +152,7 @@ public:
     void showPopup();
     void hidePopup();
     PopupMenu* popup() const { return m_popup.get(); }
+    void didMutateSubtree();
 
     void resetTypeAheadSessionForTesting();
 
@@ -249,6 +250,9 @@ private:
     int optionCount() const override;
     String optionAtIndex(int index) const override;
 
+    void observeTreeMutation();
+    void unobserveTreeMutation();
+
     // m_listItems contains HTMLOptionElement, HTMLOptGroupElement, and
     // HTMLHRElement objects.
     mutable ListItems m_listItems;
@@ -266,6 +270,8 @@ private:
     int m_suggestedIndex;
     bool m_isAutofilledByPreview;
 
+    class PopupUpdater;
+    Member<PopupUpdater> m_popupUpdater;
     Member<PopupMenu> m_popup;
     int m_indexToSelectOnCancel;
     bool m_popupIsVisible;