⚠ Archived content — this site is no longer maintained.   Current WebKit documentation is at docs.webkit.org.

Changeset 119470 in webkit


Ignore:
Timestamp:
Jun 5, 2012, 2:08:04 AM (14 years ago)
Author:
tkent@chromium.org
Message:

Move some function definitions in EmptyClients.h to EmptyClients.cpp
​https://bugs.webkit.org/show_bug.cgi?id=88285

Reviewed by Ryosuke Niwa.

Source/WebCore:

If we have definitions of functions with RefPtr<> in EmptyClients.h like

virtual void runOpenPanel(Frame*, PassRefPtr<FileChooser>) { }

and a source file includes EmptyClient.h, the source file needs to
include FileChooser.h though the source file doesn't use FileChooser
class explicitly because the definition of runOpenPanel() needs to call
FileChooser::deref().
To avoid this, we had better move such functions to EmptyClients.cpp.

No new tests. No behavior changes.

  • loader/EmptyClients.cpp: Move such functions from EmptyClients.h to

here, and move EmptyPopupMenu and EmptySearchPopupMenu too because
they're used only by EmptyChromeClient.
(WebCore):
(EmptyPopupMenu):
(WebCore::EmptyPopupMenu::show):
(WebCore::EmptyPopupMenu::hide):
(WebCore::EmptyPopupMenu::updateFromElement):
(WebCore::EmptyPopupMenu::disconnectClient):
(EmptySearchPopupMenu):
(WebCore::EmptySearchPopupMenu::popupMenu):
(WebCore::EmptySearchPopupMenu::saveRecentSearches):
(WebCore::EmptySearchPopupMenu::loadRecentSearches):
(WebCore::EmptySearchPopupMenu::enabled):
(WebCore::EmptyChromeClient::createPopupMenu):
(WebCore::EmptyChromeClient::createSearchPopupMenu):
(WebCore::EmptyChromeClient::createColorChooser):
(WebCore::EmptyChromeClient::runOpenPanel):
(WebCore::EmptyFrameLoaderClient::dispatchDecidePolicyForNewWindowAction):
(WebCore::EmptyFrameLoaderClient::dispatchDecidePolicyForNavigationAction):
(WebCore::EmptyFrameLoaderClient::dispatchWillSendSubmitEvent):
(WebCore::EmptyFrameLoaderClient::dispatchWillSubmitForm):
(WebCore::EmptyFrameLoaderClient::createDocumentLoader):
(WebCore::EmptyFrameLoaderClient::createFrame):
(WebCore::EmptyFrameLoaderClient::createPlugin):
(WebCore::EmptyFrameLoaderClient::createJavaAppletWidget):
(WebCore::EmptyFrameLoaderClient::createMediaPlayerProxyPlugin):
(WebCore::EmptyFrameLoaderClient::createNetworkingContext):
(WebCore::EmptyFrameLoaderClient::dispatchIntent):
(WebCore::EmptyTextCheckerClient::requestCheckingOfString):
(WebCore::EmptyEditorClient::registerUndoStep):
(WebCore::EmptyEditorClient::registerRedoStep):
(WebCore::EmptyContextMenuClient::customizeMenu):

  • loader/EmptyClients.h: Move such function definitions to

EmptyClient.cpp, and append OVERRIDE.
(EmptyChromeClient):
(EmptyFrameLoaderClient):
(EmptyTextCheckerClient):
(EmptyEditorClient):
(EmptyContextMenuClient):

  • svg/graphics/SVGImage.cpp: Remove unnecessary #includes.

Source/WebKit/chromium:

  • src/WebHelperPluginImpl.cpp: Remove unnecessary #includes, and add necessary #includes.
  • src/WebPagePopupImpl.cpp: ditto.
