Commit ffd93c32 authored by darin's avatar darin
Browse files

WebCore:

        Reviewed by Hyatt.

        - added a Timer class
        - used the Timer class for the redirection timer
        - moved Frame, FrameView, MacFrame, and FrameNodeTree into WebCore namespace
        - removed more KWQ

        * ForwardingHeaders/khtml_factory.h: Removed.
        * kwq/KWQKHTMLFactory.cpp: Removed.
        * kwq/KWQKHTMLFactory.h: Removed.

        * platform/Timer.h: Added.
        * platform/mac/Timer.cpp: Added.

        * WebCore.vcproj/WebCore/WebCore.vcproj: Updated for added and removed files.
        * WebCore.xcodeproj/project.pbxproj: Ditto.

        * page/Frame.h:
        * page/Frame.cpp:
        (WebCore::Frame::init): Remove code to set up slotRedirect.
        (WebCore::Frame::checkCompleted): Call start/stopRedirectionTimer instead of using
        the redirection timer directly.
        (WebCore::Frame::scheduleRedirection): Ditto.
        (WebCore::Frame::scheduleLocationChange): Ditto.
        (WebCore::Frame::scheduleHistoryNavigation): Ditto.
        (WebCore::Frame::cancelRedirection): Ditto.
        (WebCore::Frame::redirectionTimerFired): Renamed from slotRedirect.
        (WebCore::Frame::slotParentCompleted): More startRedirectionTimer.
        (WebCore::Frame::startRedirectionTimer): Added. Virtual bottleneck to start the
        redirection timer.
        (WebCore::Frame::stopRedirectionTimer): Added. Virtual bottleneck to stop the
        redirection timer.

        * page/FramePrivate.h: Changed m_redirectionTimer from a QTimer to a Timer.

        * bridge/mac/MacFrame.mm:
        (WebCore::MacFrame::startRedirectionTimer): Added. Avoids the need for the QTimer
        "monitor" feature that I had added a while back to implement the client-redirected
        callback.
        (WebCore::MacFrame::stopRedirectionTimer): Ditto.

        * kwq/KWQSlot.cpp: Removed slotRedirected.

        * ForwardingHeaders/ksvg2/KSVGPart.h: Removed using to put Frame into various
        namespaces (all of which are WebCore now anyway).

        * bindings/objc/DOMInternal.mm:
        * bridge/mac/BrowserExtensionMac.h:
        * bridge/mac/KWQKHTMLView.cpp:
        * bridge/mac/MacFrame.h:
        * bridge/mac/WebCoreFrameBridge.h:
        * bridge/mac/WebCoreFrameBridge.mm:
        * bridge/mac/WebCorePageBridge.h:
        * bridge/mac/WebCorePageBridge.mm:
        * css/cssstyleselector.cpp:
        * css/cssstyleselector.h:
        * khtml/ecma/kjs_binding.cpp:
        * khtml/ecma/kjs_binding.h:
        * khtml/ecma/kjs_navigator.cpp:
        * khtml/ecma/kjs_navigator.h:
        * khtml/ecma/kjs_proxy.h:
        * khtml/ecma/kjs_window.h:
        * khtml/editing/SelectionController.h:
        * khtml/editing/jsediting.h:
        * khtml/html/html_baseimpl.h:
        * khtml/html/html_documentimpl.cpp:
        * khtml/html/html_documentimpl.h:
        * khtml/html/html_headimpl.h:
        * khtml/html/htmlparser.h:
        * khtml/html/htmltokenizer.h:
        * khtml/xml/DOMImplementationImpl.h:
        * khtml/xml/DocumentImpl.h:
        * khtml/xml/dom2_eventsimpl.h:
        * khtml/xml/xml_tokenizer.h:
        * khtml/xsl/xslt_processorimpl.h:
        * ksvg2/svg/SVGDocumentImpl.cpp:
        * kwq/KWQClipboard.h:
        * kwq/KWQComboBox.mm:
        * kwq/KWQFileButton.h:
        * kwq/KWQFrame.mm:
        * kwq/KWQKJavaAppletWidget.h:
        * kwq/KWQListBox.mm:
        * kwq/KWQSignalStubs.cpp:
        * kwq/KWQSlider.mm:
        * kwq/KWQTextField.mm:
        * kwq/KWQWidget.mm:
        * kwq/WebCoreSettings.mm:
        * kwq/WebCoreTextRendererFactory.mm:
        * loader/DocLoader.h:
        * page/FrameTreeNode.cpp:
        * page/FrameTreeNode.h:
        * page/FrameView.cpp:
        * page/FrameView.h:
        * page/Page.cpp:
        * page/Page.h:
        * rendering/InlineTextBox.h:
        * rendering/font.cpp:
        * rendering/render_canvas.h:
        * rendering/render_frames.h:
        * rendering/render_object.h:
        * rendering/render_replaced.h:
        Updated for namespace and header changes.

