2007-08-10 Holger Hans Peter Freyther <zecke@selfish.org>
authorzecke <zecke@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 10 Aug 2007 09:58:14 +0000 (09:58 +0000)
committerzecke <zecke@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 10 Aug 2007 09:58:14 +0000 (09:58 +0000)
        Reviewed by Mark.

        Rename the namespace from WebKitGtk to WebKit. Move the various *Client
        classes into the WebKit namespace. Change the class names to not contain Gtk.
        The file names have to contain the Gtk suffix to not clash with files in WebCore (e.g.
        bridge/EditorClient.h).

        * Api/webkitgtkframe.cpp:
        * Api/webkitgtkpage.cpp:
        * Api/webkitgtkprivate.cpp:
        * Api/webkitgtkprivate.h:
        * ChangeLog:
        * WebCoreSupport/ChromeClientGtk.cpp:
        (WebKit::ChromeClient::ChromeClient):
        (WebKit::ChromeClient::chromeDestroyed):
        (WebKit::ChromeClient::windowRect):
        (WebKit::ChromeClient::setWindowRect):
        (WebKit::ChromeClient::pageRect):
        (WebKit::ChromeClient::scaleFactor):
        (WebKit::ChromeClient::focus):
        (WebKit::ChromeClient::unfocus):
        (WebKit::ChromeClient::createWindow):
        (WebKit::ChromeClient::createModalDialog):
        (WebKit::ChromeClient::show):
        (WebKit::ChromeClient::canRunModal):
        (WebKit::ChromeClient::runModal):
        (WebKit::ChromeClient::setToolbarsVisible):
        (WebKit::ChromeClient::toolbarsVisible):
        (WebKit::ChromeClient::setStatusbarVisible):
        (WebKit::ChromeClient::statusbarVisible):
        (WebKit::ChromeClient::setScrollbarsVisible):
        (WebKit::ChromeClient::scrollbarsVisible):
        (WebKit::ChromeClient::setMenubarVisible):
        (WebKit::ChromeClient::menubarVisible):
        (WebKit::ChromeClient::setResizable):
        (WebKit::ChromeClient::closeWindowSoon):
        (WebKit::ChromeClient::canTakeFocus):
        (WebKit::ChromeClient::takeFocus):
        (WebKit::ChromeClient::canRunBeforeUnloadConfirmPanel):
        (WebKit::ChromeClient::runBeforeUnloadConfirmPanel):
        (WebKit::ChromeClient::runJavaScriptAlert):
        (WebKit::ChromeClient::runJavaScriptConfirm):
        (WebKit::ChromeClient::setStatusbarText):
        (WebKit::ChromeClient::shouldInterruptJavaScript):
        (WebKit::ChromeClient::tabsToLinks):
        (WebKit::ChromeClient::windowResizerRect):
        (WebKit::ChromeClient::addToDirtyRegion):
        (WebKit::ChromeClient::scrollBackingStore):
        (WebKit::ChromeClient::updateBackingStore):
        (WebKit::ChromeClient::mouseDidMoveOverElement):
        (WebKit::ChromeClient::setToolTip):
        * WebCoreSupport/ChromeClientGtk.h:
        * WebCoreSupport/ContextMenuClientGtk.cpp:
        (WebKit::ContextMenuClient::contextMenuDestroyed):
        (WebKit::ContextMenuClient::getCustomMenuFromDefaultItems):
        (WebKit::ContextMenuClient::contextMenuItemSelected):
        (WebKit::ContextMenuClient::downloadURL):
        (WebKit::ContextMenuClient::copyImageToClipboard):
        (WebKit::ContextMenuClient::searchWithGoogle):
        (WebKit::ContextMenuClient::lookUpInDictionary):
        (WebKit::ContextMenuClient::speak):
        * WebCoreSupport/ContextMenuClientGtk.h:
        * WebCoreSupport/EditorClientGtk.cpp:
        (WebKit::EditorClient::shouldDeleteRange):
        (WebKit::EditorClient::shouldShowDeleteInterface):
        (WebKit::EditorClient::isContinuousSpellCheckingEnabled):
        (WebKit::EditorClient::isGrammarCheckingEnabled):
        (WebKit::EditorClient::spellCheckerDocumentTag):
        (WebKit::EditorClient::shouldBeginEditing):
        (WebKit::EditorClient::shouldEndEditing):
        (WebKit::EditorClient::shouldInsertText):
        (WebKit::EditorClient::shouldChangeSelectedRange):
        (WebKit::EditorClient::shouldApplyStyle):
        (WebKit::EditorClient::shouldMoveRangeAfterDelete):
        (WebKit::EditorClient::didBeginEditing):
        (WebKit::EditorClient::respondToChangedContents):
        (WebKit::EditorClient::respondToChangedSelection):
        (WebKit::EditorClient::didEndEditing):
        (WebKit::EditorClient::didWriteSelectionToPasteboard):
        (WebKit::EditorClient::didSetSelectionTypesForPasteboard):
        (WebKit::EditorClient::selectWordBeforeMenuEvent):
        (WebKit::EditorClient::isEditable):
        (WebKit::EditorClient::registerCommandForUndo):
        (WebKit::EditorClient::registerCommandForRedo):
        (WebKit::EditorClient::clearUndoRedoOperations):
        (WebKit::EditorClient::canUndo):
        (WebKit::EditorClient::canRedo):
        (WebKit::EditorClient::undo):
        (WebKit::EditorClient::redo):
        (WebKit::EditorClient::shouldInsertNode):
        (WebKit::EditorClient::pageDestroyed):
        (WebKit::EditorClient::smartInsertDeleteEnabled):
        (WebKit::EditorClient::toggleContinuousSpellChecking):
        (WebKit::EditorClient::toggleGrammarChecking):
        (WebKit::EditorClient::handleInputMethodKeypress):
        (WebKit::EditorClient::EditorClient):
        (WebKit::EditorClient::textFieldDidBeginEditing):
        (WebKit::EditorClient::textFieldDidEndEditing):
        (WebKit::EditorClient::textDidChangeInTextField):
        (WebKit::EditorClient::doTextFieldCommandFromEvent):
        (WebKit::EditorClient::textWillBeDeletedInTextField):
        (WebKit::EditorClient::textDidChangeInTextArea):
        (WebKit::EditorClient::ignoreWordInSpellDocument):
        (WebKit::EditorClient::learnWord):
        (WebKit::EditorClient::checkSpellingOfString):
        (WebKit::EditorClient::checkGrammarOfString):
        (WebKit::EditorClient::updateSpellingUIWithGrammarString):
        (WebKit::EditorClient::updateSpellingUIWithMisspelledWord):
        (WebKit::EditorClient::showSpellingUI):
        (WebKit::EditorClient::spellingUIIsShowing):
        * WebCoreSupport/EditorClientGtk.h:
        * WebCoreSupport/FrameLoaderClientGtk.cpp:
        (WebKit::FrameLoaderClient::FrameLoaderClient):
        (WebKit::FrameLoaderClient::userAgent):
        (WebKit::FrameLoaderClient::createDocumentLoader):
        (WebKit::FrameLoaderClient::committedLoad):
        (WebKit::FrameLoaderClient::dispatchDidReceiveAuthenticationChallenge):
        (WebKit::FrameLoaderClient::dispatchDidCancelAuthenticationChallenge):
        (WebKit::FrameLoaderClient::dispatchWillSendRequest):
        (WebKit::FrameLoaderClient::assignIdentifierToInitialRequest):
        (WebKit::FrameLoaderClient::postProgressStartedNotification):
        (WebKit::FrameLoaderClient::postProgressFinishedNotification):
        (WebKit::FrameLoaderClient::frameLoaderDestroyed):
        (WebKit::FrameLoaderClient::dispatchDidReceiveResponse):
        (WebKit::FrameLoaderClient::createPlugin):
        (WebKit::FrameLoaderClient::redirectDataToPlugin):
        (WebKit::FrameLoaderClient::createJavaAppletWidget):
        (WebKit::FrameLoaderClient::overrideMediaType):
        (WebKit::FrameLoaderClient::windowObjectCleared):
        (WebKit::FrameLoaderClient::setMainFrameDocumentReady):
        (WebKit::FrameLoaderClient::hasWebView):
        (WebKit::FrameLoaderClient::hasFrameView):
        (WebKit::FrameLoaderClient::dispatchDidFinishLoad):
        (WebKit::FrameLoaderClient::frameLoadCompleted):
        (WebKit::FrameLoaderClient::saveViewStateToItem):
        (WebKit::FrameLoaderClient::restoreViewState):
        (WebKit::FrameLoaderClient::privateBrowsingEnabled):
        (WebKit::FrameLoaderClient::makeDocumentView):
        (WebKit::FrameLoaderClient::makeRepresentation):
        (WebKit::FrameLoaderClient::forceLayout):
        (WebKit::FrameLoaderClient::forceLayoutForNonHTML):
        (WebKit::FrameLoaderClient::setCopiesOnScroll):
        (WebKit::FrameLoaderClient::detachedFromParent1):
        (WebKit::FrameLoaderClient::detachedFromParent2):
        (WebKit::FrameLoaderClient::detachedFromParent3):
        (WebKit::FrameLoaderClient::detachedFromParent4):
        (WebKit::FrameLoaderClient::loadedFromCachedPage):
        (WebKit::FrameLoaderClient::dispatchDidHandleOnloadEvents):
        (WebKit::FrameLoaderClient::dispatchDidReceiveServerRedirectForProvisionalLoad):
        (WebKit::FrameLoaderClient::dispatchDidCancelClientRedirect):
        (WebKit::FrameLoaderClient::dispatchWillPerformClientRedirect):
        (WebKit::FrameLoaderClient::dispatchDidChangeLocationWithinPage):
        (WebKit::FrameLoaderClient::dispatchWillClose):
        (WebKit::FrameLoaderClient::dispatchDidReceiveIcon):
        (WebKit::FrameLoaderClient::dispatchDidStartProvisionalLoad):
        (WebKit::FrameLoaderClient::dispatchDidReceiveTitle):
        (WebKit::FrameLoaderClient::dispatchDidCommitLoad):
        (WebKit::FrameLoaderClient::dispatchDidFinishDocumentLoad):
        (WebKit::FrameLoaderClient::dispatchDidFirstLayout):
        (WebKit::FrameLoaderClient::dispatchShow):
        (WebKit::FrameLoaderClient::cancelPolicyCheck):
        (WebKit::FrameLoaderClient::dispatchDidLoadMainResource):
        (WebKit::FrameLoaderClient::revertToProvisionalState):
        (WebKit::FrameLoaderClient::clearUnarchivingState):
        (WebKit::FrameLoaderClient::willChangeTitle):
        (WebKit::FrameLoaderClient::didChangeTitle):
        (WebKit::FrameLoaderClient::finishedLoading):
        (WebKit::FrameLoaderClient::finalSetupForReplace):
        (WebKit::FrameLoaderClient::setDefersLoading):
        (WebKit::FrameLoaderClient::isArchiveLoadPending):
        (WebKit::FrameLoaderClient::cancelPendingArchiveLoad):
        (WebKit::FrameLoaderClient::clearArchivedResources):
        (WebKit::FrameLoaderClient::canHandleRequest):
        (WebKit::FrameLoaderClient::canShowMIMEType):
        (WebKit::FrameLoaderClient::representationExistsForURLScheme):
        (WebKit::FrameLoaderClient::generatedMIMETypeForURLScheme):
        (WebKit::FrameLoaderClient::provisionalLoadStarted):
        (WebKit::FrameLoaderClient::didFinishLoad):
        (WebKit::FrameLoaderClient::setDocumentViewFromCachedPage):
        (WebKit::FrameLoaderClient::dispatchDidReceiveContentLength):
        (WebKit::FrameLoaderClient::dispatchDidFinishLoading):
        (WebKit::FrameLoaderClient::dispatchDidFailLoading):
        (WebKit::FrameLoaderClient::dispatchDidLoadResourceFromMemoryCache):
        (WebKit::FrameLoaderClient::dispatchDidFailProvisionalLoad):
        (WebKit::FrameLoaderClient::dispatchDidFailLoad):
        (WebKit::FrameLoaderClient::download):
        (WebKit::FrameLoaderClient::cancelledError):
        (WebKit::FrameLoaderClient::blockedError):
        (WebKit::FrameLoaderClient::cannotShowURLError):
        (WebKit::FrameLoaderClient::interruptForPolicyChangeError):
        (WebKit::FrameLoaderClient::cannotShowMIMETypeError):
        (WebKit::FrameLoaderClient::fileDoesNotExistError):
        (WebKit::FrameLoaderClient::shouldFallBack):
        (WebKit::FrameLoaderClient::willUseArchive):
        (WebKit::FrameLoaderClient::saveDocumentViewToCachedPage):
        (WebKit::FrameLoaderClient::canCachePage):
        (WebKit::FrameLoaderClient::dispatchCreatePage):
        (WebKit::FrameLoaderClient::dispatchUnableToImplementPolicy):
        * WebCoreSupport/FrameLoaderClientGtk.h:
        * WebCoreSupport/InspectorClientGtk.cpp:
        (WebKit::InspectorClient::inspectorDestroyed):
        (WebKit::InspectorClient::createPage):
        (WebKit::InspectorClient::showWindow):
        (WebKit::InspectorClient::closeWindow):
        (WebKit::InspectorClient::attachWindow):
        (WebKit::InspectorClient::detachWindow):
        (WebKit::InspectorClient::highlight):
        (WebKit::InspectorClient::hideHighlight):
        * WebCoreSupport/InspectorClientGtk.h:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@24978 268f45cc-cd09-0410-ab3c-d52691b4dbfc

