Commit 697588b9 authored by zecke's avatar zecke

2007-08-10 Holger Hans Peter Freyther <zecke@selfish.org>

        Reviewed by Mark.

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

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


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@24978 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 4ec066fb
......@@ -130,7 +130,7 @@ GObject* webkit_gtk_frame_new(WebKitGtkPage* page)
WebKitGtkFramePrivate* frameData = WEBKIT_GTK_FRAME_GET_PRIVATE(frame);
WebKitGtkPagePrivate* pageData = WEBKIT_GTK_PAGE_GET_PRIVATE(page);
frameData->client = new FrameLoaderClientGtk(frame);
frameData->client = new WebKit::FrameLoaderClient(frame);
frameData->frame = new Frame(pageData->page, 0, frameData->client);
FrameView* frameView = new FrameView(frameData->frame);
......@@ -150,7 +150,7 @@ GObject* webkit_gtk_frame_init_with_page(WebKitGtkPage* page, HTMLFrameOwnerElem
WebKitGtkFramePrivate* frameData = WEBKIT_GTK_FRAME_GET_PRIVATE(frame);
WebKitGtkPagePrivate* pageData = WEBKIT_GTK_PAGE_GET_PRIVATE(page);
frameData->client = new FrameLoaderClientGtk(frame);
frameData->client = new WebKit::FrameLoaderClient(frame);
frameData->frame = new Frame(pageData->page, element, frameData->client);
FrameView* frameView = new FrameView(frameData->frame);
......
......@@ -48,8 +48,8 @@
#include "SubstituteData.h"
using namespace WebKit;
using namespace WebCore;
using namespace WebKitGtk;
extern "C" {
......@@ -347,7 +347,7 @@ static void webkit_gtk_page_class_init(WebKitGtkPageClass* pageClass)
static void webkit_gtk_page_init(WebKitGtkPage* page)
{
WebKitGtkPagePrivate* pageData = WEBKIT_GTK_PAGE_GET_PRIVATE(WEBKIT_GTK_PAGE(page));
pageData->page = new Page(new ChromeClientGtk(page), new ContextMenuClientGtk, new EditorClientGtk(page), 0, new InspectorClientGtk);
pageData->page = new Page(new WebKit::ChromeClient(page), new WebKit::ContextMenuClient, new WebKit::EditorClient(page), 0, new WebKit::InspectorClient);
Settings* settings = pageData->page->settings();
settings->setLoadsImagesAutomatically(true);
......
......@@ -29,13 +29,14 @@
#include "config.h"
#include "webkitgtkprivate.h"
#include "NotImplemented.h"
#include "FrameLoader.h"
#include "ChromeClientGtk.h"
#include "FrameLoader.h"
#include "FrameLoaderClientGtk.h"
#include "NotImplemented.h"
using namespace WebCore;
namespace WebKitGtk {
namespace WebKit {
void apply(WebKitGtkSettings*, WebCore::Settings*)
{
notImplemented();
......@@ -65,7 +66,7 @@ WebCore::Frame* core(WebKitGtkFrame* frame)
WebKitGtkFrame* kit(WebCore::Frame* coreFrame)
{
FrameLoaderClientGtk* client = static_cast<FrameLoaderClientGtk*>(coreFrame->loader()->client());
WebKit::FrameLoaderClient* client = static_cast<WebKit::FrameLoaderClient*>(coreFrame->loader()->client());
return client->webFrame();
}
......@@ -77,7 +78,7 @@ WebCore::Page* core(WebKitGtkPage* page)
WebKitGtkPage* kit(WebCore::Page* page)
{
ChromeClientGtk* client = static_cast<ChromeClientGtk*>(page->chrome()->client());
WebKit::ChromeClient* client = static_cast<WebKit::ChromeClient*>(page->chrome()->client());
return client->webPage();
}
}
......@@ -44,9 +44,9 @@
#include "Settings.h"
#include "Page.h"
#include "Frame.h"
#include "FrameLoaderClientGtk.h"
#include "FrameLoaderClient.h"
namespace WebKitGtk {
namespace WebKit {
void apply(WebKitGtkSettings*,WebCore::Settings*);
WebKitGtkSettings* create(WebCore::Settings*);
WebKitGtkFrame* getFrameFromPage(WebKitGtkPage*);
......@@ -74,7 +74,7 @@ extern "C" {
typedef struct _WebKitGtkFramePrivate WebKitGtkFramePrivate;
struct _WebKitGtkFramePrivate {
WebCore::Frame* frame;
WebCore::FrameLoaderClientGtk* client;
WebCore::FrameLoaderClient* client;
WebKitGtkPage* page;
};
......
2007-08-10 Holger Hans Peter Freyther <zecke@selfish.org>
Reviewed by Mark.
Rename the namespace from WebKitGtk to WebKit. Move the various *Client
classes into the WebKit namespace. Change the class names to not contain Gtk.
The file names have to contain the Gtk suffix to not clash with files in WebCore (e.g.
bridge/EditorClient.h).
* Api/webkitgtkframe.cpp:
* Api/webkitgtkpage.cpp:
* Api/webkitgtkprivate.cpp:
* Api/webkitgtkprivate.h:
* ChangeLog:
* WebCoreSupport/ChromeClientGtk.cpp:
(WebKit::ChromeClient::ChromeClient):
(WebKit::ChromeClient::chromeDestroyed):
(WebKit::ChromeClient::windowRect):
(WebKit::ChromeClient::setWindowRect):
(WebKit::ChromeClient::pageRect):
(WebKit::ChromeClient::scaleFactor):
(WebKit::ChromeClient::focus):
(WebKit::ChromeClient::unfocus):
(WebKit::ChromeClient::createWindow):
(WebKit::ChromeClient::createModalDialog):
(WebKit::ChromeClient::show):
(WebKit::ChromeClient::canRunModal):
(WebKit::ChromeClient::runModal):
(WebKit::ChromeClient::setToolbarsVisible):
(WebKit::ChromeClient::toolbarsVisible):
(WebKit::ChromeClient::setStatusbarVisible):
(WebKit::ChromeClient::statusbarVisible):
(WebKit::ChromeClient::setScrollbarsVisible):
(WebKit::ChromeClient::scrollbarsVisible):
(WebKit::ChromeClient::setMenubarVisible):
(WebKit::ChromeClient::menubarVisible):
(WebKit::ChromeClient::setResizable):
(WebKit::ChromeClient::closeWindowSoon):
(WebKit::ChromeClient::canTakeFocus):
(WebKit::ChromeClient::takeFocus):
(WebKit::ChromeClient::canRunBeforeUnloadConfirmPanel):
(WebKit::ChromeClient::runBeforeUnloadConfirmPanel):
(WebKit::ChromeClient::runJavaScriptAlert):
(WebKit::ChromeClient::runJavaScriptConfirm):
(WebKit::ChromeClient::setStatusbarText):
(WebKit::ChromeClient::shouldInterruptJavaScript):
(WebKit::ChromeClient::tabsToLinks):
(WebKit::ChromeClient::windowResizerRect):
(WebKit::ChromeClient::addToDirtyRegion):
(WebKit::ChromeClient::scrollBackingStore):
(WebKit::ChromeClient::updateBackingStore):
(WebKit::ChromeClient::mouseDidMoveOverElement):
(WebKit::ChromeClient::setToolTip):
* WebCoreSupport/ChromeClientGtk.h:
* WebCoreSupport/ContextMenuClientGtk.cpp:
(WebKit::ContextMenuClient::contextMenuDestroyed):
(WebKit::ContextMenuClient::getCustomMenuFromDefaultItems):
(WebKit::ContextMenuClient::contextMenuItemSelected):
(WebKit::ContextMenuClient::downloadURL):
(WebKit::ContextMenuClient::copyImageToClipboard):
(WebKit::ContextMenuClient::searchWithGoogle):
(WebKit::ContextMenuClient::lookUpInDictionary):
(WebKit::ContextMenuClient::speak):
* WebCoreSupport/ContextMenuClientGtk.h:
* WebCoreSupport/EditorClientGtk.cpp:
(WebKit::EditorClient::shouldDeleteRange):
(WebKit::EditorClient::shouldShowDeleteInterface):
(WebKit::EditorClient::isContinuousSpellCheckingEnabled):
(WebKit::EditorClient::isGrammarCheckingEnabled):
(WebKit::EditorClient::spellCheckerDocumentTag):
(WebKit::EditorClient::shouldBeginEditing):
(WebKit::EditorClient::shouldEndEditing):
(WebKit::EditorClient::shouldInsertText):
(WebKit::EditorClient::shouldChangeSelectedRange):
(WebKit::EditorClient::shouldApplyStyle):
(WebKit::EditorClient::shouldMoveRangeAfterDelete):
(WebKit::EditorClient::didBeginEditing):
(WebKit::EditorClient::respondToChangedContents):
(WebKit::EditorClient::respondToChangedSelection):
(WebKit::EditorClient::didEndEditing):
(WebKit::EditorClient::didWriteSelectionToPasteboard):
(WebKit::EditorClient::didSetSelectionTypesForPasteboard):
(WebKit::EditorClient::selectWordBeforeMenuEvent):
(WebKit::EditorClient::isEditable):
(WebKit::EditorClient::registerCommandForUndo):
(WebKit::EditorClient::registerCommandForRedo):
(WebKit::EditorClient::clearUndoRedoOperations):
(WebKit::EditorClient::canUndo):
(WebKit::EditorClient::canRedo):
(WebKit::EditorClient::undo):
(WebKit::EditorClient::redo):
(WebKit::EditorClient::shouldInsertNode):
(WebKit::EditorClient::pageDestroyed):
(WebKit::EditorClient::smartInsertDeleteEnabled):
(WebKit::EditorClient::toggleContinuousSpellChecking):
(WebKit::EditorClient::toggleGrammarChecking):
(WebKit::EditorClient::handleInputMethodKeypress):
(WebKit::EditorClient::EditorClient):
(WebKit::EditorClient::textFieldDidBeginEditing):
(WebKit::EditorClient::textFieldDidEndEditing):
(WebKit::EditorClient::textDidChangeInTextField):
(WebKit::EditorClient::doTextFieldCommandFromEvent):
(WebKit::EditorClient::textWillBeDeletedInTextField):
(WebKit::EditorClient::textDidChangeInTextArea):
(WebKit::EditorClient::ignoreWordInSpellDocument):
(WebKit::EditorClient::learnWord):
(WebKit::EditorClient::checkSpellingOfString):
(WebKit::EditorClient::checkGrammarOfString):
(WebKit::EditorClient::updateSpellingUIWithGrammarString):
(WebKit::EditorClient::updateSpellingUIWithMisspelledWord):
(WebKit::EditorClient::showSpellingUI):
(WebKit::EditorClient::spellingUIIsShowing):
* WebCoreSupport/EditorClientGtk.h:
* WebCoreSupport/FrameLoaderClientGtk.cpp:
(WebKit::FrameLoaderClient::FrameLoaderClient):
(WebKit::FrameLoaderClient::userAgent):
(WebKit::FrameLoaderClient::createDocumentLoader):
(WebKit::FrameLoaderClient::committedLoad):
(WebKit::FrameLoaderClient::dispatchDidReceiveAuthenticationChallenge):
(WebKit::FrameLoaderClient::dispatchDidCancelAuthenticationChallenge):
(WebKit::FrameLoaderClient::dispatchWillSendRequest):
(WebKit::FrameLoaderClient::assignIdentifierToInitialRequest):
(WebKit::FrameLoaderClient::postProgressStartedNotification):
(WebKit::FrameLoaderClient::postProgressFinishedNotification):
(WebKit::FrameLoaderClient::frameLoaderDestroyed):
(WebKit::FrameLoaderClient::dispatchDidReceiveResponse):
(WebKit::FrameLoaderClient::createPlugin):
(WebKit::FrameLoaderClient::redirectDataToPlugin):
(WebKit::FrameLoaderClient::createJavaAppletWidget):
(WebKit::FrameLoaderClient::overrideMediaType):
(WebKit::FrameLoaderClient::windowObjectCleared):
(WebKit::FrameLoaderClient::setMainFrameDocumentReady):
(WebKit::FrameLoaderClient::hasWebView):
(WebKit::FrameLoaderClient::hasFrameView):
(WebKit::FrameLoaderClient::dispatchDidFinishLoad):
(WebKit::FrameLoaderClient::frameLoadCompleted):
(WebKit::FrameLoaderClient::saveViewStateToItem):
(WebKit::FrameLoaderClient::restoreViewState):
(WebKit::FrameLoaderClient::privateBrowsingEnabled):
(WebKit::FrameLoaderClient::makeDocumentView):
(WebKit::FrameLoaderClient::makeRepresentation):
(WebKit::FrameLoaderClient::forceLayout):
(WebKit::FrameLoaderClient::forceLayoutForNonHTML):
(WebKit::FrameLoaderClient::setCopiesOnScroll):
(WebKit::FrameLoaderClient::detachedFromParent1):
(WebKit::FrameLoaderClient::detachedFromParent2):
(WebKit::FrameLoaderClient::detachedFromParent3):
(WebKit::FrameLoaderClient::detachedFromParent4):
(WebKit::FrameLoaderClient::loadedFromCachedPage):
(WebKit::FrameLoaderClient::dispatchDidHandleOnloadEvents):
(WebKit::FrameLoaderClient::dispatchDidReceiveServerRedirectForProvisionalLoad):
(WebKit::FrameLoaderClient::dispatchDidCancelClientRedirect):
(WebKit::FrameLoaderClient::dispatchWillPerformClientRedirect):
(WebKit::FrameLoaderClient::dispatchDidChangeLocationWithinPage):
(WebKit::FrameLoaderClient::dispatchWillClose):
(WebKit::FrameLoaderClient::dispatchDidReceiveIcon):
(WebKit::FrameLoaderClient::dispatchDidStartProvisionalLoad):
(WebKit::FrameLoaderClient::dispatchDidReceiveTitle):
(WebKit::FrameLoaderClient::dispatchDidCommitLoad):
(WebKit::FrameLoaderClient::dispatchDidFinishDocumentLoad):
(WebKit::FrameLoaderClient::dispatchDidFirstLayout):
(WebKit::FrameLoaderClient::dispatchShow):
(WebKit::FrameLoaderClient::cancelPolicyCheck):
(WebKit::FrameLoaderClient::dispatchDidLoadMainResource):
(WebKit::FrameLoaderClient::revertToProvisionalState):
(WebKit::FrameLoaderClient::clearUnarchivingState):
(WebKit::FrameLoaderClient::willChangeTitle):
(WebKit::FrameLoaderClient::didChangeTitle):
(WebKit::FrameLoaderClient::finishedLoading):
(WebKit::FrameLoaderClient::finalSetupForReplace):
(WebKit::FrameLoaderClient::setDefersLoading):
(WebKit::FrameLoaderClient::isArchiveLoadPending):
(WebKit::FrameLoaderClient::cancelPendingArchiveLoad):
(WebKit::FrameLoaderClient::clearArchivedResources):
(WebKit::FrameLoaderClient::canHandleRequest):
(WebKit::FrameLoaderClient::canShowMIMEType):
(WebKit::FrameLoaderClient::representationExistsForURLScheme):
(WebKit::FrameLoaderClient::generatedMIMETypeForURLScheme):
(WebKit::FrameLoaderClient::provisionalLoadStarted):
(WebKit::FrameLoaderClient::didFinishLoad):
(WebKit::FrameLoaderClient::setDocumentViewFromCachedPage):
(WebKit::FrameLoaderClient::dispatchDidReceiveContentLength):
(WebKit::FrameLoaderClient::dispatchDidFinishLoading):
(WebKit::FrameLoaderClient::dispatchDidFailLoading):
(WebKit::FrameLoaderClient::dispatchDidLoadResourceFromMemoryCache):
(WebKit::FrameLoaderClient::dispatchDidFailProvisionalLoad):
(WebKit::FrameLoaderClient::dispatchDidFailLoad):
(WebKit::FrameLoaderClient::download):
(WebKit::FrameLoaderClient::cancelledError):
(WebKit::FrameLoaderClient::blockedError):
(WebKit::FrameLoaderClient::cannotShowURLError):
(WebKit::FrameLoaderClient::interruptForPolicyChangeError):
(WebKit::FrameLoaderClient::cannotShowMIMETypeError):
(WebKit::FrameLoaderClient::fileDoesNotExistError):
(WebKit::FrameLoaderClient::shouldFallBack):
(WebKit::FrameLoaderClient::willUseArchive):
(WebKit::FrameLoaderClient::saveDocumentViewToCachedPage):
(WebKit::FrameLoaderClient::canCachePage):
(WebKit::FrameLoaderClient::dispatchCreatePage):
(WebKit::FrameLoaderClient::dispatchUnableToImplementPolicy):
* WebCoreSupport/FrameLoaderClientGtk.h:
* WebCoreSupport/InspectorClientGtk.cpp:
(WebKit::InspectorClient::inspectorDestroyed):
(WebKit::InspectorClient::createPage):
(WebKit::InspectorClient::showWindow):
(WebKit::InspectorClient::closeWindow):
(WebKit::InspectorClient::attachWindow):
(WebKit::InspectorClient::detachWindow):
(WebKit::InspectorClient::highlight):
(WebKit::InspectorClient::hideHighlight):
* WebCoreSupport/InspectorClientGtk.h:
2007-08-10 Holger Hans Peter Freyther <zecke@selfish.org>
Reviewed by Adam.
......
......@@ -39,160 +39,160 @@
using namespace WebCore;
namespace WebKitGtk {
ChromeClientGtk::ChromeClientGtk(WebKitGtkPage* page)
namespace WebKit {
ChromeClient::ChromeClient(WebKitGtkPage* page)
: m_webPage(page)
{
}
void ChromeClientGtk::chromeDestroyed()
void ChromeClient::chromeDestroyed()
{
notImplemented();
}
FloatRect ChromeClientGtk::windowRect()
FloatRect ChromeClient::windowRect()
{
notImplemented();
return FloatRect();
}
void ChromeClientGtk::setWindowRect(const FloatRect& r)
void ChromeClient::setWindowRect(const FloatRect& r)
{
notImplemented();
}
FloatRect ChromeClientGtk::pageRect()
FloatRect ChromeClient::pageRect()
{
notImplemented();
return FloatRect();
}
float ChromeClientGtk::scaleFactor()
float ChromeClient::scaleFactor()
{
notImplemented();
return 1.0;
}
void ChromeClientGtk::focus()
void ChromeClient::focus()
{
notImplemented();
}
void ChromeClientGtk::unfocus()
void ChromeClient::unfocus()
{
notImplemented();
}
Page* ChromeClientGtk::createWindow(Frame*, const FrameLoadRequest&)
Page* ChromeClient::createWindow(Frame*, const FrameLoadRequest&)
{
/* TODO: FrameLoadRequest is not used */
WebKitGtkPage* page = WEBKIT_GTK_PAGE_GET_CLASS(m_webPage)->create_page(m_webPage);
if (!page)
return 0;
WebKitGtkPagePrivate *private_data = WEBKIT_GTK_PAGE_GET_PRIVATE(WEBKIT_GTK_PAGE(page));
return private_data->page;
WebKitGtkPagePrivate *privateData = WEBKIT_GTK_PAGE_GET_PRIVATE(WEBKIT_GTK_PAGE(page));
return privateData->page;
}
Page* ChromeClientGtk::createModalDialog(Frame*, const FrameLoadRequest&)
Page* ChromeClient::createModalDialog(Frame*, const FrameLoadRequest&)
{
notImplemented();
return 0;
}
void ChromeClientGtk::show()
void ChromeClient::show()
{
notImplemented();
}
bool ChromeClientGtk::canRunModal()
bool ChromeClient::canRunModal()
{
notImplemented();
return false;
}
void ChromeClientGtk::runModal()
void ChromeClient::runModal()
{
notImplemented();
}
void ChromeClientGtk::setToolbarsVisible(bool)
void ChromeClient::setToolbarsVisible(bool)
{
notImplemented();
}
bool ChromeClientGtk::toolbarsVisible()
bool ChromeClient::toolbarsVisible()
{
notImplemented();
return false;
}
void ChromeClientGtk::setStatusbarVisible(bool)
void ChromeClient::setStatusbarVisible(bool)
{
notImplemented();
}
bool ChromeClientGtk::statusbarVisible()
bool ChromeClient::statusbarVisible()
{
notImplemented();
return false;
}
void ChromeClientGtk::setScrollbarsVisible(bool)
void ChromeClient::setScrollbarsVisible(bool)
{
notImplemented();
}
bool ChromeClientGtk::scrollbarsVisible() {
bool ChromeClient::scrollbarsVisible() {
notImplemented();
return false;
}
void ChromeClientGtk::setMenubarVisible(bool)
void ChromeClient::setMenubarVisible(bool)
{
notImplemented();
}
bool ChromeClientGtk::menubarVisible()
bool ChromeClient::menubarVisible()
{
notImplemented();
return false;
}
void ChromeClientGtk::setResizable(bool)
void ChromeClient::setResizable(bool)
{
notImplemented();
}
void ChromeClientGtk::closeWindowSoon()
void ChromeClient::closeWindowSoon()
{
notImplemented();
}
bool ChromeClientGtk::canTakeFocus(FocusDirection)
bool ChromeClient::canTakeFocus(FocusDirection)
{
notImplemented();
return true;
}
void ChromeClientGtk::takeFocus(FocusDirection)
void ChromeClient::takeFocus(FocusDirection)
{
notImplemented();
}
bool ChromeClientGtk::canRunBeforeUnloadConfirmPanel()
bool ChromeClient::canRunBeforeUnloadConfirmPanel()
{
notImplemented();
return false;
}
bool ChromeClientGtk::runBeforeUnloadConfirmPanel(const WebCore::String&, WebCore::Frame*)
bool ChromeClient::runBeforeUnloadConfirmPanel(const WebCore::String&, WebCore::Frame*)
{
notImplemented();
return false;
}
void ChromeClientGtk::addMessageToConsole(const WebCore::String& message, unsigned int lineNumber, const WebCore::String& sourceId)
void ChromeClient::addMessageToConsole(const WebCore::String& message, unsigned int lineNumber, const WebCore::String& sourceId)
{
CString messageString = message.utf8();
CString sourceIdString = sourceId.utf8();
......@@ -200,19 +200,19 @@ void ChromeClientGtk::addMessageToConsole(const WebCore::String& message, unsign
WEBKIT_GTK_PAGE_GET_CLASS(m_webPage)->java_script_console_message(m_webPage, messageString.data(), lineNumber, sourceIdString.data());
}
void ChromeClientGtk::runJavaScriptAlert(Frame* frame, const String& message)
void ChromeClient::runJavaScriptAlert(Frame* frame, const String& message)
{
CString messageString = message.utf8();
WEBKIT_GTK_PAGE_GET_CLASS(m_webPage)->java_script_alert(m_webPage, kit(frame), messageString.data());
}
bool ChromeClientGtk::runJavaScriptConfirm(Frame* frame, const String& message)
bool ChromeClient::runJavaScriptConfirm(Frame* frame, const String& message)
{
CString messageString = message.utf8();
return WEBKIT_GTK_PAGE_GET_CLASS(m_webPage)->java_script_confirm(m_webPage, kit(frame), messageString.data());
}
bool ChromeClientGtk::runJavaScriptPrompt(Frame* frame, const String& message, const String& defaultValue, String& result)
bool ChromeClient::runJavaScriptPrompt(Frame* frame, const String& message, const String& defaultValue, String& result)
{
CString messageString = message.utf8();
CString defaultValueString = defaultValue.utf8();
......@@ -230,56 +230,56 @@ bool ChromeClientGtk::runJavaScriptPrompt(Frame* frame, const String& message, c
}
}
void ChromeClientGtk::setStatusbarText(const String& string)
void ChromeClient::setStatusbarText(const String& string)
{
CString stringMessage = string.utf8();
g_signal_emit_by_name(m_webPage, "status_bar_text_changed", stringMessage.data());
}
bool ChromeClientGtk::shouldInterruptJavaScript()
bool ChromeClient::shouldInterruptJavaScript()
{
notImplemented();
return false;
}
bool ChromeClientGtk::tabsToLinks() const
bool ChromeClient::tabsToLinks() const
{
notImplemented();
return false;
}
IntRect ChromeClientGtk::windowResizerRect() const
IntRect ChromeClient::windowResizerRect() const
{
notImplemented();
return IntRect();
}
void ChromeClientGtk::addToDirtyRegion(const IntRect&)
void ChromeClient::addToDirtyRegion(const IntRect&)
{
notImplemented();
}
void ChromeClientGtk::scrollBackingStore(int dx, int dy, const IntRect& scrollViewRect, const IntRect& clipRect)
void ChromeClient::scrollBackingStore(int dx, int dy, const IntRect& scrollViewRect, const IntRect& clipRect)
{
notImplemented();
}
void ChromeClientGtk::updateBackingStore()
void ChromeClient::updateBackingStore()
{
notImplemented();
}
void ChromeClientGtk::mouseDidMoveOverElement(const HitTestResult&, unsigned modifierFlags)
void ChromeClient::mouseDidMoveOverElement(const HitTestResult&, unsigned modifierFlags)
{
notImplemented();
}
void ChromeClientGtk::setToolTip(const String&)
void ChromeClient::setToolTip(const String&)
{
notImplemented();
}
void ChromeClientGtk::print(Frame*)
void ChromeClient::print(Frame*)
{
notImplemented();
}
......
......@@ -33,11 +33,11 @@
typedef struct _WebKitGtkPage WebKitGtkPage;
namespace WebKitGtk {
namespace WebKit {
class ChromeClientGtk : public WebCore::ChromeClient {
class ChromeClient : public WebCore::ChromeClient {
public:
ChromeClientGtk(WebKitGtkPage*);
ChromeClient(WebKitGtkPage*);
WebKitGtkPage* webPage() const { return m_webPage; }
virtual void chromeDestroyed();
......@@ -106,4 +106,4 @@ namespace WebKitGtk {
};
}
#endif // ChromeClientGtk_h
#endif // ChromeClient_h
......@@ -32,50 +32,52 @@
#include <stdio.h>
namespace WebCore {
using namespace WebCore;
namespace WebKit {
void ContextMenuClientGtk::contextMenuDestroyed()
void ContextMenuClient::contextMenuDestroyed()
{
notImplemented();
}
PlatformMenuDescription ContextMenuClientGtk::getCustomMenuFromDefaultItems(ContextMenu*)
PlatformMenuDescription ContextMenuClient::getCustomMenuFromDefaultItems(ContextMenu*)
{
notImplemented();
return PlatformMenuDescription();
}