WebCore:

author zecke <zecke@268f45cc-cd09-0410-ab3c-d52691b4dbfc>

Fri, 10 Aug 2007 01:53:39 +0000 (01:53 +0000)

committer zecke <zecke@268f45cc-cd09-0410-ab3c-d52691b4dbfc>

Fri, 10 Aug 2007 01:53:39 +0000 (01:53 +0000)
author zecke <zecke@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 10 Aug 2007 01:53:39 +0000 (01:53 +0000)
committer zecke <zecke@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 10 Aug 2007 01:53:39 +0000 (01:53 +0000)
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog

index 1d76fd9c6ce802cb19e82e09e4de924e29d8b03d..9358cd5f604aab05a45dc8e286cf54eb5ad2d780 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2007-08-10  Holger Hans Peter Freyther  <zecke@selfish.org>
+
+        Reviewed by Adam.
+
+        Move the various *ClientGdk.{h,cpp} away from the WebCore directory as
+        of http://bugs.webkit.org/show_bug.cgi?id=14727.
+
+        * WebCore.pro:
+        * platform/gdk/TemporaryLinkStubs.cpp:
+
  2007-08-09  Anders Carlsson  <andersca@apple.com>
  
          Reviewed by Maciej.
diff --git a/WebCore/WebCore.pro b/WebCore/WebCore.pro