Location:
trunk/Source
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r119469 r119470  
     12012-06-05  Kent Tamura  <tkent@chromium.org>
     2
     3        Move some function definitions in EmptyClients.h to EmptyClients.cpp
     4        https://bugs.webkit.org/show_bug.cgi?id=88285
     5
     6        Reviewed by Ryosuke Niwa.
     7
     8        If we have definitions of functions with RefPtr<> in EmptyClients.h like
     9
     10            virtual void runOpenPanel(Frame*, PassRefPtr<FileChooser>) { }
     11
     12        and a source file includes EmptyClient.h, the source file needs to
     13        include FileChooser.h though the source file doesn't use FileChooser
     14        class explicitly because the definition of runOpenPanel() needs to call
     15        FileChooser::deref().
     16        To avoid this, we had better move such functions to EmptyClients.cpp.
     17
     18        No new tests. No behavior changes.
     19
     20        * loader/EmptyClients.cpp: Move such functions from EmptyClients.h to
     21        here, and move EmptyPopupMenu and EmptySearchPopupMenu too because
     22        they're used only by EmptyChromeClient.
     23        (WebCore):
     24        (EmptyPopupMenu):
     25        (WebCore::EmptyPopupMenu::show):
     26        (WebCore::EmptyPopupMenu::hide):
     27        (WebCore::EmptyPopupMenu::updateFromElement):
     28        (WebCore::EmptyPopupMenu::disconnectClient):
     29        (EmptySearchPopupMenu):
     30        (WebCore::EmptySearchPopupMenu::popupMenu):
     31        (WebCore::EmptySearchPopupMenu::saveRecentSearches):
     32        (WebCore::EmptySearchPopupMenu::loadRecentSearches):
     33        (WebCore::EmptySearchPopupMenu::enabled):
     34        (WebCore::EmptyChromeClient::createPopupMenu):
     35        (WebCore::EmptyChromeClient::createSearchPopupMenu):
     36        (WebCore::EmptyChromeClient::createColorChooser):
     37        (WebCore::EmptyChromeClient::runOpenPanel):
     38        (WebCore::EmptyFrameLoaderClient::dispatchDecidePolicyForNewWindowAction):
     39        (WebCore::EmptyFrameLoaderClient::dispatchDecidePolicyForNavigationAction):
     40        (WebCore::EmptyFrameLoaderClient::dispatchWillSendSubmitEvent):
     41        (WebCore::EmptyFrameLoaderClient::dispatchWillSubmitForm):
     42        (WebCore::EmptyFrameLoaderClient::createDocumentLoader):
     43        (WebCore::EmptyFrameLoaderClient::createFrame):
     44        (WebCore::EmptyFrameLoaderClient::createPlugin):
     45        (WebCore::EmptyFrameLoaderClient::createJavaAppletWidget):
     46        (WebCore::EmptyFrameLoaderClient::createMediaPlayerProxyPlugin):
     47        (WebCore::EmptyFrameLoaderClient::createNetworkingContext):
     48        (WebCore::EmptyFrameLoaderClient::dispatchIntent):
     49        (WebCore::EmptyTextCheckerClient::requestCheckingOfString):
     50        (WebCore::EmptyEditorClient::registerUndoStep):
     51        (WebCore::EmptyEditorClient::registerRedoStep):
     52        (WebCore::EmptyContextMenuClient::customizeMenu):
     53        * loader/EmptyClients.h: Move such function definitions to
     54        EmptyClient.cpp, and append OVERRIDE.
     55        (EmptyChromeClient):
     56        (EmptyFrameLoaderClient):
     57        (EmptyTextCheckerClient):
     58        (EmptyEditorClient):
     59        (EmptyContextMenuClient):
     60        * svg/graphics/SVGImage.cpp: Remove unnecessary #includes.
     61
    1622012-06-05  Alexander Pavlov  <apavlov@chromium.org>
    263

  • trunk/Source/WebCore/loader/EmptyClients.cpp

    r113811 r119470  
    2929#include "EmptyClients.h"
    3030
    31 #if ENABLE(SVG) || ENABLE(PAGE_POPUP)
     31#include "DocumentLoader.h"
    3232#include "FileChooser.h"
    3333#include "FormState.h"
     34#include "Frame.h"
     35#include "FrameNetworkingContext.h"
    3436#include "HTMLFormElement.h"
     37
     38#if ENABLE(INPUT_TYPE_COLOR)
     39#include "ColorChooser.h"
     40#endif
    3541
    3642namespace WebCore {
    3743
     44#if ENABLE(SVG) || ENABLE(PAGE_POPUP)
    3845void fillWithEmptyClients(Page::PageClients& pageClients)
    3946{
    … …  
    5461    pageClients.inspectorClient = dummyInspectorClient;
    5562}
     63#endif
     64
     65class EmptyPopupMenu : public PopupMenu {
     66public:
     67    virtual void show(const IntRect&, FrameView*, int) { }
     68    virtual void hide() { }
     69    virtual void updateFromElement() { }
     70    virtual void disconnectClient() { }
     71};
     72
     73class EmptySearchPopupMenu : public SearchPopupMenu {
     74public:
     75    virtual PopupMenu* popupMenu() { return m_popup.get(); }
     76    virtual void saveRecentSearches(const AtomicString&, const Vector<String>&) { }
     77    virtual void loadRecentSearches(const AtomicString&, Vector<String>&) { }
     78    virtual bool enabled() { return false; }
     79
     80private:
     81    RefPtr<EmptyPopupMenu> m_popup;
     82};
     83
     84PassRefPtr<PopupMenu> EmptyChromeClient::createPopupMenu(PopupMenuClient*) const
     85{
     86    return adoptRef(new EmptyPopupMenu());
     87}
     88
     89PassRefPtr<SearchPopupMenu> EmptyChromeClient::createSearchPopupMenu(PopupMenuClient*) const
     90{
     91    return adoptRef(new EmptySearchPopupMenu());
     92}
     93
     94#if ENABLE(INPUT_TYPE_COLOR)
     95PassOwnPtr<ColorChooser> EmptyChromeClient::createColorChooser(ColorChooserClient*, const Color&)
     96{
     97    return nullptr;
     98}
     99#endif
     100
     101void EmptyChromeClient::runOpenPanel(Frame*, PassRefPtr<FileChooser>)
     102{
     103}
     104
     105void EmptyFrameLoaderClient::dispatchDecidePolicyForNewWindowAction(FramePolicyFunction, const NavigationAction&, const ResourceRequest&, PassRefPtr<FormState>, const String&)
     106{
     107}
     108
     109void EmptyFrameLoaderClient::dispatchDecidePolicyForNavigationAction(FramePolicyFunction, const NavigationAction&, const ResourceRequest&, PassRefPtr<FormState>)
     110{
     111}
     112
     113void EmptyFrameLoaderClient::dispatchWillSendSubmitEvent(PassRefPtr<FormState>)
     114{
     115}
     116
     117void EmptyFrameLoaderClient::dispatchWillSubmitForm(FramePolicyFunction, PassRefPtr<FormState>)
     118{
     119}
     120
     121PassRefPtr<DocumentLoader> EmptyFrameLoaderClient::createDocumentLoader(const ResourceRequest& request, const SubstituteData& substituteData)
     122{
     123    return DocumentLoader::create(request, substituteData);
     124}
     125
     126PassRefPtr<Frame> EmptyFrameLoaderClient::createFrame(const KURL&, const String&, HTMLFrameOwnerElement*, const String&, bool, int, int)
     127{
     128    return 0;
     129}
     130
     131PassRefPtr<Widget> EmptyFrameLoaderClient::createPlugin(const IntSize&, HTMLPlugInElement*, const KURL&, const Vector<String>&, const Vector<String>&, const String&, bool)
     132{
     133    return 0;
     134}
     135
     136PassRefPtr<Widget> EmptyFrameLoaderClient::createJavaAppletWidget(const IntSize&, HTMLAppletElement*, const KURL&, const Vector<String>&, const Vector<String>&)
     137{
     138    return 0;
     139}
     140
     141#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
     142PassRefPtr<Widget> EmptyFrameLoaderClient::createMediaPlayerProxyPlugin(const IntSize&, HTMLMediaElement*, const KURL&, const Vector<String>&, const Vector<String>&, const String&)
     143{
     144    return 0;
     145}
     146#endif
     147
     148PassRefPtr<FrameNetworkingContext> EmptyFrameLoaderClient::createNetworkingContext()
     149{
     150    return PassRefPtr<FrameNetworkingContext>();
     151}
     152
     153#if ENABLE(WEB_INTENTS)
     154void EmptyFrameLoaderClient::dispatchIntent(PassRefPtr<IntentRequest>)
     155{
     156}
     157#endif
     158
     159void EmptyTextCheckerClient::requestCheckingOfString(PassRefPtr<TextCheckingRequest>)
     160{
     161}
     162
     163void EmptyEditorClient::registerUndoStep(PassRefPtr<UndoStep>)
     164{
     165}
     166
     167void EmptyEditorClient::registerRedoStep(PassRefPtr<UndoStep>)
     168{
     169}
     170
     171#if ENABLE(CONTEXT_MENUS)
     172#if USE(CROSS_PLATFORM_CONTEXT_MENUS)
     173PassOwnPtr<ContextMenu> EmptyContextMenuClient::customizeMenu(PassOwnPtr<ContextMenu>)
     174{
     175    return nullptr;
     176}
     177#endif
     178#endif
    56179
    57180}
    58 #endif

  • trunk/Source/WebCore/loader/EmptyClients.h

    r119192 r119470  
    3333#include "DeviceMotionClient.h"
    3434#include "DeviceOrientationClient.h"
    35 #include "DocumentLoader.h"
    3635#include "DragClient.h"
    37 #include "EditCommand.h"
    3836#include "EditorClient.h"
    3937#include "TextCheckerClient.h"
    … …  
    4139#include "FocusDirection.h"
    4240#include "FrameLoaderClient.h"
    43 #include "FrameNetworkingContext.h"
    4441#include "InspectorClient.h"
    4542#include "Page.h"
    46 #include "PopupMenu.h"
    4743#include "ResourceError.h"
    48 #include "SearchPopupMenu.h"
    4944
    5045#if USE(V8)
    5146#include <v8.h>
    52 #endif
    53 
    54 #if ENABLE(INPUT_TYPE_COLOR)
    55 #include "ColorChooser.h"
    56 #endif
    57 
    58 #if ENABLE(WEB_INTENTS)
    59 #include "IntentRequest.h"
    6047#endif
    6148
    … …  
    7764class GraphicsContext3D;
    7865
    79 class EmptyPopupMenu : public PopupMenu {
    80 public:
    81     virtual void show(const IntRect&, FrameView*, int) {}
    82     virtual void hide() {}
    83     virtual void updateFromElement() {}
    84     virtual void disconnectClient() {}
    85 };
    86 
    87 class EmptySearchPopupMenu : public SearchPopupMenu {
    88 public:
    89     virtual PopupMenu* popupMenu() { return m_popup.get(); }
    90     virtual void saveRecentSearches(const AtomicString&, const Vector<String>&) {}
    91     virtual void loadRecentSearches(const AtomicString&, Vector<String>&) {}
    92     virtual bool enabled() { return false; }
    93 
    94 private:
    95     RefPtr<EmptyPopupMenu> m_popup;
    96 };
    97 
    9866class EmptyChromeClient : public ChromeClient {
    9967public:
    … …  
    151119    virtual bool selectItemAlignmentFollowsMenuWritingDirection() { return false; }
    152120    virtual bool hasOpenedPopup() const OVERRIDE { return false; }
    153     virtual PassRefPtr<PopupMenu> createPopupMenu(PopupMenuClient*) const { return adoptRef(new EmptyPopupMenu()); }
    154     virtual PassRefPtr<SearchPopupMenu> createSearchPopupMenu(PopupMenuClient*) const { return adoptRef(new EmptySearchPopupMenu()); }
     121    virtual PassRefPtr<PopupMenu> createPopupMenu(PopupMenuClient*) const OVERRIDE;
     122    virtual PassRefPtr<SearchPopupMenu> createSearchPopupMenu(PopupMenuClient*) const OVERRIDE;
    155123#if ENABLE(PAGE_POPUP)
    156124    virtual PagePopup* openPagePopup(PagePopupClient*, const IntRect&) OVERRIDE { return 0; }
    … …  
    203171
    204172#if ENABLE(INPUT_TYPE_COLOR)
    205     virtual PassOwnPtr<ColorChooser> createColorChooser(ColorChooserClient*, const Color&) { return nullptr; }
    206 #endif
    207 
    208     virtual void runOpenPanel(Frame*, PassRefPtr<FileChooser>) { }
     173    virtual PassOwnPtr<ColorChooser> createColorChooser(ColorChooserClient*, const Color&) OVERRIDE;
     174#endif
     175
     176    virtual void runOpenPanel(Frame*, PassRefPtr<FileChooser>) OVERRIDE;
    209177    virtual void loadIconForFiles(const Vector<String>&, FileIconLoader*) { }
    210178
    … …  
    298266
    299267    virtual void dispatchDecidePolicyForResponse(FramePolicyFunction, const ResourceResponse&, const ResourceRequest&) { }
    300     virtual void dispatchDecidePolicyForNewWindowAction(FramePolicyFunction, const NavigationAction&, const ResourceRequest&, PassRefPtr<FormState>, const String&) { }
    301     virtual void dispatchDecidePolicyForNavigationAction(FramePolicyFunction, const NavigationAction&, const ResourceRequest&, PassRefPtr<FormState>) { }
     268    virtual void dispatchDecidePolicyForNewWindowAction(FramePolicyFunction, const NavigationAction&, const ResourceRequest&, PassRefPtr<FormState>, const String&) OVERRIDE;
     269    virtual void dispatchDecidePolicyForNavigationAction(FramePolicyFunction, const NavigationAction&, const ResourceRequest&, PassRefPtr<FormState>) OVERRIDE;
    302270    virtual void cancelPolicyCheck() { }
    303271
    304272    virtual void dispatchUnableToImplementPolicy(const ResourceError&) { }
    305273
    306     virtual void dispatchWillSendSubmitEvent(PassRefPtr<FormState>) { }
    307     virtual void dispatchWillSubmitForm(FramePolicyFunction, PassRefPtr<FormState>) { }
     274    virtual void dispatchWillSendSubmitEvent(PassRefPtr<FormState>) OVERRIDE;
     275    virtual void dispatchWillSubmitForm(FramePolicyFunction, PassRefPtr<FormState>) OVERRIDE;
    308276
    309277    virtual void revertToProvisionalState(DocumentLoader*) { }
    … …  
    350318    virtual void prepareForDataSourceReplacement() { }
    351319
    352     virtual PassRefPtr<DocumentLoader> createDocumentLoader(const ResourceRequest& request, const SubstituteData& substituteData) { return DocumentLoader::create(request, substituteData); }
     320    virtual PassRefPtr<DocumentLoader> createDocumentLoader(const ResourceRequest&, const SubstituteData&) OVERRIDE;
    353321    virtual void setTitle(const StringWithDirection&, const KURL&) { }
    354322
    … …  
    374342    virtual void didRunInsecureContent(SecurityOrigin*, const KURL&) { }
    375343    virtual void didDetectXSS(const KURL&, bool) { }
    376     virtual PassRefPtr<Frame> createFrame(const KURL&, const String&, HTMLFrameOwnerElement*, const String&, bool, int, int) { return 0; }
    377     virtual PassRefPtr<Widget> createPlugin(const IntSize&, HTMLPlugInElement*, const KURL&, const Vector<String>&, const Vector<String>&, const String&, bool) { return 0; }
    378     virtual PassRefPtr<Widget> createJavaAppletWidget(const IntSize&, HTMLAppletElement*, const KURL&, const Vector<String>&, const Vector<String>&) { return 0; }
     344    virtual PassRefPtr<Frame> createFrame(const KURL&, const String&, HTMLFrameOwnerElement*, const String&, bool, int, int) OVERRIDE;
     345    virtual PassRefPtr<Widget> createPlugin(const IntSize&, HTMLPlugInElement*, const KURL&, const Vector<String>&, const Vector<String>&, const String&, bool) OVERRIDE;
     346    virtual PassRefPtr<Widget> createJavaAppletWidget(const IntSize&, HTMLAppletElement*, const KURL&, const Vector<String>&, const Vector<String>&) OVERRIDE;
    379347#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
    380     virtual PassRefPtr<Widget> createMediaPlayerProxyPlugin(const IntSize&, HTMLMediaElement*, const KURL&, const Vector<String>&, const Vector<String>&, const String&) { return 0; }
     348    virtual PassRefPtr<Widget> createMediaPlayerProxyPlugin(const IntSize&, HTMLMediaElement*, const KURL&, const Vector<String>&, const Vector<String>&, const String&) OVERRIDE;
    381349    virtual void hideMediaPlayerProxyPlugin(Widget*) { }
    382350    virtual void showMediaPlayerProxyPlugin(Widget*) { }
    … …  
    408376#endif
    409377
    410     virtual PassRefPtr<FrameNetworkingContext> createNetworkingContext() { return PassRefPtr<FrameNetworkingContext>(); }
     378    virtual PassRefPtr<FrameNetworkingContext> createNetworkingContext() OVERRIDE;
    411379
    412380#if ENABLE(WEB_INTENTS)
    413     virtual void dispatchIntent(PassRefPtr<IntentRequest>) { }
     381    virtual void dispatchIntent(PassRefPtr<IntentRequest>) OVERRIDE;
    414382#endif
    415383};
    … …  
    429397
    430398    virtual void getGuessesForWord(const String&, const String&, Vector<String>&) { }
    431     virtual void requestCheckingOfString(PassRefPtr<TextCheckingRequest>) { }
     399    virtual void requestCheckingOfString(PassRefPtr<TextCheckingRequest>) OVERRIDE;
    432400};
    433401
    … …  
    469437    virtual void didSetSelectionTypesForPasteboard() { }
    470438
    471     virtual void registerUndoStep(PassRefPtr<UndoStep>) { }
    472     virtual void registerRedoStep(PassRefPtr<UndoStep>) { }
     439    virtual void registerUndoStep(PassRefPtr<UndoStep>) OVERRIDE;
     440    virtual void registerRedoStep(PassRefPtr<UndoStep>) OVERRIDE;
    473441    virtual void clearUndoRedoOperations() { }
    474442
    … …  
    547515
    548516#if USE(CROSS_PLATFORM_CONTEXT_MENUS)
    549     virtual PassOwnPtr<ContextMenu> customizeMenu(PassOwnPtr<ContextMenu>) { return nullptr; }
     517    virtual PassOwnPtr<ContextMenu> customizeMenu(PassOwnPtr<ContextMenu>) OVERRIDE;
    550518#else
    551519    virtual PlatformMenuDescription getCustomMenuFromDefaultItems(ContextMenu*) { return 0; }

  • trunk/Source/WebCore/svg/graphics/SVGImage.cpp

    r116001 r119470  
    3131#include "SVGImage.h"
    3232
    33 #include "CachedPage.h"
    3433#include "DocumentLoader.h"
    3534#include "EmptyClients.h"
    36 #include "FileChooser.h"
    37 #include "FileIconLoader.h"
    38 #include "FloatRect.h"
    39 #include "Frame.h"
    40 #include "FrameLoader.h"
    4135#include "FrameView.h"
    42 #include "GraphicsContext.h"
    43 #include "HTMLFormElement.h"
    4436#include "ImageBuffer.h"
    45 #include "ImageObserver.h"
    46 #include "Length.h"
    47 #include "Page.h"
    4837#include "RenderSVGRoot.h"
    49 #include "RenderView.h"
    50 #include "ResourceError.h"
    5138#include "SVGDocument.h"
    52 #include "SVGLength.h"
    53 #include "SVGRenderSupport.h"
    5439#include "SVGSVGElement.h"
    5540#include "Settings.h"

  • trunk/Source/WebKit/chromium/ChangeLog

    r119468 r119470  
     12012-06-05  Kent Tamura  <tkent@chromium.org>
     2
     3        Move some function definitions in EmptyClients.h to EmptyClients.cpp
     4        https://bugs.webkit.org/show_bug.cgi?id=88285
     5
     6        Reviewed by Ryosuke Niwa.
     7
     8        * src/WebHelperPluginImpl.cpp: Remove unnecessary #includes, and add necessary #includes.
     9        * src/WebPagePopupImpl.cpp: ditto.
     10
    1112012-06-05  Noel Gordon  <noel.gordon@gmail.com>
    212

  • trunk/Source/WebKit/chromium/src/WebHelperPluginImpl.cpp

    r119434 r119470  
    3333
    3434#include "Chrome.h"
     35#include "DocumentLoader.h"
    3536#include "EmptyClients.h"
    3637#include "FocusController.h"
    37 #include "FileChooser.h"
    38 #include "FocusController.h"
    39 #include "FormState.h"
    4038#include "FrameView.h"
    41 #include "HTMLFormElement.h"
    4239#include "Page.h"
    43 #include "PagePopupClient.h"
    4440#include "PageWidgetDelegate.h"
    4541#include "Settings.h"
    46 #include "WebInputEvent.h"
    47 #include "WebInputEventConversion.h"
    4842#include "WebFrameImpl.h"
    49 #include "WebPagePopup.h"
    5043#include "WebViewClient.h"
    5144#include "WebViewImpl.h"

  • trunk/Source/WebKit/chromium/src/WebPagePopupImpl.cpp

    r118482 r119470  
    3434#include "Chrome.h"
    3535#include "DOMWindowPagePopup.h"
     36#include "DocumentLoader.h"
    3637#include "EmptyClients.h"
    37 #include "FileChooser.h"
    3838#include "FocusController.h"
    39 #include "FormState.h"
     39#include "Frame.h"
    4040#include "FrameView.h"
    41 #include "HTMLFormElement.h"
    4241#include "Page.h"
    4342#include "PagePopupClient.h"
Note: See TracChangeset for help on using the changeset viewer.