[webkit-changes] [119470] trunk/Source

Tue, 05 Jun 2012 02:08:16 -0700

Title: [119470] trunk/Source
Revision
119470
Author
[email protected]
Date
2012-06-05 02:08:04 -0700 (Tue, 05 Jun 2012)

Log 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.

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (119469 => 119470)


--- trunk/Source/WebCore/ChangeLog	2012-06-05 08:56:24 UTC (rev 119469)
+++ trunk/Source/WebCore/ChangeLog	2012-06-05 09:08:04 UTC (rev 119470)
@@ -1,3 +1,64 @@
+2012-06-05  Kent Tamura  <[email protected]>
+
+        Move some function definitions in EmptyClients.h to EmptyClients.cpp
+        https://bugs.webkit.org/show_bug.cgi?id=88285
+
+        Reviewed by Ryosuke Niwa.
+
+        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.
+
 2012-06-05  Alexander Pavlov  <[email protected]>
 
         Web Inspector: "-webkit"-prefixed properties are considered inherited in the Computed Style pane

Modified: trunk/Source/WebCore/loader/EmptyClients.cpp (119469 => 119470)


--- trunk/Source/WebCore/loader/EmptyClients.cpp	2012-06-05 08:56:24 UTC (rev 119469)
+++ trunk/Source/WebCore/loader/EmptyClients.cpp	2012-06-05 09:08:04 UTC (rev 119470)
@@ -28,13 +28,20 @@
 #include "config.h"
 #include "EmptyClients.h"
 
-#if ENABLE(SVG) || ENABLE(PAGE_POPUP)
+#include "DocumentLoader.h"
 #include "FileChooser.h"
 #include "FormState.h"
+#include "Frame.h"
+#include "FrameNetworkingContext.h"
 #include "HTMLFormElement.h"
 
+#if ENABLE(INPUT_TYPE_COLOR)
+#include "ColorChooser.h"
+#endif
+
 namespace WebCore {
 
+#if ENABLE(SVG) || ENABLE(PAGE_POPUP)
 void fillWithEmptyClients(Page::PageClients& pageClients)
 {
 #if ENABLE(CONTEXT_MENUS)
@@ -53,6 +60,121 @@
     static InspectorClient* dummyInspectorClient = adoptPtr(new EmptyInspectorClient).leakPtr();
     pageClients.inspectorClient = dummyInspectorClient;
 }
+#endif
 
+class EmptyPopupMenu : public PopupMenu {
+public:
+    virtual void show(const IntRect&, FrameView*, int) { }
+    virtual void hide() { }
+    virtual void updateFromElement() { }
+    virtual void disconnectClient() { }
+};
+
+class EmptySearchPopupMenu : public SearchPopupMenu {
+public:
+    virtual PopupMenu* popupMenu() { return m_popup.get(); }
+    virtual void saveRecentSearches(const AtomicString&, const Vector<String>&) { }
+    virtual void loadRecentSearches(const AtomicString&, Vector<String>&) { }
+    virtual bool enabled() { return false; }
+
+private:
+    RefPtr<EmptyPopupMenu> m_popup;
+};
+
+PassRefPtr<PopupMenu> EmptyChromeClient::createPopupMenu(PopupMenuClient*) const
+{
+    return adoptRef(new EmptyPopupMenu());
 }
+
+PassRefPtr<SearchPopupMenu> EmptyChromeClient::createSearchPopupMenu(PopupMenuClient*) const
+{
+    return adoptRef(new EmptySearchPopupMenu());
+}
+
+#if ENABLE(INPUT_TYPE_COLOR)
+PassOwnPtr<ColorChooser> EmptyChromeClient::createColorChooser(ColorChooserClient*, const Color&)
+{
+    return nullptr;
+}
 #endif
+
+void EmptyChromeClient::runOpenPanel(Frame*, PassRefPtr<FileChooser>)
+{
+}
+
+void EmptyFrameLoaderClient::dispatchDecidePolicyForNewWindowAction(FramePolicyFunction, const NavigationAction&, const ResourceRequest&, PassRefPtr<FormState>, const String&)
+{
+}
+
+void EmptyFrameLoaderClient::dispatchDecidePolicyForNavigationAction(FramePolicyFunction, const NavigationAction&, const ResourceRequest&, PassRefPtr<FormState>)
+{
+}
+
+void EmptyFrameLoaderClient::dispatchWillSendSubmitEvent(PassRefPtr<FormState>)
+{
+}
+
+void EmptyFrameLoaderClient::dispatchWillSubmitForm(FramePolicyFunction, PassRefPtr<FormState>)
+{
+}
+
+PassRefPtr<DocumentLoader> EmptyFrameLoaderClient::createDocumentLoader(const ResourceRequest& request, const SubstituteData& substituteData)
+{
+    return DocumentLoader::create(request, substituteData);
+}
+
+PassRefPtr<Frame> EmptyFrameLoaderClient::createFrame(const KURL&, const String&, HTMLFrameOwnerElement*, const String&, bool, int, int)
+{
+    return 0;
+}
+
+PassRefPtr<Widget> EmptyFrameLoaderClient::createPlugin(const IntSize&, HTMLPlugInElement*, const KURL&, const Vector<String>&, const Vector<String>&, const String&, bool)
+{
+    return 0;
+}
+
+PassRefPtr<Widget> EmptyFrameLoaderClient::createJavaAppletWidget(const IntSize&, HTMLAppletElement*, const KURL&, const Vector<String>&, const Vector<String>&)
+{
+    return 0;
+}
+
+#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
+PassRefPtr<Widget> EmptyFrameLoaderClient::createMediaPlayerProxyPlugin(const IntSize&, HTMLMediaElement*, const KURL&, const Vector<String>&, const Vector<String>&, const String&)
+{
+    return 0;
+}
+#endif
+
+PassRefPtr<FrameNetworkingContext> EmptyFrameLoaderClient::createNetworkingContext()
+{
+    return PassRefPtr<FrameNetworkingContext>();
+}
+
+#if ENABLE(WEB_INTENTS)
+void EmptyFrameLoaderClient::dispatchIntent(PassRefPtr<IntentRequest>)
+{
+}
+#endif
+
+void EmptyTextCheckerClient::requestCheckingOfString(PassRefPtr<TextCheckingRequest>)
+{
+}
+
+void EmptyEditorClient::registerUndoStep(PassRefPtr<UndoStep>)
+{
+}
+
+void EmptyEditorClient::registerRedoStep(PassRefPtr<UndoStep>)
+{
+}
+
+#if ENABLE(CONTEXT_MENUS)
+#if USE(CROSS_PLATFORM_CONTEXT_MENUS)
+PassOwnPtr<ContextMenu> EmptyContextMenuClient::customizeMenu(PassOwnPtr<ContextMenu>)
+{
+    return nullptr;
+}
+#endif
+#endif
+
+}