index 6fd07e3437ec0778d304b6305ca9272ccc0bec6e..8510801dba47f451531c9fbe5e2495682a430af2 100644 (file)
--- a/WebCore/WebCore.pro
+++ b/WebCore/WebCore.pro
@@ -842,22 +842,22 @@ gdk-port {
          ../WebKit/gtk/Api/webkitgtkpage.h \
          ../WebKit/gtk/Api/webkitgtkprivate.h \
          ../WebKit/gtk/Api/webkitgtksettings.h \
-        ../WebKit/gtk/WebCoreSupport/ChromeClientGdk.h
+        ../WebKit/gtk/WebCoreSupport/ChromeClientGtk.h \ 
+        ../WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.h \
+        ../WebKit/gtk/WebCoreSupport/EditorClientGtk.h \
+        ../WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.h \
+        ../WebKit/gtk/WebCoreSupport/InspectorClientGtk.h
      SOURCES += \
          platform/TextCodecICU.cpp \
          platform/TextBreakIteratorICU.cpp \
          page/gdk/EventHandlerGdk.cpp \
          page/gdk/FrameGdk.cpp \
-        page/gdk/ContextMenuClientGdk.cpp \
          page/gdk/DragControllerGdk.cpp \
-        page/gdk/InspectorClientGdk.cpp \
          loader/gdk/DocumentLoaderGdk.cpp \
-        loader/gdk/FrameLoaderClientGdk.cpp \
          platform/gdk/CookieJarGdk.cpp \
          platform/gdk/CursorGdk.cpp \
          platform/gdk/DragDataGdk.cpp \
          platform/gdk/DragImageGdk.cpp \
-        platform/gdk/EditorClientGdk.cpp \
          platform/gdk/FontCacheGdk.cpp \
          platform/gdk/FontDataGdk.cpp \
          platform/gdk/FontGdk.cpp \
@@ -900,7 +900,11 @@ gdk-port {
          ../WebKit/gtk/Api/webkitgtkpage.cpp \
          ../WebKit/gtk/Api/webkitgtkprivate.cpp \
          ../WebKit/gtk/Api/webkitgtksettings.cpp \
-        ../WebKit/gtk/WebCoreSupport/ChromeClientGdk.cpp
+        ../WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp \ 
+        ../WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.cpp \
+        ../WebKit/gtk/WebCoreSupport/EditorClientGtk.cpp \
+        ../WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp \
+        ../WebKit/gtk/WebCoreSupport/InspectorClientGtk.cpp
  }
   
  contains(DEFINES, ENABLE_ICONDATABASE=1) {
diff --git a/WebCore/platform/gdk/TemporaryLinkStubs.cpp b/WebCore/platform/gdk/TemporaryLinkStubs.cpp

index 4ece1f8946d99377c651638d98c6ce5483f51775..5df55e971a7ec5273bcdc5f700c1e642d8e15ae6 100644 (file)
--- a/WebCore/platform/gdk/TemporaryLinkStubs.cpp
+++ b/WebCore/platform/gdk/TemporaryLinkStubs.cpp
@@ -44,7 +44,6 @@
  #include "Font.h"
  #include "FrameLoadRequest.h"
  #include "FrameLoader.h"
-#include "FrameLoaderClientGdk.h"
  #include "FrameView.h"
  #include "FTPDirectoryDocument.h"
  #include "GlobalHistory.h"
diff --git a/WebKit/gtk/Api/webkitgtkframe.cpp b/WebKit/gtk/Api/webkitgtkframe.cpp

index 9cdd4b895e4a1762ffbb70887a4fd9b5d0bb7733..ae4810ec630547c65617472a8ca08528da297b32 100644 (file)
--- a/WebKit/gtk/Api/webkitgtkframe.cpp
+++ b/WebKit/gtk/Api/webkitgtkframe.cpp
@@ -32,7 +32,7 @@
  #include "webkitgtkprivate.h"
  
  #include "FrameLoader.h"
-#include "FrameLoaderClientGdk.h"
+#include "FrameLoaderClientGtk.h"
  #include "FrameView.h"
  #include "HTMLFrameOwnerElement.h"
  
@@ -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 FrameLoaderClientGdk(frame);
+    frameData->client = new FrameLoaderClientGtk(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 FrameLoaderClientGdk(frame);
+    frameData->client = new FrameLoaderClientGtk(frame);
      frameData->frame = new Frame(pageData->page, element, frameData->client);
  
      FrameView* frameView = new FrameView(frameData->frame);
diff --git a/WebKit/gtk/Api/webkitgtkpage.cpp b/WebKit/gtk/Api/webkitgtkpage.cpp

index 71b93fadd698754c03c3547a500d9b400cbc1485..fa3d8150829485112280c0677e5f4b1567fa3605 100644 (file)
--- a/WebKit/gtk/Api/webkitgtkpage.cpp
+++ b/WebKit/gtk/Api/webkitgtkpage.cpp
@@ -33,14 +33,14 @@
  #include "webkitgtkprivate.h"
  
  #include "NotImplemented.h"
-#include "ChromeClientGdk.h"
-#include "ContextMenuClientGdk.h"
-#include "EditorClientGdk.h"
+#include "ChromeClientGtk.h"
+#include "ContextMenuClientGtk.h"
+#include "EditorClientGtk.h"
  #include "EventHandler.h"
  #include "HitTestRequest.h"
  #include "HitTestResult.h"
  #include "GraphicsContext.h"
-#include "InspectorClientGdk.h"
+#include "InspectorClientGtk.h"
  #include "FrameLoader.h"
  #include "FrameView.h"
  #include "PlatformKeyboardEvent.h"
@@ -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 ChromeClientGdk(page), new ContextMenuClientGdk, new EditorClientGdk(page), 0, new InspectorClientGdk);
+    pageData->page = new Page(new ChromeClientGtk(page), new ContextMenuClientGtk, new EditorClientGtk(page), 0, new InspectorClientGtk);
  
      Settings* settings = pageData->page->settings();
      settings->setLoadsImagesAutomatically(true);
diff --git a/WebKit/gtk/Api/webkitgtkprivate.cpp b/WebKit/gtk/Api/webkitgtkprivate.cpp

index 19b7b120db1bfcdf532a8bea913e8601378d1a77..7fbe78b2238f6be49b3c9bcb9d1846f8a3a85e84 100644 (file)
--- a/WebKit/gtk/Api/webkitgtkprivate.cpp
+++ b/WebKit/gtk/Api/webkitgtkprivate.cpp
@@ -31,7 +31,7 @@
  #include "webkitgtkprivate.h"
  #include "NotImplemented.h"
  #include "FrameLoader.h"
-#include "ChromeClientGdk.h"
+#include "ChromeClientGtk.h"
  
  using namespace WebCore;
  
@@ -65,7 +65,7 @@ WebCore::Frame* core(WebKitGtkFrame* frame)
  
  WebKitGtkFrame* kit(WebCore::Frame* coreFrame)
  {
-    FrameLoaderClientGdk* client = static_cast<FrameLoaderClientGdk*>(coreFrame->loader()->client());
+    FrameLoaderClientGtk* client = static_cast<FrameLoaderClientGtk*>(coreFrame->loader()->client());
      return client->webFrame();
  }
  
@@ -77,7 +77,7 @@ WebCore::Page* core(WebKitGtkPage* page)
  
  WebKitGtkPage* kit(WebCore::Page* page)
  {
-    ChromeClientGdk* client = static_cast<ChromeClientGdk*>(page->chrome()->client());
+    ChromeClientGtk* client = static_cast<ChromeClientGtk*>(page->chrome()->client());
      return client->webPage();
  }
  }
diff --git a/WebKit/gtk/Api/webkitgtkprivate.h b/WebKit/gtk/Api/webkitgtkprivate.h

index 0510e3aa0ada8ac9f3775d99bdc5bb8b2d68f77f..bafef28d261708e546bd377063bf666ce6297ead 100644 (file)
--- a/WebKit/gtk/Api/webkitgtkprivate.h
+++ b/WebKit/gtk/Api/webkitgtkprivate.h
@@ -44,7 +44,7 @@
  #include "Settings.h"
  #include "Page.h"
  #include "Frame.h"
-#include "FrameLoaderClientGdk.h"
+#include "FrameLoaderClientGtk.h"
  
  namespace WebKitGtk {
      void apply(WebKitGtkSettings*,WebCore::Settings*);
@@ -74,7 +74,7 @@ extern "C" {
      typedef struct _WebKitGtkFramePrivate WebKitGtkFramePrivate;
      struct _WebKitGtkFramePrivate {
          WebCore::Frame* frame;
-        WebCore::FrameLoaderClientGdk* client;
+        WebCore::FrameLoaderClientGtk* client;
          WebKitGtkPage* page;
      };
  
diff --git a/WebKit/gtk/ChangeLog b/WebKit/gtk/ChangeLog

index 571e0f227e2d52d06f4f5d80cda900ef6bb9f0a8..eaa74cecbe15bd1cd47b64dd18e32d27ddfa4ba4 100644 (file)
--- a/WebKit/gtk/ChangeLog
+++ b/WebKit/gtk/ChangeLog
@@ -1,3 +1,241 @@
+2007-08-10  Holger Hans Peter Freyther  <zecke@selfish.org>
+
+        Reviewed by Adam.
+
+        As of http://bugs.webkit.org/show_bug.cgi?id=14727 move the
+        various *ClientGdk.{cpp,h} files from WebCore to WebKit/gtk/WebCoreSupport and
+        rename it from Gdk to Gtk.
+
+        * Api/webkitgtkdefines.h:
+        * Api/webkitgtkframe.cpp:
+        * Api/webkitgtkframe.h:
+        * Api/webkitgtkglobal.cpp:
+        * Api/webkitgtkglobal.h:
+        * Api/webkitgtknetworkrequest.cpp:
+        * Api/webkitgtknetworkrequest.h:
+        * Api/webkitgtkpage.cpp:
+        * Api/webkitgtkpage.h:
+        * Api/webkitgtkprivate.cpp:
+        * Api/webkitgtkprivate.h:
+        * Api/webkitgtksettings.cpp:
+        * Api/webkitgtksettings.h:
+        * WebCoreSupport/ChromeClientGtk.cpp: Renamed from WebKit/gtk/WebCoreSupport/ChromeClientGdk.cpp.
+        (WebKitGtk::ChromeClientGtk::ChromeClientGtk):
+        (WebKitGtk::ChromeClientGtk::chromeDestroyed):
+        (WebKitGtk::ChromeClientGtk::windowRect):
+        (WebKitGtk::ChromeClientGtk::setWindowRect):
+        (WebKitGtk::ChromeClientGtk::pageRect):
+        (WebKitGtk::ChromeClientGtk::scaleFactor):
+        (WebKitGtk::ChromeClientGtk::focus):
+        (WebKitGtk::ChromeClientGtk::unfocus):
+        (WebKitGtk::ChromeClientGtk::createWindow):
+        (WebKitGtk::ChromeClientGtk::createModalDialog):
+        (WebKitGtk::ChromeClientGtk::show):
+        (WebKitGtk::ChromeClientGtk::canRunModal):
+        (WebKitGtk::ChromeClientGtk::runModal):
+        (WebKitGtk::ChromeClientGtk::setToolbarsVisible):
+        (WebKitGtk::ChromeClientGtk::toolbarsVisible):
+        (WebKitGtk::ChromeClientGtk::setStatusbarVisible):
+        (WebKitGtk::ChromeClientGtk::statusbarVisible):
+        (WebKitGtk::ChromeClientGtk::setScrollbarsVisible):
+        (WebKitGtk::ChromeClientGtk::scrollbarsVisible):
+        (WebKitGtk::ChromeClientGtk::setMenubarVisible):
+        (WebKitGtk::ChromeClientGtk::menubarVisible):
+        (WebKitGtk::ChromeClientGtk::setResizable):
+        (WebKitGtk::ChromeClientGtk::closeWindowSoon):
+        (WebKitGtk::ChromeClientGtk::canTakeFocus):
+        (WebKitGtk::ChromeClientGtk::takeFocus):
+        (WebKitGtk::ChromeClientGtk::canRunBeforeUnloadConfirmPanel):
+        (WebKitGtk::ChromeClientGtk::runBeforeUnloadConfirmPanel):
+        (WebKitGtk::ChromeClientGtk::addMessageToConsole):
+        (WebKitGtk::ChromeClientGtk::runJavaScriptAlert):
+        (WebKitGtk::ChromeClientGtk::runJavaScriptConfirm):
+        (WebKitGtk::ChromeClientGtk::runJavaScriptPrompt):
+        (WebKitGtk::ChromeClientGtk::setStatusbarText):
+        (WebKitGtk::ChromeClientGtk::shouldInterruptJavaScript):
+        (WebKitGtk::ChromeClientGtk::tabsToLinks):
+        (WebKitGtk::ChromeClientGtk::windowResizerRect):
+        (WebKitGtk::ChromeClientGtk::addToDirtyRegion):
+        (WebKitGtk::ChromeClientGtk::scrollBackingStore):
+        (WebKitGtk::ChromeClientGtk::updateBackingStore):
+        (WebKitGtk::ChromeClientGtk::mouseDidMoveOverElement):
+        (WebKitGtk::ChromeClientGtk::setToolTip):
+        * WebCoreSupport/ChromeClientGtk.h: Renamed from WebKit/gtk/WebCoreSupport/ChromeClientGdk.h.
+        (WebKitGtk::ChromeClientGtk::webPage):
+        * WebCoreSupport/ContextMenuClientGtk.cpp: Renamed from WebCore/page/gdk/ContextMenuClientGdk.cpp.
+        (WebCore::ContextMenuClientGtk::contextMenuDestroyed):
+        (WebCore::ContextMenuClientGtk::getCustomMenuFromDefaultItems):
+        (WebCore::ContextMenuClientGtk::contextMenuItemSelected):
+        (WebCore::ContextMenuClientGtk::downloadURL):
+        (WebCore::ContextMenuClientGtk::copyImageToClipboard):
+        (WebCore::ContextMenuClientGtk::searchWithGoogle):
+        (WebCore::ContextMenuClientGtk::lookUpInDictionary):
+        (WebCore::ContextMenuClientGtk::speak):
+        (WebCore::ContextMenuClientGtk::stopSpeaking):
+        * WebCoreSupport/ContextMenuClientGtk.h: Renamed from WebCore/page/gdk/ContextMenuClientGdk.h.
+        * WebCoreSupport/EditorClientGtk.cpp: Renamed from WebCore/platform/gdk/EditorClientGdk.cpp.
+        (WebCore::EditorClientGtk::shouldDeleteRange):
+        (WebCore::EditorClientGtk::shouldShowDeleteInterface):
+        (WebCore::EditorClientGtk::isContinuousSpellCheckingEnabled):
+        (WebCore::EditorClientGtk::isGrammarCheckingEnabled):
+        (WebCore::EditorClientGtk::spellCheckerDocumentTag):
+        (WebCore::EditorClientGtk::shouldBeginEditing):
+        (WebCore::EditorClientGtk::shouldEndEditing):
+        (WebCore::EditorClientGtk::shouldInsertText):
+        (WebCore::EditorClientGtk::shouldChangeSelectedRange):
+        (WebCore::EditorClientGtk::shouldApplyStyle):
+        (WebCore::EditorClientGtk::shouldMoveRangeAfterDelete):
+        (WebCore::EditorClientGtk::didBeginEditing):
+        (WebCore::EditorClientGtk::respondToChangedContents):
+        (WebCore::EditorClientGtk::respondToChangedSelection):
+        (WebCore::EditorClientGtk::didEndEditing):
+        (WebCore::EditorClientGtk::didWriteSelectionToPasteboard):
+        (WebCore::EditorClientGtk::didSetSelectionTypesForPasteboard):
+        (WebCore::EditorClientGtk::selectWordBeforeMenuEvent):
+        (WebCore::EditorClientGtk::isEditable):
+        (WebCore::EditorClientGtk::registerCommandForUndo):
+        (WebCore::EditorClientGtk::registerCommandForRedo):
+        (WebCore::EditorClientGtk::clearUndoRedoOperations):
+        (WebCore::EditorClientGtk::canUndo):
+        (WebCore::EditorClientGtk::canRedo):
+        (WebCore::EditorClientGtk::undo):
+        (WebCore::EditorClientGtk::redo):
+        (WebCore::EditorClientGtk::shouldInsertNode):
+        (WebCore::EditorClientGtk::pageDestroyed):
+        (WebCore::EditorClientGtk::smartInsertDeleteEnabled):
+        (WebCore::EditorClientGtk::toggleContinuousSpellChecking):
+        (WebCore::EditorClientGtk::toggleGrammarChecking):
+        (WebCore::EditorClientGtk::handleKeypress):
+        (WebCore::EditorClientGtk::handleInputMethodKeypress):
+        (WebCore::EditorClientGtk::EditorClientGtk):
+        (WebCore::EditorClientGtk::textFieldDidBeginEditing):
+        (WebCore::EditorClientGtk::textFieldDidEndEditing):
+        (WebCore::EditorClientGtk::textDidChangeInTextField):
+        (WebCore::EditorClientGtk::doTextFieldCommandFromEvent):
+        (WebCore::EditorClientGtk::textWillBeDeletedInTextField):
+        (WebCore::EditorClientGtk::textDidChangeInTextArea):
+        (WebCore::EditorClientGtk::ignoreWordInSpellDocument):
+        (WebCore::EditorClientGtk::learnWord):
+        (WebCore::EditorClientGtk::checkSpellingOfString):
+        (WebCore::EditorClientGtk::checkGrammarOfString):
+        (WebCore::EditorClientGtk::updateSpellingUIWithGrammarString):
+        (WebCore::EditorClientGtk::updateSpellingUIWithMisspelledWord):
+        (WebCore::EditorClientGtk::showSpellingUI):
+        (WebCore::EditorClientGtk::spellingUIIsShowing):
+        (WebCore::EditorClientGtk::getGuessesForWord):
+        * WebCoreSupport/EditorClientGtk.h: Renamed from WebCore/platform/gdk/EditorClientGdk.h.
+        * WebCoreSupport/FrameLoaderClientGtk.cpp: Renamed from WebCore/loader/gdk/FrameLoaderClientGdk.cpp.
+        (WebCore::FrameLoaderClientGtk::FrameLoaderClientGtk):
+        (WebCore::FrameLoaderClientGtk::userAgent):
+        (WebCore::FrameLoaderClientGtk::createDocumentLoader):
+        (WebCore::FrameLoaderClientGtk::dispatchWillSubmitForm):
+        (WebCore::FrameLoaderClientGtk::committedLoad):
+        (WebCore::FrameLoaderClientGtk::dispatchDidReceiveAuthenticationChallenge):
+        (WebCore::FrameLoaderClientGtk::dispatchDidCancelAuthenticationChallenge):
+        (WebCore::FrameLoaderClientGtk::dispatchWillSendRequest):
+        (WebCore::FrameLoaderClientGtk::assignIdentifierToInitialRequest):
+        (WebCore::FrameLoaderClientGtk::postProgressStartedNotification):
+        (WebCore::FrameLoaderClientGtk::postProgressEstimateChangedNotification):
+        (WebCore::FrameLoaderClientGtk::postProgressFinishedNotification):
+        (WebCore::FrameLoaderClientGtk::frameLoaderDestroyed):
+        (WebCore::FrameLoaderClientGtk::dispatchDidReceiveResponse):
+        (WebCore::FrameLoaderClientGtk::dispatchDecidePolicyForMIMEType):
+        (WebCore::FrameLoaderClientGtk::dispatchDecidePolicyForNewWindowAction):
+        (WebCore::FrameLoaderClientGtk::dispatchDecidePolicyForNavigationAction):
+        (WebCore::FrameLoaderClientGtk::createPlugin):
+        (WebCore::FrameLoaderClientGtk::createFrame):
+        (WebCore::FrameLoaderClientGtk::redirectDataToPlugin):
+        (WebCore::FrameLoaderClientGtk::createJavaAppletWidget):
+        (WebCore::FrameLoaderClientGtk::objectContentType):
+        (WebCore::FrameLoaderClientGtk::overrideMediaType):
+        (WebCore::FrameLoaderClientGtk::windowObjectCleared):
+        (WebCore::FrameLoaderClientGtk::setMainFrameDocumentReady):
+        (WebCore::FrameLoaderClientGtk::hasWebView):
+        (WebCore::FrameLoaderClientGtk::hasFrameView):
+        (WebCore::FrameLoaderClientGtk::dispatchDidFinishLoad):
+        (WebCore::FrameLoaderClientGtk::frameLoadCompleted):
+        (WebCore::FrameLoaderClientGtk::saveViewStateToItem):
+        (WebCore::FrameLoaderClientGtk::restoreViewState):
+        (WebCore::FrameLoaderClientGtk::shouldGoToHistoryItem):
+        (WebCore::FrameLoaderClientGtk::privateBrowsingEnabled):
+        (WebCore::FrameLoaderClientGtk::makeDocumentView):
+        (WebCore::FrameLoaderClientGtk::makeRepresentation):
+        (WebCore::FrameLoaderClientGtk::forceLayout):
+        (WebCore::FrameLoaderClientGtk::forceLayoutForNonHTML):
+        (WebCore::FrameLoaderClientGtk::setCopiesOnScroll):
+        (WebCore::FrameLoaderClientGtk::detachedFromParent1):
+        (WebCore::FrameLoaderClientGtk::detachedFromParent2):
+        (WebCore::FrameLoaderClientGtk::detachedFromParent3):
+        (WebCore::FrameLoaderClientGtk::detachedFromParent4):
+        (WebCore::FrameLoaderClientGtk::loadedFromCachedPage):
+        (WebCore::FrameLoaderClientGtk::dispatchDidHandleOnloadEvents):
+        (WebCore::FrameLoaderClientGtk::dispatchDidReceiveServerRedirectForProvisionalLoad):
+        (WebCore::FrameLoaderClientGtk::dispatchDidCancelClientRedirect):
+        (WebCore::FrameLoaderClientGtk::dispatchWillPerformClientRedirect):
+        (WebCore::FrameLoaderClientGtk::dispatchDidChangeLocationWithinPage):
+        (WebCore::FrameLoaderClientGtk::dispatchWillClose):
+        (WebCore::FrameLoaderClientGtk::dispatchDidReceiveIcon):
+        (WebCore::FrameLoaderClientGtk::dispatchDidStartProvisionalLoad):
+        (WebCore::FrameLoaderClientGtk::dispatchDidReceiveTitle):
+        (WebCore::FrameLoaderClientGtk::dispatchDidCommitLoad):
+        (WebCore::FrameLoaderClientGtk::dispatchDidFinishDocumentLoad):
+        (WebCore::FrameLoaderClientGtk::dispatchDidFirstLayout):
+        (WebCore::FrameLoaderClientGtk::dispatchShow):
+        (WebCore::FrameLoaderClientGtk::cancelPolicyCheck):
+        (WebCore::FrameLoaderClientGtk::dispatchDidLoadMainResource):
+        (WebCore::FrameLoaderClientGtk::revertToProvisionalState):
+        (WebCore::FrameLoaderClientGtk::clearUnarchivingState):
+        (WebCore::FrameLoaderClientGtk::willChangeTitle):
+        (WebCore::FrameLoaderClientGtk::didChangeTitle):
+        (WebCore::FrameLoaderClientGtk::finishedLoading):
+        (WebCore::FrameLoaderClientGtk::finalSetupForReplace):
+        (WebCore::FrameLoaderClientGtk::setDefersLoading):
+        (WebCore::FrameLoaderClientGtk::isArchiveLoadPending):
+        (WebCore::FrameLoaderClientGtk::cancelPendingArchiveLoad):
+        (WebCore::FrameLoaderClientGtk::clearArchivedResources):
+        (WebCore::FrameLoaderClientGtk::canHandleRequest):
+        (WebCore::FrameLoaderClientGtk::canShowMIMEType):
+        (WebCore::FrameLoaderClientGtk::representationExistsForURLScheme):
+        (WebCore::FrameLoaderClientGtk::generatedMIMETypeForURLScheme):
+        (WebCore::FrameLoaderClientGtk::provisionalLoadStarted):
+        (WebCore::FrameLoaderClientGtk::didFinishLoad):
+        (WebCore::FrameLoaderClientGtk::prepareForDataSourceReplacement):
+        (WebCore::FrameLoaderClientGtk::setTitle):
+        (WebCore::FrameLoaderClientGtk::setDocumentViewFromCachedPage):
+        (WebCore::FrameLoaderClientGtk::dispatchDidReceiveContentLength):
+        (WebCore::FrameLoaderClientGtk::dispatchDidFinishLoading):
+        (WebCore::FrameLoaderClientGtk::dispatchDidFailLoading):
+        (WebCore::FrameLoaderClientGtk::dispatchDidLoadResourceFromMemoryCache):
+        (WebCore::FrameLoaderClientGtk::dispatchDidFailProvisionalLoad):
+        (WebCore::FrameLoaderClientGtk::dispatchDidFailLoad):
+        (WebCore::FrameLoaderClientGtk::download):
+        (WebCore::FrameLoaderClientGtk::cancelledError):
+        (WebCore::FrameLoaderClientGtk::blockedError):
+        (WebCore::FrameLoaderClientGtk::cannotShowURLError):
+        (WebCore::FrameLoaderClientGtk::interruptForPolicyChangeError):
+        (WebCore::FrameLoaderClientGtk::cannotShowMIMETypeError):
+        (WebCore::FrameLoaderClientGtk::fileDoesNotExistError):
+        (WebCore::FrameLoaderClientGtk::shouldFallBack):
+        (WebCore::FrameLoaderClientGtk::willUseArchive):
+        (WebCore::FrameLoaderClientGtk::saveDocumentViewToCachedPage):
+        (WebCore::FrameLoaderClientGtk::canCachePage):
+        (WebCore::FrameLoaderClientGtk::dispatchCreatePage):
+        (WebCore::FrameLoaderClientGtk::dispatchUnableToImplementPolicy):
+        * WebCoreSupport/FrameLoaderClientGtk.h: Renamed from WebCore/loader/gdk/FrameLoaderClientGdk.h.
+        (WebCore::FrameLoaderClientGtk::~FrameLoaderClientGtk):
+        (WebCore::FrameLoaderClientGtk::webFrame):
+        * WebCoreSupport/InspectorClientGtk.cpp: Renamed from WebCore/page/gdk/InspectorClientGdk.cpp.
+        (WebCore::InspectorClientGtk::inspectorDestroyed):
+        (WebCore::InspectorClientGtk::createPage):
+        (WebCore::InspectorClientGtk::showWindow):
+        (WebCore::InspectorClientGtk::closeWindow):
+        (WebCore::InspectorClientGtk::attachWindow):
+        (WebCore::InspectorClientGtk::detachWindow):
+        (WebCore::InspectorClientGtk::highlight):
+        (WebCore::InspectorClientGtk::hideHighlight):
+        (WebCore::InspectorClientGtk::inspectedURLChanged):
+        * WebCoreSupport/InspectorClientGtk.h: Renamed from WebCore/page/gdk/InspectorClientGdk.h.
+
  2007-08-10  Holger Hans Peter Freyther  <zecke@selfish.org>
  
          Build fix.
diff --git a/WebKit/gtk/WebCoreSupport/ChromeClientGdk.cpp b/WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp

similarity index 71%

rename from WebKit/gtk/WebCoreSupport/ChromeClientGdk.cpp

rename to WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp

index b4fc6ac1281de28b85c7fcf44230a334808b63b2..56467e3ae9bbe90e5381df255a7cf70256ae8b39 100644 (file)
--- a/WebKit/gtk/WebCoreSupport/ChromeClientGdk.cpp
+++ b/WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp
@@ -27,7 +27,7 @@
   */
  
  #include "config.h"
-#include "ChromeClientGdk.h"
+#include "ChromeClientGtk.h"
  #include "FloatRect.h"
  #include "IntRect.h"
  #include "PlatformString.h"
@@ -40,50 +40,50 @@
  using namespace WebCore;
  
  namespace WebKitGtk {
-ChromeClientGdk::ChromeClientGdk(WebKitGtkPage* page)
+ChromeClientGtk::ChromeClientGtk(WebKitGtkPage* page)
      : m_webPage(page)
  {
  }
  
-void ChromeClientGdk::chromeDestroyed()
+void ChromeClientGtk::chromeDestroyed()
  {
      notImplemented();
  }
  
-FloatRect ChromeClientGdk::windowRect()
+FloatRect ChromeClientGtk::windowRect()
  {
      notImplemented();
      return FloatRect();
  }
  
-void ChromeClientGdk::setWindowRect(const FloatRect& r)
+void ChromeClientGtk::setWindowRect(const FloatRect& r)
  {
      notImplemented();
  }
  
-FloatRect ChromeClientGdk::pageRect()
+FloatRect ChromeClientGtk::pageRect()
  {
      notImplemented();
      return FloatRect();
  }
  
-float ChromeClientGdk::scaleFactor()
+float ChromeClientGtk::scaleFactor()
  {
      notImplemented();
      return 1.0;
  }
  
-void ChromeClientGdk::focus()
+void ChromeClientGtk::focus()
  {
      notImplemented();
  }
  
-void ChromeClientGdk::unfocus()
+void ChromeClientGtk::unfocus()
  {
      notImplemented();
  }
      
-Page* ChromeClientGdk::createWindow(Frame*, const FrameLoadRequest&)
+Page* ChromeClientGtk::createWindow(Frame*, const FrameLoadRequest&)
  {
      /* TODO: FrameLoadRequest is not used */
      WebKitGtkPage* page = WEBKIT_GTK_PAGE_GET_CLASS(m_webPage)->create_page(m_webPage);
@@ -94,105 +94,105 @@ Page* ChromeClientGdk::createWindow(Frame*, const FrameLoadRequest&)
      return private_data->page;
  }
  
-Page* ChromeClientGdk::createModalDialog(Frame*, const FrameLoadRequest&)
+Page* ChromeClientGtk::createModalDialog(Frame*, const FrameLoadRequest&)
  {
      notImplemented();
      return 0;
  }
  
-void ChromeClientGdk::show()
+void ChromeClientGtk::show()
  {
      notImplemented();
  }
  
-bool ChromeClientGdk::canRunModal()
+bool ChromeClientGtk::canRunModal()
  {
      notImplemented();
      return false;
  }
  
-void ChromeClientGdk::runModal()
+void ChromeClientGtk::runModal()
  {
      notImplemented();
  }
  
-void ChromeClientGdk::setToolbarsVisible(bool)
+void ChromeClientGtk::setToolbarsVisible(bool)
  {
      notImplemented();
  }
  
-bool ChromeClientGdk::toolbarsVisible()
+bool ChromeClientGtk::toolbarsVisible()
  {
      notImplemented();
      return false;
  }
  
-void ChromeClientGdk::setStatusbarVisible(bool)
+void ChromeClientGtk::setStatusbarVisible(bool)
  {
      notImplemented();
  }
  
-bool ChromeClientGdk::statusbarVisible()
+bool ChromeClientGtk::statusbarVisible()
  {
      notImplemented();
      return false;
  }
  
-void ChromeClientGdk::setScrollbarsVisible(bool)
+void ChromeClientGtk::setScrollbarsVisible(bool)
  {
      notImplemented();
  }
  
-bool ChromeClientGdk::scrollbarsVisible() {
+bool ChromeClientGtk::scrollbarsVisible() {
      notImplemented();
      return false;
  }
  
-void ChromeClientGdk::setMenubarVisible(bool)
+void ChromeClientGtk::setMenubarVisible(bool)
  {
      notImplemented();
  }
  
-bool ChromeClientGdk::menubarVisible()
+bool ChromeClientGtk::menubarVisible()
  {
      notImplemented();
      return false;
  }
  
-void ChromeClientGdk::setResizable(bool)
+void ChromeClientGtk::setResizable(bool)
  {
      notImplemented();
  }
  
-void ChromeClientGdk::closeWindowSoon()
+void ChromeClientGtk::closeWindowSoon()
  {
      notImplemented();
  }
  
-bool ChromeClientGdk::canTakeFocus(FocusDirection)
+bool ChromeClientGtk::canTakeFocus(FocusDirection)
  {
      notImplemented();
      return true;
  }
  
-void ChromeClientGdk::takeFocus(FocusDirection)
+void ChromeClientGtk::takeFocus(FocusDirection)
  {
      notImplemented();
  }
  
-bool ChromeClientGdk::canRunBeforeUnloadConfirmPanel()
+bool ChromeClientGtk::canRunBeforeUnloadConfirmPanel()
  {
      notImplemented();
      return false;
  }
  
-bool ChromeClientGdk::runBeforeUnloadConfirmPanel(const WebCore::String&, WebCore::Frame*)
+bool ChromeClientGtk::runBeforeUnloadConfirmPanel(const WebCore::String&, WebCore::Frame*)
  {
      notImplemented();
      return false;
  }
  
-void ChromeClientGdk::addMessageToConsole(const WebCore::String& message, unsigned int lineNumber, const WebCore::String& sourceId)
+void ChromeClientGtk::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 ChromeClientGdk::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 ChromeClientGdk::runJavaScriptAlert(Frame* frame, const String& message)
+void ChromeClientGtk::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 ChromeClientGdk::runJavaScriptConfirm(Frame* frame, const String& message)
+bool ChromeClientGtk::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 ChromeClientGdk::runJavaScriptPrompt(Frame* frame, const String& message, const String& defaultValue, String& result)
+bool ChromeClientGtk::runJavaScriptPrompt(Frame* frame, const String& message, const String& defaultValue, String& result)
  {
      CString messageString = message.utf8();
      CString defaultValueString = defaultValue.utf8(); 
@@ -230,56 +230,56 @@ bool ChromeClientGdk::runJavaScriptPrompt(Frame* frame, const String& message, c
      }
  }
  
-void ChromeClientGdk::setStatusbarText(const String& string)
+void ChromeClientGtk::setStatusbarText(const String& string)
  {
      CString stringMessage = string.utf8();
      g_signal_emit_by_name(m_webPage, "status_bar_text_changed", stringMessage.data());
  }
  
-bool ChromeClientGdk::shouldInterruptJavaScript()
+bool ChromeClientGtk::shouldInterruptJavaScript()
  {
      notImplemented();
      return false;
  }
  
-bool ChromeClientGdk::tabsToLinks() const
+bool ChromeClientGtk::tabsToLinks() const
  {
      notImplemented();
      return false;
  }
  
-IntRect ChromeClientGdk::windowResizerRect() const
+IntRect ChromeClientGtk::windowResizerRect() const
  {
      notImplemented();
      return IntRect();
  }
  
-void ChromeClientGdk::addToDirtyRegion(const IntRect&)
+void ChromeClientGtk::addToDirtyRegion(const IntRect&)
  {
      notImplemented();
  }
  
-void ChromeClientGdk::scrollBackingStore(int dx, int dy, const IntRect& scrollViewRect, const IntRect& clipRect)
+void ChromeClientGtk::scrollBackingStore(int dx, int dy, const IntRect& scrollViewRect, const IntRect& clipRect)
  {
      notImplemented();
  }
  
-void ChromeClientGdk::updateBackingStore()
+void ChromeClientGtk::updateBackingStore()
  {
      notImplemented();
  }
  
-void ChromeClientGdk::mouseDidMoveOverElement(const HitTestResult&, unsigned modifierFlags)
+void ChromeClientGtk::mouseDidMoveOverElement(const HitTestResult&, unsigned modifierFlags)
  {
      notImplemented();
  }
  
-void ChromeClientGdk::setToolTip(const String&)
+void ChromeClientGtk::setToolTip(const String&)
  {
      notImplemented();
  }
  
-void ChromeClientGdk::print(Frame*)
+void ChromeClientGtk::print(Frame*)
  {
      notImplemented();
  }
diff --git a/WebKit/gtk/WebCoreSupport/ChromeClientGdk.h b/WebKit/gtk/WebCoreSupport/ChromeClientGtk.h

similarity index 95%

rename from WebKit/gtk/WebCoreSupport/ChromeClientGdk.h

rename to WebKit/gtk/WebCoreSupport/ChromeClientGtk.h

index d421b8d7dba746a392c20d64985e13dca029fe40..39279d926e604387542cc0ecffc134e30835f012 100644 (file)
--- a/WebKit/gtk/WebCoreSupport/ChromeClientGdk.h
+++ b/WebKit/gtk/WebCoreSupport/ChromeClientGtk.h
@@ -26,8 +26,8 @@
   * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   */
  
-#ifndef ChromeClientGdk_h
-#define ChromeClientGdk_h
+#ifndef ChromeClientGtk_h
+#define ChromeClientGtk_h
  
  #include "ChromeClient.h"
  
@@ -35,9 +35,9 @@ typedef struct _WebKitGtkPage WebKitGtkPage;
  
  namespace WebKitGtk {
  
-    class ChromeClientGdk : public WebCore::ChromeClient {
+    class ChromeClientGtk : public WebCore::ChromeClient {
      public:
-        ChromeClientGdk(WebKitGtkPage*);
+        ChromeClientGtk(WebKitGtkPage*);
          WebKitGtkPage* webPage() const { return m_webPage; }
  
          virtual void chromeDestroyed();
@@ -106,4 +106,4 @@ namespace WebKitGtk {
      };
  }
  
-#endif // ChromeClientGdk_h
+#endif // ChromeClientGtk_h
diff --git a/WebCore/page/gdk/ContextMenuClientGdk.cpp b/WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.cpp

similarity index 77%

rename from WebCore/page/gdk/ContextMenuClientGdk.cpp

rename to WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.cpp

index 2689a1bdce4121eed7b3989d55ef7b00bd3bffec..1c2565f75b3a90b8f5ceff2e8f7149548ae728a6 100644 (file)
--- a/WebCore/page/gdk/ContextMenuClientGdk.cpp
+++ b/WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.cpp
@@ -24,7 +24,7 @@
   */
  
  #include "config.h"
-#include "ContextMenuClientGdk.h"
+#include "ContextMenuClientGtk.h"
  
  #include "HitTestResult.h"
  #include "KURL.h"
@@ -34,48 +34,48 @@
  
  namespace WebCore {
      
-void ContextMenuClientGdk::contextMenuDestroyed()
+void ContextMenuClientGtk::contextMenuDestroyed()
  {
      notImplemented();
  }
  
-PlatformMenuDescription ContextMenuClientGdk::getCustomMenuFromDefaultItems(ContextMenu*)
+PlatformMenuDescription ContextMenuClientGtk::getCustomMenuFromDefaultItems(ContextMenu*)
  {
      notImplemented();
      return PlatformMenuDescription();
  }
  
-void ContextMenuClientGdk::contextMenuItemSelected(ContextMenuItem*, const ContextMenu*)
+void ContextMenuClientGtk::contextMenuItemSelected(ContextMenuItem*, const ContextMenu*)
  {
      notImplemented();
  }
  
-void ContextMenuClientGdk::downloadURL(const KURL& url)
+void ContextMenuClientGtk::downloadURL(const KURL& url)
  {
      notImplemented();
  }
  
-void ContextMenuClientGdk::copyImageToClipboard(const HitTestResult&)
+void ContextMenuClientGtk::copyImageToClipboard(const HitTestResult&)
  {
      notImplemented();
  }
  
-void ContextMenuClientGdk::searchWithGoogle(const Frame*)
+void ContextMenuClientGtk::searchWithGoogle(const Frame*)
  {
      notImplemented();
  }
  
-void ContextMenuClientGdk::lookUpInDictionary(Frame*)
+void ContextMenuClientGtk::lookUpInDictionary(Frame*)
  {
      notImplemented();
  }
  
-void ContextMenuClientGdk::speak(const String&)
+void ContextMenuClientGtk::speak(const String&)
  {
      notImplemented();
  }
  
-void ContextMenuClientGdk::stopSpeaking()
+void ContextMenuClientGtk::stopSpeaking()
  {
      notImplemented();
  }
diff --git a/WebCore/page/gdk/ContextMenuClientGdk.h b/WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.h

similarity index 94%

rename from WebCore/page/gdk/ContextMenuClientGdk.h

rename to WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.h

index 6b2e5e797d705e2f0cabbb67eaef49e36a087d27..bfcf56a9272f13fa89e3fc4b669c3807bae80cbe 100644 (file)
--- a/WebCore/page/gdk/ContextMenuClientGdk.h
+++ b/WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.h
@@ -23,15 +23,15 @@
   * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   */
  
-#ifndef ContextMenuClientGdk_h
-#define ContextMenuClientGdk_h
+#ifndef ContextMenuClientGtk_h
+#define ContextMenuClientGtk_h
  
  #include "ContextMenuClient.h"
  
  namespace WebCore {
      class ContextMenu;
  
-    class ContextMenuClientGdk : public ContextMenuClient
+    class ContextMenuClientGtk : public ContextMenuClient
      {
      public:
          virtual void contextMenuDestroyed();
diff --git a/WebCore/platform/gdk/EditorClientGdk.cpp b/WebKit/gtk/WebCoreSupport/EditorClientGtk.cpp

similarity index 66%

rename from WebCore/platform/gdk/EditorClientGdk.cpp

rename to WebKit/gtk/WebCoreSupport/EditorClientGtk.cpp

index d698a226ca1aac4dada79f21d710a839900c81b2..2af38ff2098f228fc08157b74cab27295399245a 100644 (file)
--- a/WebCore/platform/gdk/EditorClientGdk.cpp
+++ b/WebKit/gtk/WebCoreSupport/EditorClientGtk.cpp
@@ -28,7 +28,7 @@
   */
  
  #include "config.h"
-#include "EditorClientGdk.h"
+#include "EditorClientGtk.h"
  
  #include "EditCommand.h"
  #include "Editor.h"
@@ -47,178 +47,178 @@ using namespace WebKitGtk;
  
  namespace WebCore {
  
-bool EditorClientGdk::shouldDeleteRange(Range*)
+bool EditorClientGtk::shouldDeleteRange(Range*)
  {
      notImplemented();
      return false;
  }
  
-bool EditorClientGdk::shouldShowDeleteInterface(HTMLElement*)
+bool EditorClientGtk::shouldShowDeleteInterface(HTMLElement*)
  {
      return false;
  }
  
-bool EditorClientGdk::isContinuousSpellCheckingEnabled()
+bool EditorClientGtk::isContinuousSpellCheckingEnabled()
  {
      notImplemented();
      return false;
  }
  
-bool EditorClientGdk::isGrammarCheckingEnabled()
+bool EditorClientGtk::isGrammarCheckingEnabled()
  {
      notImplemented();
      return false;
  }
  
-int EditorClientGdk::spellCheckerDocumentTag()
+int EditorClientGtk::spellCheckerDocumentTag()
  {
      notImplemented();
      return 0;
  }
  
-bool EditorClientGdk::shouldBeginEditing(WebCore::Range*)
+bool EditorClientGtk::shouldBeginEditing(WebCore::Range*)
  {
      notImplemented();
      return false;
  }
  
-bool EditorClientGdk::shouldEndEditing(WebCore::Range*)
+bool EditorClientGtk::shouldEndEditing(WebCore::Range*)
  {
      notImplemented();
      return false;
  }
  
-bool EditorClientGdk::shouldInsertText(String, Range*, EditorInsertAction)
+bool EditorClientGtk::shouldInsertText(String, Range*, EditorInsertAction)
  {
      notImplemented();
      return true;
  }
  
-bool EditorClientGdk::shouldChangeSelectedRange(Range* fromRange, Range* toRange, EAffinity, bool stillSelecting)
+bool EditorClientGtk::shouldChangeSelectedRange(Range* fromRange, Range* toRange, EAffinity, bool stillSelecting)
  {
      notImplemented();
      return true;
  }
  
-bool EditorClientGdk::shouldApplyStyle(WebCore::CSSStyleDeclaration*,
+bool EditorClientGtk::shouldApplyStyle(WebCore::CSSStyleDeclaration*,
                                        WebCore::Range*)
  {
      notImplemented();
      return false;
  }
  
-bool EditorClientGdk::shouldMoveRangeAfterDelete(WebCore::Range*, WebCore::Range*)
+bool EditorClientGtk::shouldMoveRangeAfterDelete(WebCore::Range*, WebCore::Range*)
  {
      notImplemented();
      return true;
  }
  
-void EditorClientGdk::didBeginEditing()
+void EditorClientGtk::didBeginEditing()
  {
      notImplemented();
  }
  
-void EditorClientGdk::respondToChangedContents()
+void EditorClientGtk::respondToChangedContents()
  {
      notImplemented();
  }
  
-void EditorClientGdk::respondToChangedSelection()
+void EditorClientGtk::respondToChangedSelection()
  {
      notImplemented();
  }
  
-void EditorClientGdk::didEndEditing()
+void EditorClientGtk::didEndEditing()
  {
      notImplemented();
  }
  
-void EditorClientGdk::didWriteSelectionToPasteboard()
+void EditorClientGtk::didWriteSelectionToPasteboard()
  {
      notImplemented();
  }
  
-void EditorClientGdk::didSetSelectionTypesForPasteboard()
+void EditorClientGtk::didSetSelectionTypesForPasteboard()
  {
      notImplemented();
  }
  
-bool EditorClientGdk::selectWordBeforeMenuEvent()
+bool EditorClientGtk::selectWordBeforeMenuEvent()
  {
      notImplemented();
      return false;
  }
  
-bool EditorClientGdk::isEditable()
+bool EditorClientGtk::isEditable()
  {
      notImplemented();
      return false;
  }
  
-void EditorClientGdk::registerCommandForUndo(WTF::PassRefPtr<WebCore::EditCommand>)
+void EditorClientGtk::registerCommandForUndo(WTF::PassRefPtr<WebCore::EditCommand>)
  {
      notImplemented();
  }
  
-void EditorClientGdk::registerCommandForRedo(WTF::PassRefPtr<WebCore::EditCommand>)
+void EditorClientGtk::registerCommandForRedo(WTF::PassRefPtr<WebCore::EditCommand>)
  {
      notImplemented();
  }
  
-void EditorClientGdk::clearUndoRedoOperations()
+void EditorClientGtk::clearUndoRedoOperations()
  {
      notImplemented();
  }
  
-bool EditorClientGdk::canUndo() const
+bool EditorClientGtk::canUndo() const
  {
      notImplemented();
      return false;
  }
  
-bool EditorClientGdk::canRedo() const
+bool EditorClientGtk::canRedo() const
  {
      notImplemented();
      return false;
  }
  
-void EditorClientGdk::undo()
+void EditorClientGtk::undo()
  {
      notImplemented();
  }
  
-void EditorClientGdk::redo()
+void EditorClientGtk::redo()
  {
      notImplemented();
  }
  
-bool EditorClientGdk::shouldInsertNode(Node*, Range*, EditorInsertAction)
+bool EditorClientGtk::shouldInsertNode(Node*, Range*, EditorInsertAction)
  {
      notImplemented();
      return false;
  }
  
-void EditorClientGdk::pageDestroyed()
+void EditorClientGtk::pageDestroyed()
  {
      notImplemented();
  }
  
-bool EditorClientGdk::smartInsertDeleteEnabled()
+bool EditorClientGtk::smartInsertDeleteEnabled()
  {
      notImplemented();
      return false;
  }
  
-void EditorClientGdk::toggleContinuousSpellChecking()
+void EditorClientGtk::toggleContinuousSpellChecking()
  {
      notImplemented();
  }
  
-void EditorClientGdk::toggleGrammarChecking()
+void EditorClientGtk::toggleGrammarChecking()
  {
  }
  
-void EditorClientGdk::handleKeypress(KeyboardEvent* event)
+void EditorClientGtk::handleKeypress(KeyboardEvent* event)
  {
      Frame* frame = core(m_page)->focusController()->focusedOrMainFrame();
      if (!frame)
@@ -258,89 +258,89 @@ void EditorClientGdk::handleKeypress(KeyboardEvent* event)
  }
  
  
-void EditorClientGdk::handleInputMethodKeypress(KeyboardEvent*)
+void EditorClientGtk::handleInputMethodKeypress(KeyboardEvent*)
  {
      notImplemented();
  }
  
-EditorClientGdk::EditorClientGdk(WebKitGtkPage* page)
+EditorClientGtk::EditorClientGtk(WebKitGtkPage* page)
      : m_page(page)
  {
  }
  
-void EditorClientGdk::textFieldDidBeginEditing(Element*)
+void EditorClientGtk::textFieldDidBeginEditing(Element*)
  {
      notImplemented();
  }
  
-void EditorClientGdk::textFieldDidEndEditing(Element*)
+void EditorClientGtk::textFieldDidEndEditing(Element*)
  {
      notImplemented();
  }
  
-void EditorClientGdk::textDidChangeInTextField(Element*)
+void EditorClientGtk::textDidChangeInTextField(Element*)
  {
      notImplemented();
  }
  
-bool EditorClientGdk::doTextFieldCommandFromEvent(Element*, KeyboardEvent*)
+bool EditorClientGtk::doTextFieldCommandFromEvent(Element*, KeyboardEvent*)
  {
      notImplemented();
      return false;
  }
  
-void EditorClientGdk::textWillBeDeletedInTextField(Element*)
+void EditorClientGtk::textWillBeDeletedInTextField(Element*)
  {
      notImplemented();
  }
  
-void EditorClientGdk::textDidChangeInTextArea(Element*)
+void EditorClientGtk::textDidChangeInTextArea(Element*)
  {
      notImplemented();
  }
  
-void EditorClientGdk::ignoreWordInSpellDocument(const String&)
+void EditorClientGtk::ignoreWordInSpellDocument(const String&)
  {
      notImplemented();
  }
  
-void EditorClientGdk::learnWord(const String&)
+void EditorClientGtk::learnWord(const String&)
  {
      notImplemented();
  }
  
-void EditorClientGdk::checkSpellingOfString(const UChar*, int, int*, int*)
+void EditorClientGtk::checkSpellingOfString(const UChar*, int, int*, int*)
  {
      notImplemented();
  }
  
-void EditorClientGdk::checkGrammarOfString(const UChar*, int, Vector<GrammarDetail>&, int*, int*)
+void EditorClientGtk::checkGrammarOfString(const UChar*, int, Vector<GrammarDetail>&, int*, int*)
  {
      notImplemented();
  }
  
-void EditorClientGdk::updateSpellingUIWithGrammarString(const String&, const GrammarDetail&)
+void EditorClientGtk::updateSpellingUIWithGrammarString(const String&, const GrammarDetail&)
  {
      notImplemented();
  }
  
-void EditorClientGdk::updateSpellingUIWithMisspelledWord(const String&)
+void EditorClientGtk::updateSpellingUIWithMisspelledWord(const String&)
  {
      notImplemented();
  }
  
-void EditorClientGdk::showSpellingUI(bool)
+void EditorClientGtk::showSpellingUI(bool)
  {
      notImplemented();
  }
  
-bool EditorClientGdk::spellingUIIsShowing()
+bool EditorClientGtk::spellingUIIsShowing()
  {
      notImplemented();
      return false;
  }
  
-void EditorClientGdk::getGuessesForWord(const String&, Vector<String>&)
+void EditorClientGtk::getGuessesForWord(const String&, Vector<String>&)
  {
      notImplemented();
  }
diff --git a/WebCore/platform/gdk/EditorClientGdk.h b/WebKit/gtk/WebCoreSupport/EditorClientGtk.h

similarity index 97%

rename from WebCore/platform/gdk/EditorClientGdk.h

rename to WebKit/gtk/WebCoreSupport/EditorClientGtk.h

index 6a867957ae83ab62640497912eebc233f61c585b..7b594fa61934cb8a8609b30efe5bd72570ac576d 100644 (file)
--- a/WebCore/platform/gdk/EditorClientGdk.h
+++ b/WebKit/gtk/WebCoreSupport/EditorClientGtk.h
@@ -27,8 +27,8 @@
   * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   */
  
-#ifndef EditorClientGdk_h
-#define EditorClientGdk_h
+#ifndef EditorClientGtk_h
+#define EditorClientGtk_h
  
  #include "EditorClient.h"
  
@@ -40,9 +40,9 @@ namespace WebCore {
  
  class Page;
  
-class EditorClientGdk : public EditorClient {
+class EditorClientGtk : public EditorClient {
  public:
-    EditorClientGdk(WebKitGtkPage*);
+    EditorClientGtk(WebKitGtkPage*);
  
      // from EditorClient
      virtual void pageDestroyed();
diff --git a/WebCore/loader/gdk/FrameLoaderClientGdk.cpp b/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp

similarity index 62%

rename from WebCore/loader/gdk/FrameLoaderClientGdk.cpp

rename to WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp

index e155dd50609d96ba1a15b4a82a1503cb43dced3d..e8f34d5ab5300121aa5ac921f6f4a2720ee53bd9 100644 (file)
--- a/WebCore/loader/gdk/FrameLoaderClientGdk.cpp
+++ b/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp
@@ -31,7 +31,7 @@
   */
   
  #include "config.h"
-#include "FrameLoaderClientGdk.h"
+#include "FrameLoaderClientGtk.h"
  #include "DocumentLoader.h"
  #include "FrameLoader.h"
  #include "FrameView.h"
@@ -55,25 +55,25 @@ using namespace WebKitGtk;
  
  namespace WebCore {
  
-FrameLoaderClientGdk::FrameLoaderClientGdk(WebKitGtkFrame* frame)
+FrameLoaderClientGtk::FrameLoaderClientGtk(WebKitGtkFrame* frame)
      : m_frame(frame)
      , m_firstData(false)
  {
      ASSERT(m_frame);
  }
  
-String FrameLoaderClientGdk::userAgent(const KURL&)
+String FrameLoaderClientGtk::userAgent(const KURL&)
  {
      return "Mozilla/5.0 (X11; U; Linux i686; en-US) AppleWebKit/420+ (KHTML, like Gecko)";
  }
  
-WTF::PassRefPtr<WebCore::DocumentLoader> FrameLoaderClientGdk::createDocumentLoader(const WebCore::ResourceRequest& request, const SubstituteData& substituteData)
+WTF::PassRefPtr<WebCore::DocumentLoader> FrameLoaderClientGtk::createDocumentLoader(const WebCore::ResourceRequest& request, const SubstituteData& substituteData)
  {
      RefPtr<DocumentLoader> loader = new DocumentLoader(request, substituteData);
      return loader.release();
  }
  
-void FrameLoaderClientGdk::dispatchWillSubmitForm(FramePolicyFunction policyFunction,  PassRefPtr<FormState>)
+void FrameLoaderClientGtk::dispatchWillSubmitForm(FramePolicyFunction policyFunction,  PassRefPtr<FormState>)
  {
      // FIXME: This is surely too simple
      ASSERT(policyFunction);
@@ -83,40 +83,40 @@ void FrameLoaderClientGdk::dispatchWillSubmitForm(FramePolicyFunction policyFunc
  }
  
  
-void FrameLoaderClientGdk::committedLoad(DocumentLoader* loader, const char* data, int length)
+void FrameLoaderClientGtk::committedLoad(DocumentLoader* loader, const char* data, int length)
  {
      FrameLoader *fl = loader->frameLoader();
      fl->setEncoding(m_response.textEncodingName(), false);
      fl->addData(data, length);
  }
  
-void FrameLoaderClientGdk::dispatchDidReceiveAuthenticationChallenge(DocumentLoader*, unsigned long  identifier, const AuthenticationChallenge&)
+void FrameLoaderClientGtk::dispatchDidReceiveAuthenticationChallenge(DocumentLoader*, unsigned long  identifier, const AuthenticationChallenge&)
  {
      notImplemented();
  }
  
-void FrameLoaderClientGdk::dispatchDidCancelAuthenticationChallenge(DocumentLoader*, unsigned long  identifier, const AuthenticationChallenge&)
+void FrameLoaderClientGtk::dispatchDidCancelAuthenticationChallenge(DocumentLoader*, unsigned long  identifier, const AuthenticationChallenge&)
  {
      notImplemented();
  }
  
-void FrameLoaderClientGdk::dispatchWillSendRequest(DocumentLoader*, unsigned long , ResourceRequest&, const ResourceResponse&)
+void FrameLoaderClientGtk::dispatchWillSendRequest(DocumentLoader*, unsigned long , ResourceRequest&, const ResourceResponse&)
  {
      notImplemented();
  }
  
-void FrameLoaderClientGdk::assignIdentifierToInitialRequest(unsigned long identifier, DocumentLoader*, const ResourceRequest&)
+void FrameLoaderClientGtk::assignIdentifierToInitialRequest(unsigned long identifier, DocumentLoader*, const ResourceRequest&)
  {
      notImplemented();   
  }
  
-void FrameLoaderClientGdk::postProgressStartedNotification()
+void FrameLoaderClientGtk::postProgressStartedNotification()
  {
      WebKitGtkPage* page = getPageFromFrame(m_frame);
      g_signal_emit_by_name(page, "load_started", m_frame);
  }
  
-void FrameLoaderClientGdk::postProgressEstimateChangedNotification()
+void FrameLoaderClientGtk::postProgressEstimateChangedNotification()
  {
      WebKitGtkPage* kitPage = getPageFromFrame(m_frame);
      Page* corePage = core(kitPage);
@@ -124,26 +124,26 @@ void FrameLoaderClientGdk::postProgressEstimateChangedNotification()
      g_signal_emit_by_name(kitPage, "load_progress_changed", lround(corePage->progress()->estimatedProgress()*100)); 
  }
  
-void FrameLoaderClientGdk::postProgressFinishedNotification()
+void FrameLoaderClientGtk::postProgressFinishedNotification()
  {
      WebKitGtkPage* page = getPageFromFrame(m_frame);
  
      g_signal_emit_by_name(page, "load_finished", m_frame);
  }
  
-void FrameLoaderClientGdk::frameLoaderDestroyed()
+void FrameLoaderClientGtk::frameLoaderDestroyed()
  {
      m_frame = 0;
      delete this;
  }
  
-void FrameLoaderClientGdk::dispatchDidReceiveResponse(DocumentLoader*, unsigned long, const ResourceResponse& response)
+void FrameLoaderClientGtk::dispatchDidReceiveResponse(DocumentLoader*, unsigned long, const ResourceResponse& response)
  {
      m_response = response;
      m_firstData = true;
  }
  
-void FrameLoaderClientGdk::dispatchDecidePolicyForMIMEType(FramePolicyFunction policyFunction, const String&, const ResourceRequest&)
+void FrameLoaderClientGtk::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 FrameLoaderClientGdk::dispatchDecidePolicyForMIMEType(FramePolicyFunction p
      (core(m_frame)->loader()->*policyFunction)(PolicyUse);
  }
  
-void FrameLoaderClientGdk::dispatchDecidePolicyForNewWindowAction(FramePolicyFunction policyFunction, const NavigationAction&, const ResourceRequest&, const String&)
+void FrameLoaderClientGtk::dispatchDecidePolicyForNewWindowAction(FramePolicyFunction policyFunction, const NavigationAction&, const ResourceRequest&, const String&)
  {
      ASSERT(policyFunction);
      if (!policyFunction)
@@ -162,7 +162,7 @@ void FrameLoaderClientGdk::dispatchDecidePolicyForNewWindowAction(FramePolicyFun
      (core(m_frame)->loader()->*policyFunction)(PolicyIgnore);
  }
  
-void FrameLoaderClientGdk::dispatchDecidePolicyForNavigationAction(FramePolicyFunction policyFunction, const NavigationAction&, const ResourceRequest&)
+void FrameLoaderClientGtk::dispatchDecidePolicyForNavigationAction(FramePolicyFunction policyFunction, const NavigationAction&, const ResourceRequest&)
  {
      ASSERT(policyFunction);
      if (!policyFunction)
@@ -170,13 +170,13 @@ void FrameLoaderClientGdk::dispatchDecidePolicyForNavigationAction(FramePolicyFu
      (core(m_frame)->loader()->*policyFunction)(PolicyUse);
  }
  
-Widget* FrameLoaderClientGdk::createPlugin(Element*, const KURL&, const Vector<String>&, const Vector<String>&, const String&, bool)
+Widget* FrameLoaderClientGtk::createPlugin(Element*, const KURL&, const Vector<String>&, const Vector<String>&, const String&, bool)
  {
      notImplemented();
      return 0;
  }
  
-Frame* FrameLoaderClientGdk::createFrame(const KURL& url, const String& name, HTMLFrameOwnerElement* ownerElement,
+Frame* FrameLoaderClientGtk::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* FrameLoaderClientGdk::createFrame(const KURL& url, const String& name, HT
      return childFrame;
  }
  
-void FrameLoaderClientGdk::redirectDataToPlugin(Widget* pluginWidget)
+void FrameLoaderClientGtk::redirectDataToPlugin(Widget* pluginWidget)
  {
      notImplemented();
      return;
  }
  
-Widget* FrameLoaderClientGdk::createJavaAppletWidget(const IntSize&, Element*, const KURL& baseURL,
+Widget* FrameLoaderClientGtk::createJavaAppletWidget(const IntSize&, Element*, const KURL& baseURL,
                                                      const Vector<String>& paramNames, const Vector<String>& paramValues)
  {
      notImplemented();
      return 0;
  }
  
-ObjectContentType FrameLoaderClientGdk::objectContentType(const KURL& url, const String& mimeType)
+ObjectContentType FrameLoaderClientGtk::objectContentType(const KURL& url, const String& mimeType)
  {
      if (!url.isValid())
          return ObjectContentType();
@@ -238,55 +238,55 @@ ObjectContentType FrameLoaderClientGdk::objectContentType(const KURL& url, const
      return ObjectContentType();
  }
  
-String FrameLoaderClientGdk::overrideMediaType() const
+String FrameLoaderClientGtk::overrideMediaType() const
  {
      notImplemented();
      return String();
  }
  
-void FrameLoaderClientGdk::windowObjectCleared() const
+void FrameLoaderClientGtk::windowObjectCleared() const
  {
      g_signal_emit_by_name(m_frame, "cleared");
  }
  
-void FrameLoaderClientGdk::setMainFrameDocumentReady(bool) 
+void FrameLoaderClientGtk::setMainFrameDocumentReady(bool) 
  {
      // this is only interesting once we provide an external API for the DOM
  }
  
-bool FrameLoaderClientGdk::hasWebView() const
+bool FrameLoaderClientGtk::hasWebView() const
  {
      notImplemented();
      return true;
  }
  
-bool FrameLoaderClientGdk::hasFrameView() const
+bool FrameLoaderClientGtk::hasFrameView() const
  {
      notImplemented();
      return true;
  }
  
-void FrameLoaderClientGdk::dispatchDidFinishLoad() 
+void FrameLoaderClientGtk::dispatchDidFinishLoad() 
  { 
      g_signal_emit_by_name(m_frame, "load_done", true);
  }
  
-void FrameLoaderClientGdk::frameLoadCompleted() 
+void FrameLoaderClientGtk::frameLoadCompleted() 
  {
      notImplemented(); 
  }
  
-void FrameLoaderClientGdk::saveViewStateToItem(HistoryItem*)
+void FrameLoaderClientGtk::saveViewStateToItem(HistoryItem*)
  {
      notImplemented(); 
  }
  
-void FrameLoaderClientGdk::restoreViewState()
+void FrameLoaderClientGtk::restoreViewState()
  {
      notImplemented(); 
  }
  
-bool FrameLoaderClientGdk::shouldGoToHistoryItem(HistoryItem* item) const 
+bool FrameLoaderClientGtk::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 FrameLoaderClientGdk::shouldGoToHistoryItem(HistoryItem* item) const
      return item != 0;
  }
  
-bool FrameLoaderClientGdk::privateBrowsingEnabled() const { notImplemented(); return false; }
-void FrameLoaderClientGdk::makeDocumentView() { notImplemented(); }
-void FrameLoaderClientGdk::makeRepresentation(DocumentLoader*) { notImplemented(); }
-void FrameLoaderClientGdk::forceLayout() { notImplemented(); }
-void FrameLoaderClientGdk::forceLayoutForNonHTML() { notImplemented(); }
-void FrameLoaderClientGdk::setCopiesOnScroll() { notImplemented(); }
-void FrameLoaderClientGdk::detachedFromParent1() { notImplemented(); }
-void FrameLoaderClientGdk::detachedFromParent2() { notImplemented(); }
-void FrameLoaderClientGdk::detachedFromParent3() { notImplemented(); }
-void FrameLoaderClientGdk::detachedFromParent4() { notImplemented(); }
-void FrameLoaderClientGdk::loadedFromCachedPage() { notImplemented(); }
-void FrameLoaderClientGdk::dispatchDidHandleOnloadEvents() {notImplemented(); }
-void FrameLoaderClientGdk::dispatchDidReceiveServerRedirectForProvisionalLoad() { notImplemented(); }
-void FrameLoaderClientGdk::dispatchDidCancelClientRedirect() { notImplemented(); }
-void FrameLoaderClientGdk::dispatchWillPerformClientRedirect(const KURL&, double, double) { notImplemented(); }
-void FrameLoaderClientGdk::dispatchDidChangeLocationWithinPage() { notImplemented(); }
-void FrameLoaderClientGdk::dispatchWillClose() { notImplemented(); }
-
-void FrameLoaderClientGdk::dispatchDidReceiveIcon()
+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()
  {
      WebKitGtkPage* page = getPageFromFrame(m_frame);
  
      g_signal_emit_by_name(page, "icon_loaded", m_frame);
  }
  
-void FrameLoaderClientGdk::dispatchDidStartProvisionalLoad()
+void FrameLoaderClientGtk::dispatchDidStartProvisionalLoad()
  {
  }
  
-void FrameLoaderClientGdk::dispatchDidReceiveTitle(const String& title)
+void FrameLoaderClientGtk::dispatchDidReceiveTitle(const String& title)
  {
      notImplemented();
  }
  
-void FrameLoaderClientGdk::dispatchDidCommitLoad() { notImplemented(); }
-void FrameLoaderClientGdk::dispatchDidFinishDocumentLoad() { notImplemented(); }
-void FrameLoaderClientGdk::dispatchDidFirstLayout() { notImplemented(); }
-void FrameLoaderClientGdk::dispatchShow() { notImplemented(); }
-void FrameLoaderClientGdk::cancelPolicyCheck() { notImplemented(); }
-void FrameLoaderClientGdk::dispatchDidLoadMainResource(DocumentLoader*) { notImplemented(); }
-void FrameLoaderClientGdk::revertToProvisionalState(DocumentLoader*) { notImplemented(); }
-void FrameLoaderClientGdk::clearUnarchivingState(DocumentLoader*) { notImplemented(); }
-void FrameLoaderClientGdk::willChangeTitle(DocumentLoader*) { notImplemented(); }
-void FrameLoaderClientGdk::didChangeTitle(DocumentLoader *l) { setTitle(l->title(), l->URL()); }
-void FrameLoaderClientGdk::finishedLoading(DocumentLoader*) { notImplemented(); }
-void FrameLoaderClientGdk::finalSetupForReplace(DocumentLoader*) { notImplemented(); }
-void FrameLoaderClientGdk::setDefersLoading(bool) { notImplemented(); }
-bool FrameLoaderClientGdk::isArchiveLoadPending(ResourceLoader*) const { notImplemented(); return false; }
-void FrameLoaderClientGdk::cancelPendingArchiveLoad(ResourceLoader*) { notImplemented(); }
-void FrameLoaderClientGdk::clearArchivedResources() { notImplemented(); }
-bool FrameLoaderClientGdk::canHandleRequest(const ResourceRequest&) const { notImplemented(); return true; }
-bool FrameLoaderClientGdk::canShowMIMEType(const String&) const { notImplemented(); return true; }
-bool FrameLoaderClientGdk::representationExistsForURLScheme(const String&) const { notImplemented(); return false; }
-String FrameLoaderClientGdk::generatedMIMETypeForURLScheme(const String&) const { notImplemented(); return String(); }
-
-void FrameLoaderClientGdk::provisionalLoadStarted()
+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()
  {
      notImplemented();
  }
  
-void FrameLoaderClientGdk::didFinishLoad() {
+void FrameLoaderClientGtk::didFinishLoad() {
      notImplemented();
  }
  
-void FrameLoaderClientGdk::prepareForDataSourceReplacement() { notImplemented(); }
+void FrameLoaderClientGtk::prepareForDataSourceReplacement() { notImplemented(); }
  
-void FrameLoaderClientGdk::setTitle(const String& title, const KURL& url)
+void FrameLoaderClientGtk::setTitle(const String& title, const KURL& url)
  {
      WebKitGtkPage* page = getPageFromFrame(m_frame);
  
@@ -372,38 +372,38 @@ void FrameLoaderClientGdk::setTitle(const String& title, const KURL& url)
          g_signal_emit_by_name(page, "title_changed", titleString.data(), urlString.data());
  }
  
-void FrameLoaderClientGdk::setDocumentViewFromCachedPage(WebCore::CachedPage*) { notImplemented(); }
-void FrameLoaderClientGdk::dispatchDidReceiveContentLength(DocumentLoader*, unsigned long  identifier, int lengthReceived) { notImplemented(); }
-void FrameLoaderClientGdk::dispatchDidFinishLoading(DocumentLoader*, unsigned long  identifier) { notImplemented(); }
-void FrameLoaderClientGdk::dispatchDidFailLoading(DocumentLoader*, unsigned long  identifier, const ResourceError&) { notImplemented(); }
-bool FrameLoaderClientGdk::dispatchDidLoadResourceFromMemoryCache(DocumentLoader*, const ResourceRequest&, const ResourceResponse&, int length) { notImplemented(); return false; }
+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 FrameLoaderClientGdk::dispatchDidFailProvisionalLoad(const ResourceError&)
+void FrameLoaderClientGtk::dispatchDidFailProvisionalLoad(const ResourceError&)
  {
      g_signal_emit_by_name(m_frame, "load_done", false);
  }
  
-void FrameLoaderClientGdk::dispatchDidFailLoad(const ResourceError&)
+void FrameLoaderClientGtk::dispatchDidFailLoad(const ResourceError&)
  {
      g_signal_emit_by_name(m_frame, "load_done", false);
  }
  
-void FrameLoaderClientGdk::download(ResourceHandle*, const ResourceRequest&, const ResourceRequest&, const ResourceResponse&) { notImplemented(); }
-ResourceError FrameLoaderClientGdk::cancelledError(const ResourceRequest&) { notImplemented(); return ResourceError(); }
-ResourceError FrameLoaderClientGdk::blockedError(const ResourceRequest&) { notImplemented(); return ResourceError(); }
-ResourceError FrameLoaderClientGdk::cannotShowURLError(const ResourceRequest&) { notImplemented(); return ResourceError(); }
-ResourceError FrameLoaderClientGdk::interruptForPolicyChangeError(const ResourceRequest&) { notImplemented(); return ResourceError(); }
-ResourceError FrameLoaderClientGdk::cannotShowMIMETypeError(const ResourceResponse&) { notImplemented(); return ResourceError(); }
-ResourceError FrameLoaderClientGdk::fileDoesNotExistError(const ResourceResponse&) { notImplemented(); return ResourceError(); }
-bool FrameLoaderClientGdk::shouldFallBack(const ResourceError&) { notImplemented(); return false; }
-bool FrameLoaderClientGdk::willUseArchive(ResourceLoader*, const ResourceRequest&, const KURL& originalURL) const { notImplemented(); return false; }
-void FrameLoaderClientGdk::saveDocumentViewToCachedPage(CachedPage*) { notImplemented(); }
-bool FrameLoaderClientGdk::canCachePage() const { notImplemented(); return false; }
-Frame* FrameLoaderClientGdk::dispatchCreatePage() { notImplemented(); return 0; }
-void FrameLoaderClientGdk::dispatchUnableToImplementPolicy(const ResourceError&) { notImplemented(); }
-void FrameLoaderClientGdk::setMainDocumentError(DocumentLoader*, const ResourceError&) { notImplemented(); }
-void FrameLoaderClientGdk::startDownload(const ResourceRequest&) { notImplemented(); }
-void FrameLoaderClientGdk::updateGlobalHistoryForStandardLoad(const KURL&) { notImplemented(); }
-void FrameLoaderClientGdk::updateGlobalHistoryForReload(const KURL&) { notImplemented(); }
+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(); }
  
  }
diff --git a/WebCore/loader/gdk/FrameLoaderClientGdk.h b/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.h

similarity index 97%

rename from WebCore/loader/gdk/FrameLoaderClientGdk.h

rename to WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.h

index 60d49e224fc1b474468de8fde8848f3cdb28076c..9e03af18f021aa071b657d5b76ea9165a1c14ef0 100644 (file)
--- a/WebCore/loader/gdk/FrameLoaderClientGdk.h
+++ b/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.h
@@ -26,8 +26,8 @@
   * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   */
  
-#ifndef FrameLoaderClientGdk_H
-#define FrameLoaderClientGdk_H
+#ifndef FrameLoaderClientGtk_H
+#define FrameLoaderClientGtk_H
  
  #include "FrameLoaderClient.h"
  
@@ -37,10 +37,10 @@ typedef struct _WebKitGtkFrame WebKitGtkFrame;
  
  namespace WebCore {
  
-    class FrameLoaderClientGdk : public FrameLoaderClient {
+    class FrameLoaderClientGtk : public FrameLoaderClient {
      public:
-        FrameLoaderClientGdk(WebKitGtkFrame*);
-        virtual ~FrameLoaderClientGdk() { }
+        FrameLoaderClientGtk(WebKitGtkFrame*);
+        virtual ~FrameLoaderClientGtk() { }
          virtual void frameLoaderDestroyed();
  
          WebKitGtkFrame*  webFrame() const { return m_frame; }
diff --git a/WebCore/page/gdk/InspectorClientGdk.cpp b/WebKit/gtk/WebCoreSupport/InspectorClientGtk.cpp

similarity index 81%

rename from WebCore/page/gdk/InspectorClientGdk.cpp

rename to WebKit/gtk/WebCoreSupport/InspectorClientGtk.cpp

index 46af3ed9f083670ff2c03459a304d34ceca01ff7..87cf688f255ad7e866e754a5e62ef6f4083e3d14 100644 (file)
--- a/WebCore/page/gdk/InspectorClientGdk.cpp
+++ b/WebKit/gtk/WebCoreSupport/InspectorClientGtk.cpp
@@ -27,54 +27,54 @@
   */
  
  #include "config.h"
-#include "InspectorClientGdk.h"
+#include "InspectorClientGtk.h"
  
  #include "NotImplemented.h"
  
  namespace WebCore {
  
-void InspectorClientGdk::inspectorDestroyed()
+void InspectorClientGtk::inspectorDestroyed()
  {
      notImplemented();
  }
  
-Page* InspectorClientGdk::createPage()
+Page* InspectorClientGtk::createPage()
  {
      notImplemented();
      return 0;
  }
  
-void InspectorClientGdk::showWindow()
+void InspectorClientGtk::showWindow()
  {
      notImplemented();
  }
  
-void InspectorClientGdk::closeWindow()
+void InspectorClientGtk::closeWindow()
  {
      notImplemented();
  }
  
-void InspectorClientGdk::attachWindow()
+void InspectorClientGtk::attachWindow()
  {
      notImplemented();
  }
  
-void InspectorClientGdk::detachWindow()
+void InspectorClientGtk::detachWindow()
  {
      notImplemented();
  }
  
-void InspectorClientGdk::highlight(Node* node)
+void InspectorClientGtk::highlight(Node* node)
  {
      notImplemented();
  }
  
-void InspectorClientGdk::hideHighlight()
+void InspectorClientGtk::hideHighlight()
  {
      notImplemented();
  }
  
-void InspectorClientGdk::inspectedURLChanged(const String&)
+void InspectorClientGtk::inspectedURLChanged(const String&)
  {
      notImplemented();
  }
diff --git a/WebCore/page/gdk/InspectorClientGdk.h b/WebKit/gtk/WebCoreSupport/InspectorClientGtk.h

similarity index 94%

rename from WebCore/page/gdk/InspectorClientGdk.h

rename to WebKit/gtk/WebCoreSupport/InspectorClientGtk.h

index 1352d1a5b404d89e78b0f515a5086ae651417838..ca3ffafef48298e1ceb7f3dfb207c54d89de9d0e 100644 (file)
--- a/WebCore/page/gdk/InspectorClientGdk.h
+++ b/WebKit/gtk/WebCoreSupport/InspectorClientGtk.h
@@ -26,8 +26,8 @@
   * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   */
  
-#ifndef InspectorClientGdk_h
-#define InspectorClientGdk_h
+#ifndef InspectorClientGtk_h
+#define InspectorClientGtk_h
  
  #include "InspectorClient.h"
  
@@ -36,7 +36,7 @@ namespace WebCore {
      class Page;
      class String;
  
-    class InspectorClientGdk : public InspectorClient {
+    class InspectorClientGtk : public InspectorClient {
      public:
          virtual void inspectorDestroyed();
author	zecke <zecke@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
	Fri, 10 Aug 2007 01:53:39 +0000 (01:53 +0000)
committer	zecke <zecke@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
	Fri, 10 Aug 2007 01:53:39 +0000 (01:53 +0000)
WebCore/ChangeLog		patch \| blob \| history
WebCore/WebCore.pro		patch \| blob \| history
WebCore/platform/gdk/TemporaryLinkStubs.cpp		patch \| blob \| history
WebKit/gtk/Api/webkitgtkframe.cpp		patch \| blob \| history
WebKit/gtk/Api/webkitgtkpage.cpp		patch \| blob \| history
WebKit/gtk/Api/webkitgtkprivate.cpp		patch \| blob \| history
WebKit/gtk/Api/webkitgtkprivate.h		patch \| blob \| history
WebKit/gtk/ChangeLog		patch \| blob \| history
WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp	[moved from WebKit/gtk/WebCoreSupport/ChromeClientGdk.cpp with 71% similarity]	patch \| blob \| history
WebKit/gtk/WebCoreSupport/ChromeClientGtk.h	[moved from WebKit/gtk/WebCoreSupport/ChromeClientGdk.h with 95% similarity]	patch \| blob \| history
WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.cpp	[moved from WebCore/page/gdk/ContextMenuClientGdk.cpp with 77% similarity]	patch \| blob \| history
WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.h	[moved from WebCore/page/gdk/ContextMenuClientGdk.h with 94% similarity]	patch \| blob \| history
WebKit/gtk/WebCoreSupport/EditorClientGtk.cpp	[moved from WebCore/platform/gdk/EditorClientGdk.cpp with 66% similarity]	patch \| blob \| history
WebKit/gtk/WebCoreSupport/EditorClientGtk.h	[moved from WebCore/platform/gdk/EditorClientGdk.h with 97% similarity]	patch \| blob \| history
WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp	[moved from WebCore/loader/gdk/FrameLoaderClientGdk.cpp with 62% similarity]	patch \| blob \| history
WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.h	[moved from WebCore/loader/gdk/FrameLoaderClientGdk.h with 97% similarity]	patch \| blob \| history
WebKit/gtk/WebCoreSupport/InspectorClientGtk.cpp	[moved from WebCore/page/gdk/InspectorClientGdk.cpp with 81% similarity]	patch \| blob \| history
WebKit/gtk/WebCoreSupport/InspectorClientGtk.h	[moved from WebCore/page/gdk/InspectorClientGdk.h with 94% similarity]	patch \| blob \| history