15 files changed:
WebKit/gtk/Api/webkitgtkframe.cpp
WebKit/gtk/Api/webkitgtkpage.cpp
WebKit/gtk/Api/webkitgtkprivate.cpp
WebKit/gtk/Api/webkitgtkprivate.h
WebKit/gtk/ChangeLog
WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp
WebKit/gtk/WebCoreSupport/ChromeClientGtk.h
WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.cpp
WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.h
WebKit/gtk/WebCoreSupport/EditorClientGtk.cpp
WebKit/gtk/WebCoreSupport/EditorClientGtk.h
WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp
WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.h
WebKit/gtk/WebCoreSupport/InspectorClientGtk.cpp
WebKit/gtk/WebCoreSupport/InspectorClientGtk.h

index ae4810ec630547c65617472a8ca08528da297b32..dacd68caa43f0de6395aeaacc3903ad20671ad80 100644 (file)
@@ -130,7 +130,7 @@ GObject* webkit_gtk_frame_new(WebKitGtkPage* page)
     WebKitGtkFramePrivate* frameData = WEBKIT_GTK_FRAME_GET_PRIVATE(frame);
     WebKitGtkPagePrivate* pageData = WEBKIT_GTK_PAGE_GET_PRIVATE(page);
 
-    frameData->client = new FrameLoaderClientGtk(frame);
+    frameData->client = new WebKit::FrameLoaderClient(frame);
     frameData->frame = new Frame(pageData->page, 0, frameData->client);
 
     FrameView* frameView = new FrameView(frameData->frame);