Modified: trunk/Source/WebCore/loader/EmptyClients.h (119469 => 119470)


--- trunk/Source/WebCore/loader/EmptyClients.h	2012-06-05 08:56:24 UTC (rev 119469)
+++ trunk/Source/WebCore/loader/EmptyClients.h	2012-06-05 09:08:04 UTC (rev 119470)
@@ -32,33 +32,20 @@
 #include "ContextMenuClient.h"
 #include "DeviceMotionClient.h"
 #include "DeviceOrientationClient.h"
-#include "DocumentLoader.h"
 #include "DragClient.h"
-#include "EditCommand.h"
 #include "EditorClient.h"
 #include "TextCheckerClient.h"
 #include "FloatRect.h"
 #include "FocusDirection.h"
 #include "FrameLoaderClient.h"
-#include "FrameNetworkingContext.h"
 #include "InspectorClient.h"
 #include "Page.h"
-#include "PopupMenu.h"
 #include "ResourceError.h"
-#include "SearchPopupMenu.h"
 
 #if USE(V8)
 #include <v8.h>
 #endif
 
-#if ENABLE(INPUT_TYPE_COLOR)
-#include "ColorChooser.h"
-#endif
-
-#if ENABLE(WEB_INTENTS)
-#include "IntentRequest.h"
-#endif
-
 /*
  This file holds empty Client stubs for use by WebCore.
  Viewless element needs to create a dummy Page->Frame->FrameView tree for use in parsing or executing _javascript_.
@@ -76,25 +63,6 @@
 
 class GraphicsContext3D;
 
-class EmptyPopupMenu : public PopupMenu {
-public:
-    virtual void show(const IntRect&, FrameView*, int) {}
-    virtual void hide() {}
-    virtual void updateFromElement() {}
-    virtual void disconnectClient() {}
-};
-
-class EmptySearchPopupMenu : public SearchPopupMenu {
-public:
-    virtual PopupMenu* popupMenu() { return m_popup.get(); }
-    virtual void saveRecentSearches(const AtomicString&, const Vector<String>&) {}
-    virtual void loadRecentSearches(const AtomicString&, Vector<String>&) {}
-    virtual bool enabled() { return false; }
-
-private:
-    RefPtr<EmptyPopupMenu> m_popup;
-};
-
 class EmptyChromeClient : public ChromeClient {
 public:
     virtual ~EmptyChromeClient() { }
@@ -150,8 +118,8 @@
     virtual bool selectItemWritingDirectionIsNatural() { return false; }
     virtual bool selectItemAlignmentFollowsMenuWritingDirection() { return false; }
     virtual bool hasOpenedPopup() const OVERRIDE { return false; }
-    virtual PassRefPtr<PopupMenu> createPopupMenu(PopupMenuClient*) const { return adoptRef(new EmptyPopupMenu()); }
-    virtual PassRefPtr<SearchPopupMenu> createSearchPopupMenu(PopupMenuClient*) const { return adoptRef(new EmptySearchPopupMenu()); }
+    virtual PassRefPtr<PopupMenu> createPopupMenu(PopupMenuClient*) const OVERRIDE;
+    virtual PassRefPtr<SearchPopupMenu> createSearchPopupMenu(PopupMenuClient*) const OVERRIDE;
 #if ENABLE(PAGE_POPUP)
     virtual PagePopup* openPagePopup(PagePopupClient*, const IntRect&) OVERRIDE { return 0; }
     virtual void closePagePopup(PagePopup*) OVERRIDE { }
@@ -202,10 +170,10 @@
 #endif
 
 #if ENABLE(INPUT_TYPE_COLOR)
-    virtual PassOwnPtr<ColorChooser> createColorChooser(ColorChooserClient*, const Color&) { return nullptr; }
+    virtual PassOwnPtr<ColorChooser> createColorChooser(ColorChooserClient*, const Color&) OVERRIDE;
 #endif
 
-    virtual void runOpenPanel(Frame*, PassRefPtr<FileChooser>) { }
+    virtual void runOpenPanel(Frame*, PassRefPtr<FileChooser>) OVERRIDE;
     virtual void loadIconForFiles(const Vector<String>&, FileIconLoader*) { }
 
     virtual void formStateDidChange(const Node*) { }
@@ -297,14 +265,14 @@
     virtual void dispatchShow() { }
 
     virtual void dispatchDecidePolicyForResponse(FramePolicyFunction, const ResourceResponse&, const ResourceRequest&) { }
-    virtual void dispatchDecidePolicyForNewWindowAction(FramePolicyFunction, const NavigationAction&, const ResourceRequest&, PassRefPtr<FormState>, const String&) { }
-    virtual void dispatchDecidePolicyForNavigationAction(FramePolicyFunction, const NavigationAction&, const ResourceRequest&, PassRefPtr<FormState>) { }
+    virtual void dispatchDecidePolicyForNewWindowAction(FramePolicyFunction, const NavigationAction&, const ResourceRequest&, PassRefPtr<FormState>, const String&) OVERRIDE;
+    virtual void dispatchDecidePolicyForNavigationAction(FramePolicyFunction, const NavigationAction&, const ResourceRequest&, PassRefPtr<FormState>) OVERRIDE;
     virtual void cancelPolicyCheck() { }
 
     virtual void dispatchUnableToImplementPolicy(const ResourceError&) { }
 
-    virtual void dispatchWillSendSubmitEvent(PassRefPtr<FormState>) { }
-    virtual void dispatchWillSubmitForm(FramePolicyFunction, PassRefPtr<FormState>) { }
+    virtual void dispatchWillSendSubmitEvent(PassRefPtr<FormState>) OVERRIDE;
+    virtual void dispatchWillSubmitForm(FramePolicyFunction, PassRefPtr<FormState>) OVERRIDE;
 
     virtual void revertToProvisionalState(DocumentLoader*) { }
     virtual void setMainDocumentError(DocumentLoader*, const ResourceError&) { }
@@ -349,7 +317,7 @@
     virtual void didFinishLoad() { }
     virtual void prepareForDataSourceReplacement() { }
 
-    virtual PassRefPtr<DocumentLoader> createDocumentLoader(const ResourceRequest& request, const SubstituteData& substituteData) { return DocumentLoader::create(request, substituteData); }
+    virtual PassRefPtr<DocumentLoader> createDocumentLoader(const ResourceRequest&, const SubstituteData&) OVERRIDE;
     virtual void setTitle(const StringWithDirection&, const KURL&) { }
 
     virtual String userAgent(const KURL&) { return ""; }
@@ -373,11 +341,11 @@
     virtual void didDisplayInsecureContent() { }
     virtual void didRunInsecureContent(SecurityOrigin*, const KURL&) { }
     virtual void didDetectXSS(const KURL&, bool) { }
-    virtual PassRefPtr<Frame> createFrame(const KURL&, const String&, HTMLFrameOwnerElement*, const String&, bool, int, int) { return 0; }
-    virtual PassRefPtr<Widget> createPlugin(const IntSize&, HTMLPlugInElement*, const KURL&, const Vector<String>&, const Vector<String>&, const String&, bool) { return 0; }
-    virtual PassRefPtr<Widget> createJavaAppletWidget(const IntSize&, HTMLAppletElement*, const KURL&, const Vector<String>&, const Vector<String>&) { return 0; }
+    virtual PassRefPtr<Frame> createFrame(const KURL&, const String&, HTMLFrameOwnerElement*, const String&, bool, int, int) OVERRIDE;
+    virtual PassRefPtr<Widget> createPlugin(const IntSize&, HTMLPlugInElement*, const KURL&, const Vector<String>&, const Vector<String>&, const String&, bool) OVERRIDE;
+    virtual PassRefPtr<Widget> createJavaAppletWidget(const IntSize&, HTMLAppletElement*, const KURL&, const Vector<String>&, const Vector<String>&) OVERRIDE;
 #if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
-    virtual PassRefPtr<Widget> createMediaPlayerProxyPlugin(const IntSize&, HTMLMediaElement*, const KURL&, const Vector<String>&, const Vector<String>&, const String&) { return 0; }
+    virtual PassRefPtr<Widget> createMediaPlayerProxyPlugin(const IntSize&, HTMLMediaElement*, const KURL&, const Vector<String>&, const Vector<String>&, const String&) OVERRIDE;
     virtual void hideMediaPlayerProxyPlugin(Widget*) { }
     virtual void showMediaPlayerProxyPlugin(Widget*) { }
 #endif
@@ -407,10 +375,10 @@
     virtual bool shouldCacheResponse(DocumentLoader*, unsigned long, const ResourceResponse&, const unsigned char*, unsigned long long) { return true; }
 #endif
 
-    virtual PassRefPtr<FrameNetworkingContext> createNetworkingContext() { return PassRefPtr<FrameNetworkingContext>(); }
+    virtual PassRefPtr<FrameNetworkingContext> createNetworkingContext() OVERRIDE;
 
 #if ENABLE(WEB_INTENTS)
-    virtual void dispatchIntent(PassRefPtr<IntentRequest>) { }
+    virtual void dispatchIntent(PassRefPtr<IntentRequest>) OVERRIDE;
 #endif
 };
 
@@ -428,7 +396,7 @@
 #endif
 
     virtual void getGuessesForWord(const String&, const String&, Vector<String>&) { }
-    virtual void requestCheckingOfString(PassRefPtr<TextCheckingRequest>) { }
+    virtual void requestCheckingOfString(PassRefPtr<TextCheckingRequest>) OVERRIDE;
 };
 
 class EmptyEditorClient : public EditorClient {
@@ -468,8 +436,8 @@
     virtual void didWriteSelectionToPasteboard() { }
     virtual void didSetSelectionTypesForPasteboard() { }
 
-    virtual void registerUndoStep(PassRefPtr<UndoStep>) { }
-    virtual void registerRedoStep(PassRefPtr<UndoStep>) { }
+    virtual void registerUndoStep(PassRefPtr<UndoStep>) OVERRIDE;
+    virtual void registerRedoStep(PassRefPtr<UndoStep>) OVERRIDE;
     virtual void clearUndoRedoOperations() { }
 
     virtual bool canCopyCut(Frame*, bool defaultValue) const { return defaultValue; }
@@ -546,7 +514,7 @@
     virtual void contextMenuDestroyed() { }
 
 #if USE(CROSS_PLATFORM_CONTEXT_MENUS)
-    virtual PassOwnPtr<ContextMenu> customizeMenu(PassOwnPtr<ContextMenu>) { return nullptr; }
+    virtual PassOwnPtr<ContextMenu> customizeMenu(PassOwnPtr<ContextMenu>) OVERRIDE;
 #else
     virtual PlatformMenuDescription getCustomMenuFromDefaultItems(ContextMenu*) { return 0; }
 #endif

Modified: trunk/Source/WebCore/svg/graphics/SVGImage.cpp (119469 => 119470)


--- trunk/Source/WebCore/svg/graphics/SVGImage.cpp	2012-06-05 08:56:24 UTC (rev 119469)
+++ trunk/Source/WebCore/svg/graphics/SVGImage.cpp	2012-06-05 09:08:04 UTC (rev 119470)
@@ -30,27 +30,12 @@
 #if ENABLE(SVG)
 #include "SVGImage.h"
 
-#include "CachedPage.h"
 #include "DocumentLoader.h"
 #include "EmptyClients.h"
-#include "FileChooser.h"
-#include "FileIconLoader.h"
-#include "FloatRect.h"
-#include "Frame.h"
-#include "FrameLoader.h"
 #include "FrameView.h"
-#include "GraphicsContext.h"
-#include "HTMLFormElement.h"
 #include "ImageBuffer.h"
-#include "ImageObserver.h"
-#include "Length.h"
-#include "Page.h"
 #include "RenderSVGRoot.h"
-#include "RenderView.h"
-#include "ResourceError.h"
 #include "SVGDocument.h"
-#include "SVGLength.h"
-#include "SVGRenderSupport.h"
 #include "SVGSVGElement.h"
 #include "Settings.h"

Modified: trunk/Source/WebKit/chromium/ChangeLog (119469 => 119470)


--- trunk/Source/WebKit/chromium/ChangeLog	2012-06-05 08:56:24 UTC (rev 119469)
+++ trunk/Source/WebKit/chromium/ChangeLog	2012-06-05 09:08:04 UTC (rev 119470)
@@ -1,3 +1,13 @@
+2012-06-05  Kent Tamura  <[email protected]>
+
+        Move some function definitions in EmptyClients.h to EmptyClients.cpp
+        https://bugs.webkit.org/show_bug.cgi?id=88285
+
+        Reviewed by Ryosuke Niwa.
+
+        * src/WebHelperPluginImpl.cpp: Remove unnecessary #includes, and add necessary #includes.
+        * src/WebPagePopupImpl.cpp: ditto.
+
 2012-06-05  Noel Gordon  <[email protected]>
 
         Unreviewed.  Rolled DEPS.

Modified: trunk/Source/WebKit/chromium/src/WebHelperPluginImpl.cpp (119469 => 119470)


--- trunk/Source/WebKit/chromium/src/WebHelperPluginImpl.cpp	2012-06-05 08:56:24 UTC (rev 119469)
+++ trunk/Source/WebKit/chromium/src/WebHelperPluginImpl.cpp	2012-06-05 09:08:04 UTC (rev 119470)
@@ -32,21 +32,14 @@
 #include "WebHelperPluginImpl.h"
 
 #include "Chrome.h"
+#include "DocumentLoader.h"
 #include "EmptyClients.h"
 #include "FocusController.h"
-#include "FileChooser.h"
-#include "FocusController.h"
-#include "FormState.h"
 #include "FrameView.h"
-#include "HTMLFormElement.h"
 #include "Page.h"
-#include "PagePopupClient.h"
 #include "PageWidgetDelegate.h"
 #include "Settings.h"
-#include "WebInputEvent.h"
-#include "WebInputEventConversion.h"
 #include "WebFrameImpl.h"
-#include "WebPagePopup.h"
 #include "WebViewClient.h"
 #include "WebViewImpl.h"
 #include "WebWidgetClient.h"

Modified: trunk/Source/WebKit/chromium/src/WebPagePopupImpl.cpp (119469 => 119470)


--- trunk/Source/WebKit/chromium/src/WebPagePopupImpl.cpp	2012-06-05 08:56:24 UTC (rev 119469)
+++ trunk/Source/WebKit/chromium/src/WebPagePopupImpl.cpp	2012-06-05 09:08:04 UTC (rev 119470)
@@ -33,12 +33,11 @@
 
 #include "Chrome.h"
 #include "DOMWindowPagePopup.h"
+#include "DocumentLoader.h"
 #include "EmptyClients.h"
-#include "FileChooser.h"
 #include "FocusController.h"
-#include "FormState.h"
+#include "Frame.h"
 #include "FrameView.h"
-#include "HTMLFormElement.h"
 #include "Page.h"
 #include "PagePopupClient.h"
 #include "PageWidgetDelegate.h"

_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to