WebKit:

        Reviewed by Hyatt.

        * WebCoreSupport.subproj/WebFrameBridge.m:
        (-[WebFrameBridge createChildFrameNamed:withURL:referrer:renderPart:allowsScrolling:marginWidth:marginHeight:]):
        Updated for name change.



git-svn-id: http://svn.webkit.org/repository/webkit/trunk@12492 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent b4ce2e27
2006-01-31 Darin Adler <darin@apple.com>
Reviewed by Hyatt.
- added a Timer class
- used the Timer class for the redirection timer
- moved Frame, FrameView, MacFrame, and FrameNodeTree into WebCore namespace
- removed more KWQ
* ForwardingHeaders/khtml_factory.h: Removed.
* kwq/KWQKHTMLFactory.cpp: Removed.
* kwq/KWQKHTMLFactory.h: Removed.
* platform/Timer.h: Added.
* platform/mac/Timer.cpp: Added.
* WebCore.vcproj/WebCore/WebCore.vcproj: Updated for added and removed files.
* WebCore.xcodeproj/project.pbxproj: Ditto.
* page/Frame.h:
* page/Frame.cpp:
(WebCore::Frame::init): Remove code to set up slotRedirect.
(WebCore::Frame::checkCompleted): Call start/stopRedirectionTimer instead of using
the redirection timer directly.
(WebCore::Frame::scheduleRedirection): Ditto.
(WebCore::Frame::scheduleLocationChange): Ditto.
(WebCore::Frame::scheduleHistoryNavigation): Ditto.
(WebCore::Frame::cancelRedirection): Ditto.
(WebCore::Frame::redirectionTimerFired): Renamed from slotRedirect.
(WebCore::Frame::slotParentCompleted): More startRedirectionTimer.
(WebCore::Frame::startRedirectionTimer): Added. Virtual bottleneck to start the
redirection timer.
(WebCore::Frame::stopRedirectionTimer): Added. Virtual bottleneck to stop the
redirection timer.
* page/FramePrivate.h: Changed m_redirectionTimer from a QTimer to a Timer.
* bridge/mac/MacFrame.mm:
(WebCore::MacFrame::startRedirectionTimer): Added. Avoids the need for the QTimer
"monitor" feature that I had added a while back to implement the client-redirected
callback.
(WebCore::MacFrame::stopRedirectionTimer): Ditto.
* kwq/KWQSlot.cpp: Removed slotRedirected.
* ForwardingHeaders/ksvg2/KSVGPart.h: Removed using to put Frame into various
namespaces (all of which are WebCore now anyway).
* bindings/objc/DOMInternal.mm:
* bridge/mac/BrowserExtensionMac.h:
* bridge/mac/KWQKHTMLView.cpp:
* bridge/mac/MacFrame.h:
* bridge/mac/WebCoreFrameBridge.h:
* bridge/mac/WebCoreFrameBridge.mm:
* bridge/mac/WebCorePageBridge.h:
* bridge/mac/WebCorePageBridge.mm:
* css/cssstyleselector.cpp:
* css/cssstyleselector.h:
* khtml/ecma/kjs_binding.cpp:
* khtml/ecma/kjs_binding.h:
* khtml/ecma/kjs_navigator.cpp:
* khtml/ecma/kjs_navigator.h:
* khtml/ecma/kjs_proxy.h:
* khtml/ecma/kjs_window.h:
* khtml/editing/SelectionController.h:
* khtml/editing/jsediting.h:
* khtml/html/html_baseimpl.h:
* khtml/html/html_documentimpl.cpp:
* khtml/html/html_documentimpl.h:
* khtml/html/html_headimpl.h:
* khtml/html/htmlparser.h:
* khtml/html/htmltokenizer.h:
* khtml/xml/DOMImplementationImpl.h:
* khtml/xml/DocumentImpl.h:
* khtml/xml/dom2_eventsimpl.h:
* khtml/xml/xml_tokenizer.h:
* khtml/xsl/xslt_processorimpl.h:
* ksvg2/svg/SVGDocumentImpl.cpp:
* kwq/KWQClipboard.h:
* kwq/KWQComboBox.mm:
* kwq/KWQFileButton.h:
* kwq/KWQFrame.mm:
* kwq/KWQKJavaAppletWidget.h:
* kwq/KWQListBox.mm:
* kwq/KWQSignalStubs.cpp:
* kwq/KWQSlider.mm:
* kwq/KWQTextField.mm:
* kwq/KWQWidget.mm:
* kwq/WebCoreSettings.mm:
* kwq/WebCoreTextRendererFactory.mm:
* loader/DocLoader.h:
* page/FrameTreeNode.cpp:
* page/FrameTreeNode.h:
* page/FrameView.cpp:
* page/FrameView.h:
* page/Page.cpp:
* page/Page.h:
* rendering/InlineTextBox.h:
* rendering/font.cpp:
* rendering/render_canvas.h:
* rendering/render_frames.h:
* rendering/render_object.h:
* rendering/render_replaced.h:
Updated for namespace and header changes.
2006-01-31 Anders Carlsson <andersca@mac.com>
 
