Commit d97bdb9c authored by zecke's avatar zecke

WebCore:

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:

WebKit/gtk:
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.


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@24969 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 024d7e10
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.
......@@ -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) {
......
......@@ -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"
......
......@@ -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);
......
......@@ -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);
......
......@@ -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();
}
}
......@@ -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;
};
......
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.
......
......@@ -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());
}