New SELECT Popup: Recalc style when a web font is loaded

Source/web/PopupMenuImpl.cpp

 // Copyright (c) 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 #include "web/PopupMenuImpl.h"
 
 #include "core/HTMLNames.h"
 #include "core/css/CSSFontSelector.h"
 #include "core/dom/ElementTraversal.h"
 #include "core/dom/ExecutionContextTask.h"
 #include "core/dom/NodeComputedStyle.h"
 #include "core/dom/StyleEngine.h"
 #include "core/frame/FrameView.h"
 #include "core/html/HTMLHRElement.h"
 #include "core/html/HTMLOptGroupElement.h"
 #include "core/html/HTMLOptionElement.h"
 #include "core/html/parser/HTMLParserIdioms.h"
 #include "core/layout/LayoutTheme.h"
 #include "core/page/PagePopup.h"
 #include "platform/geometry/IntRect.h"
 #include "platform/text/PlatformLocale.h"
 #include "public/platform/Platform.h"
 #include "public/web/WebColorChooser.h"
 #include "web/ChromeClientImpl.h"
 #include "web/WebViewImpl.h"
 
 namespace blink {
 
-class PopupMenuCSSFontSelector : public CSSFontSelector {
+class PopupMenuCSSFontSelector : public CSSFontSelector, private CSSFontSelectorClient {
 public:
     static PassRefPtrWillBeRawPtr<PopupMenuCSSFontSelector> create(Document* document, CSSFontSelector* ownerFontSelector)
     {
         return adoptRefWillBeNoop(new PopupMenuCSSFontSelector(document, ownerFontSelector));
     }
 
+    ~PopupMenuCSSFontSelector();
+
     // We don't override willUseFontData() for now because the old PopupListBox
     // only worked with fonts loaded when opening the popup.
     virtual PassRefPtr<FontData> getFontData(const FontDescription&, const AtomicString&) override;
 
     DECLARE_VIRTUAL_TRACE();
 
 private:
-    PopupMenuCSSFontSelector(Document* document, CSSFontSelector* ownerFontSelector)
-        : CSSFontSelector(document)
-        , m_ownerFontSelector(ownerFontSelector)
-    {
-    }
+    PopupMenuCSSFontSelector(Document*, CSSFontSelector*);
+
+    virtual void fontsNeedUpdate(CSSFontSelector*) override;
+
     RefPtrWillBeMember<CSSFontSelector> m_ownerFontSelector;
 };
 
+PopupMenuCSSFontSelector::PopupMenuCSSFontSelector(Document* document, CSSFontSelector* ownerFontSelector)
+    : CSSFontSelector(document)
+    , m_ownerFontSelector(ownerFontSelector)
+{
+    m_ownerFontSelector->registerForInvalidationCallbacks(this);
+}
+
+PopupMenuCSSFontSelector::~PopupMenuCSSFontSelector()
+{
+#if ENABLE(OILPAN)

[Kunihiko Sakamoto, 2015/05/29 07:40:06]

Should be #if !ENABLE(OILPAN).

[keishi, 2015/06/02 05:33:00]

Done.

+    m_ownerFontSelector->unregisterForInvalidationCallbacks(this);
+#endif
+}
+
 PassRefPtr<FontData> PopupMenuCSSFontSelector::getFontData(const FontDescription& description, const AtomicString& name)
 {
     return m_ownerFontSelector->getFontData(description, name);
 }
 
+void PopupMenuCSSFontSelector::fontsNeedUpdate(CSSFontSelector* fontSelector)
+{
+    dispatchInvalidationCallbacks();
+}
+
 DEFINE_TRACE(PopupMenuCSSFontSelector)
 {
     visitor->trace(m_ownerFontSelector);
     CSSFontSelector::trace(visitor);
+    CSSFontSelectorClient::trace(visitor);
 }
 
 PassRefPtrWillBeRawPtr<PopupMenuImpl> PopupMenuImpl::create(ChromeClientImpl* chromeClient, PopupMenuClient* client)
 {
     return adoptRefWillBeNoop(new PopupMenuImpl(chromeClient, client));
 }
 
 PopupMenuImpl::PopupMenuImpl(ChromeClientImpl* chromeClient, PopupMenuClient* client)
     : m_chromeClient(chromeClient)
     , m_client(client)
@@ skipping 299 matching lines @@
 
 void PopupMenuImpl::disconnectClient()
 {
     m_client = nullptr;
     // Cannot be done during finalization, so instead done when the
     // layout object is destroyed and disconnected.
     dispose();
 }
 
 } // namespace blink