Reviewed by Darin.
......@@ -6,7 +111,7 @@
REGRESSION: United.com menus messed up due to document.all/MSIE sniff
* khtml/ecma/kjs_html.h:
(KJS::HTMLAllCollection::masqueradeAsNull):
(KJS::HTMLAllCollection::masqueradeAsUndefined):
Update for name change.
2006-01-30 Geoffrey Garen <ggaren@apple.com>
......
#include "Frame.h"
class Frame;
namespace KDOM {
using ::Frame;
}
namespace KSVG {
using ::Frame;
}
......@@ -262,14 +262,6 @@
RelativePath="..\..\kwq\KWQKDebug.h"
>
</File>
<File
RelativePath="..\..\kwq\KWQKHTMLFactory.cpp"
>
</File>
<File
RelativePath="..\..\kwq\KWQKHTMLFactory.h"
>
</File>
<File
RelativePath="..\..\kwq\kwqkhtmlpart.h"
>
......
......@@ -93,6 +93,8 @@
65FEA86909833ADE00BED4AB /* Page.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 65FEA86809833ADE00BED4AB /* Page.cpp */; };
7E6FEED80898582300C44C3F /* WebCoreScriptDebugger.h in Headers */ = {isa = PBXBuildFile; fileRef = 7E6FEED60898582300C44C3F /* WebCoreScriptDebugger.h */; settings = {ATTRIBUTES = (Private, ); }; };
7E6FEED90898582300C44C3F /* WebCoreScriptDebugger.mm in Sources */ = {isa = PBXBuildFile; fileRef = 7E6FEED70898582300C44C3F /* WebCoreScriptDebugger.mm */; };
9305B24D098F1B6B00C28855 /* Timer.h in Headers */ = {isa = PBXBuildFile; fileRef = 9305B24C098F1B6B00C28855 /* Timer.h */; };
9305B250098F1B8B00C28855 /* Timer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9305B24F098F1B8B00C28855 /* Timer.cpp */; };
937A36A7097E2E3200E4EE2F /* UserAgentStyleSheets.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 937A36A6097E2E3200E4EE2F /* UserAgentStyleSheets.cpp */; };
9385F762098D9C3100D90D24 /* Screen.h in Headers */ = {isa = PBXBuildFile; fileRef = 9385F761098D9C3100D90D24 /* Screen.h */; };
9385F774098D9CB900D90D24 /* Screen.mm in Sources */ = {isa = PBXBuildFile; fileRef = 9385F773098D9CB900D90D24 /* Screen.mm */; };
......@@ -161,7 +163,6 @@
93F1994508245E59001E9ABC /* KWQKCookieJar.h in Headers */ = {isa = PBXBuildFile; fileRef = F58784EE02DE375901EA4122 /* KWQKCookieJar.h */; };
93F1994608245E59001E9ABC /* KWQKCursor.h in Headers */ = {isa = PBXBuildFile; fileRef = F587862002DE398401EA4122 /* KWQKCursor.h */; };
93F1994708245E59001E9ABC /* KWQKDebug.h in Headers */ = {isa = PBXBuildFile; fileRef = F58785F402DE382001EA4122 /* KWQKDebug.h */; };
93F1994A08245E59001E9ABC /* KWQKHTMLFactory.h in Headers */ = {isa = PBXBuildFile; fileRef = F587863402DE3A1401EA4122 /* KWQKHTMLFactory.h */; };
93F1994F08245E59001E9ABC /* KWQKHTMLSettings.h in Headers */ = {isa = PBXBuildFile; fileRef = F587863A02DE3A1401EA4122 /* KWQKHTMLSettings.h */; };
93F1995008245E59001E9ABC /* KWQKIOGlobal.h in Headers */ = {isa = PBXBuildFile; fileRef = F587864902DE3A9A01EA4122 /* KWQKIOGlobal.h */; };
93F1995408245E59001E9ABC /* KWQKJavaAppletWidget.h in Headers */ = {isa = PBXBuildFile; fileRef = F587864502DE3A7701EA4122 /* KWQKJavaAppletWidget.h */; };
......@@ -288,7 +289,6 @@
93F19A2508245E59001E9ABC /* KWQKCookieJar.mm in Sources */ = {isa = PBXBuildFile; fileRef = F58784EF02DE375901EA4122 /* KWQKCookieJar.mm */; };
93F19A2608245E59001E9ABC /* KWQKCursor.mm in Sources */ = {isa = PBXBuildFile; fileRef = F58784F002DE375901EA4122 /* KWQKCursor.mm */; };
93F19A2908245E59001E9ABC /* KWQKHistoryProvider.mm in Sources */ = {isa = PBXBuildFile; fileRef = F58784F602DE375901EA4122 /* KWQKHistoryProvider.mm */; };
93F19A2A08245E59001E9ABC /* KWQKHTMLFactory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F58784F702DE375901EA4122 /* KWQKHTMLFactory.cpp */; };
93F19A2E08245E59001E9ABC /* KWQKJavaAppletWidget.mm in Sources */ = {isa = PBXBuildFile; fileRef = F58784FF02DE375901EA4122 /* KWQKJavaAppletWidget.mm */; };
93F19A3008245E59001E9ABC /* KWQKJobClasses.mm in Sources */ = {isa = PBXBuildFile; fileRef = F587850102DE375901EA4122 /* KWQKJobClasses.mm */; };
93F19A3108245E59001E9ABC /* KWQLoader.mm in Sources */ = {isa = PBXBuildFile; fileRef = F587850302DE375901EA4122 /* KWQLoader.mm */; };
......@@ -1193,6 +1193,8 @@
84C0FA2C052B966D000440A1 /* southWestResizeCursor.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = southWestResizeCursor.tiff; path = Resources/southWestResizeCursor.tiff; sourceTree = "<group>"; };
84C0FA2D052B966D000440A1 /* waitCursor.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = waitCursor.tiff; path = Resources/waitCursor.tiff; sourceTree = "<group>"; };
84C0FA2E052B966D000440A1 /* westResizeCursor.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = westResizeCursor.tiff; path = Resources/westResizeCursor.tiff; sourceTree = "<group>"; };
9305B24C098F1B6B00C28855 /* Timer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Timer.h; path = platform/Timer.h; sourceTree = "<group>"; };
9305B24F098F1B8B00C28855 /* Timer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Timer.cpp; path = platform/mac/Timer.cpp; sourceTree = "<group>"; };
9325AAB7041D0E9A00A9CAC5 /* WebCoreScrollView.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebCoreScrollView.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
9325AAB8041D0E9A00A9CAC5 /* WebCoreScrollView.m */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.objc; path = WebCoreScrollView.m; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
932B9834070297DC0032804F /* text_granularity.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; name = text_granularity.h; path = editing/text_granularity.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
......@@ -2124,7 +2126,6 @@
F58784EF02DE375901EA4122 /* KWQKCookieJar.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = KWQKCookieJar.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
F58784F002DE375901EA4122 /* KWQKCursor.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = KWQKCursor.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
F58784F602DE375901EA4122 /* KWQKHistoryProvider.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = KWQKHistoryProvider.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
F58784F702DE375901EA4122 /* KWQKHTMLFactory.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = KWQKHTMLFactory.cpp; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
F58784FF02DE375901EA4122 /* KWQKJavaAppletWidget.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = KWQKJavaAppletWidget.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
F587850102DE375901EA4122 /* KWQKJobClasses.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = KWQKJobClasses.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
F587850302DE375901EA4122 /* KWQLoader.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = KWQLoader.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
......@@ -2175,7 +2176,6 @@
F58785FA02DE382001EA4122 /* KWQKLocale.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = KWQKLocale.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
F587860202DE382001EA4122 /* KWQKURL.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = KWQKURL.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
F587862002DE398401EA4122 /* KWQKCursor.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = KWQKCursor.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
F587863402DE3A1401EA4122 /* KWQKHTMLFactory.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = KWQKHTMLFactory.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
F587863A02DE3A1401EA4122 /* KWQKHTMLSettings.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = KWQKHTMLSettings.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
F587864502DE3A7701EA4122 /* KWQKJavaAppletWidget.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = KWQKJavaAppletWidget.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
F587864902DE3A9A01EA4122 /* KWQKIOGlobal.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = KWQKIOGlobal.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
......@@ -3099,6 +3099,7 @@
BCF1A5BA097832090061A123 /* platform */ = {
isa = PBXGroup;
children = (
9305B24C098F1B6B00C28855 /* Timer.h */,
BCD75ABD0989A45C003E28DF /* Image.mm */,
BCD75ABB0989A446003E28DF /* Image.h */,
BC075985098861A400407B48 /* Brush.h */,
......@@ -3140,6 +3141,7 @@
93E62D990985F41600E1B5E3 /* SystemTime.h */,
9385F761098D9C3100D90D24 /* Screen.h */,
9385F773098D9CB900D90D24 /* Screen.mm */,
9305B24F098F1B8B00C28855 /* Timer.cpp */,
);
name = platform;
sourceTree = "<group>";
......@@ -3697,8 +3699,6 @@
F587864302DE3A1601EA4122 /* khtml */ = {
isa = PBXGroup;
children = (
F587863402DE3A1401EA4122 /* KWQKHTMLFactory.h */,
F58784F702DE375901EA4122 /* KWQKHTMLFactory.cpp */,
F587863A02DE3A1401EA4122 /* KWQKHTMLSettings.h */,
F587864502DE3A7701EA4122 /* KWQKJavaAppletWidget.h */,
F58784FF02DE375901EA4122 /* KWQKJavaAppletWidget.mm */,
......@@ -3871,7 +3871,6 @@
93F1994508245E59001E9ABC /* KWQKCookieJar.h in Headers */,
93F1994608245E59001E9ABC /* KWQKCursor.h in Headers */,
93F1994708245E59001E9ABC /* KWQKDebug.h in Headers */,
93F1994A08245E59001E9ABC /* KWQKHTMLFactory.h in Headers */,
93F1994F08245E59001E9ABC /* KWQKHTMLSettings.h in Headers */,
93F1995008245E59001E9ABC /* KWQKIOGlobal.h in Headers */,
93F1995408245E59001E9ABC /* KWQKJavaAppletWidget.h in Headers */,
......@@ -4323,6 +4322,7 @@
BC075986098861A400407B48 /* Brush.h in Headers */,
BCD75ABC0989A446003E28DF /* Image.h in Headers */,
9385F762098D9C3100D90D24 /* Screen.h in Headers */,
9305B24D098F1B6B00C28855 /* Timer.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
......@@ -4986,7 +4986,6 @@
93F19A2508245E59001E9ABC /* KWQKCookieJar.mm in Sources */,
93F19A2608245E59001E9ABC /* KWQKCursor.mm in Sources */,
93F19A2908245E59001E9ABC /* KWQKHistoryProvider.mm in Sources */,
93F19A2A08245E59001E9ABC /* KWQKHTMLFactory.cpp in Sources */,
93F19A2E08245E59001E9ABC /* KWQKJavaAppletWidget.mm in Sources */,
93F19A3008245E59001E9ABC /* KWQKJobClasses.mm in Sources */,
93F19A3108245E59001E9ABC /* KWQLoader.mm in Sources */,
......@@ -5440,6 +5439,7 @@
BCD75ABE0989A45C003E28DF /* Image.mm in Sources */,
1A37F63A0988EE3300D05E90 /* JSCore.cpp in Sources */,
9385F774098D9CB900D90D24 /* Screen.mm in Sources */,
9305B250098F1B8B00C28855 /* Timer.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
......
......@@ -43,12 +43,7 @@
#import <JavaScriptCore/runtime_root.h>
#import <JavaScriptCore/WebScriptObjectPrivate.h>
using DOM::CSSException;
using DOM::DOMString;
using DOM::DOMStringImpl;
using DOM::EventException;
using DOM::NodeImpl;
using DOM::RangeException;
using namespace WebCore;
using KJS::ExecState;
using KJS::Interpreter;
......@@ -97,7 +92,7 @@ void raiseDOMException(int code)
{
ASSERT(code);
NSString *name = DOMException;
NSString *name = ::DOMException;
if (code >= RangeException::_EXCEPTION_OFFSET && code <= RangeException::_EXCEPTION_MAX) {
name = DOMRangeException;
......
......@@ -25,11 +25,11 @@
#include "BrowserExtension.h"
namespace WebCore {
class Frame;
class MacFrame;
namespace WebCore {
class BrowserExtensionMac : public BrowserExtension {
public:
BrowserExtensionMac(Frame *);
......
......@@ -29,6 +29,8 @@
#include "MacFrame.h"
#include "KWQWindowWidget.h"
namespace WebCore {
/*
Currently this file just extends the KDE implementation.
See khtml/khtmlview.cpp for the rest of the implementation.
......@@ -43,3 +45,5 @@ IntPoint FrameView::viewportToGlobal(const IntPoint &p) const
{
return static_cast<KWQWindowWidget *>(topLevelWidget())->viewportToGlobal(p);
}
}
......@@ -38,22 +38,9 @@
#import <CoreFoundation/CoreFoundation.h>
class FramePrivate;
class KWQWindowWidget;
class NPObject;
namespace DOM {
class DocumentFragmentImpl;
class HTMLTableCellElementImpl;
}
namespace khtml {
class RenderObject;
class RenderStyle;
class VisiblePosition;
struct DashboardRegionValue;
}
namespace KJS {
class PausedTimeouts;
class SavedProperties;
......@@ -112,6 +99,17 @@ typedef int NSWritingDirection;
#endif
namespace WebCore {
class DocumentFragmentImpl;
class FramePrivate;
class HTMLTableCellElementImpl;
class RenderObject;
class RenderStyle;
class VisiblePosition;
struct DashboardRegionValue;
enum KWQSelectionDirection {
KWQSelectingNext,
KWQSelectingPrevious
......@@ -131,18 +129,18 @@ public:
virtual bool openURL(const KURL &);
virtual void openURLRequest(const KURL &, const WebCore::URLArgs &);
virtual void submitForm(const KURL &, const WebCore::URLArgs &);
virtual void openURLRequest(const KURL &, const URLArgs &);
virtual void submitForm(const KURL &, const URLArgs &);
void scheduleHistoryNavigation( int steps );
QString advanceToNextMisspelling(bool startBeforeSelection = false);
virtual void setTitle(const DOM::DOMString &);
virtual void setTitle(const DOMString &);
void setStatusBarText(const QString &status);
virtual void urlSelected(const KURL &url, int button, int state, const WebCore::URLArgs &args);
virtual ObjectContents *createPart(const khtml::ChildFrame &child, const KURL &url, const QString &mimeType);
virtual void urlSelected(const KURL &url, int button, int state, const URLArgs &args);
virtual ObjectContents *createPart(const ChildFrame &child, const KURL &url, const QString &mimeType);
virtual void scheduleClose();
......@@ -153,11 +151,11 @@ public:
virtual void saveDocumentState();
virtual void restoreDocumentState();
virtual void addMessageToConsole(const DOM::DOMString& message, unsigned int lineNumber, const DOM::DOMString& sourceID);
virtual void addMessageToConsole(const DOMString& message, unsigned int lineNumber, const DOMString& sourceID);
void setDisplaysWithFocusAttributes(bool flag);
NSView *nextKeyView(DOM::NodeImpl *startingPoint, KWQSelectionDirection);
NSView *nextKeyViewInFrameHierarchy(DOM::NodeImpl *startingPoint, KWQSelectionDirection);
NSView *nextKeyView(NodeImpl *startingPoint, KWQSelectionDirection);
NSView *nextKeyViewInFrameHierarchy(NodeImpl *startingPoint, KWQSelectionDirection);
static NSView *nextKeyViewForWidget(QWidget *startingPoint, KWQSelectionDirection);
static bool currentEventIsKeyboardOptionTab();
static bool handleKeyboardOptionTabInView(NSView *view);
......@@ -167,9 +165,9 @@ public:
static bool currentEventIsMouseDownInWidget(QWidget *candidate);
virtual void runJavaScriptAlert(const DOM::DOMString& message);
virtual bool runJavaScriptConfirm(const DOM::DOMString& message);
virtual bool runJavaScriptPrompt(const DOM::DOMString& message, const DOM::DOMString& defaultValue, DOM::DOMString& result);
virtual void runJavaScriptAlert(const DOMString& message);
virtual bool runJavaScriptConfirm(const DOMString& message);
virtual bool runJavaScriptPrompt(const DOMString& message, const DOMString& defaultValue, DOMString& result);
virtual bool locationbarVisible();
virtual bool menubarVisible();
virtual bool personalbarVisible();
......@@ -180,7 +178,7 @@ public:
virtual void createEmptyDocument();
virtual WebCore::BrowserExtension* createBrowserExtension() { return new WebCore::BrowserExtensionMac(this); }
virtual BrowserExtension* createBrowserExtension() { return new BrowserExtensionMac(this); }
static WebCoreFrameBridge *bridgeForWidget(const QWidget *);
......@@ -192,20 +190,20 @@ public:
NSRect visibleSelectionRect() const;
NSImage *selectionImage() const;
NSImage *snapshotDragImage(DOM::NodeImpl *node, NSRect *imageRect, NSRect *elementRect) const;
NSImage *snapshotDragImage(NodeImpl *node, NSRect *imageRect, NSRect *elementRect) const;
bool dispatchDragSrcEvent(const DOM::AtomicString &eventType, const IntPoint &loc) const;
bool dispatchDragSrcEvent(const AtomicString &eventType, const IntPoint &loc) const;
NSFont *fontForSelection(bool *hasMultipleFonts) const;
NSDictionary *fontAttributesForSelectionStart() const;
NSWritingDirection baseWritingDirectionForSelectionStart() const;
virtual void markMisspellingsInAdjacentWords(const khtml::VisiblePosition &);
virtual void markMisspellings(const khtml::SelectionController &);
virtual void markMisspellingsInAdjacentWords(const VisiblePosition &);
virtual void markMisspellings(const SelectionController &);
NSFileWrapper *fileWrapperForElement(DOM::ElementImpl *);
NSAttributedString *attributedString(DOM::NodeImpl *startNode, int startOffset, DOM::NodeImpl *endNode, int endOffset);
NSFileWrapper *fileWrapperForElement(ElementImpl *);
NSAttributedString *attributedString(NodeImpl *startNode, int startOffset, NodeImpl *endNode, int endOffset);
void mouseDown(NSEvent *);
void mouseDragged(NSEvent *);
......@@ -234,17 +232,15 @@ public:
bool sendContextMenuEvent(NSEvent *);
bool passMouseDownEventToWidget(QWidget *);
virtual bool passSubframeEventToSubframe(DOM::NodeImpl::MouseEvent &);
virtual bool passWheelEventToChildWidget(DOM::NodeImpl *);
void redirectionTimerStartedOrStopped();
virtual bool passSubframeEventToSubframe(NodeImpl::MouseEvent &);
virtual bool passWheelEventToChildWidget(NodeImpl *);
virtual void clearRecordedFormValues();
virtual void recordFormValue(const QString &name, const QString &value, DOM::HTMLFormElementImpl *element);
virtual void recordFormValue(const QString &name, const QString &value, HTMLFormElementImpl *element);
NSString *searchForLabelsAboveCell(QRegExp *regExp, DOM::HTMLTableCellElementImpl *cell);
NSString *searchForLabelsBeforeElement(NSArray *labels, DOM::ElementImpl *element);
NSString *matchLabelsAgainstElement(NSArray *labels, DOM::ElementImpl *element);
NSString *searchForLabelsAboveCell(QRegExp *regExp, HTMLTableCellElementImpl *cell);
NSString *searchForLabelsBeforeElement(NSArray *labels, ElementImpl *element);
NSString *matchLabelsAgainstElement(NSArray *labels, ElementImpl *element);
bool findString(NSString *str, bool forward, bool caseFlag, bool wrapFlag);
......@@ -258,8 +254,8 @@ public:
WebCoreKeyboardUIMode keyboardUIMode() const;
void didTellBridgeAboutLoad(const DOM::DOMString& URL);
bool haveToldBridgeAboutLoad(const DOM::DOMString& URL);
void didTellBridgeAboutLoad(const DOMString& URL);
bool haveToldBridgeAboutLoad(const DOMString& URL);
virtual KJS::Bindings::Instance *getEmbedInstanceForWidget(QWidget*);
virtual KJS::Bindings::Instance *getObjectInstanceForWidget(QWidget*);
......@@ -267,8 +263,8 @@ public:
void addPluginRootObject(const KJS::Bindings::RootObject *root);
void cleanupPluginRootObjects();
virtual void registerCommandForUndo(const khtml::EditCommandPtr &);
virtual void registerCommandForRedo(const khtml::EditCommandPtr &);
virtual void registerCommandForUndo(const EditCommandPtr &);
virtual void registerCommandForRedo(const EditCommandPtr &);
virtual void clearUndoRedoOperations();
virtual void issueUndoCommand();
virtual void issueRedoCommand();
......@@ -277,12 +273,12 @@ public:
virtual void issuePasteCommand();
virtual void issuePasteAndMatchStyleCommand();
virtual void issueTransposeCommand();
virtual void respondToChangedSelection(const khtml::SelectionController &oldSelection, bool closeTyping);
virtual void respondToChangedSelection(const SelectionController &oldSelection, bool closeTyping);
virtual void respondToChangedContents();
virtual bool isContentEditable() const;
virtual bool shouldChangeSelection(const khtml::SelectionController &oldSelection, const khtml::SelectionController &newSelection, khtml::EAffinity affinity, bool stillSelecting) const;
virtual bool shouldBeginEditing(const DOM::RangeImpl *) const;
virtual bool shouldEndEditing(const DOM::RangeImpl *) const;
virtual bool shouldChangeSelection(const SelectionController &oldSelection, const SelectionController &newSelection, EAffinity affinity, bool stillSelecting) const;
virtual bool shouldBeginEditing(const RangeImpl *) const;
virtual bool shouldEndEditing(const RangeImpl *) const;
KJS::Bindings::RootObject *executionContextForDOM();
KJS::Bindings::RootObject *bindingRootObject();
......@@ -293,10 +289,10 @@ public:
virtual void partClearedInBegin();
// Implementation of CSS property -khtml-user-drag == auto
bool shouldDragAutoNode(DOM::NodeImpl*, int x, int y) const;
bool shouldDragAutoNode(NodeImpl*, int x, int y) const;
void setMarkedTextRange(const DOM::RangeImpl *, NSArray *attributes, NSArray *ranges);
virtual DOM::RangeImpl *markedTextRange() const { return m_markedTextRange.get(); }
void setMarkedTextRange(const RangeImpl *, NSArray *attributes, NSArray *ranges);
virtual RangeImpl *markedTextRange() const { return m_markedTextRange.get(); }
virtual bool canGoBackOrForward(int distance) const;
......@@ -314,23 +310,26 @@ public:
protected:
virtual QString generateFrameName();
virtual void startRedirectionTimer();
virtual void stopRedirectionTimer();
private:
virtual void khtmlMousePressEvent(khtml::MousePressEvent *);
virtual void khtmlMouseMoveEvent(khtml::MouseMoveEvent *);
virtual void khtmlMouseReleaseEvent(khtml::MouseReleaseEvent *);
virtual void khtmlMousePressEvent(MousePressEvent *);
virtual void khtmlMouseMoveEvent(MouseMoveEvent *);
virtual void khtmlMouseReleaseEvent(MouseReleaseEvent *);
NSView *mouseDownViewIfStillGood();
NSView *nextKeyViewInFrame(DOM::NodeImpl *startingPoint, KWQSelectionDirection);
static NSView *documentViewForNode(DOM::NodeImpl *);
NSView *nextKeyViewInFrame(NodeImpl *startingPoint, KWQSelectionDirection);
static NSView *documentViewForNode(NodeImpl *);
bool dispatchCPPEvent(const DOM::AtomicString &eventType, KWQClipboard::AccessPolicy policy);
bool dispatchCPPEvent(const AtomicString &eventType, KWQClipboard::AccessPolicy policy);
NSImage *imageFromRect(NSRect rect) const;
void freeClipboard();
void registerCommandForUndoOrRedo(const khtml::EditCommandPtr &cmd, bool isRedo);
void registerCommandForUndoOrRedo(const EditCommandPtr &cmd, bool isRedo);
virtual void detachFromView();
......@@ -361,7 +360,7 @@ private:
bool _haveUndoRedoOperations;
HashSet<RefPtr<DOM::DOMStringImpl> > urlsBridgeKnowsAbout;
HashSet<RefPtr<DOMStringImpl> > urlsBridgeKnowsAbout;
friend class Frame;
......@@ -371,7 +370,7 @@ private:
WebScriptObject *_windowScriptObject;
NPObject *_windowScriptNPObject;
RefPtr<DOM::NodeImpl> _dragSrc; // element that may be a drag source, for the current mouse gesture
RefPtr<NodeImpl> _dragSrc; // element that may be a drag source, for the current mouse gesture
bool _dragSrcIsLink;
bool _dragSrcIsImage;
bool _dragSrcInSelection;
......@@ -379,10 +378,12 @@ private:
bool _dragSrcIsDHTML;
KWQClipboard *_dragClipboard; // used on only the source side of dragging
RefPtr<DOM::RangeImpl> m_markedTextRange;
RefPtr<RangeImpl> m_markedTextRange;
};
inline MacFrame *Mac(Frame *frame) { return static_cast<MacFrame *>(frame); }
inline const MacFrame *Mac(const Frame *frame) { return static_cast<const MacFrame *>(frame); }
}
#endif
......@@ -88,19 +88,20 @@
#undef _KWQ_TIMING
using namespace WebCore;
using namespace EventNames;
using namespace HTMLNames;
@interface NSObject (WebPlugIn)
- (id)objectForWebScript;
- (void *)pluginScriptableObject;
@end
using namespace KJS;
using namespace Bindings;
using namespace KIO;
@interface NSObject (WebPlugIn)
- (id)objectForWebScript;
- (void *)pluginScriptableObject;
@end
namespace WebCore {
using namespace EventNames;
using namespace HTMLNames;
NSEvent *MacFrame::_currentEvent = nil;
......@@ -129,12 +130,6 @@ bool FrameView::isFrameView() const
return true;
}
static void redirectionTimerMonitor(void *context)
{
MacFrame *kwq = static_cast<MacFrame *>(context);
kwq->redirectionTimerStartedOrStopped();
}
MacFrame::MacFrame()
: _bridge(nil)
, _started(this, SIGNAL(started(KIO::Job *)))
......@@ -160,7 +155,6 @@ MacFrame::MacFrame()
Frame::init(0);
mutableInstances().prepend(this);
d->m_redirectionTimer.setMonitor(redirectionTimerMonitor, this);
}