WebCore:
Reviewed by Maciej.
Additional coding by Maciej, additional review by Oliver.
Get rid of the FrameMac and FrameQt classes. Instead
move all methods into Frame directly, and implement
some platform specific methods in foo/FrameFoo.cpp.
Some general cleanup in Frame:
* Move some methods out of Frame, to the place where they
belong.
* Unify the different ways of creating the JavaScript wrappers
for <object>, <embed> and <applet>
* Some cleanup of the WebCoreFrameBridge
* ForwardingHeaders/bindings/NP_jsobject.h: Added.
* ForwardingHeaders/bindings/npruntime_impl.h: Added.
* ForwardingHeaders/bindings/runtime_root.h: Added.
* WebCore.exp:
* WebCore.xcodeproj/project.pbxproj:
* bindings/js/kjs_binding.cpp:
(KJS::ScriptInterpreter::shouldInterruptScript):
* bindings/objc/DOM.mm:
(-[DOMNode KJS::Bindings::]):
* bindings/objc/DOMInternal.mm:
(-[WebScriptObject _initializeScriptDOMNodeImp]):
* bridge/EditorClient.h:
* bridge/mac/FrameViewMac.mm:
(WebCore::FrameView::updateBorder):
(WebCore::FrameView::updateDashboardRegions):
* bridge/mac/WebCoreAXObject.mm:
(-[WebCoreAXObject rendererForView:]):
* dom/Position.cpp:
(WebCore::Position::next):
* editing/CommandByName.cpp:
(WebCore::Frame::execCopy):
(WebCore::Frame::execCut):
(WebCore::Frame::execPaste):
* editing/Editor.cpp:
(WebCore::Editor::canEdit):
(WebCore::Editor::pasteWithPasteboard):
(WebCore::Editor::paste):
(WebCore::Editor::pasteAsPlainText):
* editing/Editor.h:
* editing/JSEditor.cpp:
* html/HTMLAppletElement.cpp:
(WebCore::HTMLAppletElement::getInstance):
* html/HTMLEmbedElement.cpp:
(WebCore::HTMLEmbedElement::getInstance):
* html/HTMLFormElement.cpp:
(WebCore::HTMLFormElement::formData):
* html/HTMLObjectElement.cpp:
(WebCore::HTMLObjectElement::getInstance):
* loader/FrameLoader.cpp:
(WebCore::FrameLoader::clear):
(WebCore::FrameLoader::detachFromParent):
* loader/mac/ImageDocumentMac.mm:
(WebCore::finishImageLoad):
* loader/qt/DocumentLoaderQt.cpp:
* page/Chrome.cpp:
(WebCore::Chrome::shouldInterruptJavaScript):
* page/Chrome.h:
* page/ChromeClient.h:
* page/Frame.cpp:
(WebCore::Frame::~Frame):
(WebCore::Frame::markedTextRange):
(WebCore::Frame::shouldChangeSelection):
(WebCore::Frame::shouldDeleteSelection):
(WebCore::Frame::isContentEditable):
(WebCore::Frame::setSecureKeyboardEntry):
(WebCore::Frame::isSecureKeyboardEntry):
(WebCore::Frame::bindingRootObject):
(WebCore::Frame::createRootObject):
(WebCore::Frame::windowScriptNPObject):
(WebCore::Frame::cleanupScriptObjects):
(WebCore::FramePrivate::FramePrivate):
* page/Frame.h:
* page/FramePrivate.h:
* page/FrameView.h:
* page/mac/EventHandlerMac.mm:
(WebCore::EventHandler::tabsToLinks):
(WebCore::EventHandler::tabsToAllControls):
(WebCore::EventHandler::focusDocumentView):
(WebCore::EventHandler::passMouseDownEventToWidget):
(WebCore::EventHandler::handleDrag):
(WebCore::EventHandler::sendFakeEventsAfterWidgetTracking):
(WebCore::EventHandler::keyboardUIMode):
* page/mac/FrameMac.h: Removed.
* page/mac/FrameMac.mm:
(WebCore::Frame::setBridge):
(WebCore::Frame::bridge):
(WebCore::Frame::searchForLabelsAboveCell):
(WebCore::Frame::searchForLabelsBeforeElement):
(WebCore::Frame::matchLabelsAgainstElement):
(WebCore::Frame::focusWindow):
(WebCore::Frame::unfocusWindow):
(WebCore::Frame::imageFromRect):
(WebCore::Frame::selectionImage):
(WebCore::Frame::snapshotDragImage):
(WebCore::Frame::fontAttributesForSelectionStart):
(WebCore::Frame::baseWritingDirectionForSelectionStart):
(WebCore::Frame::print):
(WebCore::Frame::issuePasteCommand):
(WebCore::Frame::issueTransposeCommand):
(WebCore::Frame::respondToChangedSelection):
(WebCore::Frame::textFieldDidBeginEditing):
(WebCore::Frame::textFieldDidEndEditing):
(WebCore::Frame::textDidChangeInTextField):
(WebCore::Frame::textDidChangeInTextArea):
(WebCore::Frame::doTextFieldCommandFromEvent):
(WebCore::Frame::textWillBeDeletedInTextField):
(WebCore::Frame::setSecureKeyboardEntry):
(WebCore::Frame::isSecureKeyboardEntry):
(WebCore::Frame::setMarkedTextRange):
(WebCore::Frame::dashboardRegionsDictionary):
(WebCore::Frame::dashboardRegionsChanged):
(WebCore::Frame::willPopupMenu):
(WebCore::Frame::isCharacterSmartReplaceExempt):
(WebCore::Frame::setNeedsReapplyStyles):
(WebCore::Frame::customHighlightLineRect):
(WebCore::Frame::paintCustomHighlight):
(WebCore::Frame::createScriptInstanceForWidget):
(WebCore::Frame::windowScriptObject):
(WebCore::Frame::cleanupPlatformScriptObjects):
* page/mac/WebCoreFrameBridge.h:
* page/mac/WebCoreFrameBridge.mm:
(createRootObject):
(bridge):
(-[WebCoreFrameBridge _frame]):
* page/qt/EventHandlerQt.cpp:
* page/qt/FrameQt.cpp:
(WebCore::Frame::unfocusWindow):
(WebCore::Frame::focusWindow):
(WebCore::Frame::issueTransposeCommand):
(WebCore::Frame::respondToChangedSelection):
(WebCore::Frame::print):
(WebCore::Frame::createScriptInstanceForWidget):
(WebCore::Frame::cleanupPlatformScriptObjects):
(WebCore::Frame::isCharacterSmartReplaceExempt):
* page/qt/FrameQt.h: Removed.
* platform/MimeTypeRegistry.h:
* platform/graphics/svg/SVGImage.cpp:
(WebCore::SVGImage::setData):
* platform/graphics/svg/SVGImageEmptyClients.h:
(WebCore::SVGEmptyChromeClient::shouldInterruptJavaScript):
(WebCore::SVGEmptyEditorClient::shouldChangeSelectedRange):
* platform/mac/ClipboardMac.h:
* platform/mac/ClipboardMac.mm:
(WebCore::ClipboardMac::ClipboardMac):
* platform/mac/FileChooserMac.mm:
(-[OpenPanelController beginSheetWithFrame:]):
* platform/mac/MimeTypeRegistryMac.mm:
(WebCore::MimeTypeRegistry::getMIMETypeForPath):
* platform/mac/PopupMenuMac.mm:
(WebCore::PopupMenu::show):
* platform/mac/WidgetMac.mm:
(WebCore::Widget::setFocus):
(WebCore::Widget::setIsSelected):
* platform/network/mac/ResourceHandleMac.mm:
* platform/network/qt/ResourceHandleManagerQt.cpp:
* platform/network/qt/ResourceHandleQt.cpp:
(WebCore::ResourceHandle::start):
* platform/qt/MimeTypeRegistryQt.cpp:
(WebCore::MimeTypeRegistry::getMIMETypeForPath):
* platform/qt/PopupMenuQt.cpp:
* platform/qt/ScrollViewCanvasQt.cpp:
* platform/qt/ScrollViewQt.cpp:
* platform/win/TemporaryLinkStubs.cpp:
* rendering/InlineTextBox.cpp:
(WebCore::InlineTextBox::paintCustomHighlight):
* rendering/RenderBox.cpp:
(WebCore::RenderBox::paintCustomHighlight):
* rendering/RootInlineBox.cpp:
(WebCore::RootInlineBox::addHighlightOverflow):
(WebCore::RootInlineBox::paintCustomHighlight):
WebKit:
Reviewed by Maciej.
Additional coding by Maciej, additional review by Oliver.
Added implementations for the new callbacks in EditorClient
and ChromeClient (basically moved from WebFrameBridge).
Cleaned up some code paths that are not called anymore
and done fully inside WebCore now.
* DefaultDelegates/WebDefaultContextMenuDelegate.mm:
* Misc/WebElementDictionary.mm:
* Misc/WebNSAttributedStringExtras.mm:
* Plugins/WebBaseNetscapePluginView.mm:
(-[WebBaseNetscapePluginView getVariable:value:]):
* Plugins/WebNetscapePluginEmbeddedView.mm:
* Plugins/WebNetscapePluginStream.mm:
* Plugins/WebPluginContainerCheck.mm:
* WebCoreSupport/WebChromeClient.h:
* WebCoreSupport/WebChromeClient.mm:
(WebChromeClient::shouldInterruptJavaScript):
* WebCoreSupport/WebEditorClient.h:
* WebCoreSupport/WebEditorClient.mm:
(WebEditorClient::shouldChangeSelectedRange):
* WebCoreSupport/WebFrameBridge.mm:
(-[WebFrameBridge finishInitializingWithPage:frameName:frameView:ownerElement:]):
(-[WebFrameBridge fini]):
* WebCoreSupport/WebFrameLoaderClient.mm:
* WebView/WebArchiver.mm:
* WebView/WebFrame.mm:
(core):
(kit):
(-[WebFrame _updateBackground]):
* WebView/WebFrameInternal.h:
* WebView/WebFrameView.mm:
* WebView/WebHTMLRepresentation.mm:
* WebView/WebHTMLView.mm:
(-[WebHTMLView _updateMouseoverWithEvent:]):
(-[WebHTMLView _isEditable]):
(-[WebHTMLView validateUserInterfaceItem:]):
(-[WebHTMLView maintainsInactiveSelection]):
(-[WebHTMLView scrollWheel:]):
(-[WebHTMLView acceptsFirstMouse:]):
(-[WebHTMLView shouldDelayWindowOrderingForEvent:]):
(-[WebHTMLView cut:]):
(-[WebHTMLView paste:]):
(-[WebHTMLView selectedAttributedString]):
* WebView/WebScriptDebugDelegate.mm:
* WebView/WebView.mm:
(-[WebView _dashboardRegions]):
(-[WebView setProhibitsMainFrameScrolling:]):
(-[WebView _setInViewSourceMode:]):
(-[WebView _inViewSourceMode]):
(-[WebView shouldClose]):
(-[WebView setEditable:]):
WebKitQt:
Reviewed by Maciej.
Additional coding by Maciej, additional review by Oliver.
Add stubs for the new methods in ChormeClient and EditorClient,
remove all references to FrameQt.
* Api/qwebframe.cpp:
(QWebFrame::QWebFrame):
* Api/qwebframe_p.h:
* Api/qwebpage.cpp:
* WebCoreSupport/ChromeClientQt.cpp:
(WebCore::ChromeClientQt::shouldInterruptJavaScript):
* WebCoreSupport/ChromeClientQt.h:
* WebCoreSupport/EditorClientQt.cpp:
(WebCore::EditorClientQt::shouldChangeSelectedRange):
(WebCore::EditorClientQt::isEditable):
* WebCoreSupport/EditorClientQt.h:
* WebCoreSupport/FrameLoaderClientQt.cpp:
(WebCore::FrameLoaderClientQt::setFrame):
(WebCore::FrameLoaderClientQt::webFrame):
* WebCoreSupport/FrameLoaderClientQt.h:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@19702 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/bridge/EditorClient.h b/WebCore/bridge/EditorClient.h
index e476e61..916ed26 100644
--- a/WebCore/bridge/EditorClient.h
+++ b/WebCore/bridge/EditorClient.h
@@ -1,5 +1,6 @@
/*
* Copyright (C) 2006, 2007 Apple Inc. All rights reserved.
+ * Copyright (C) 2007 Trolltech ASA
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -27,6 +28,7 @@
#define EditorClient_h
#include "EditorInsertAction.h"
+#include "TextAffinity.h"
#include <wtf/Forward.h>
#if PLATFORM(MAC)
@@ -40,6 +42,7 @@
class CSSStyleDeclaration;
class EditCommand;
+class Element;
class Frame;
class HTMLElement;
class KeyboardEvent;
@@ -68,7 +71,8 @@
virtual bool shouldEndEditing(Range*) = 0;
virtual bool shouldInsertNode(Node*, Range*, EditorInsertAction) = 0;
virtual bool shouldInsertText(String, Range*, EditorInsertAction) = 0;
-// virtual bool shouldChangeSelectedRange(Range* fromRange, Range* toRange, NSSelectionAffinity, bool stillSelecting) = 0;
+ virtual bool shouldChangeSelectedRange(Range* fromRange, Range* toRange, EAffinity, bool stillSelecting) = 0;
+
virtual bool shouldApplyStyle(CSSStyleDeclaration*, Range*) = 0;
// virtual bool shouldChangeTypingStyle(CSSStyleDeclaration* fromStyle, CSSStyleDeclaration* toStyle) = 0;
// virtual bool doCommandBySelector(SEL selector) = 0;
@@ -93,6 +97,13 @@
virtual void redo() = 0;
virtual void handleKeyPress(KeyboardEvent*) = 0;
+
+ virtual void textFieldDidBeginEditing(Element*) = 0;
+ virtual void textFieldDidEndEditing(Element*) = 0;
+ virtual void textDidChangeInTextField(Element*) = 0;
+ virtual bool doTextFieldCommandFromEvent(Element*, KeyboardEvent*) = 0;
+ virtual void textWillBeDeletedInTextField(Element*) = 0;
+ virtual void textDidChangeInTextArea(Element*) = 0;
#if PLATFORM(MAC)
virtual void markedTextAbandoned(Frame*) = 0;