@@ -150,7 +150,7 @@ GObject* webkit_gtk_frame_init_with_page(WebKitGtkPage* page, HTMLFrameOwnerElem
     WebKitGtkFramePrivate* frameData = WEBKIT_GTK_FRAME_GET_PRIVATE(frame);
     WebKitGtkPagePrivate* pageData = WEBKIT_GTK_PAGE_GET_PRIVATE(page);
 
-    frameData->client = new FrameLoaderClientGtk(frame);
+    frameData->client = new WebKit::FrameLoaderClient(frame);
     frameData->frame = new Frame(pageData->page, element, frameData->client);
 
     FrameView* frameView = new FrameView(frameData->frame);
index fa3d8150829485112280c0677e5f4b1567fa3605..76bc0f4aebfa59edfac2652cf786478cd685c407 100644 (file)
@@ -48,8 +48,8 @@
 #include "SubstituteData.h"
 
 
+using namespace WebKit;
 using namespace WebCore;
-using namespace WebKitGtk;
 
 extern "C" {
 
@@ -347,7 +347,7 @@ static void webkit_gtk_page_class_init(WebKitGtkPageClass* pageClass)
 static void webkit_gtk_page_init(WebKitGtkPage* page)
 {
     WebKitGtkPagePrivate* pageData = WEBKIT_GTK_PAGE_GET_PRIVATE(WEBKIT_GTK_PAGE(page));
-    pageData->page = new Page(new ChromeClientGtk(page), new ContextMenuClientGtk, new EditorClientGtk(page), 0, new InspectorClientGtk);
+    pageData->page = new Page(new WebKit::ChromeClient(page), new WebKit::ContextMenuClient, new WebKit::EditorClient(page), 0, new WebKit::InspectorClient);
 
     Settings* settings = pageData->page->settings();
     settings->setLoadsImagesAutomatically(true);
index 7fbe78b2238f6be49b3c9bcb9d1846f8a3a85e84..31caba0929da60085e4399090b86f7b1cf946c32 100644 (file)
 #include "config.h"
 
 #include "webkitgtkprivate.h"
-#include "NotImplemented.h"
-#include "FrameLoader.h"
 #include "ChromeClientGtk.h"
+#include "FrameLoader.h"
+#include "FrameLoaderClientGtk.h"
+#include "NotImplemented.h"
 
 using namespace WebCore;
 
-namespace WebKitGtk {
+namespace WebKit {
 void apply(WebKitGtkSettings*, WebCore::Settings*)
 {
     notImplemented();
@@ -65,7 +66,7 @@ WebCore::Frame* core(WebKitGtkFrame* frame)
 
 WebKitGtkFrame* kit(WebCore::Frame* coreFrame)
 {
-    FrameLoaderClientGtk* client = static_cast<FrameLoaderClientGtk*>(coreFrame->loader()->client());
+    WebKit::FrameLoaderClient* client = static_cast<WebKit::FrameLoaderClient*>(coreFrame->loader()->client());
     return client->webFrame();
 }
 
@@ -77,7 +78,7 @@ WebCore::Page* core(WebKitGtkPage* page)
 
 WebKitGtkPage* kit(WebCore::Page* page)
 {
-    ChromeClientGtk* client = static_cast<ChromeClientGtk*>(page->chrome()->client());
+    WebKit::ChromeClient* client = static_cast<WebKit::ChromeClient*>(page->chrome()->client());
     return client->webPage();
 }
 }
index bafef28d261708e546bd377063bf666ce6297ead..9ab1b41f2fa71483b9626472a7665ae74eca3d25 100644 (file)
@@ -44,9 +44,9 @@
 #include "Settings.h"
 #include "Page.h"
 #include "Frame.h"
-#include "FrameLoaderClientGtk.h"
+#include "FrameLoaderClient.h"
 
-namespace WebKitGtk {
+namespace WebKit {
     void apply(WebKitGtkSettings*,WebCore::Settings*);
     WebKitGtkSettings* create(WebCore::Settings*);
     WebKitGtkFrame*  getFrameFromPage(WebKitGtkPage*);
@@ -74,7 +74,7 @@ extern "C" {
     typedef struct _WebKitGtkFramePrivate WebKitGtkFramePrivate;
     struct _WebKitGtkFramePrivate {
         WebCore::Frame* frame;
-        WebCore::FrameLoaderClientGtk* client;
+        WebCore::FrameLoaderClient* client;
         WebKitGtkPage* page;
     };
 
index eaa74cecbe15bd1cd47b64dd18e32d27ddfa4ba4..f15df19893d283321a7cd7978629bb57e9377983 100644 (file)
@@ -1,3 +1,216 @@
+2007-08-10  Holger Hans Peter Freyther  <zecke@selfish.org>
+
+        Reviewed by Mark.
+
+        Rename the namespace from WebKitGtk to WebKit. Move the various *Client
+        classes into the WebKit namespace. Change the class names to not contain Gtk.
+        The file names have to contain the Gtk suffix to not clash with files in WebCore (e.g.
+        bridge/EditorClient.h).
+        
+
+        * Api/webkitgtkframe.cpp:
+        * Api/webkitgtkpage.cpp:
+        * Api/webkitgtkprivate.cpp:
+        * Api/webkitgtkprivate.h:
+        * ChangeLog:
+        * WebCoreSupport/ChromeClientGtk.cpp:
+        (WebKit::ChromeClient::ChromeClient):
+        (WebKit::ChromeClient::chromeDestroyed):
+        (WebKit::ChromeClient::windowRect):
+        (WebKit::ChromeClient::setWindowRect):
+        (WebKit::ChromeClient::pageRect):
+        (WebKit::ChromeClient::scaleFactor):
+        (WebKit::ChromeClient::focus):
+        (WebKit::ChromeClient::unfocus):
+        (WebKit::ChromeClient::createWindow):
+        (WebKit::ChromeClient::createModalDialog):
+        (WebKit::ChromeClient::show):
+        (WebKit::ChromeClient::canRunModal):
+        (WebKit::ChromeClient::runModal):
+        (WebKit::ChromeClient::setToolbarsVisible):
+        (WebKit::ChromeClient::toolbarsVisible):
+        (WebKit::ChromeClient::setStatusbarVisible):
+        (WebKit::ChromeClient::statusbarVisible):
+        (WebKit::ChromeClient::setScrollbarsVisible):
+        (WebKit::ChromeClient::scrollbarsVisible):
+        (WebKit::ChromeClient::setMenubarVisible):
+        (WebKit::ChromeClient::menubarVisible):
+        (WebKit::ChromeClient::setResizable):
+        (WebKit::ChromeClient::closeWindowSoon):
+        (WebKit::ChromeClient::canTakeFocus):
+        (WebKit::ChromeClient::takeFocus):
+        (WebKit::ChromeClient::canRunBeforeUnloadConfirmPanel):
+        (WebKit::ChromeClient::runBeforeUnloadConfirmPanel):
+        (WebKit::ChromeClient::runJavaScriptAlert):
+        (WebKit::ChromeClient::runJavaScriptConfirm):
+        (WebKit::ChromeClient::setStatusbarText):
+        (WebKit::ChromeClient::shouldInterruptJavaScript):
+        (WebKit::ChromeClient::tabsToLinks):
+        (WebKit::ChromeClient::windowResizerRect):
+        (WebKit::ChromeClient::addToDirtyRegion):
+        (WebKit::ChromeClient::scrollBackingStore):
+        (WebKit::ChromeClient::updateBackingStore):
+        (WebKit::ChromeClient::mouseDidMoveOverElement):
+        (WebKit::ChromeClient::setToolTip):
+        * WebCoreSupport/ChromeClientGtk.h:
+        * WebCoreSupport/ContextMenuClientGtk.cpp:
+        (WebKit::ContextMenuClient::contextMenuDestroyed):
+        (WebKit::ContextMenuClient::getCustomMenuFromDefaultItems):
+        (WebKit::ContextMenuClient::contextMenuItemSelected):
+        (WebKit::ContextMenuClient::downloadURL):
+        (WebKit::ContextMenuClient::copyImageToClipboard):
+        (WebKit::ContextMenuClient::searchWithGoogle):
+        (WebKit::ContextMenuClient::lookUpInDictionary):
+        (WebKit::ContextMenuClient::speak):
+        * WebCoreSupport/ContextMenuClientGtk.h:
+        * WebCoreSupport/EditorClientGtk.cpp:
+        (WebKit::EditorClient::shouldDeleteRange):
+        (WebKit::EditorClient::shouldShowDeleteInterface):
+        (WebKit::EditorClient::isContinuousSpellCheckingEnabled):
+        (WebKit::EditorClient::isGrammarCheckingEnabled):
+        (WebKit::EditorClient::spellCheckerDocumentTag):
+        (WebKit::EditorClient::shouldBeginEditing):
+        (WebKit::EditorClient::shouldEndEditing):
+        (WebKit::EditorClient::shouldInsertText):
+        (WebKit::EditorClient::shouldChangeSelectedRange):
+        (WebKit::EditorClient::shouldApplyStyle):
+        (WebKit::EditorClient::shouldMoveRangeAfterDelete):
+        (WebKit::EditorClient::didBeginEditing):
+        (WebKit::EditorClient::respondToChangedContents):
+        (WebKit::EditorClient::respondToChangedSelection):
+        (WebKit::EditorClient::didEndEditing):
+        (WebKit::EditorClient::didWriteSelectionToPasteboard):
+        (WebKit::EditorClient::didSetSelectionTypesForPasteboard):
+        (WebKit::EditorClient::selectWordBeforeMenuEvent):
+        (WebKit::EditorClient::isEditable):
+        (WebKit::EditorClient::registerCommandForUndo):
+        (WebKit::EditorClient::registerCommandForRedo):
+        (WebKit::EditorClient::clearUndoRedoOperations):
+        (WebKit::EditorClient::canUndo):
+        (WebKit::EditorClient::canRedo):
+        (WebKit::EditorClient::undo):
+        (WebKit::EditorClient::redo):
+        (WebKit::EditorClient::shouldInsertNode):
+        (WebKit::EditorClient::pageDestroyed):
+        (WebKit::EditorClient::smartInsertDeleteEnabled):
+        (WebKit::EditorClient::toggleContinuousSpellChecking):
+        (WebKit::EditorClient::toggleGrammarChecking):
+        (WebKit::EditorClient::handleInputMethodKeypress):
+        (WebKit::EditorClient::EditorClient):
+        (WebKit::EditorClient::textFieldDidBeginEditing):
+        (WebKit::EditorClient::textFieldDidEndEditing):
+        (WebKit::EditorClient::textDidChangeInTextField):
+        (WebKit::EditorClient::doTextFieldCommandFromEvent):
+        (WebKit::EditorClient::textWillBeDeletedInTextField):
+        (WebKit::EditorClient::textDidChangeInTextArea):
+        (WebKit::EditorClient::ignoreWordInSpellDocument):
+        (WebKit::EditorClient::learnWord):
+        (WebKit::EditorClient::checkSpellingOfString):
+        (WebKit::EditorClient::checkGrammarOfString):
+        (WebKit::EditorClient::updateSpellingUIWithGrammarString):
+        (WebKit::EditorClient::updateSpellingUIWithMisspelledWord):
+        (WebKit::EditorClient::showSpellingUI):
+        (WebKit::EditorClient::spellingUIIsShowing):
+        * WebCoreSupport/EditorClientGtk.h:
+        * WebCoreSupport/FrameLoaderClientGtk.cpp:
+        (WebKit::FrameLoaderClient::FrameLoaderClient):
+        (WebKit::FrameLoaderClient::userAgent):
+        (WebKit::FrameLoaderClient::createDocumentLoader):
+        (WebKit::FrameLoaderClient::committedLoad):
+        (WebKit::FrameLoaderClient::dispatchDidReceiveAuthenticationChallenge):
+        (WebKit::FrameLoaderClient::dispatchDidCancelAuthenticationChallenge):
+        (WebKit::FrameLoaderClient::dispatchWillSendRequest):
+        (WebKit::FrameLoaderClient::assignIdentifierToInitialRequest):
+        (WebKit::FrameLoaderClient::postProgressStartedNotification):
+        (WebKit::FrameLoaderClient::postProgressFinishedNotification):
+        (WebKit::FrameLoaderClient::frameLoaderDestroyed):
+        (WebKit::FrameLoaderClient::dispatchDidReceiveResponse):
+        (WebKit::FrameLoaderClient::createPlugin):
+        (WebKit::FrameLoaderClient::redirectDataToPlugin):
+        (WebKit::FrameLoaderClient::createJavaAppletWidget):
+        (WebKit::FrameLoaderClient::overrideMediaType):
+        (WebKit::FrameLoaderClient::windowObjectCleared):
+        (WebKit::FrameLoaderClient::setMainFrameDocumentReady):
+        (WebKit::FrameLoaderClient::hasWebView):
+        (WebKit::FrameLoaderClient::hasFrameView):
+        (WebKit::FrameLoaderClient::dispatchDidFinishLoad):
+        (WebKit::FrameLoaderClient::frameLoadCompleted):
+        (WebKit::FrameLoaderClient::saveViewStateToItem):
+        (WebKit::FrameLoaderClient::restoreViewState):
+        (WebKit::FrameLoaderClient::privateBrowsingEnabled):
+        (WebKit::FrameLoaderClient::makeDocumentView):
+        (WebKit::FrameLoaderClient::makeRepresentation):
+        (WebKit::FrameLoaderClient::forceLayout):
+        (WebKit::FrameLoaderClient::forceLayoutForNonHTML):
+        (WebKit::FrameLoaderClient::setCopiesOnScroll):
+        (WebKit::FrameLoaderClient::detachedFromParent1):
+        (WebKit::FrameLoaderClient::detachedFromParent2):
+        (WebKit::FrameLoaderClient::detachedFromParent3):
+        (WebKit::FrameLoaderClient::detachedFromParent4):
+        (WebKit::FrameLoaderClient::loadedFromCachedPage):
+        (WebKit::FrameLoaderClient::dispatchDidHandleOnloadEvents):
+        (WebKit::FrameLoaderClient::dispatchDidReceiveServerRedirectForProvisionalLoad):
+        (WebKit::FrameLoaderClient::dispatchDidCancelClientRedirect):
+        (WebKit::FrameLoaderClient::dispatchWillPerformClientRedirect):
+        (WebKit::FrameLoaderClient::dispatchDidChangeLocationWithinPage):
+        (WebKit::FrameLoaderClient::dispatchWillClose):
+        (WebKit::FrameLoaderClient::dispatchDidReceiveIcon):
+        (WebKit::FrameLoaderClient::dispatchDidStartProvisionalLoad):
+        (WebKit::FrameLoaderClient::dispatchDidReceiveTitle):
+        (WebKit::FrameLoaderClient::dispatchDidCommitLoad):
+        (WebKit::FrameLoaderClient::dispatchDidFinishDocumentLoad):
+        (WebKit::FrameLoaderClient::dispatchDidFirstLayout):
+        (WebKit::FrameLoaderClient::dispatchShow):
+        (WebKit::FrameLoaderClient::cancelPolicyCheck):
+        (WebKit::FrameLoaderClient::dispatchDidLoadMainResource):
+        (WebKit::FrameLoaderClient::revertToProvisionalState):
+        (WebKit::FrameLoaderClient::clearUnarchivingState):
+        (WebKit::FrameLoaderClient::willChangeTitle):
+        (WebKit::FrameLoaderClient::didChangeTitle):
+        (WebKit::FrameLoaderClient::finishedLoading):
+        (WebKit::FrameLoaderClient::finalSetupForReplace):
+        (WebKit::FrameLoaderClient::setDefersLoading):
+        (WebKit::FrameLoaderClient::isArchiveLoadPending):
+        (WebKit::FrameLoaderClient::cancelPendingArchiveLoad):
+        (WebKit::FrameLoaderClient::clearArchivedResources):
+        (WebKit::FrameLoaderClient::canHandleRequest):
+        (WebKit::FrameLoaderClient::canShowMIMEType):
+        (WebKit::FrameLoaderClient::representationExistsForURLScheme):
+        (WebKit::FrameLoaderClient::generatedMIMETypeForURLScheme):
+        (WebKit::FrameLoaderClient::provisionalLoadStarted):
+        (WebKit::FrameLoaderClient::didFinishLoad):
+        (WebKit::FrameLoaderClient::setDocumentViewFromCachedPage):
+        (WebKit::FrameLoaderClient::dispatchDidReceiveContentLength):
+        (WebKit::FrameLoaderClient::dispatchDidFinishLoading):
+        (WebKit::FrameLoaderClient::dispatchDidFailLoading):
+        (WebKit::FrameLoaderClient::dispatchDidLoadResourceFromMemoryCache):
+        (WebKit::FrameLoaderClient::dispatchDidFailProvisionalLoad):
+        (WebKit::FrameLoaderClient::dispatchDidFailLoad):
+        (WebKit::FrameLoaderClient::download):
+        (WebKit::FrameLoaderClient::cancelledError):
+        (WebKit::FrameLoaderClient::blockedError):
+        (WebKit::FrameLoaderClient::cannotShowURLError):
+        (WebKit::FrameLoaderClient::interruptForPolicyChangeError):
+        (WebKit::FrameLoaderClient::cannotShowMIMETypeError):
+        (WebKit::FrameLoaderClient::fileDoesNotExistError):
+        (WebKit::FrameLoaderClient::shouldFallBack):
+        (WebKit::FrameLoaderClient::willUseArchive):
+        (WebKit::FrameLoaderClient::saveDocumentViewToCachedPage):
+        (WebKit::FrameLoaderClient::canCachePage):
+        (WebKit::FrameLoaderClient::dispatchCreatePage):
+        (WebKit::FrameLoaderClient::dispatchUnableToImplementPolicy):
+        * WebCoreSupport/FrameLoaderClientGtk.h:
+        * WebCoreSupport/InspectorClientGtk.cpp:
+        (WebKit::InspectorClient::inspectorDestroyed):
+        (WebKit::InspectorClient::createPage):
+        (WebKit::InspectorClient::showWindow):
+        (WebKit::InspectorClient::closeWindow):
+        (WebKit::InspectorClient::attachWindow):
+        (WebKit::InspectorClient::detachWindow):
+        (WebKit::InspectorClient::highlight):
+        (WebKit::InspectorClient::hideHighlight):
+        * WebCoreSupport/InspectorClientGtk.h:
+
 2007-08-10  Holger Hans Peter Freyther  <zecke@selfish.org>
 
         Reviewed by Adam.
index 56467e3ae9bbe90e5381df255a7cf70256ae8b39..d096c4c624c96338c15923010b1f47cd57a7bb1f 100644 (file)
 
 using namespace WebCore;
 
-namespace WebKitGtk {
-ChromeClientGtk::ChromeClientGtk(WebKitGtkPage* page)
+namespace WebKit {
+ChromeClient::ChromeClient(WebKitGtkPage* page)
     : m_webPage(page)
 {
 }
 
-void ChromeClientGtk::chromeDestroyed()
+void ChromeClient::chromeDestroyed()
 {
     notImplemented();
 }
 
-FloatRect ChromeClientGtk::windowRect()
+FloatRect ChromeClient::windowRect()
 {
     notImplemented();
     return FloatRect();
 }
 
-void ChromeClientGtk::setWindowRect(const FloatRect& r)
+void ChromeClient::setWindowRect(const FloatRect& r)
 {
     notImplemented();
 }
 
-FloatRect ChromeClientGtk::pageRect()
+FloatRect ChromeClient::pageRect()
 {
     notImplemented();
     return FloatRect();
 }
 
-float ChromeClientGtk::scaleFactor()
+float ChromeClient::scaleFactor()
 {
     notImplemented();
     return 1.0;
 }
 
-void ChromeClientGtk::focus()
+void ChromeClient::focus()
 {
     notImplemented();
 }
 
-void ChromeClientGtk::unfocus()
+void ChromeClient::unfocus()
 {
     notImplemented();
 }
     
-Page* ChromeClientGtk::createWindow(Frame*, const FrameLoadRequest&)
+Page* ChromeClient::createWindow(Frame*, const FrameLoadRequest&)
 {
     /* TODO: FrameLoadRequest is not used */
     WebKitGtkPage* page = WEBKIT_GTK_PAGE_GET_CLASS(m_webPage)->create_page(m_webPage);
     if (!page)
         return 0;
 
-    WebKitGtkPagePrivate *private_data = WEBKIT_GTK_PAGE_GET_PRIVATE(WEBKIT_GTK_PAGE(page));
-    return private_data->page;
+    WebKitGtkPagePrivate *privateData = WEBKIT_GTK_PAGE_GET_PRIVATE(WEBKIT_GTK_PAGE(page));
+    return privateData->page;
 }
 
-Page* ChromeClientGtk::createModalDialog(Frame*, const FrameLoadRequest&)
+Page* ChromeClient::createModalDialog(Frame*, const FrameLoadRequest&)
 {
     notImplemented();
     return 0;
 }
 
-void ChromeClientGtk::show()
+void ChromeClient::show()
 {
     notImplemented();
 }
 
-bool ChromeClientGtk::canRunModal()
+bool ChromeClient::canRunModal()
 {
     notImplemented();
     return false;
 }
 
-void ChromeClientGtk::runModal()
+void ChromeClient::runModal()
 {
     notImplemented();
 }
 
-void ChromeClientGtk::setToolbarsVisible(bool)
+void ChromeClient::setToolbarsVisible(bool)
 {
     notImplemented();
 }
 
-bool ChromeClientGtk::toolbarsVisible()
+bool ChromeClient::toolbarsVisible()
 {
     notImplemented();
     return false;
 }
 
-void ChromeClientGtk::setStatusbarVisible(bool)
+void ChromeClient::setStatusbarVisible(bool)
 {
     notImplemented();
 }
 
-bool ChromeClientGtk::statusbarVisible()
+bool ChromeClient::statusbarVisible()
 {
     notImplemented();
     return false;
 }
 
-void ChromeClientGtk::setScrollbarsVisible(bool)
+void ChromeClient::setScrollbarsVisible(bool)
 {
     notImplemented();
 }
 
-bool ChromeClientGtk::scrollbarsVisible() {
+bool ChromeClient::scrollbarsVisible() {
     notImplemented();
     return false;
 }
 
-void ChromeClientGtk::setMenubarVisible(bool)
+void ChromeClient::setMenubarVisible(bool)
 {
     notImplemented();
 }
 
-bool ChromeClientGtk::menubarVisible()
+bool ChromeClient::menubarVisible()
 {
     notImplemented();
     return false;
 }
 
-void ChromeClientGtk::setResizable(bool)
+void ChromeClient::setResizable(bool)
 {
     notImplemented();
 }
 
-void ChromeClientGtk::closeWindowSoon()
+void ChromeClient::closeWindowSoon()
 {
     notImplemented();
 }
 
-bool ChromeClientGtk::canTakeFocus(FocusDirection)
+bool ChromeClient::canTakeFocus(FocusDirection)
 {
     notImplemented();
     return true;
 }
 
-void ChromeClientGtk::takeFocus(FocusDirection)
+void ChromeClient::takeFocus(FocusDirection)
 {
     notImplemented();
 }
 
-bool ChromeClientGtk::canRunBeforeUnloadConfirmPanel()
+bool ChromeClient::canRunBeforeUnloadConfirmPanel()
 {
     notImplemented();
     return false;
 }
 
-bool ChromeClientGtk::runBeforeUnloadConfirmPanel(const WebCore::String&, WebCore::Frame*)
+bool ChromeClient::runBeforeUnloadConfirmPanel(const WebCore::String&, WebCore::Frame*)
 {
     notImplemented();
     return false;
 }
 
-void ChromeClientGtk::addMessageToConsole(const WebCore::String& message, unsigned int lineNumber, const WebCore::String& sourceId)
+void ChromeClient::addMessageToConsole(const WebCore::String& message, unsigned int lineNumber, const WebCore::String& sourceId)
 {
     CString messageString = message.utf8();
     CString sourceIdString = sourceId.utf8();
@@ -200,19 +200,19 @@ void ChromeClientGtk::addMessageToConsole(const WebCore::String& message, unsign
     WEBKIT_GTK_PAGE_GET_CLASS(m_webPage)->java_script_console_message(m_webPage, messageString.data(), lineNumber, sourceIdString.data());
 }
 
-void ChromeClientGtk::runJavaScriptAlert(Frame* frame, const String& message)
+void ChromeClient::runJavaScriptAlert(Frame* frame, const String& message)
 {
     CString messageString = message.utf8();
     WEBKIT_GTK_PAGE_GET_CLASS(m_webPage)->java_script_alert(m_webPage, kit(frame), messageString.data());
 }
 
-bool ChromeClientGtk::runJavaScriptConfirm(Frame* frame, const String& message)
+bool ChromeClient::runJavaScriptConfirm(Frame* frame, const String& message)
 {
     CString messageString = message.utf8();
     return WEBKIT_GTK_PAGE_GET_CLASS(m_webPage)->java_script_confirm(m_webPage, kit(frame), messageString.data());
 }
 
-bool ChromeClientGtk::runJavaScriptPrompt(Frame* frame, const String& message, const String& defaultValue, String& result)
+bool ChromeClient::runJavaScriptPrompt(Frame* frame, const String& message, const String& defaultValue, String& result)
 {
     CString messageString = message.utf8();
     CString defaultValueString = defaultValue.utf8(); 
@@ -230,56 +230,56 @@ bool ChromeClientGtk::runJavaScriptPrompt(Frame* frame, const String& message, c
     }
 }
 
-void ChromeClientGtk::setStatusbarText(const String& string)
+void ChromeClient::setStatusbarText(const String& string)
 {
     CString stringMessage = string.utf8();
     g_signal_emit_by_name(m_webPage, "status_bar_text_changed", stringMessage.data());
 }
 
-bool ChromeClientGtk::shouldInterruptJavaScript()
+bool ChromeClient::shouldInterruptJavaScript()
 {
     notImplemented();
     return false;
 }
 
-bool ChromeClientGtk::tabsToLinks() const
+bool ChromeClient::tabsToLinks() const
 {
     notImplemented();
     return false;
 }
 
-IntRect ChromeClientGtk::windowResizerRect() const
+IntRect ChromeClient::windowResizerRect() const
 {
     notImplemented();
     return IntRect();
 }
 
-void ChromeClientGtk::addToDirtyRegion(const IntRect&)
+void ChromeClient::addToDirtyRegion(const IntRect&)
 {
     notImplemented();
 }
 
-void ChromeClientGtk::scrollBackingStore(int dx, int dy, const IntRect& scrollViewRect, const IntRect& clipRect)
+void ChromeClient::scrollBackingStore(int dx, int dy, const IntRect& scrollViewRect, const IntRect& clipRect)
 {
     notImplemented();
 }
 
-void ChromeClientGtk::updateBackingStore()
+void ChromeClient::updateBackingStore()
 {
     notImplemented();
 }
 
-void ChromeClientGtk::mouseDidMoveOverElement(const HitTestResult&, unsigned modifierFlags)
+void ChromeClient::mouseDidMoveOverElement(const HitTestResult&, unsigned modifierFlags)
 {
     notImplemented();
 }
 
-void ChromeClientGtk::setToolTip(const String&)
+void ChromeClient::setToolTip(const String&)
 {
     notImplemented();
 }
 
-void ChromeClientGtk::print(Frame*)
+void ChromeClient::print(Frame*)
 {
     notImplemented();
 }
index 39279d926e604387542cc0ecffc134e30835f012..0edd150b33ef3cd58512019eff0132910a0c632c 100644 (file)
 
 typedef struct _WebKitGtkPage WebKitGtkPage;
 
-namespace WebKitGtk {
+namespace WebKit {
 
-    class ChromeClientGtk : public WebCore::ChromeClient {
+    class ChromeClient : public WebCore::ChromeClient {
     public:
-        ChromeClientGtk(WebKitGtkPage*);
+        ChromeClient(WebKitGtkPage*);
         WebKitGtkPage* webPage() const { return m_webPage; }
 
         virtual void chromeDestroyed();
@@ -106,4 +106,4 @@ namespace WebKitGtk {
     };
 }
 
-#endif // ChromeClientGtk_h
+#endif // ChromeClient_h
index 1c2565f75b3a90b8f5ceff2e8f7149548ae728a6..8ae705722d276f762dceeed14867030c578c92c7 100644 (file)
 
 #include <stdio.h>
 
-namespace WebCore {
+using namespace WebCore;
+
+namespace WebKit {
     
-void ContextMenuClientGtk::contextMenuDestroyed()
+void ContextMenuClient::contextMenuDestroyed()
 {
     notImplemented();
 }
 
-PlatformMenuDescription ContextMenuClientGtk::getCustomMenuFromDefaultItems(ContextMenu*)
+PlatformMenuDescription ContextMenuClient::getCustomMenuFromDefaultItems(ContextMenu*)
 {
     notImplemented();
     return PlatformMenuDescription();
 }
 
-void ContextMenuClientGtk::contextMenuItemSelected(ContextMenuItem*, const ContextMenu*)
+void ContextMenuClient::contextMenuItemSelected(ContextMenuItem*, const ContextMenu*)
 {
     notImplemented();
 }
 
-void ContextMenuClientGtk::downloadURL(const KURL& url)
+void ContextMenuClient::downloadURL(const KURL& url)
 {
     notImplemented();
 }
 
-void ContextMenuClientGtk::copyImageToClipboard(const HitTestResult&)
+void ContextMenuClient::copyImageToClipboard(const HitTestResult&)
 {
     notImplemented();
 }
 
-void ContextMenuClientGtk::searchWithGoogle(const Frame*)
+void ContextMenuClient::searchWithGoogle(const Frame*)
 {
     notImplemented();
 }
 
-void ContextMenuClientGtk::lookUpInDictionary(Frame*)
+void ContextMenuClient::lookUpInDictionary(Frame*)
 {
     notImplemented();
 }
 
-void ContextMenuClientGtk::speak(const String&)
+void ContextMenuClient::speak(const String&)
 {
     notImplemented();
 }
 
-void ContextMenuClientGtk::stopSpeaking()
+void ContextMenuClient::stopSpeaking()
 {
     notImplemented();
 }
index bfcf56a9272f13fa89e3fc4b669c3807bae80cbe..2dca47c2e17472e648b541a01d2f4ac3685c9832 100644 (file)
 
 namespace WebCore {
     class ContextMenu;
+}
+
+namespace WebKit {
 
-    class ContextMenuClientGtk : public ContextMenuClient
+    class ContextMenuClient : public WebCore::ContextMenuClient
     {
     public:
         virtual void contextMenuDestroyed();
         
-        virtual PlatformMenuDescription getCustomMenuFromDefaultItems(ContextMenu*);
-        virtual void contextMenuItemSelected(ContextMenuItem*, const ContextMenu*);
+        virtual WebCore::PlatformMenuDescription getCustomMenuFromDefaultItems(WebCore::ContextMenu*);
+        virtual void contextMenuItemSelected(WebCore::ContextMenuItem*, const WebCore::ContextMenu*);
 
-        virtual void downloadURL(const KURL& url);
-        virtual void copyImageToClipboard(const HitTestResult&);
-        virtual void searchWithGoogle(const Frame*);
-        virtual void lookUpInDictionary(Frame*);
-        virtual void speak(const String&);
+        virtual void downloadURL(const WebCore::KURL& url);
+        virtual void copyImageToClipboard(const WebCore::HitTestResult&);
+        virtual void searchWithGoogle(const WebCore::Frame*);
+        virtual void lookUpInDictionary(WebCore::Frame*);
+        virtual void speak(const WebCore::String&);
         virtual void stopSpeaking();
     };
 }
index 2af38ff2098f228fc08157b74cab27295399245a..a5b5898f47586a9f3087323100f133bb76725d3f 100644 (file)
 
 #include <stdio.h>
 
-using namespace WebKitGtk;
+using namespace WebCore;
 
-namespace WebCore {
+namespace WebKit {
 
-bool EditorClientGtk::shouldDeleteRange(Range*)
+bool EditorClient::shouldDeleteRange(Range*)
 {
     notImplemented();
     return false;
 }
 
-bool EditorClientGtk::shouldShowDeleteInterface(HTMLElement*)
+bool EditorClient::shouldShowDeleteInterface(HTMLElement*)
 {
     return false;
 }
 
-bool EditorClientGtk::isContinuousSpellCheckingEnabled()
+bool EditorClient::isContinuousSpellCheckingEnabled()
 {
     notImplemented();
     return false;
 }
 
-bool EditorClientGtk::isGrammarCheckingEnabled()
+bool EditorClient::isGrammarCheckingEnabled()
 {
     notImplemented();
     return false;
 }
 
-int EditorClientGtk::spellCheckerDocumentTag()
+int EditorClient::spellCheckerDocumentTag()
 {
     notImplemented();
     return 0;
 }
 
-bool EditorClientGtk::shouldBeginEditing(WebCore::Range*)
+bool EditorClient::shouldBeginEditing(WebCore::Range*)
 {
     notImplemented();
     return false;
 }
 
-bool EditorClientGtk::shouldEndEditing(WebCore::Range*)
+bool EditorClient::shouldEndEditing(WebCore::Range*)
 {
     notImplemented();
     return false;
 }
 
-bool EditorClientGtk::shouldInsertText(String, Range*, EditorInsertAction)
+bool EditorClient::shouldInsertText(String, Range*, EditorInsertAction)
 {
     notImplemented();
     return true;
 }
 
-bool EditorClientGtk::shouldChangeSelectedRange(Range* fromRange, Range* toRange, EAffinity, bool stillSelecting)
+bool EditorClient::shouldChangeSelectedRange(Range* fromRange, Range* toRange, EAffinity, bool stillSelecting)
 {
     notImplemented();
     return true;
 }
 
-bool EditorClientGtk::shouldApplyStyle(WebCore::CSSStyleDeclaration*,
+bool EditorClient::shouldApplyStyle(WebCore::CSSStyleDeclaration*,
                                       WebCore::Range*)
 {
     notImplemented();
     return false;
 }
 
-bool EditorClientGtk::shouldMoveRangeAfterDelete(WebCore::Range*, WebCore::Range*)
+bool EditorClient::shouldMoveRangeAfterDelete(WebCore::Range*, WebCore::Range*)
 {
     notImplemented();
     return true;
 }
 
-void EditorClientGtk::didBeginEditing()
+void EditorClient::didBeginEditing()
 {
     notImplemented();
 }
 
-void EditorClientGtk::respondToChangedContents()
+void EditorClient::respondToChangedContents()
 {
     notImplemented();
 }
 
-void EditorClientGtk::respondToChangedSelection()
+void EditorClient::respondToChangedSelection()
 {
     notImplemented();
 }
 
-void EditorClientGtk::didEndEditing()
+void EditorClient::didEndEditing()
 {
     notImplemented();
 }
 
-void EditorClientGtk::didWriteSelectionToPasteboard()
+void EditorClient::didWriteSelectionToPasteboard()
 {
     notImplemented();
 }
 
-void EditorClientGtk::didSetSelectionTypesForPasteboard()
+void EditorClient::didSetSelectionTypesForPasteboard()
 {
     notImplemented();
 }
 
-bool EditorClientGtk::selectWordBeforeMenuEvent()
+bool EditorClient::selectWordBeforeMenuEvent()
 {
     notImplemented();
     return false;
 }
 
-bool EditorClientGtk::isEditable()
+bool EditorClient::isEditable()
 {
     notImplemented();
     return false;
 }
 
-void EditorClientGtk::registerCommandForUndo(WTF::PassRefPtr<WebCore::EditCommand>)
+void EditorClient::registerCommandForUndo(WTF::PassRefPtr<WebCore::EditCommand>)
 {
     notImplemented();
 }
 
-void EditorClientGtk::registerCommandForRedo(WTF::PassRefPtr<WebCore::EditCommand>)
+void EditorClient::registerCommandForRedo(WTF::PassRefPtr<WebCore::EditCommand>)
 {
     notImplemented();
 }
 
-void EditorClientGtk::clearUndoRedoOperations()
+void EditorClient::clearUndoRedoOperations()
 {
     notImplemented();
 }
 
-bool EditorClientGtk::canUndo() const
+bool EditorClient::canUndo() const
 {
     notImplemented();
     return false;
 }
 
-bool EditorClientGtk::canRedo() const
+bool EditorClient::canRedo() const
 {
     notImplemented();
     return false;
 }
 
-void EditorClientGtk::undo()
+void EditorClient::undo()
 {
     notImplemented();
 }
 
-void EditorClientGtk::redo()
+void EditorClient::redo()
 {
     notImplemented();
 }
 
-bool EditorClientGtk::shouldInsertNode(Node*, Range*, EditorInsertAction)
+bool EditorClient::shouldInsertNode(Node*, Range*, EditorInsertAction)
 {
     notImplemented();
     return false;
 }
 
-void EditorClientGtk::pageDestroyed()
+void EditorClient::pageDestroyed()
 {
     notImplemented();
 }
 
-bool EditorClientGtk::smartInsertDeleteEnabled()
+bool EditorClient::smartInsertDeleteEnabled()
 {
     notImplemented();
     return false;
 }
 
-void EditorClientGtk::toggleContinuousSpellChecking()
+void EditorClient::toggleContinuousSpellChecking()
 {
     notImplemented();
 }
 
-void EditorClientGtk::toggleGrammarChecking()
+void EditorClient::toggleGrammarChecking()
 {
 }
 
-void EditorClientGtk::handleKeypress(KeyboardEvent* event)
+void EditorClient::handleKeypress(KeyboardEvent* event)
 {
     Frame* frame = core(m_page)->focusController()->focusedOrMainFrame();
     if (!frame)
@@ -258,89 +258,89 @@ void EditorClientGtk::handleKeypress(KeyboardEvent* event)
 }
 
 
-void EditorClientGtk::handleInputMethodKeypress(KeyboardEvent*)
+void EditorClient::handleInputMethodKeypress(KeyboardEvent*)
 {
     notImplemented();
 }
 
-EditorClientGtk::EditorClientGtk(WebKitGtkPage* page)
+EditorClient::EditorClient(WebKitGtkPage* page)
     : m_page(page)
 {
 }
 
-void EditorClientGtk::textFieldDidBeginEditing(Element*)
+void EditorClient::textFieldDidBeginEditing(Element*)
 {
     notImplemented();
 }
 
-void EditorClientGtk::textFieldDidEndEditing(Element*)
+void EditorClient::textFieldDidEndEditing(Element*)
 {
     notImplemented();
 }
 
-void EditorClientGtk::textDidChangeInTextField(Element*)
+void EditorClient::textDidChangeInTextField(Element*)
 {
     notImplemented();
 }
 
-bool EditorClientGtk::doTextFieldCommandFromEvent(Element*, KeyboardEvent*)
+bool EditorClient::doTextFieldCommandFromEvent(Element*, KeyboardEvent*)
 {
     notImplemented();
     return false;
 }
 
-void EditorClientGtk::textWillBeDeletedInTextField(Element*)
+void EditorClient::textWillBeDeletedInTextField(Element*)
 {
     notImplemented();
 }
 
-void EditorClientGtk::textDidChangeInTextArea(Element*)
+void EditorClient::textDidChangeInTextArea(Element*)
 {
     notImplemented();
 }
 
-void EditorClientGtk::ignoreWordInSpellDocument(const String&)
+void EditorClient::ignoreWordInSpellDocument(const String&)
 {
     notImplemented();
 }
 
-void EditorClientGtk::learnWord(const String&)
+void EditorClient::learnWord(const String&)
 {
     notImplemented();
 }
 
-void EditorClientGtk::checkSpellingOfString(const UChar*, int, int*, int*)
+void EditorClient::checkSpellingOfString(const UChar*, int, int*, int*)
 {
     notImplemented();
 }
 
-void EditorClientGtk::checkGrammarOfString(const UChar*, int, Vector<GrammarDetail>&, int*, int*)
+void EditorClient::checkGrammarOfString(const UChar*, int, Vector<GrammarDetail>&, int*, int*)
 {
     notImplemented();
 }
 
-void EditorClientGtk::updateSpellingUIWithGrammarString(const String&, const GrammarDetail&)
+void EditorClient::updateSpellingUIWithGrammarString(const String&, const GrammarDetail&)
 {
     notImplemented();
 }
 
-void EditorClientGtk::updateSpellingUIWithMisspelledWord(const String&)
+void EditorClient::updateSpellingUIWithMisspelledWord(const String&)
 {
     notImplemented();
 }
 
-void EditorClientGtk::showSpellingUI(bool)
+void EditorClient::showSpellingUI(bool)
 {
     notImplemented();
 }
 
-bool EditorClientGtk::spellingUIIsShowing()
+bool EditorClient::spellingUIIsShowing()
 {
     notImplemented();
     return false;
 }
 
-void EditorClientGtk::getGuessesForWord(const String&, Vector<String>&)
+void EditorClient::getGuessesForWord(const String&, Vector<String>&)
 {
     notImplemented();
 }
index 7b594fa61934cb8a8609b30efe5bd72570ac576d..91ba50d2645cac5f4ad9a671004518ae38c7e944 100644 (file)
 typedef struct _WebKitGtkPage WebKitGtkPage;
 
 namespace WebCore {
+    class Page;
+}
+
+namespace WebKit {
 
-class Page;
 
-class EditorClientGtk : public EditorClient {
-public:
-    EditorClientGtk(WebKitGtkPage*);
+    class EditorClient : public WebCore::EditorClient {
+    public:
+        EditorClient(WebKitGtkPage*);
 
-    // from EditorClient
-    virtual void pageDestroyed();
+        // from EditorClient
+        virtual void pageDestroyed();
     
-    virtual bool shouldDeleteRange(Range*);
-    virtual bool shouldShowDeleteInterface(HTMLElement*);
-    virtual bool smartInsertDeleteEnabled(); 
-    virtual bool isContinuousSpellCheckingEnabled();
-    virtual void toggleContinuousSpellChecking();
-    virtual bool isGrammarCheckingEnabled();
-    virtual void toggleGrammarChecking();
-    virtual int spellCheckerDocumentTag();
+        virtual bool shouldDeleteRange(WebCore::Range*);
+        virtual bool shouldShowDeleteInterface(WebCore::HTMLElement*);
+        virtual bool smartInsertDeleteEnabled(); 
+        virtual bool isContinuousSpellCheckingEnabled();
+        virtual void toggleContinuousSpellChecking();
+        virtual bool isGrammarCheckingEnabled();
+        virtual void toggleGrammarChecking();
+        virtual int spellCheckerDocumentTag();
     
-    virtual bool selectWordBeforeMenuEvent();
-    virtual bool isEditable();
+        virtual bool selectWordBeforeMenuEvent();
+        virtual bool isEditable();
 
-    virtual bool shouldBeginEditing(Range*);
-    virtual bool shouldEndEditing(Range*);
-    virtual bool shouldInsertNode(Node*, Range*, EditorInsertAction);
-    virtual bool shouldInsertText(String, Range*, EditorInsertAction);
-    virtual bool shouldChangeSelectedRange(Range* fromRange, Range* toRange, EAffinity, bool stillSelecting);
+        virtual bool shouldBeginEditing(WebCore::Range*);
+        virtual bool shouldEndEditing(WebCore::Range*);
+        virtual bool shouldInsertNode(WebCore::Node*, WebCore::Range*, WebCore::EditorInsertAction);
+        virtual bool shouldInsertText(WebCore::String, WebCore::Range*, WebCore::EditorInsertAction);
+        virtual bool shouldChangeSelectedRange(WebCore::Range* fromRange, WebCore::Range* toRange, WebCore::EAffinity, bool stillSelecting);
 
-    virtual bool shouldApplyStyle(CSSStyleDeclaration*, Range*);
+        virtual bool shouldApplyStyle(WebCore::CSSStyleDeclaration*, WebCore::Range*);
 
-    virtual bool shouldMoveRangeAfterDelete(Range*, Range*);
+        virtual bool shouldMoveRangeAfterDelete(WebCore::Range*, WebCore::Range*);
 
-    virtual void didBeginEditing();
-    virtual void respondToChangedContents();
-    virtual void respondToChangedSelection();
-    virtual void didEndEditing();
-    virtual void didWriteSelectionToPasteboard();
-    virtual void didSetSelectionTypesForPasteboard();
+        virtual void didBeginEditing();
+        virtual void respondToChangedContents();
+        virtual void respondToChangedSelection();
+        virtual void didEndEditing();
+        virtual void didWriteSelectionToPasteboard();
+        virtual void didSetSelectionTypesForPasteboard();
     
-    virtual void registerCommandForUndo(PassRefPtr<EditCommand>);
-    virtual void registerCommandForRedo(PassRefPtr<EditCommand>);
-    virtual void clearUndoRedoOperations();
+        virtual void registerCommandForUndo(WTF::PassRefPtr<WebCore::EditCommand>);
+        virtual void registerCommandForRedo(WTF::PassRefPtr<WebCore::EditCommand>);
+        virtual void clearUndoRedoOperations();
 
-    virtual bool canUndo() const;
-    virtual bool canRedo() const;
+        virtual bool canUndo() const;
+        virtual bool canRedo() const;
     
-    virtual void undo();
-    virtual void redo();
-
-    virtual void handleKeypress(KeyboardEvent*);
-    virtual void handleInputMethodKeypress(KeyboardEvent*);
-
-    virtual void textFieldDidBeginEditing(Element*);
-    virtual void textFieldDidEndEditing(Element*);
-    virtual void textDidChangeInTextField(Element*);
-    virtual bool doTextFieldCommandFromEvent(Element*, KeyboardEvent*);
-    virtual void textWillBeDeletedInTextField(Element*);
-    virtual void textDidChangeInTextArea(Element*);
-
-    virtual void ignoreWordInSpellDocument(const String&);
-    virtual void learnWord(const String&);
-    virtual void checkSpellingOfString(const UChar*, int length, int* misspellingLocation, int* misspellingLength);
-    virtual void checkGrammarOfString(const UChar*, int length, Vector<GrammarDetail>&, int* badGrammarLocation, int* badGrammarLength);
-    virtual void updateSpellingUIWithGrammarString(const String&, const GrammarDetail&);
-    virtual void updateSpellingUIWithMisspelledWord(const String&);
-    virtual void showSpellingUI(bool show);
-    virtual bool spellingUIIsShowing();
-    virtual void getGuessesForWord(const String&, Vector<String>& guesses);
-
-private:
-    WebKitGtkPage* m_page;
-};
-
+        virtual void undo();
+        virtual void redo();
+
+        virtual void handleKeypress(WebCore::KeyboardEvent*);
+        virtual void handleInputMethodKeypress(WebCore::KeyboardEvent*);
+
+        virtual void textFieldDidBeginEditing(WebCore::Element*);
+        virtual void textFieldDidEndEditing(WebCore::Element*);
+        virtual void textDidChangeInTextField(WebCore::Element*);
+        virtual bool doTextFieldCommandFromEvent(WebCore::Element*, WebCore::KeyboardEvent*);
+        virtual void textWillBeDeletedInTextField(WebCore::Element*);
+        virtual void textDidChangeInTextArea(WebCore::Element*);
+
+        virtual void ignoreWordInSpellDocument(const WebCore::String&);
+        virtual void learnWord(const WebCore::String&);
+        virtual void checkSpellingOfString(const UChar*, int length, int* misspellingLocation, int* misspellingLength);
+        virtual void checkGrammarOfString(const UChar*, int length, WTF::Vector<WebCore::GrammarDetail>&, int* badGrammarLocation, int* badGrammarLength);
+        virtual void updateSpellingUIWithGrammarString(const WebCore::String&, const WebCore::GrammarDetail&);
+        virtual void updateSpellingUIWithMisspelledWord(const WebCore::String&);
+        virtual void showSpellingUI(bool show);
+        virtual bool spellingUIIsShowing();
+        virtual void getGuessesForWord(const WebCore::String&, WTF::Vector<WebCore::String>& guesses);
+
+    private:
+        WebKitGtkPage* m_page;
+    };
 }
 
 #endif
index e8f34d5ab5300121aa5ac921f6f4a2720ee53bd9..054ca7319c29d3c368adabfdfbb305b30492baf5 100644 (file)
 #include "webkitgtkprivate.h"
 #include <stdio.h>
 
-using namespace WebKitGtk;
+using namespace WebCore;
 
-namespace WebCore {
+namespace WebKit {
 
-FrameLoaderClientGtk::FrameLoaderClientGtk(WebKitGtkFrame* frame)
+FrameLoaderClient::FrameLoaderClient(WebKitGtkFrame* frame)
     : m_frame(frame)
     , m_firstData(false)
 {
     ASSERT(m_frame);
 }
 
-String FrameLoaderClientGtk::userAgent(const KURL&)
+String FrameLoaderClient::userAgent(const KURL&)
 {
     return "Mozilla/5.0 (X11; U; Linux i686; en-US) AppleWebKit/420+ (KHTML, like Gecko)";
 }
 
-WTF::PassRefPtr<WebCore::DocumentLoader> FrameLoaderClientGtk::createDocumentLoader(const WebCore::ResourceRequest& request, const SubstituteData& substituteData)
+WTF::PassRefPtr<WebCore::DocumentLoader> FrameLoaderClient::createDocumentLoader(const WebCore::ResourceRequest& request, const SubstituteData& substituteData)
 {
     RefPtr<DocumentLoader> loader = new DocumentLoader(request, substituteData);
     return loader.release();
 }
 
-void FrameLoaderClientGtk::dispatchWillSubmitForm(FramePolicyFunction policyFunction,  PassRefPtr<FormState>)
+void FrameLoaderClient::dispatchWillSubmitForm(FramePolicyFunction policyFunction,  PassRefPtr<FormState>)
 {
     // FIXME: This is surely too simple
     ASSERT(policyFunction);
@@ -83,40 +83,40 @@ void FrameLoaderClientGtk::dispatchWillSubmitForm(FramePolicyFunction policyFunc
 }
 
 
-void FrameLoaderClientGtk::committedLoad(DocumentLoader* loader, const char* data, int length)
+void FrameLoaderClient::committedLoad(DocumentLoader* loader, const char* data, int length)
 {
     FrameLoader *fl = loader->frameLoader();
     fl->setEncoding(m_response.textEncodingName(), false);
     fl->addData(data, length);
 }
 
-void FrameLoaderClientGtk::dispatchDidReceiveAuthenticationChallenge(DocumentLoader*, unsigned long  identifier, const AuthenticationChallenge&)
+void FrameLoaderClient::dispatchDidReceiveAuthenticationChallenge(DocumentLoader*, unsigned long  identifier, const AuthenticationChallenge&)
 {
     notImplemented();
 }
 
-void FrameLoaderClientGtk::dispatchDidCancelAuthenticationChallenge(DocumentLoader*, unsigned long  identifier, const AuthenticationChallenge&)
+void FrameLoaderClient::dispatchDidCancelAuthenticationChallenge(DocumentLoader*, unsigned long  identifier, const AuthenticationChallenge&)
 {
     notImplemented();
 }
 
-void FrameLoaderClientGtk::dispatchWillSendRequest(DocumentLoader*, unsigned long , ResourceRequest&, const ResourceResponse&)
+void FrameLoaderClient::dispatchWillSendRequest(DocumentLoader*, unsigned long , ResourceRequest&, const ResourceResponse&)
 {
     notImplemented();
 }
 
-void FrameLoaderClientGtk::assignIdentifierToInitialRequest(unsigned long identifier, DocumentLoader*, const ResourceRequest&)
+void FrameLoaderClient::assignIdentifierToInitialRequest(unsigned long identifier, DocumentLoader*, const ResourceRequest&)
 {
     notImplemented();   
 }
 
-void FrameLoaderClientGtk::postProgressStartedNotification()
+void FrameLoaderClient::postProgressStartedNotification()
 {
     WebKitGtkPage* page = getPageFromFrame(m_frame);
     g_signal_emit_by_name(page, "load_started", m_frame);
 }
 
-void FrameLoaderClientGtk::postProgressEstimateChangedNotification()
+void FrameLoaderClient::postProgressEstimateChangedNotification()
 {
     WebKitGtkPage* kitPage = getPageFromFrame(m_frame);
     Page* corePage = core(kitPage);
@@ -124,26 +124,26 @@ void FrameLoaderClientGtk::postProgressEstimateChangedNotification()
     g_signal_emit_by_name(kitPage, "load_progress_changed", lround(corePage->progress()->estimatedProgress()*100)); 
 }
 
-void FrameLoaderClientGtk::postProgressFinishedNotification()
+void FrameLoaderClient::postProgressFinishedNotification()
 {
     WebKitGtkPage* page = getPageFromFrame(m_frame);
 
     g_signal_emit_by_name(page, "load_finished", m_frame);
 }
 
-void FrameLoaderClientGtk::frameLoaderDestroyed()
+void FrameLoaderClient::frameLoaderDestroyed()
 {
     m_frame = 0;
     delete this;
 }
 
-void FrameLoaderClientGtk::dispatchDidReceiveResponse(DocumentLoader*, unsigned long, const ResourceResponse& response)
+void FrameLoaderClient::dispatchDidReceiveResponse(DocumentLoader*, unsigned long, const ResourceResponse& response)
 {
     m_response = response;
     m_firstData = true;
 }
 
-void FrameLoaderClientGtk::dispatchDecidePolicyForMIMEType(FramePolicyFunction policyFunction, const String&, const ResourceRequest&)
+void FrameLoaderClient::dispatchDecidePolicyForMIMEType(FramePolicyFunction policyFunction, const String&, const ResourceRequest&)
 {
     // FIXME: we need to call directly here (comment copied from Qt version)
     ASSERT(policyFunction);
@@ -152,7 +152,7 @@ void FrameLoaderClientGtk::dispatchDecidePolicyForMIMEType(FramePolicyFunction p
     (core(m_frame)->loader()->*policyFunction)(PolicyUse);
 }
 
-void FrameLoaderClientGtk::dispatchDecidePolicyForNewWindowAction(FramePolicyFunction policyFunction, const NavigationAction&, const ResourceRequest&, const String&)
+void FrameLoaderClient::dispatchDecidePolicyForNewWindowAction(FramePolicyFunction policyFunction, const NavigationAction&, const ResourceRequest&, const String&)
 {
     ASSERT(policyFunction);
     if (!policyFunction)
@@ -162,7 +162,7 @@ void FrameLoaderClientGtk::dispatchDecidePolicyForNewWindowAction(FramePolicyFun
     (core(m_frame)->loader()->*policyFunction)(PolicyIgnore);
 }
 
-void FrameLoaderClientGtk::dispatchDecidePolicyForNavigationAction(FramePolicyFunction policyFunction, const NavigationAction&, const ResourceRequest&)
+void FrameLoaderClient::dispatchDecidePolicyForNavigationAction(FramePolicyFunction policyFunction, const NavigationAction&, const ResourceRequest&)
 {
     ASSERT(policyFunction);
     if (!policyFunction)
@@ -170,13 +170,13 @@ void FrameLoaderClientGtk::dispatchDecidePolicyForNavigationAction(FramePolicyFu
     (core(m_frame)->loader()->*policyFunction)(PolicyUse);
 }
 
-Widget* FrameLoaderClientGtk::createPlugin(Element*, const KURL&, const Vector<String>&, const Vector<String>&, const String&, bool)
+Widget* FrameLoaderClient::createPlugin(Element*, const KURL&, const Vector<String>&, const Vector<String>&, const String&, bool)
 {
     notImplemented();
     return 0;
 }
 
-Frame* FrameLoaderClientGtk::createFrame(const KURL& url, const String& name, HTMLFrameOwnerElement* ownerElement,
+Frame* FrameLoaderClient::createFrame(const KURL& url, const String& name, HTMLFrameOwnerElement* ownerElement,
                                         const String& referrer, bool allowsScrolling, int marginWidth, int marginHeight)
 {
     Frame* coreFrame = core(webFrame());
@@ -213,20 +213,20 @@ Frame* FrameLoaderClientGtk::createFrame(const KURL& url, const String& name, HT
     return childFrame;
 }
 
-void FrameLoaderClientGtk::redirectDataToPlugin(Widget* pluginWidget)
+void FrameLoaderClient::redirectDataToPlugin(Widget* pluginWidget)
 {
     notImplemented();
     return;
 }
 
-Widget* FrameLoaderClientGtk::createJavaAppletWidget(const IntSize&, Element*, const KURL& baseURL,
+Widget* FrameLoaderClient::createJavaAppletWidget(const IntSize&, Element*, const KURL& baseURL,
                                                     const Vector<String>& paramNames, const Vector<String>& paramValues)
 {
     notImplemented();
     return 0;
 }
 
-ObjectContentType FrameLoaderClientGtk::objectContentType(const KURL& url, const String& mimeType)
+ObjectContentType FrameLoaderClient::objectContentType(const KURL& url, const String& mimeType)
 {
     if (!url.isValid())
         return ObjectContentType();
@@ -238,55 +238,55 @@ ObjectContentType FrameLoaderClientGtk::objectContentType(const KURL& url, const
     return ObjectContentType();
 }
 
-String FrameLoaderClientGtk::overrideMediaType() const
+String FrameLoaderClient::overrideMediaType() const
 {
     notImplemented();
     return String();
 }
 
-void FrameLoaderClientGtk::windowObjectCleared() const
+void FrameLoaderClient::windowObjectCleared() const
 {
     g_signal_emit_by_name(m_frame, "cleared");
 }
 
-void FrameLoaderClientGtk::setMainFrameDocumentReady(bool) 
+void FrameLoaderClient::setMainFrameDocumentReady(bool) 
 {
     // this is only interesting once we provide an external API for the DOM
 }
 
-bool FrameLoaderClientGtk::hasWebView() const
+bool FrameLoaderClient::hasWebView() const
 {
     notImplemented();
     return true;
 }
 
-bool FrameLoaderClientGtk::hasFrameView() const
+bool FrameLoaderClient::hasFrameView() const
 {
     notImplemented();
     return true;
 }
 
-void FrameLoaderClientGtk::dispatchDidFinishLoad() 
+void FrameLoaderClient::dispatchDidFinishLoad() 
 { 
     g_signal_emit_by_name(m_frame, "load_done", true);
 }
 
-void FrameLoaderClientGtk::frameLoadCompleted() 
+void FrameLoaderClient::frameLoadCompleted() 
 {
     notImplemented(); 
 }
 
-void FrameLoaderClientGtk::saveViewStateToItem(HistoryItem*)
+void FrameLoaderClient::saveViewStateToItem(HistoryItem*)
 {
     notImplemented(); 
 }
 
-void FrameLoaderClientGtk::restoreViewState()
+void FrameLoaderClient::restoreViewState()
 {
     notImplemented(); 
 }
 
-bool FrameLoaderClientGtk::shouldGoToHistoryItem(HistoryItem* item) const 
+bool FrameLoaderClient::shouldGoToHistoryItem(HistoryItem* item) const 
 {
     // FIXME: This is a very simple implementation. More sophisticated
     // implementation would delegate the decision to a PolicyDelegate.
@@ -294,73 +294,73 @@ bool FrameLoaderClientGtk::shouldGoToHistoryItem(HistoryItem* item) const
     return item != 0;
 }
 
-bool FrameLoaderClientGtk::privateBrowsingEnabled() const { notImplemented(); return false; }
-void FrameLoaderClientGtk::makeDocumentView() { notImplemented(); }
-void FrameLoaderClientGtk::makeRepresentation(DocumentLoader*) { notImplemented(); }
-void FrameLoaderClientGtk::forceLayout() { notImplemented(); }
-void FrameLoaderClientGtk::forceLayoutForNonHTML() { notImplemented(); }
-void FrameLoaderClientGtk::setCopiesOnScroll() { notImplemented(); }
-void FrameLoaderClientGtk::detachedFromParent1() { notImplemented(); }
-void FrameLoaderClientGtk::detachedFromParent2() { notImplemented(); }
-void FrameLoaderClientGtk::detachedFromParent3() { notImplemented(); }
-void FrameLoaderClientGtk::detachedFromParent4() { notImplemented(); }
-void FrameLoaderClientGtk::loadedFromCachedPage() { notImplemented(); }
-void FrameLoaderClientGtk::dispatchDidHandleOnloadEvents() {notImplemented(); }
-void FrameLoaderClientGtk::dispatchDidReceiveServerRedirectForProvisionalLoad() { notImplemented(); }
-void FrameLoaderClientGtk::dispatchDidCancelClientRedirect() { notImplemented(); }
-void FrameLoaderClientGtk::dispatchWillPerformClientRedirect(const KURL&, double, double) { notImplemented(); }
-void FrameLoaderClientGtk::dispatchDidChangeLocationWithinPage() { notImplemented(); }
-void FrameLoaderClientGtk::dispatchWillClose() { notImplemented(); }
-
-void FrameLoaderClientGtk::dispatchDidReceiveIcon()
+bool FrameLoaderClient::privateBrowsingEnabled() const { notImplemented(); return false; }
+void FrameLoaderClient::makeDocumentView() { notImplemented(); }
+void FrameLoaderClient::makeRepresentation(DocumentLoader*) { notImplemented(); }
+void FrameLoaderClient::forceLayout() { notImplemented(); }
+void FrameLoaderClient::forceLayoutForNonHTML() { notImplemented(); }
+void FrameLoaderClient::setCopiesOnScroll() { notImplemented(); }
+void FrameLoaderClient::detachedFromParent1() { notImplemented(); }
+void FrameLoaderClient::detachedFromParent2() { notImplemented(); }
+void FrameLoaderClient::detachedFromParent3() { notImplemented(); }
+void FrameLoaderClient::detachedFromParent4() { notImplemented(); }
+void FrameLoaderClient::loadedFromCachedPage() { notImplemented(); }
+void FrameLoaderClient::dispatchDidHandleOnloadEvents() {notImplemented(); }
+void FrameLoaderClient::dispatchDidReceiveServerRedirectForProvisionalLoad() { notImplemented(); }
+void FrameLoaderClient::dispatchDidCancelClientRedirect() { notImplemented(); }
+void FrameLoaderClient::dispatchWillPerformClientRedirect(const KURL&, double, double) { notImplemented(); }
+void FrameLoaderClient::dispatchDidChangeLocationWithinPage() { notImplemented(); }
+void FrameLoaderClient::dispatchWillClose() { notImplemented(); }
+
+void FrameLoaderClient::dispatchDidReceiveIcon()
 {
     WebKitGtkPage* page = getPageFromFrame(m_frame);
 
     g_signal_emit_by_name(page, "icon_loaded", m_frame);
 }
 
-void FrameLoaderClientGtk::dispatchDidStartProvisionalLoad()
+void FrameLoaderClient::dispatchDidStartProvisionalLoad()
 {
 }
 
-void FrameLoaderClientGtk::dispatchDidReceiveTitle(const String& title)
+void FrameLoaderClient::dispatchDidReceiveTitle(const String& title)
 {
     notImplemented();
 }
 
-void FrameLoaderClientGtk::dispatchDidCommitLoad() { notImplemented(); }
-void FrameLoaderClientGtk::dispatchDidFinishDocumentLoad() { notImplemented(); }
-void FrameLoaderClientGtk::dispatchDidFirstLayout() { notImplemented(); }
-void FrameLoaderClientGtk::dispatchShow() { notImplemented(); }
-void FrameLoaderClientGtk::cancelPolicyCheck() { notImplemented(); }
-void FrameLoaderClientGtk::dispatchDidLoadMainResource(DocumentLoader*) { notImplemented(); }
-void FrameLoaderClientGtk::revertToProvisionalState(DocumentLoader*) { notImplemented(); }
-void FrameLoaderClientGtk::clearUnarchivingState(DocumentLoader*) { notImplemented(); }
-void FrameLoaderClientGtk::willChangeTitle(DocumentLoader*) { notImplemented(); }
-void FrameLoaderClientGtk::didChangeTitle(DocumentLoader *l) { setTitle(l->title(), l->URL()); }
-void FrameLoaderClientGtk::finishedLoading(DocumentLoader*) { notImplemented(); }
-void FrameLoaderClientGtk::finalSetupForReplace(DocumentLoader*) { notImplemented(); }
-void FrameLoaderClientGtk::setDefersLoading(bool) { notImplemented(); }
-bool FrameLoaderClientGtk::isArchiveLoadPending(ResourceLoader*) const { notImplemented(); return false; }
-void FrameLoaderClientGtk::cancelPendingArchiveLoad(ResourceLoader*) { notImplemented(); }
-void FrameLoaderClientGtk::clearArchivedResources() { notImplemented(); }
-bool FrameLoaderClientGtk::canHandleRequest(const ResourceRequest&) const { notImplemented(); return true; }
-bool FrameLoaderClientGtk::canShowMIMEType(const String&) const { notImplemented(); return true; }
-bool FrameLoaderClientGtk::representationExistsForURLScheme(const String&) const { notImplemented(); return false; }
-String FrameLoaderClientGtk::generatedMIMETypeForURLScheme(const String&) const { notImplemented(); return String(); }
-
-void FrameLoaderClientGtk::provisionalLoadStarted()
+void FrameLoaderClient::dispatchDidCommitLoad() { notImplemented(); }
+void FrameLoaderClient::dispatchDidFinishDocumentLoad() { notImplemented(); }
+void FrameLoaderClient::dispatchDidFirstLayout() { notImplemented(); }
+void FrameLoaderClient::dispatchShow() { notImplemented(); }
+void FrameLoaderClient::cancelPolicyCheck() { notImplemented(); }
+void FrameLoaderClient::dispatchDidLoadMainResource(DocumentLoader*) { notImplemented(); }
+void FrameLoaderClient::revertToProvisionalState(DocumentLoader*) { notImplemented(); }
+void FrameLoaderClient::clearUnarchivingState(DocumentLoader*) { notImplemented(); }
+void FrameLoaderClient::willChangeTitle(DocumentLoader*) { notImplemented(); }
+void FrameLoaderClient::didChangeTitle(DocumentLoader *l) { setTitle(l->title(), l->URL()); }
+void FrameLoaderClient::finishedLoading(DocumentLoader*) { notImplemented(); }
+void FrameLoaderClient::finalSetupForReplace(DocumentLoader*) { notImplemented(); }
+void FrameLoaderClient::setDefersLoading(bool) { notImplemented(); }
+bool FrameLoaderClient::isArchiveLoadPending(ResourceLoader*) const { notImplemented(); return false; }
+void FrameLoaderClient::cancelPendingArchiveLoad(ResourceLoader*) { notImplemented(); }
+void FrameLoaderClient::clearArchivedResources() { notImplemented(); }
+bool FrameLoaderClient::canHandleRequest(const ResourceRequest&) const { notImplemented(); return true; }
+bool FrameLoaderClient::canShowMIMEType(const String&) const { notImplemented(); return true; }
+bool FrameLoaderClient::representationExistsForURLScheme(const String&) const { notImplemented(); return false; }
+String FrameLoaderClient::generatedMIMETypeForURLScheme(const String&) const { notImplemented(); return String(); }
+
+void FrameLoaderClient::provisionalLoadStarted()
 {
     notImplemented();
 }
 
-void FrameLoaderClientGtk::didFinishLoad() {
+void FrameLoaderClient::didFinishLoad() {
     notImplemented();
 }
 
-void FrameLoaderClientGtk::prepareForDataSourceReplacement() { notImplemented(); }
+void FrameLoaderClient::prepareForDataSourceReplacement() { notImplemented(); }
 
-void FrameLoaderClientGtk::setTitle(const String& title, const KURL& url)
+void FrameLoaderClient::setTitle(const String& title, const KURL& url)
 {
     WebKitGtkPage* page = getPageFromFrame(m_frame);
 
@@ -372,38 +372,38 @@ void FrameLoaderClientGtk::setTitle(const String& title, const KURL& url)
         g_signal_emit_by_name(page, "title_changed", titleString.data(), urlString.data());
 }
 
-void FrameLoaderClientGtk::setDocumentViewFromCachedPage(WebCore::CachedPage*) { notImplemented(); }
-void FrameLoaderClientGtk::dispatchDidReceiveContentLength(DocumentLoader*, unsigned long  identifier, int lengthReceived) { notImplemented(); }
-void FrameLoaderClientGtk::dispatchDidFinishLoading(DocumentLoader*, unsigned long  identifier) { notImplemented(); }
-void FrameLoaderClientGtk::dispatchDidFailLoading(DocumentLoader*, unsigned long  identifier, const ResourceError&) { notImplemented(); }
-bool FrameLoaderClientGtk::dispatchDidLoadResourceFromMemoryCache(DocumentLoader*, const ResourceRequest&, const ResourceResponse&, int length) { notImplemented(); return false; }
+void FrameLoaderClient::setDocumentViewFromCachedPage(WebCore::CachedPage*) { notImplemented(); }
+void FrameLoaderClient::dispatchDidReceiveContentLength(DocumentLoader*, unsigned long  identifier, int lengthReceived) { notImplemented(); }
+void FrameLoaderClient::dispatchDidFinishLoading(DocumentLoader*, unsigned long  identifier) { notImplemented(); }
+void FrameLoaderClient::dispatchDidFailLoading(DocumentLoader*, unsigned long  identifier, const ResourceError&) { notImplemented(); }
+bool FrameLoaderClient::dispatchDidLoadResourceFromMemoryCache(DocumentLoader*, const ResourceRequest&, const ResourceResponse&, int length) { notImplemented(); return false; }
 
-void FrameLoaderClientGtk::dispatchDidFailProvisionalLoad(const ResourceError&)
+void FrameLoaderClient::dispatchDidFailProvisionalLoad(const ResourceError&)
 {
     g_signal_emit_by_name(m_frame, "load_done", false);
 }
 
-void FrameLoaderClientGtk::dispatchDidFailLoad(const ResourceError&)
+void FrameLoaderClient::dispatchDidFailLoad(const ResourceError&)
 {
     g_signal_emit_by_name(m_frame, "load_done", false);
 }
 
-void FrameLoaderClientGtk::download(ResourceHandle*, const ResourceRequest&, const ResourceRequest&, const ResourceResponse&) { notImplemented(); }
-ResourceError FrameLoaderClientGtk::cancelledError(const ResourceRequest&) { notImplemented(); return ResourceError(); }
-ResourceError FrameLoaderClientGtk::blockedError(const ResourceRequest&) { notImplemented(); return ResourceError(); }
-ResourceError FrameLoaderClientGtk::cannotShowURLError(const ResourceRequest&) { notImplemented(); return ResourceError(); }
-ResourceError FrameLoaderClientGtk::interruptForPolicyChangeError(const ResourceRequest&) { notImplemented(); return ResourceError(); }
-ResourceError FrameLoaderClientGtk::cannotShowMIMETypeError(const ResourceResponse&) { notImplemented(); return ResourceError(); }
-ResourceError FrameLoaderClientGtk::fileDoesNotExistError(const ResourceResponse&) { notImplemented(); return ResourceError(); }
-bool FrameLoaderClientGtk::shouldFallBack(const ResourceError&) { notImplemented(); return false; }
-bool FrameLoaderClientGtk::willUseArchive(ResourceLoader*, const ResourceRequest&, const KURL& originalURL) const { notImplemented(); return false; }
-void FrameLoaderClientGtk::saveDocumentViewToCachedPage(CachedPage*) { notImplemented(); }
-bool FrameLoaderClientGtk::canCachePage() const { notImplemented(); return false; }
-Frame* FrameLoaderClientGtk::dispatchCreatePage() { notImplemented(); return 0; }
-void FrameLoaderClientGtk::dispatchUnableToImplementPolicy(const ResourceError&) { notImplemented(); }
-void FrameLoaderClientGtk::setMainDocumentError(DocumentLoader*, const ResourceError&) { notImplemented(); }
-void FrameLoaderClientGtk::startDownload(const ResourceRequest&) { notImplemented(); }
-void FrameLoaderClientGtk::updateGlobalHistoryForStandardLoad(const KURL&) { notImplemented(); }
-void FrameLoaderClientGtk::updateGlobalHistoryForReload(const KURL&) { notImplemented(); }
+void FrameLoaderClient::download(ResourceHandle*, const ResourceRequest&, const ResourceRequest&, const ResourceResponse&) { notImplemented(); }
+ResourceError FrameLoaderClient::cancelledError(const ResourceRequest&) { notImplemented(); return ResourceError(); }
+ResourceError FrameLoaderClient::blockedError(const ResourceRequest&) { notImplemented(); return ResourceError(); }
+ResourceError FrameLoaderClient::cannotShowURLError(const ResourceRequest&) { notImplemented(); return ResourceError(); }
+ResourceError FrameLoaderClient::interruptForPolicyChangeError(const ResourceRequest&) { notImplemented(); return ResourceError(); }
+ResourceError FrameLoaderClient::cannotShowMIMETypeError(const ResourceResponse&) { notImplemented(); return ResourceError(); }
+ResourceError FrameLoaderClient::fileDoesNotExistError(const ResourceResponse&) { notImplemented(); return ResourceError(); }
+bool FrameLoaderClient::shouldFallBack(const ResourceError&) { notImplemented(); return false; }
+bool FrameLoaderClient::willUseArchive(ResourceLoader*, const ResourceRequest&, const KURL& originalURL) const { notImplemented(); return false; }
+void FrameLoaderClient::saveDocumentViewToCachedPage(CachedPage*) { notImplemented(); }
+bool FrameLoaderClient::canCachePage() const { notImplemented(); return false; }
+Frame* FrameLoaderClient::dispatchCreatePage() { notImplemented(); return 0; }
+void FrameLoaderClient::dispatchUnableToImplementPolicy(const ResourceError&) { notImplemented(); }
+void FrameLoaderClient::setMainDocumentError(DocumentLoader*, const ResourceError&) { notImplemented(); }
+void FrameLoaderClient::startDownload(const ResourceRequest&) { notImplemented(); }
+void FrameLoaderClient::updateGlobalHistoryForStandardLoad(const KURL&) { notImplemented(); }
+void FrameLoaderClient::updateGlobalHistoryForReload(const KURL&) { notImplemented(); }
 
 }
index 9e03af18f021aa071b657d5b76ea9165a1c14ef0..4e628d6beafe3bfe76803350e4af5c405f8201de 100644 (file)
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef FrameLoaderClientGtk_H
-#define FrameLoaderClientGtk_H
+#ifndef FrameLoaderClientGtk_h
+#define FrameLoaderClientGtk_h
 
 #include "FrameLoaderClient.h"
-
 #include "ResourceResponse.h"
 
 typedef struct _WebKitGtkFrame WebKitGtkFrame;
 
-namespace WebCore {
+namespace WebKit {
 
-    class FrameLoaderClientGtk : public FrameLoaderClient {
+    class FrameLoaderClient : public WebCore::FrameLoaderClient {
     public:
-        FrameLoaderClientGtk(WebKitGtkFrame*);
-        virtual ~FrameLoaderClientGtk() { }
+        FrameLoaderClient(WebKitGtkFrame*);
+        virtual ~FrameLoaderClient() { }
         virtual void frameLoaderDestroyed();
 
         WebKitGtkFrame*  webFrame() const { return m_frame; }
@@ -51,8 +50,8 @@ namespace WebCore {
         virtual bool privateBrowsingEnabled() const;
 
         virtual void makeDocumentView();
-        virtual void makeRepresentation(DocumentLoader*);
-        virtual void setDocumentViewFromCachedPage(CachedPage*);
+        virtual void makeRepresentation(WebCore::DocumentLoader*);
+        virtual void setDocumentViewFromCachedPage(WebCore::CachedPage*);
         virtual void forceLayout();
         virtual void forceLayoutForNonHTML();
 
@@ -65,119 +64,119 @@ namespace WebCore {
 
         virtual void loadedFromCachedPage();
 
-        virtual void assignIdentifierToInitialRequest(unsigned long identifier, DocumentLoader*, const ResourceRequest&);
+        virtual void assignIdentifierToInitialRequest(unsigned long identifier, WebCore::DocumentLoader*, const WebCore::ResourceRequest&);
 
-        virtual void dispatchWillSendRequest(DocumentLoader*, unsigned long  identifier, ResourceRequest&, const ResourceResponse& redirectResponse);
-        virtual void dispatchDidReceiveAuthenticationChallenge(DocumentLoader*, unsigned long identifier, const AuthenticationChallenge&);
-        virtual void dispatchDidCancelAuthenticationChallenge(DocumentLoader*, unsigned long  identifier, const AuthenticationChallenge&);
-        virtual void dispatchDidReceiveResponse(DocumentLoader*, unsigned long  identifier, const ResourceResponse&);
-        virtual void dispatchDidReceiveContentLength(DocumentLoader*, unsigned long identifier, int lengthReceived);
-        virtual void dispatchDidFinishLoading(DocumentLoader*, unsigned long  identifier);
-        virtual void dispatchDidFailLoading(DocumentLoader*, unsigned long  identifier, const ResourceError&);
-        virtual bool dispatchDidLoadResourceFromMemoryCache(DocumentLoader*, const ResourceRequest&, const ResourceResponse&, int length);
+        virtual void dispatchWillSendRequest(WebCore::DocumentLoader*, unsigned long  identifier, WebCore::ResourceRequest&, const WebCore::ResourceResponse& redirectResponse);
+        virtual void dispatchDidReceiveAuthenticationChallenge(WebCore::DocumentLoader*, unsigned long identifier, const WebCore::AuthenticationChallenge&);
+        virtual void dispatchDidCancelAuthenticationChallenge(WebCore::DocumentLoader*, unsigned long  identifier, const WebCore::AuthenticationChallenge&);
+        virtual void dispatchDidReceiveResponse(WebCore::DocumentLoader*, unsigned long  identifier, const WebCore::ResourceResponse&);
+        virtual void dispatchDidReceiveContentLength(WebCore::DocumentLoader*, unsigned long identifier, int lengthReceived);
+        virtual void dispatchDidFinishLoading(WebCore::DocumentLoader*, unsigned long  identifier);
+        virtual void dispatchDidFailLoading(WebCore::DocumentLoader*, unsigned long  identifier, const WebCore::ResourceError&);
+        virtual bool dispatchDidLoadResourceFromMemoryCache(WebCore::DocumentLoader*, const WebCore::ResourceRequest&, const WebCore::ResourceResponse&, int length);
 
         virtual void dispatchDidHandleOnloadEvents();
         virtual void dispatchDidReceiveServerRedirectForProvisionalLoad();
         virtual void dispatchDidCancelClientRedirect();
-        virtual void dispatchWillPerformClientRedirect(const KURL&, double, double);
+        virtual void dispatchWillPerformClientRedirect(const WebCore::KURL&, double, double);
         virtual void dispatchDidChangeLocationWithinPage();
         virtual void dispatchWillClose();
         virtual void dispatchDidReceiveIcon();
         virtual void dispatchDidStartProvisionalLoad();
-        virtual void dispatchDidReceiveTitle(const String&);
+        virtual void dispatchDidReceiveTitle(const WebCore::String&);
         virtual void dispatchDidCommitLoad();
-        virtual void dispatchDidFailProvisionalLoad(const ResourceError&);
-        virtual void dispatchDidFailLoad(const ResourceError&);
+        virtual void dispatchDidFailProvisionalLoad(const WebCore::ResourceError&);
+        virtual void dispatchDidFailLoad(const WebCore::ResourceError&);
         virtual void dispatchDidFinishDocumentLoad();
         virtual void dispatchDidFinishLoad();
         virtual void dispatchDidFirstLayout();
 
-        virtual Frame* dispatchCreatePage();
+        virtual WebCore::Frame* dispatchCreatePage();
         virtual void dispatchShow();
 
-        virtual void dispatchDecidePolicyForMIMEType(FramePolicyFunction, const String& MIMEType, const ResourceRequest&);
-        virtual void dispatchDecidePolicyForNewWindowAction(FramePolicyFunction, const NavigationAction&, const ResourceRequest&, const String& frameName);
-        virtual void dispatchDecidePolicyForNavigationAction(FramePolicyFunction, const NavigationAction&, const ResourceRequest&);
+        virtual void dispatchDecidePolicyForMIMEType(WebCore::FramePolicyFunction, const WebCore::String& MIMEType, const WebCore::ResourceRequest&);
+        virtual void dispatchDecidePolicyForNewWindowAction(WebCore::FramePolicyFunction, const WebCore::NavigationAction&, const WebCore::ResourceRequest&, const WebCore::String& frameName);
+        virtual void dispatchDecidePolicyForNavigationAction(WebCore::FramePolicyFunction, const WebCore::NavigationAction&, const WebCore::ResourceRequest&);
         virtual void cancelPolicyCheck();
 
-        virtual void dispatchUnableToImplementPolicy(const ResourceError&);
+        virtual void dispatchUnableToImplementPolicy(const WebCore::ResourceError&);
 
-        virtual void dispatchWillSubmitForm(FramePolicyFunction, PassRefPtr<FormState>);
+        virtual void dispatchWillSubmitForm(WebCore::FramePolicyFunction, WTF::PassRefPtr<WebCore::FormState>);
 
-        virtual void dispatchDidLoadMainResource(DocumentLoader*);
-        virtual void revertToProvisionalState(DocumentLoader*);
-        virtual void setMainDocumentError(DocumentLoader*, const ResourceError&);
-        virtual void clearUnarchivingState(DocumentLoader*);
+        virtual void dispatchDidLoadMainResource(WebCore::DocumentLoader*);
+        virtual void revertToProvisionalState(WebCore::DocumentLoader*);
+        virtual void setMainDocumentError(WebCore::DocumentLoader*, const WebCore::ResourceError&);
+        virtual void clearUnarchivingState(WebCore::DocumentLoader*);
 
         virtual void postProgressStartedNotification();
         virtual void postProgressEstimateChangedNotification();
         virtual void postProgressFinishedNotification();
 
-        virtual Frame* createFrame(const KURL& url, const String& name, HTMLFrameOwnerElement* ownerElement,
-                                   const String& referrer, bool allowsScrolling, int marginWidth, int marginHeight);
-        virtual Widget* createPlugin(Element*, const KURL&, const Vector<String>&, const Vector<String>&, const String&, bool);
-        virtual void redirectDataToPlugin(Widget* pluginWidget);
-        virtual Widget* createJavaAppletWidget(const IntSize&, Element*, const KURL& baseURL, const Vector<String>& paramNames, const Vector<String>& paramValues);
-        virtual String overrideMediaType() const;
+        virtual WebCore::Frame* createFrame(const WebCore::KURL& url, const WebCore::String& name, WebCore::HTMLFrameOwnerElement* ownerElement,
+                                   const WebCore::String& referrer, bool allowsScrolling, int marginWidth, int marginHeight);
+        virtual WebCore::Widget* createPlugin(WebCore::Element*, const WebCore::KURL&, const WTF::Vector<WebCore::String>&, const WTF::Vector<WebCore::String>&, const WebCore::String&, bool);
+        virtual void redirectDataToPlugin(WebCore::Widget* pluginWidget);
+        virtual WebCore::Widget* createJavaAppletWidget(const WebCore::IntSize&, WebCore::Element*, const WebCore::KURL& baseURL, const WTF::Vector<WebCore::String>& paramNames, const WTF::Vector<WebCore::String>& paramValues);
+        virtual WebCore::String overrideMediaType() const;
         virtual void windowObjectCleared() const;
 
-        virtual ObjectContentType objectContentType(const KURL& url, const String& mimeType);
+        virtual WebCore::ObjectContentType objectContentType(const WebCore::KURL& url, const WebCore::String& mimeType);
 
         virtual void setMainFrameDocumentReady(bool);
 
-        virtual void startDownload(const ResourceRequest&);
+        virtual void startDownload(const WebCore::ResourceRequest&);
 
-        virtual void willChangeTitle(DocumentLoader*);
-        virtual void didChangeTitle(DocumentLoader*);
+        virtual void willChangeTitle(WebCore::DocumentLoader*);
+        virtual void didChangeTitle(WebCore::DocumentLoader*);
 
-        virtual void committedLoad(DocumentLoader*, const char*, int);
-        virtual void finishedLoading(DocumentLoader*);
-        virtual void finalSetupForReplace(DocumentLoader*);
+        virtual void committedLoad(WebCore::DocumentLoader*, const char*, int);
+        virtual void finishedLoading(WebCore::DocumentLoader*);
+        virtual void finalSetupForReplace(WebCore::DocumentLoader*);
 
-        virtual void updateGlobalHistoryForStandardLoad(const KURL&);
-        virtual void updateGlobalHistoryForReload(const KURL&);
-        virtual bool shouldGoToHistoryItem(HistoryItem*) const;
+        virtual void updateGlobalHistoryForStandardLoad(const WebCore::KURL&);
+        virtual void updateGlobalHistoryForReload(const WebCore::KURL&);
+        virtual bool shouldGoToHistoryItem(WebCore::HistoryItem*) const;
 
-        virtual ResourceError cancelledError(const ResourceRequest&);
-        virtual ResourceError blockedError(const ResourceRequest&);
-        virtual ResourceError cannotShowURLError(const ResourceRequest&);
-        virtual ResourceError interruptForPolicyChangeError(const ResourceRequest&);
+        virtual WebCore::ResourceError cancelledError(const WebCore::ResourceRequest&);
+        virtual WebCore::ResourceError blockedError(const WebCore::ResourceRequest&);
+        virtual WebCore::ResourceError cannotShowURLError(const WebCore::ResourceRequest&);
+        virtual WebCore::ResourceError interruptForPolicyChangeError(const WebCore::ResourceRequest&);
 
-        virtual ResourceError cannotShowMIMETypeError(const ResourceResponse&);
-        virtual ResourceError fileDoesNotExistError(const ResourceResponse&);
+        virtual WebCore::ResourceError cannotShowMIMETypeError(const WebCore::ResourceResponse&);
+        virtual WebCore::ResourceError fileDoesNotExistError(const WebCore::ResourceResponse&);
 
-        virtual bool shouldFallBack(const ResourceError&);
+        virtual bool shouldFallBack(const WebCore::ResourceError&);
 
         virtual void setDefersLoading(bool);
 
-        virtual bool willUseArchive(ResourceLoader*, const ResourceRequest&, const KURL& originalURL) const;
-        virtual bool isArchiveLoadPending(ResourceLoader*) const;
-        virtual void cancelPendingArchiveLoad(ResourceLoader*);
+        virtual bool willUseArchive(WebCore::ResourceLoader*, const WebCore::ResourceRequest&, const WebCore::KURL& originalURL) const;
+        virtual bool isArchiveLoadPending(WebCore::ResourceLoader*) const;
+        virtual void cancelPendingArchiveLoad(WebCore::ResourceLoader*);
         virtual void clearArchivedResources();
 
-        virtual bool canHandleRequest(const ResourceRequest&) const;
-        virtual bool canShowMIMEType(const String&) const;
-        virtual bool representationExistsForURLScheme(const String&) const;
-        virtual String generatedMIMETypeForURLScheme(const String&) const;
+        virtual bool canHandleRequest(const WebCore::ResourceRequest&) const;
+        virtual bool canShowMIMEType(const WebCore::String&) const;
+        virtual bool representationExistsForURLScheme(const WebCore::String&) const;
+        virtual WebCore::String generatedMIMETypeForURLScheme(const WebCore::String&) const;
 
         virtual void frameLoadCompleted();
-        virtual void saveViewStateToItem(HistoryItem*);
+        virtual void saveViewStateToItem(WebCore::HistoryItem*);
         virtual void restoreViewState();
         virtual void provisionalLoadStarted();
         virtual void didFinishLoad();
         virtual void prepareForDataSourceReplacement();
 
         virtual WTF::PassRefPtr<WebCore::DocumentLoader> createDocumentLoader(const WebCore::ResourceRequest&, const WebCore::SubstituteData&);
-        virtual void setTitle(const String& title, const KURL&);
+        virtual void setTitle(const WebCore::String& title, const WebCore::KURL&);
 
-        virtual String userAgent(const KURL&);
+        virtual WebCore::String userAgent(const WebCore::KURL&);
 
-        virtual void saveDocumentViewToCachedPage(CachedPage*);
+        virtual void saveDocumentViewToCachedPage(WebCore::CachedPage*);
         virtual bool canCachePage() const;
-        virtual void download(ResourceHandle*, const ResourceRequest&, const ResourceRequest&, const ResourceResponse&);
+        virtual void download(WebCore::ResourceHandle*, const WebCore::ResourceRequest&, const WebCore::ResourceRequest&, const WebCore::ResourceResponse&);
     private:
         WebKitGtkFrame* m_frame;
-        ResourceResponse m_response;
+        WebCore::ResourceResponse m_response;
         bool m_firstData;
     };
 
index 87cf688f255ad7e866e754a5e62ef6f4083e3d14..d42fdb63ca289dd3ca22853d327508bbea77d416 100644 (file)
 
 #include "NotImplemented.h"
 
-namespace WebCore {
+using namespace WebCore;
 
-void InspectorClientGtk::inspectorDestroyed()
+namespace WebKit {
+
+void InspectorClient::inspectorDestroyed()
 {
     notImplemented();
 }
 
-Page* InspectorClientGtk::createPage()
+Page* InspectorClient::createPage()
 {
     notImplemented();
     return 0;
 }
 
-void InspectorClientGtk::showWindow()
+void InspectorClient::showWindow()
 {
     notImplemented();
 }
 
-void InspectorClientGtk::closeWindow()
+void InspectorClient::closeWindow()
 {
     notImplemented();
 }
 
-void InspectorClientGtk::attachWindow()
+void InspectorClient::attachWindow()
 {
     notImplemented();
 }
 
-void InspectorClientGtk::detachWindow()
+void InspectorClient::detachWindow()
 {
     notImplemented();
 }
 
-void InspectorClientGtk::highlight(Node* node)
+void InspectorClient::highlight(Node* node)
 {
     notImplemented();
 }
 
-void InspectorClientGtk::hideHighlight()
+void InspectorClient::hideHighlight()
 {
     notImplemented();
 }
 
-void InspectorClientGtk::inspectedURLChanged(const String&)
+void InspectorClient::inspectedURLChanged(const String&)
 {
     notImplemented();
 }
index ca3ffafef48298e1ceb7f3dfb207c54d89de9d0e..4c1885e3e5b972cf7f2cf77f672099cfe778598d 100644 (file)
@@ -35,12 +35,15 @@ namespace WebCore {
     class Node;
     class Page;
     class String;
+}
+
+namespace WebKit {
 
-    class InspectorClientGtk : public InspectorClient {
+    class InspectorClient : public WebCore::InspectorClient {
     public:
         virtual void inspectorDestroyed();
 
-        virtual Page* createPage();
+        virtual WebCore::Page* createPage();
 
         virtual void showWindow();
         virtual void closeWindow();
@@ -48,9 +51,9 @@ namespace WebCore {
         virtual void attachWindow();
         virtual void detachWindow();
 
-        virtual void highlight(Node*);
+        virtual void highlight(WebCore::Node*);
         virtual void hideHighlight();
-        virtual void inspectedURLChanged(const String& newURL);
+        virtual void inspectedURLChanged(const WebCore::String& newURL);
     };
 }