[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
darin
darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 08:41:20 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit fb958e8b2dea2e3e83b7efe0895b9f0a41eb49d0
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Sun May 23 22:45:28 2004 +0000
Reviewed by Ken.
- went through things marked "unimplemented" or "not implemented" and removed
or implemented as many as possible
* kwq/DOM.mm: (-[DOMNode dispatchEvent:]): Implemented.
Also moved DOMAbstractView and DOMDocumentView into DOMViews.mm.
* kwq/DOM-CSS.mm: (-[DOMDocument getComputedStyle::]): Implemented.
* kwq/DOMEventsInternal.h: Added.
* kwq/DOMEvents.mm:
(-[DOMEvent type]): Implemented.
(-[DOMEvent target]): Implemented.
(-[DOMEvent currentTarget]): Implemented.
(-[DOMEvent eventPhase]): Implemented.
(-[DOMEvent bubbles]): Implemented.
(-[DOMEvent cancelable]): Implemented.
(-[DOMEvent timeStamp]): Implemented.
(-[DOMEvent stopPropagation]): Implemented.
(-[DOMEvent preventDefault]): Implemented.
(-[DOMEvent initEvent:::]): Implemented.
(-[DOMEvent _eventImpl]): Added.
(-[DOMEvent _initWithEventImpl:]): Added.
(+[DOMEvent _eventWithImpl:]): Added.
(-[DOMMouseEvent _mouseEventImpl]): Added.
(-[DOMMouseEvent screenX]): Implemented.
(-[DOMMouseEvent screenY]): Implemented.
(-[DOMMouseEvent clientX]): Implemented.
(-[DOMMouseEvent clientY]): Implemented.
(-[DOMMouseEvent ctrlKey]): Implemented.
(-[DOMMouseEvent shiftKey]): Implemented.
(-[DOMMouseEvent altKey]): Implemented.
(-[DOMMouseEvent metaKey]): Implemented.
(-[DOMMouseEvent button]): Implemented.
(-[DOMMouseEvent relatedTarget]): Implemented.
(-[DOMMouseEvent initMouseEvent:::::::::::::::]): Implemented.
(-[DOMMutationEvent _mutationEventImpl]): Added.
(-[DOMMutationEvent relatedNode]): Implemented.
(-[DOMMutationEvent prevValue]): Implemented.
(-[DOMMutationEvent newValue]): Implemented.
(-[DOMMutationEvent attrName]): Implemented.
(-[DOMMutationEvent attrChange]): Implemented.
(-[DOMMutationEvent initMutationEvent::::::::]):
(-[DOMUIEvent _UIEventImpl]): Added.
(-[DOMUIEvent view]): Implemented.
(-[DOMUIEvent detail]): Implemented.
(-[DOMUIEvent initUIEvent:::::]): Implemented.
(-[DOMDocument createEvent:]): Implemented.
* kwq/DOMHTMLInternal.h: Added.
* kwq/DOMHTML.mm:
(+[DOMHTMLOptionsCollection _optionsCollectionWithImpl:]): Added.
(-[DOMHTMLOptionsCollection length]): Implemented.
(-[DOMHTMLOptionsCollection setLength:]): Implemented.
(-[DOMHTMLOptionsCollection item:]): Implemented.
(-[DOMHTMLOptionsCollection namedItem:]): Implemented.
(-[DOMHTMLSelectElement options]): Implemented.
* kwq/DOMViews.h: Changed DOMDocumentView to be a category on DOMDocument
rather than a separate class.
* kwq/DOMViewsInternal.h: Added.
* kwq/DOMViews.mm: Added.
(-[DOMAbstractView document]): Implemnted.
(-[DOMAbstractView _abstractViewImpl]): Added.
(-[DOMAbstractView _initWithAbstractViewImpl:]): Added.
(+[DOMAbstractView _abstractViewWithImpl:]): Added.
(-[DOMDocument defaultView]): Implemented.
* khtml/dom/dom2_views.h: Made AbstractView constructor public to allow creation in
the bindings. Would not be necessary if the impl classes were used consistently.
* khtml/html/html_formimpl.h: Added options() function to HTMLSelectElementImpl.
Added HTMLOptionsCollectionImpl class.
* khtml/html/html_formimpl.cpp:
(HTMLSelectElementImpl::~HTMLSelectElementImpl): Added code to detach and deref the
options collection.
(HTMLSelectElementImpl::options): Create an options collection if needed.
(HTMLOptionsCollectionImpl::length): Added. Not yet implemented.
(HTMLOptionsCollectionImpl::setLength): Ditto.
(HTMLOptionsCollectionImpl::item): Ditto.
(HTMLOptionsCollectionImpl::namedItem): Ditto.
* khtml/khtmlview.h: Move unused focusNextPrevChild virtual function inside !APPLE_CHANGES.
* khtml/khtmlview.cpp: Put the tp, paintBuffer, and formCompletions fields entirely
inside !APPLE_CHANGES. Also made QT_NO_TOOLTIP entirely disable the tooltip field.
Also put focusNextPrevChild and formCompletionItems functions inside !APPLE_CHANGES.
* khtml/rendering/render_text.h: Removed unused isFixedWidthFont member function.
* khtml/rendering/render_text.cpp: Ditto.
* kwq/KWQCursor.h: Removed unused pos member function.
* kwq/KWQCursor.mm: Ditto.
* kwq/KWQFontMetrics.h: Removed unused rightBearing and leftBearing member functions.
* kwq/KWQFontMetrics.mm: Ditto.
* kwq/KWQKComboBox.h: Removed KCompletionBase as a base class.
* kwq/KWQKConfigBase.h: Removed unused readBoolEntry, writeEntry, and readListEntry
member functions.
* kwq/KWQKConfigBase.mm: Ditto.
(KConfig::readEntry): Improved "not implemented" message to indicate which key is uinimplemented.
(KConfig::readNumEntry): Ditto.
(KConfig::readUnsignedNumEntry): Ditto.
* kwq/KWQKLineEdit.h: Removed everything, since all the KLineEdit stuff was unused.
Changed KLineEdit to just be a typedef for QLineEdit.
* kwq/KWQSlot.mm: Removed slotAutoScroll.
(KWQSlot::KWQSlot): And from here.
(KWQSlot::call): And from here.
* kwq/KWQTextStream.h: Removed unused QTextOStream and QTextIStream.
* kwq/KWQTextStream.mm: Removed unused QTextIStream function. Also made buffer sizes larger
so we don't have any problems on 64-bit systems. 10 bytes might not be long enough to sprintf an
integer or a long or a pointer, but 100 bytes surely will.
* kwq/KWQWidget.h: Removed unused focusNextPrevChild.
* kwq/KWQWidget.mm: Ditto.
* WebCore.pbproj/project.pbxproj: Removed some files, added others.
* ForwardingHeaders/kcompletionbox.h: Emptied out, no KWQKCompletionBox.h any more.
* ForwardingHeaders/kiconloader.h: Emptied out, no KWQKIconLoader.h any more.
* ForwardingHeaders/kmimetype.h: Emptied out, no KWQKMimeType.h any more.
* ForwardingHeaders/ksimpleconfig.h: Emptied out, no KWQKSimpleConfig.h any more.
* ForwardingHeaders/qfontinfo.h: Emptied out, no KWQFontInfo.h any more.
* ForwardingHeaders/qtooltip.h: Replaced with define of QT_NO_TOOLTIP, no
KWQToolTip.h any more.
* kwq/KWQCompletion.h: Removed.
* kwq/KWQCompletion.mm: Removed.
* kwq/KWQFontInfo.h: Removed.
* kwq/KWQFontInfo.mm: Removed.
* kwq/KWQKCompletionBox.h: Removed.
* kwq/KWQKIconLoader.h: Removed.
* kwq/KWQKIconLoader.mm: Removed.
* kwq/KWQKMimeType.h: Removed.
* kwq/KWQKMimeType.mm: Removed.
* kwq/KWQKSimpleConfig.h: Removed.
* kwq/KWQKSimpleConfig.mm: Removed.
* kwq/KWQToolTip.h: Removed.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6670 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index e1c9300..0f74ae5 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,148 @@
+2004-05-22 Darin Adler <darin at apple.com>
+
+ Reviewed by Ken.
+
+ - went through things marked "unimplemented" or "not implemented" and removed
+ or implemented as many as possible
+
+ * kwq/DOM.mm: (-[DOMNode dispatchEvent:]): Implemented.
+ Also moved DOMAbstractView and DOMDocumentView into DOMViews.mm.
+ * kwq/DOM-CSS.mm: (-[DOMDocument getComputedStyle::]): Implemented.
+
+ * kwq/DOMEventsInternal.h: Added.
+ * kwq/DOMEvents.mm:
+ (-[DOMEvent type]): Implemented.
+ (-[DOMEvent target]): Implemented.
+ (-[DOMEvent currentTarget]): Implemented.
+ (-[DOMEvent eventPhase]): Implemented.
+ (-[DOMEvent bubbles]): Implemented.
+ (-[DOMEvent cancelable]): Implemented.
+ (-[DOMEvent timeStamp]): Implemented.
+ (-[DOMEvent stopPropagation]): Implemented.
+ (-[DOMEvent preventDefault]): Implemented.
+ (-[DOMEvent initEvent:::]): Implemented.
+ (-[DOMEvent _eventImpl]): Added.
+ (-[DOMEvent _initWithEventImpl:]): Added.
+ (+[DOMEvent _eventWithImpl:]): Added.
+ (-[DOMMouseEvent _mouseEventImpl]): Added.
+ (-[DOMMouseEvent screenX]): Implemented.
+ (-[DOMMouseEvent screenY]): Implemented.
+ (-[DOMMouseEvent clientX]): Implemented.
+ (-[DOMMouseEvent clientY]): Implemented.
+ (-[DOMMouseEvent ctrlKey]): Implemented.
+ (-[DOMMouseEvent shiftKey]): Implemented.
+ (-[DOMMouseEvent altKey]): Implemented.
+ (-[DOMMouseEvent metaKey]): Implemented.
+ (-[DOMMouseEvent button]): Implemented.
+ (-[DOMMouseEvent relatedTarget]): Implemented.
+ (-[DOMMouseEvent initMouseEvent:::::::::::::::]): Implemented.
+ (-[DOMMutationEvent _mutationEventImpl]): Added.
+ (-[DOMMutationEvent relatedNode]): Implemented.
+ (-[DOMMutationEvent prevValue]): Implemented.
+ (-[DOMMutationEvent newValue]): Implemented.
+ (-[DOMMutationEvent attrName]): Implemented.
+ (-[DOMMutationEvent attrChange]): Implemented.
+ (-[DOMMutationEvent initMutationEvent::::::::]):
+ (-[DOMUIEvent _UIEventImpl]): Added.
+ (-[DOMUIEvent view]): Implemented.
+ (-[DOMUIEvent detail]): Implemented.
+ (-[DOMUIEvent initUIEvent:::::]): Implemented.
+ (-[DOMDocument createEvent:]): Implemented.
+
+ * kwq/DOMHTMLInternal.h: Added.
+ * kwq/DOMHTML.mm:
+ (+[DOMHTMLOptionsCollection _optionsCollectionWithImpl:]): Added.
+ (-[DOMHTMLOptionsCollection length]): Implemented.
+ (-[DOMHTMLOptionsCollection setLength:]): Implemented.
+ (-[DOMHTMLOptionsCollection item:]): Implemented.
+ (-[DOMHTMLOptionsCollection namedItem:]): Implemented.
+ (-[DOMHTMLSelectElement options]): Implemented.
+
+ * kwq/DOMViews.h: Changed DOMDocumentView to be a category on DOMDocument
+ rather than a separate class.
+ * kwq/DOMViewsInternal.h: Added.
+ * kwq/DOMViews.mm: Added.
+ (-[DOMAbstractView document]): Implemnted.
+ (-[DOMAbstractView _abstractViewImpl]): Added.
+ (-[DOMAbstractView _initWithAbstractViewImpl:]): Added.
+ (+[DOMAbstractView _abstractViewWithImpl:]): Added.
+ (-[DOMDocument defaultView]): Implemented.
+
+ * khtml/dom/dom2_views.h: Made AbstractView constructor public to allow creation in
+ the bindings. Would not be necessary if the impl classes were used consistently.
+
+ * khtml/html/html_formimpl.h: Added options() function to HTMLSelectElementImpl.
+ Added HTMLOptionsCollectionImpl class.
+ * khtml/html/html_formimpl.cpp:
+ (HTMLSelectElementImpl::~HTMLSelectElementImpl): Added code to detach and deref the
+ options collection.
+ (HTMLSelectElementImpl::options): Create an options collection if needed.
+ (HTMLOptionsCollectionImpl::length): Added. Not yet implemented.
+ (HTMLOptionsCollectionImpl::setLength): Ditto.
+ (HTMLOptionsCollectionImpl::item): Ditto.
+ (HTMLOptionsCollectionImpl::namedItem): Ditto.
+
+ * khtml/khtmlview.h: Move unused focusNextPrevChild virtual function inside !APPLE_CHANGES.
+ * khtml/khtmlview.cpp: Put the tp, paintBuffer, and formCompletions fields entirely
+ inside !APPLE_CHANGES. Also made QT_NO_TOOLTIP entirely disable the tooltip field.
+ Also put focusNextPrevChild and formCompletionItems functions inside !APPLE_CHANGES.
+
+ * khtml/rendering/render_text.h: Removed unused isFixedWidthFont member function.
+ * khtml/rendering/render_text.cpp: Ditto.
+
+ * kwq/KWQCursor.h: Removed unused pos member function.
+ * kwq/KWQCursor.mm: Ditto.
+
+ * kwq/KWQFontMetrics.h: Removed unused rightBearing and leftBearing member functions.
+ * kwq/KWQFontMetrics.mm: Ditto.
+
+ * kwq/KWQKComboBox.h: Removed KCompletionBase as a base class.
+
+ * kwq/KWQKConfigBase.h: Removed unused readBoolEntry, writeEntry, and readListEntry
+ member functions.
+ * kwq/KWQKConfigBase.mm: Ditto.
+ (KConfig::readEntry): Improved "not implemented" message to indicate which key is uinimplemented.
+ (KConfig::readNumEntry): Ditto.
+ (KConfig::readUnsignedNumEntry): Ditto.
+
+ * kwq/KWQKLineEdit.h: Removed everything, since all the KLineEdit stuff was unused.
+ Changed KLineEdit to just be a typedef for QLineEdit.
+
+ * kwq/KWQSlot.mm: Removed slotAutoScroll.
+ (KWQSlot::KWQSlot): And from here.
+ (KWQSlot::call): And from here.
+
+ * kwq/KWQTextStream.h: Removed unused QTextOStream and QTextIStream.
+ * kwq/KWQTextStream.mm: Removed unused QTextIStream function. Also made buffer sizes larger
+ so we don't have any problems on 64-bit systems. 10 bytes might not be long enough to sprintf an
+ integer or a long or a pointer, but 100 bytes surely will.
+
+ * kwq/KWQWidget.h: Removed unused focusNextPrevChild.
+ * kwq/KWQWidget.mm: Ditto.
+
+ * WebCore.pbproj/project.pbxproj: Removed some files, added others.
+
+ * ForwardingHeaders/kcompletionbox.h: Emptied out, no KWQKCompletionBox.h any more.
+ * ForwardingHeaders/kiconloader.h: Emptied out, no KWQKIconLoader.h any more.
+ * ForwardingHeaders/kmimetype.h: Emptied out, no KWQKMimeType.h any more.
+ * ForwardingHeaders/ksimpleconfig.h: Emptied out, no KWQKSimpleConfig.h any more.
+ * ForwardingHeaders/qfontinfo.h: Emptied out, no KWQFontInfo.h any more.
+ * ForwardingHeaders/qtooltip.h: Replaced with define of QT_NO_TOOLTIP, no
+ KWQToolTip.h any more.
+
+ * kwq/KWQCompletion.h: Removed.
+ * kwq/KWQCompletion.mm: Removed.
+ * kwq/KWQFontInfo.h: Removed.
+ * kwq/KWQFontInfo.mm: Removed.
+ * kwq/KWQKCompletionBox.h: Removed.
+ * kwq/KWQKIconLoader.h: Removed.
+ * kwq/KWQKIconLoader.mm: Removed.
+ * kwq/KWQKMimeType.h: Removed.
+ * kwq/KWQKMimeType.mm: Removed.
+ * kwq/KWQKSimpleConfig.h: Removed.
+ * kwq/KWQKSimpleConfig.mm: Removed.
+ * kwq/KWQToolTip.h: Removed.
+
2004-05-21 Darin Adler <darin at apple.com>
Reviewed by Maciej.
@@ -193,8 +338,8 @@
Provide the methods to glue the WebView's editing delegate so that these methods work:
- <rdar://problem/3655316>: "Editing:Ê-webViewShouldBeginEditing:inDOMRange:ÊmethodÊunimplementedÊ(WebKitÊeditingÊAPI)"
- <rdar://problem/3655317>: "Editing:Ê-webViewShouldEndEditing:inDOMRange:ÊmethodÊunimplementedÊ(WebKitÊeditingÊAPI)"
+ <rdar://problem/3655316>: "Editing: -webViewShouldBeginEditing:inDOMRange: method unimplemented (WebKit editing API)"
+ <rdar://problem/3655317>: "Editing: -webViewShouldEndEditing:inDOMRange: method unimplemented (WebKit editing API)"
While I was in the neighborhood and working on understanding focus shifts, I fixed this bug as well:
diff --git a/WebCore/ForwardingHeaders/kcompletionbox.h b/WebCore/ForwardingHeaders/kcompletionbox.h
index 433c55e..e69de29 100644
--- a/WebCore/ForwardingHeaders/kcompletionbox.h
+++ b/WebCore/ForwardingHeaders/kcompletionbox.h
@@ -1 +0,0 @@
-#include "KWQKCompletionBox.h"
diff --git a/WebCore/ForwardingHeaders/kiconloader.h b/WebCore/ForwardingHeaders/kiconloader.h
index e76a7fe..e69de29 100644
--- a/WebCore/ForwardingHeaders/kiconloader.h
+++ b/WebCore/ForwardingHeaders/kiconloader.h
@@ -1 +0,0 @@
-#include "KWQKIconLoader.h"
diff --git a/WebCore/ForwardingHeaders/kmimetype.h b/WebCore/ForwardingHeaders/kmimetype.h
index 92f0719..e69de29 100644
--- a/WebCore/ForwardingHeaders/kmimetype.h
+++ b/WebCore/ForwardingHeaders/kmimetype.h
@@ -1 +0,0 @@
-#include "KWQKMimeType.h"
diff --git a/WebCore/ForwardingHeaders/ksimpleconfig.h b/WebCore/ForwardingHeaders/ksimpleconfig.h
index cda8873..e69de29 100644
--- a/WebCore/ForwardingHeaders/ksimpleconfig.h
+++ b/WebCore/ForwardingHeaders/ksimpleconfig.h
@@ -1 +0,0 @@
-#include "KWQKSimpleConfig.h"
diff --git a/WebCore/ForwardingHeaders/qfontinfo.h b/WebCore/ForwardingHeaders/qfontinfo.h
index 88c8d3a..e69de29 100644
--- a/WebCore/ForwardingHeaders/qfontinfo.h
+++ b/WebCore/ForwardingHeaders/qfontinfo.h
@@ -1 +0,0 @@
-#include "KWQFontInfo.h"
diff --git a/WebCore/ForwardingHeaders/qtooltip.h b/WebCore/ForwardingHeaders/qtooltip.h
index 0b399e9..00f7c7f 100644
--- a/WebCore/ForwardingHeaders/qtooltip.h
+++ b/WebCore/ForwardingHeaders/qtooltip.h
@@ -1 +1 @@
-#include "KWQToolTip.h"
+#define QT_NO_TOOLTIP
diff --git a/WebCore/WebCore.pbproj/project.pbxproj b/WebCore/WebCore.pbproj/project.pbxproj
index 1761807..d996faf 100644
--- a/WebCore/WebCore.pbproj/project.pbxproj
+++ b/WebCore/WebCore.pbproj/project.pbxproj
@@ -52,8 +52,9 @@
);
isa = PBXGroup;
name = Products;
- refType = 4;
- sourceTree = "<group>";
+ path = "";
+ refType = 2;
+ sourceTree = SOURCE_ROOT;
};
034768E0FF38A50411DB9C8B = {
explicitFileType = wrapper.framework;
@@ -336,7 +337,6 @@
F58786D102DE3B8601EA4122,
F58786D202DE3B8601EA4122,
F58786D302DE3B8601EA4122,
- F587856502DE375901EA4122,
F58786D502DE3B8601EA4122,
F58785EC02DE37CB01EA4122,
354F248B02EE28590ACA2ACA,
@@ -350,7 +350,6 @@
93CCF7D6033BD43C008635CE,
F58786DB02DE3B8601EA4122,
9394E0AB03AA60FB008635CE,
- F58786DD02DE3B8601EA4122,
F58786DE02DE3B8601EA4122,
F587857502DE375901EA4122,
F58786E102DE3B8601EA4122,
@@ -359,7 +358,6 @@
F587860602DE382001EA4122,
F587860702DE382001EA4122,
F587862702DE398401EA4122,
- F587862802DE398401EA4122,
F587860902DE382001EA4122,
F587858002DE375901EA4122,
F587862902DE398401EA4122,
@@ -375,7 +373,6 @@
F587864202DE3A1401EA4122,
F587865402DE3A9A01EA4122,
F587865D02DE3A9A01EA4122,
- F587860D02DE382001EA4122,
F587865802DE3A9A01EA4122,
F587860E02DE382001EA4122,
F587864602DE3A7701EA4122,
@@ -387,7 +384,6 @@
F587862A02DE398401EA4122,
F587862B02DE398401EA4122,
F587861002DE382001EA4122,
- F587865902DE3A9A01EA4122,
F587866E02DE3B3201EA4122,
F587866F02DE3B3201EA4122,
F587867002DE3B3201EA4122,
@@ -396,7 +392,6 @@
F587867302DE3B3201EA4122,
F587867402DE3B3201EA4122,
F587866502DE3B1101EA4122,
- F587861202DE382001EA4122,
F587861502DE382001EA4122,
F587861402DE382001EA4122,
F587861602DE382001EA4122,
@@ -454,7 +449,6 @@
F58785AD02DE375901EA4122,
F587871002DE3B8601EA4122,
F587871102DE3B8601EA4122,
- F587871202DE3B8601EA4122,
F587871302DE3B8601EA4122,
F58785CD02DE375901EA4122,
F587871402DE3B8601EA4122,
@@ -534,6 +528,9 @@
BE8BD8F506359F6000D3F20B,
BE8BD90B0635CC2F00D3F20B,
9342E3EB0646C8FF00004B05,
+ 931D712C065FB91800C966E1,
+ 931D7225065FC25900C966E1,
+ 93859E33065FCAD300CF54EE,
);
isa = PBXHeadersBuildPhase;
runOnlyForDeploymentPostprocessing = 0;
@@ -574,7 +571,6 @@
F587856202DE375901EA4122,
F587856302DE375901EA4122,
F587856402DE375901EA4122,
- F587856602DE375901EA4122,
F587856702DE375901EA4122,
F587856802DE375901EA4122,
F587856902DE375901EA4122,
@@ -582,7 +578,6 @@
F587857002DE375901EA4122,
F587857102DE375901EA4122,
F587857202DE375901EA4122,
- F587857302DE375901EA4122,
F587857402DE375901EA4122,
F587857602DE375901EA4122,
F587857702DE375901EA4122,
@@ -599,16 +594,13 @@
F587858A02DE375901EA4122,
F587858B02DE375901EA4122,
F587858E02DE375901EA4122,
- F587858F02DE375901EA4122,
F587859102DE375901EA4122,
F587859202DE375901EA4122,
F587859302DE375901EA4122,
F587859502DE375901EA4122,
F587859602DE375901EA4122,
- F587859802DE375901EA4122,
F587859902DE375901EA4122,
F587859A02DE375901EA4122,
- F587859D02DE375901EA4122,
F587859E02DE375901EA4122,
F587859F02DE375901EA4122,
F58785A002DE375901EA4122,
@@ -818,6 +810,7 @@
BE8BD90A0635CC2F00D3F20B,
842F72DD06405FDF00CC271B,
9342E3EA0646C8FF00004B05,
+ 931D722B065FC40800C966E1,
);
isa = PBXSourcesBuildPhase;
runOnlyForDeploymentPostprocessing = 0;
@@ -1611,6 +1604,48 @@
settings = {
};
};
+ 931D712B065FB91800C966E1 = {
+ fileEncoding = 4;
+ isa = PBXFileReference;
+ lastKnownFileType = sourcecode.c.h;
+ path = DOMEventsInternal.h;
+ refType = 4;
+ sourceTree = "<group>";
+ };
+ 931D712C065FB91800C966E1 = {
+ fileRef = 931D712B065FB91800C966E1;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ 931D7224065FC25900C966E1 = {
+ fileEncoding = 4;
+ isa = PBXFileReference;
+ lastKnownFileType = sourcecode.c.h;
+ path = DOMViewsInternal.h;
+ refType = 4;
+ sourceTree = "<group>";
+ };
+ 931D7225065FC25900C966E1 = {
+ fileRef = 931D7224065FC25900C966E1;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ 931D722A065FC40800C966E1 = {
+ fileEncoding = 4;
+ isa = PBXFileReference;
+ lastKnownFileType = sourcecode.cpp.objcpp;
+ path = DOMViews.mm;
+ refType = 4;
+ sourceTree = "<group>";
+ };
+ 931D722B065FC40800C966E1 = {
+ fileRef = 931D722A065FC40800C966E1;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
9321274E0606724900B62302 = {
fileEncoding = 30;
isa = PBXFileReference;
@@ -1846,6 +1881,20 @@
settings = {
};
};
+ 93859E32065FCAD300CF54EE = {
+ fileEncoding = 4;
+ isa = PBXFileReference;
+ lastKnownFileType = sourcecode.c.h;
+ path = DOMHTMLInternal.h;
+ refType = 4;
+ sourceTree = "<group>";
+ };
+ 93859E33065FCAD300CF54EE = {
+ fileRef = 93859E32065FCAD300CF54EE;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
93861DDF032C2E52008635CE = {
fileEncoding = 4;
isa = PBXFileReference;
@@ -3170,8 +3219,6 @@
F550D70902E13281018635CA,
F550D70C02E13281018635CA,
F58784CD02DE375901EA4122,
- F58784D302DE375901EA4122,
- F58784D402DE375901EA4122,
F58784DA02DE375901EA4122,
354F248902EE28590ACA2ACA,
354F248A02EE28590ACA2ACA,
@@ -6589,9 +6636,11 @@
932127550606724900B62302,
BE9CB65805F9546800514D9C,
932127500606724900B62302,
+ 931D712B065FB91800C966E1,
842F72DC06405FDF00CC271B,
832556E4061DF155007B8054,
9321274E0606724900B62302,
+ 93859E32065FCAD300CF54EE,
832556E6061DF161007B8054,
BE94EB6405EFFE6B0032DCB5,
BE9CB64D05F942CB00514D9C,
@@ -6599,6 +6648,8 @@
932127510606724900B62302,
932127530606724900B62302,
932127540606724900B62302,
+ 931D7224065FC25900C966E1,
+ 931D722A065FC40800C966E1,
BE16801805EDB91A00B87935,
);
isa = PBXGroup;
@@ -6791,22 +6842,6 @@
refType = 4;
sourceTree = "<group>";
};
- F58784D302DE375901EA4122 = {
- fileEncoding = 30;
- isa = PBXFileReference;
- lastKnownFileType = sourcecode.c.h;
- path = KWQCompletion.h;
- refType = 4;
- sourceTree = "<group>";
- };
- F58784D402DE375901EA4122 = {
- fileEncoding = 30;
- isa = PBXFileReference;
- lastKnownFileType = sourcecode.cpp.objcpp;
- path = KWQCompletion.mm;
- refType = 4;
- sourceTree = "<group>";
- };
F58784D502DE375901EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
@@ -6879,14 +6914,6 @@
refType = 4;
sourceTree = "<group>";
};
- F58784E102DE375901EA4122 = {
- fileEncoding = 30;
- isa = PBXFileReference;
- lastKnownFileType = sourcecode.cpp.objcpp;
- path = KWQFontInfo.mm;
- refType = 4;
- sourceTree = "<group>";
- };
F58784E202DE375901EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
@@ -7039,14 +7066,6 @@
refType = 4;
sourceTree = "<group>";
};
- F58784FD02DE375901EA4122 = {
- fileEncoding = 30;
- isa = PBXFileReference;
- lastKnownFileType = sourcecode.cpp.objcpp;
- path = KWQKIconLoader.mm;
- refType = 4;
- sourceTree = "<group>";
- };
F58784FF02DE375901EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
@@ -7087,14 +7106,6 @@
refType = 4;
sourceTree = "<group>";
};
- F587850602DE375901EA4122 = {
- fileEncoding = 30;
- isa = PBXFileReference;
- lastKnownFileType = sourcecode.cpp.objcpp;
- path = KWQKMimeType.mm;
- refType = 4;
- sourceTree = "<group>";
- };
F587850702DE375901EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
@@ -7111,14 +7122,6 @@
refType = 4;
sourceTree = "<group>";
};
- F587850B02DE375901EA4122 = {
- fileEncoding = 30;
- isa = PBXFileReference;
- lastKnownFileType = sourcecode.cpp.objcpp;
- path = KWQKSimpleConfig.mm;
- refType = 4;
- sourceTree = "<group>";
- };
F587850C02DE375901EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
@@ -7731,18 +7734,6 @@
settings = {
};
};
- F587856502DE375901EA4122 = {
- fileRef = F58784D302DE375901EA4122;
- isa = PBXBuildFile;
- settings = {
- };
- };
- F587856602DE375901EA4122 = {
- fileRef = F58784D402DE375901EA4122;
- isa = PBXBuildFile;
- settings = {
- };
- };
F587856702DE375901EA4122 = {
fileRef = F58784D502DE375901EA4122;
isa = PBXBuildFile;
@@ -7797,12 +7788,6 @@
settings = {
};
};
- F587857302DE375901EA4122 = {
- fileRef = F58784E102DE375901EA4122;
- isa = PBXBuildFile;
- settings = {
- };
- };
F587857402DE375901EA4122 = {
fileRef = F58784E202DE375901EA4122;
isa = PBXBuildFile;
@@ -7917,12 +7902,6 @@
settings = {
};
};
- F587858F02DE375901EA4122 = {
- fileRef = F58784FD02DE375901EA4122;
- isa = PBXBuildFile;
- settings = {
- };
- };
F587859102DE375901EA4122 = {
fileRef = F58784FF02DE375901EA4122;
isa = PBXBuildFile;
@@ -7953,12 +7932,6 @@
settings = {
};
};
- F587859802DE375901EA4122 = {
- fileRef = F587850602DE375901EA4122;
- isa = PBXBuildFile;
- settings = {
- };
- };
F587859902DE375901EA4122 = {
fileRef = F587850702DE375901EA4122;
isa = PBXBuildFile;
@@ -7971,12 +7944,6 @@
settings = {
};
};
- F587859D02DE375901EA4122 = {
- fileRef = F587850B02DE375901EA4122;
- isa = PBXBuildFile;
- settings = {
- };
- };
F587859E02DE375901EA4122 = {
fileRef = F587850C02DE375901EA4122;
isa = PBXBuildFile;
@@ -8534,14 +8501,6 @@
refType = 4;
sourceTree = "<group>";
};
- F58785F702DE382001EA4122 = {
- fileEncoding = 30;
- isa = PBXFileReference;
- lastKnownFileType = sourcecode.c.h;
- path = KWQKIconLoader.h;
- refType = 4;
- sourceTree = "<group>";
- };
F58785F802DE382001EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
@@ -8566,14 +8525,6 @@
refType = 4;
sourceTree = "<group>";
};
- F58785FC02DE382001EA4122 = {
- fileEncoding = 30;
- isa = PBXFileReference;
- lastKnownFileType = sourcecode.c.h;
- path = KWQKSimpleConfig.h;
- refType = 4;
- sourceTree = "<group>";
- };
F58785FD02DE382001EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
@@ -8666,12 +8617,6 @@
settings = {
};
};
- F587860D02DE382001EA4122 = {
- fileRef = F58785F702DE382001EA4122;
- isa = PBXBuildFile;
- settings = {
- };
- };
F587860E02DE382001EA4122 = {
fileRef = F58785F802DE382001EA4122;
isa = PBXBuildFile;
@@ -8690,12 +8635,6 @@
settings = {
};
};
- F587861202DE382001EA4122 = {
- fileRef = F58785FC02DE382001EA4122;
- isa = PBXBuildFile;
- settings = {
- };
- };
F587861402DE382001EA4122 = {
fileRef = F58785FE02DE382001EA4122;
isa = PBXBuildFile;
@@ -8745,14 +8684,10 @@
F58784F402DE375901EA4122,
F58785F602DE382001EA4122,
F58784F502DE375901EA4122,
- F58785F702DE382001EA4122,
- F58784FD02DE375901EA4122,
F58785F802DE382001EA4122,
F58785F902DE382001EA4122,
F58785FA02DE382001EA4122,
F587850402DE375901EA4122,
- F58785FC02DE382001EA4122,
- F587850B02DE375901EA4122,
F58785FE02DE382001EA4122,
F58785FD02DE382001EA4122,
F58785FF02DE382001EA4122,
@@ -8788,14 +8723,6 @@
refType = 4;
sourceTree = "<group>";
};
- F587861F02DE398401EA4122 = {
- fileEncoding = 30;
- isa = PBXFileReference;
- lastKnownFileType = sourcecode.c.h;
- path = KWQKCompletionBox.h;
- refType = 4;
- sourceTree = "<group>";
- };
F587862002DE398401EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
@@ -8832,12 +8759,6 @@
settings = {
};
};
- F587862802DE398401EA4122 = {
- fileRef = F587861F02DE398401EA4122;
- isa = PBXBuildFile;
- settings = {
- };
- };
F587862902DE398401EA4122 = {
fileRef = F587862002DE398401EA4122;
isa = PBXBuildFile;
@@ -8860,7 +8781,6 @@
children = (
F587861D02DE398401EA4122,
F587861E02DE398401EA4122,
- F587861F02DE398401EA4122,
F587862002DE398401EA4122,
F58784F002DE375901EA4122,
F587862102DE398401EA4122,
@@ -9028,14 +8948,6 @@
refType = 4;
sourceTree = "<group>";
};
- F587864E02DE3A9A01EA4122 = {
- fileEncoding = 30;
- isa = PBXFileReference;
- lastKnownFileType = sourcecode.c.h;
- path = KWQKMimeType.h;
- refType = 4;
- sourceTree = "<group>";
- };
F587865202DE3A9A01EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
@@ -9074,12 +8986,6 @@
settings = {
};
};
- F587865902DE3A9A01EA4122 = {
- fileRef = F587864E02DE3A9A01EA4122;
- isa = PBXBuildFile;
- settings = {
- };
- };
F587865D02DE3A9A01EA4122 = {
fileRef = F587865202DE3A9A01EA4122;
isa = PBXBuildFile;
@@ -9097,8 +9003,6 @@
F587864C02DE3A9A01EA4122,
F58784F302DE375901EA4122,
F587864D02DE3A9A01EA4122,
- F587864E02DE3A9A01EA4122,
- F587850602DE375901EA4122,
F587865202DE3A9A01EA4122,
F587850702DE375901EA4122,
F587866202DE3B1101EA4122,
@@ -9380,14 +9284,6 @@
refType = 4;
sourceTree = "<group>";
};
- F587868C02DE3B8601EA4122 = {
- fileEncoding = 30;
- isa = PBXFileReference;
- lastKnownFileType = sourcecode.c.h;
- path = KWQFontInfo.h;
- refType = 4;
- sourceTree = "<group>";
- };
F587868D02DE3B8601EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
@@ -9740,14 +9636,6 @@
refType = 4;
sourceTree = "<group>";
};
- F58786C102DE3B8601EA4122 = {
- fileEncoding = 30;
- isa = PBXFileReference;
- lastKnownFileType = sourcecode.c.h;
- path = KWQToolTip.h;
- refType = 4;
- sourceTree = "<group>";
- };
F58786C202DE3B8601EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
@@ -9882,12 +9770,6 @@
settings = {
};
};
- F58786DD02DE3B8601EA4122 = {
- fileRef = F587868C02DE3B8601EA4122;
- isa = PBXBuildFile;
- settings = {
- };
- };
F58786DE02DE3B8601EA4122 = {
fileRef = F587868D02DE3B8601EA4122;
isa = PBXBuildFile;
@@ -10140,12 +10022,6 @@
settings = {
};
};
- F587871202DE3B8601EA4122 = {
- fileRef = F58786C102DE3B8601EA4122;
- isa = PBXBuildFile;
- settings = {
- };
- };
F587871302DE3B8601EA4122 = {
fileRef = F58786C202DE3B8601EA4122;
isa = PBXBuildFile;
@@ -10206,8 +10082,6 @@
F58784DF02DE375901EA4122,
F587868A02DE3B8601EA4122,
F58784E002DE375901EA4122,
- F587868C02DE3B8601EA4122,
- F58784E102DE375901EA4122,
F587868D02DE3B8601EA4122,
F58784E202DE375901EA4122,
F587868E02DE3B8601EA4122,
@@ -10297,7 +10171,6 @@
F587853902DE375901EA4122,
F58786C002DE3B8601EA4122,
F587853A02DE375901EA4122,
- F58786C102DE3B8601EA4122,
F58786C202DE3B8601EA4122,
F587853B02DE375901EA4122,
F587853C02DE375901EA4122,
diff --git a/WebCore/khtml/dom/dom2_views.h b/WebCore/khtml/dom/dom2_views.h
index 80f81f5..6348128 100644
--- a/WebCore/khtml/dom/dom2_views.h
+++ b/WebCore/khtml/dom/dom2_views.h
@@ -2,6 +2,7 @@
* This file is part of the DOM implementation for KDE.
*
* (C) 2001 Peter Kelly (pmk at post.com)
+ * Copyright (C) 2004 Apple Computer, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
@@ -76,14 +77,14 @@ public:
* @internal
* not part of the DOM
*/
+ AbstractView(AbstractViewImpl *i);
AbstractViewImpl *handle() const;
bool isNull() const;
protected:
- AbstractView(AbstractViewImpl *i);
AbstractViewImpl *impl;
};
+} //namespace
-}; //namespace
#endif
diff --git a/WebCore/khtml/html/html_formimpl.cpp b/WebCore/khtml/html/html_formimpl.cpp
index 7af1844..27bf086 100644
--- a/WebCore/khtml/html/html_formimpl.cpp
+++ b/WebCore/khtml/html/html_formimpl.cpp
@@ -2046,6 +2046,10 @@ HTMLSelectElementImpl::HTMLSelectElementImpl(DocumentPtr *doc, HTMLFormElementIm
HTMLSelectElementImpl::~HTMLSelectElementImpl()
{
if (getDocument()) getDocument()->deregisterMaintainsState(this);
+ if (m_options) {
+ m_options->detach();
+ m_options->deref();
+ }
}
NodeImpl::Id HTMLSelectElementImpl::id() const
@@ -2375,6 +2379,15 @@ int HTMLSelectElementImpl::listToOptionIndex(int listIndex) const
return optionIndex;
}
+HTMLOptionsCollectionImpl *HTMLSelectElementImpl::options()
+{
+ if (!m_options) {
+ m_options = new HTMLOptionsCollectionImpl(this);
+ m_options->ref();
+ }
+ return m_options;
+}
+
void HTMLSelectElementImpl::recalcListItems()
{
NodeImpl* current = firstChild();
@@ -2972,10 +2985,6 @@ HTMLIsIndexElementImpl::HTMLIsIndexElementImpl(DocumentPtr *doc, HTMLFormElement
setName("isindex");
}
-HTMLIsIndexElementImpl::~HTMLIsIndexElementImpl()
-{
-}
-
NodeImpl::Id HTMLIsIndexElementImpl::id() const
{
return ID_ISINDEX;
@@ -2996,3 +3005,25 @@ void HTMLIsIndexElementImpl::parseHTMLAttribute(HTMLAttributeImpl* attr)
// -------------------------------------------------------------------------
+unsigned long HTMLOptionsCollectionImpl::length() const
+{
+ // Not yet implemented.
+ return 0;
+}
+
+void HTMLOptionsCollectionImpl::setLength(unsigned long length)
+{
+ // Not yet implemented.
+}
+
+NodeImpl *HTMLOptionsCollectionImpl::item(unsigned long index) const
+{
+ // Not yet implemented.
+ return 0;
+}
+
+NodeImpl *HTMLOptionsCollectionImpl::namedItem(const DOMString &name) const
+{
+ // Not yet implemented.
+ return 0;
+}
diff --git a/WebCore/khtml/html/html_formimpl.h b/WebCore/khtml/html/html_formimpl.h
index 44cd9a3..1a8f7ac 100644
--- a/WebCore/khtml/html/html_formimpl.h
+++ b/WebCore/khtml/html/html_formimpl.h
@@ -4,7 +4,7 @@
* Copyright (C) 1999 Lars Knoll (knoll at kde.org)
* (C) 1999 Antti Koivisto (koivisto at kde.org)
* (C) 2000 Dirk Mueller (mueller at kde.org)
- * Copyright (C) 2003 Apple Computer, Inc.
+ * Copyright (C) 2004 Apple Computer, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
@@ -58,6 +58,7 @@ class DOMString;
class HTMLGenericFormElementImpl;
class HTMLOptionElementImpl;
class HTMLImageLoader;
+class HTMLOptionsCollectionImpl;
// -------------------------------------------------------------------------
@@ -445,6 +446,8 @@ public:
DOMString value();
void setValue(DOMStringImpl* value);
+
+ HTMLOptionsCollectionImpl *options();
virtual bool maintainsState() { return true; }
virtual QString state();
@@ -489,9 +492,10 @@ private:
protected:
mutable QMemArray<HTMLGenericFormElementImpl*> m_listItems;
+ HTMLOptionsCollectionImpl *m_options;
short m_minwidth;
- short m_size : 15;
- bool m_multiple : 1;
+ short m_size;
+ bool m_multiple;
bool m_recalcListItems;
};
@@ -639,7 +643,6 @@ class HTMLIsIndexElementImpl : public HTMLInputElementImpl
{
public:
HTMLIsIndexElementImpl(DocumentPtr *doc, HTMLFormElementImpl *f = 0);
- ~HTMLIsIndexElementImpl();
virtual Id id() const;
virtual void parseHTMLAttribute(HTMLAttributeImpl *attr);
@@ -648,7 +651,24 @@ protected:
DOMString m_prompt;
};
+// -------------------------------------------------------------------------
+
+class HTMLOptionsCollectionImpl : public khtml::Shared<HTMLOptionsCollectionImpl>
+{
+public:
+ HTMLOptionsCollectionImpl(HTMLSelectElementImpl *impl) : m_select(impl) { }
+
+ unsigned long length() const;
+ void setLength(unsigned long);
+ NodeImpl *item(unsigned long index) const;
+ NodeImpl *namedItem(const DOMString &name) const;
+
+ void detach() { m_select = 0; }
+
+private:
+ HTMLSelectElementImpl *m_select;
+};
-}; //namespace
+} //namespace
#endif
diff --git a/WebCore/khtml/khtml_part.cpp b/WebCore/khtml/khtml_part.cpp
index 6556d00..cbb7a60 100644
--- a/WebCore/khtml/khtml_part.cpp
+++ b/WebCore/khtml/khtml_part.cpp
@@ -4819,6 +4819,7 @@ void KHTMLPart::stopAutoScroll()
#endif
}
+#if !APPLE_CHANGES
void KHTMLPart::slotAutoScroll()
{
@@ -4828,6 +4829,8 @@ void KHTMLPart::slotAutoScroll()
stopAutoScroll(); // Safety
}
+#endif
+
void KHTMLPart::selectAll()
{
if(!d->m_doc) return;
diff --git a/WebCore/khtml/khtmlview.cpp b/WebCore/khtml/khtmlview.cpp
index 2f1a7e3..2a5c46a 100644
--- a/WebCore/khtml/khtmlview.cpp
+++ b/WebCore/khtml/khtmlview.cpp
@@ -106,13 +106,17 @@ public:
repaintRects = 0;
underMouse = 0;
reset();
+#if !APPLE_CHANGES
tp=0;
paintBuffer=0;
formCompletions=0;
+#endif
layoutTimerId = 0;
allDataReceivedWhenTimerSet = false;
mousePressed = false;
+#ifndef QT_NO_TOOLTIP
tooltip = 0;
+#endif
doFullRepaint = true;
isTransparent = false;
#if APPLE_CHANGES
@@ -125,13 +129,17 @@ public:
}
~KHTMLViewPrivate()
{
+#if !APPLE_CHANGES
delete formCompletions;
delete tp; tp = 0;
delete paintBuffer; paintBuffer =0;
+#endif
if (underMouse)
underMouse->deref();
+#ifndef QT_NO_TOOLTIP
delete tooltip;
+#endif
delete repaintRects;
}
void reset()
@@ -177,8 +185,10 @@ public:
repaintRects->clear();
}
+#if !APPLE_CHANGES
QPainter *tp;
QPixmap *paintBuffer;
+#endif
NodeImpl *underMouse;
// the node that was selected when enter was pressed
@@ -199,7 +209,9 @@ public:
bool ignoreWheelEvents;
int borderX, borderY;
+#if !APPLE_CHANGES
KSimpleConfig *formCompletions;
+#endif
int clickX, clickY, clickCount;
bool isDoubleClick;
@@ -219,7 +231,9 @@ public:
#endif
bool mousePressed;
bool isTransparent;
+#ifndef QT_NO_TOOLTIP
KHTMLToolTip *tooltip;
+#endif
// Used by objects during layout to communicate repaints that need to take place only
// after all layout has been completed.
@@ -1140,6 +1154,8 @@ void KHTMLView::contentsContextMenuEvent ( QContextMenuEvent *_ce )
#endif
}
+#if !APPLE_CHANGES
+
bool KHTMLView::focusNextPrevChild( bool next )
{
// Now try to find the next child
@@ -1173,6 +1189,8 @@ void KHTMLView::doAutoScroll()
}
}
+#endif
+
DOM::NodeImpl *KHTMLView::nodeUnderMouse() const
{
return d->underMouse;
@@ -1580,6 +1598,8 @@ void KHTMLView::restoreScrollBar ( )
#endif
}
+#if !APPLE_CHANGES
+
QStringList KHTMLView::formCompletionItems(const QString &name) const
{
if (!m_part->settings()->isFormCompletionEnabled())
@@ -1616,6 +1636,8 @@ void KHTMLView::addFormCompletionItem(const QString &name, const QString &value)
d->formCompletions->writeEntry(name, items);
}
+#endif
+
bool KHTMLView::dispatchMouseEvent(int eventId, DOM::NodeImpl *targetNode, bool cancelable,
int detail,QMouseEvent *_mouse, bool setUnder,
int mouseEventType)
diff --git a/WebCore/khtml/khtmlview.h b/WebCore/khtml/khtmlview.h
index 40946c7..ee555bd 100644
--- a/WebCore/khtml/khtmlview.h
+++ b/WebCore/khtml/khtmlview.h
@@ -178,8 +178,8 @@ public:
virtual void resizeEvent ( QResizeEvent * event );
virtual void showEvent ( QShowEvent * );
virtual void hideEvent ( QHideEvent *);
- virtual bool focusNextPrevChild( bool next );
#if !APPLE_CHANGES
+ virtual bool focusNextPrevChild( bool next );
virtual void drawContents ( QPainter * p, int clipx, int clipy, int clipw, int cliph );
virtual void drawContents( QPainter* );
#endif
diff --git a/WebCore/khtml/rendering/render_text.cpp b/WebCore/khtml/rendering/render_text.cpp
index f57c35e..fcb9e76 100644
--- a/WebCore/khtml/rendering/render_text.cpp
+++ b/WebCore/khtml/rendering/render_text.cpp
@@ -3,7 +3,7 @@
*
* (C) 1999 Lars Knoll (knoll at kde.org)
* (C) 2000 Dirk Mueller (mueller at kde.org)
- * Copyright (C) 2003 Apple Computer, Inc.
+ * Copyright (C) 2004 Apple Computer, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
@@ -1405,11 +1405,6 @@ QRect RenderText::getAbsoluteRepaintRect()
return cb->getAbsoluteRepaintRect();
}
-bool RenderText::isFixedWidthFont() const
-{
- return QFontInfo(style()->font()).fixedPitch();
-}
-
short RenderText::verticalPositionHint( bool firstLine ) const
{
return parent()->verticalPositionHint( firstLine );
diff --git a/WebCore/khtml/rendering/render_text.h b/WebCore/khtml/rendering/render_text.h
index 4b36315..37ae71c 100644
--- a/WebCore/khtml/rendering/render_text.h
+++ b/WebCore/khtml/rendering/render_text.h
@@ -3,7 +3,7 @@
*
* (C) 1999 Lars Knoll (knoll at kde.org)
* (C) 2000 Dirk Mueller (mueller at kde.org)
- * Copyright (C) 2003 Apple Computer, Inc.
+ * Copyright (C) 2004 Apple Computer, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
@@ -192,8 +192,6 @@ public:
virtual const QFont &font();
virtual short verticalPositionHint( bool firstLine ) const;
- bool isFixedWidthFont() const;
-
void setText(DOM::DOMStringImpl *text, bool force=false);
void setTextWithOffset(DOM::DOMStringImpl *text, uint offset, uint len, bool force=false);
diff --git a/WebCore/kwq/DOM-CSS.mm b/WebCore/kwq/DOM-CSS.mm
index eb96e78..aa1f030 100644
--- a/WebCore/kwq/DOM-CSS.mm
+++ b/WebCore/kwq/DOM-CSS.mm
@@ -27,19 +27,21 @@
#include <objc/objc-class.h>
-#import <css/css_base.h>
-#import <css/css_ruleimpl.h>
-#import <css/css_stylesheetimpl.h>
-#import <css/css_valueimpl.h>
-#import <dom/css_value.h>
-#import <dom/dom_string.h>
-#import <qcolor.h>
-#import <shared.h>
-#import <xml/dom_stringimpl.h>
+#import "css_base.h"
+#import "css_ruleimpl.h"
+#import "css_stylesheetimpl.h"
+#import "css_valueimpl.h"
+#import "css_value.h"
+#import "dom_string.h"
+#import "KWQColor.h"
+#import "shared.h"
+#import "dom_stringimpl.h"
+#import "dom2_viewsimpl.h"
#import "DOMInternal.h"
#import "KWQAssertions.h"
+using DOM::AbstractViewImpl;
using DOM::CounterImpl;
using DOM::CSSCharsetRuleImpl;
using DOM::CSSFontFaceRuleImpl;
@@ -2440,8 +2442,8 @@ void removeWrapperForRGB(QRgb value)
- (DOMCSSStyleDeclaration *)getComputedStyle:(DOMElement *)elt :(NSString *)pseudoElt
{
- ERROR("unimplemented");
- return nil;
+ return [DOMCSSStyleDeclaration _styleDeclarationWithImpl:
+ AbstractViewImpl([self _documentImpl]).getComputedStyle([elt _elementImpl], DOMString(pseudoElt).implementation())];
}
@end
diff --git a/WebCore/kwq/DOM.mm b/WebCore/kwq/DOM.mm
index 63e50ce..f7b3554 100644
--- a/WebCore/kwq/DOM.mm
+++ b/WebCore/kwq/DOM.mm
@@ -49,6 +49,7 @@
#import <JavaScriptCore/WebScriptObjectPrivate.h>
+#import "DOMEventsInternal.h"
#import "DOMHTML.h"
#import "DOMInternal.h"
#import "KWQAssertions.h"
@@ -358,8 +359,10 @@ inline Document DocumentImpl::createInstance(DocumentImpl *impl)
- (BOOL)dispatchEvent:(DOMEvent *)event
{
- ERROR("unimplemented");
- return NO;
+ int exceptionCode = 0;
+ BOOL result = [self _nodeImpl]->dispatchEvent([event _eventImpl], exceptionCode);
+ raiseOnDOMError(exceptionCode);
+ return result;
}
@end
@@ -1868,26 +1871,6 @@ inline Document DocumentImpl::createInstance(DocumentImpl *impl)
//------------------------------------------------------------------------------------------
- at implementation DOMAbstractView
-
-- (DOMDocumentView *)document
-{
- ERROR("unimplemented");
- return nil;
-}
-
- at end
-
- at implementation DOMDocumentView
-
-- (DOMAbstractView *)defaultView
-{
- ERROR("unimplemented");
- return nil;
-}
-
- at end
-
//------------------------------------------------------------------------------------------
@implementation DOMNodeFilter
diff --git a/WebCore/kwq/DOMEvents.mm b/WebCore/kwq/DOMEvents.mm
index d7cb2da..014ed04 100644
--- a/WebCore/kwq/DOMEvents.mm
+++ b/WebCore/kwq/DOMEvents.mm
@@ -25,194 +25,247 @@
#import "DOMEvents.h"
+#import "DOMEventsInternal.h"
+#import "DOMViewsInternal.h"
+#import "DOMInternal.h"
#import "KWQAssertions.h"
+#import "dom_docimpl.h"
+#import "dom2_eventsimpl.h"
+#import "dom2_views.h"
+#import "dom2_viewsimpl.h"
+
+using DOM::EventImpl;
+using DOM::MouseEventImpl;
+using DOM::MutationEventImpl;
+using DOM::UIEventImpl;
+
+ALLOW_DOM_CAST(EventImpl)
+
@implementation DOMEvent
- (NSString *)type
{
- ERROR("unimplemented");
- return nil;
+ return [self _eventImpl]->type();
}
- (id <DOMEventTarget>)target
{
- ERROR("unimplemented");
- return nil;
+ return [DOMNode _nodeWithImpl:[self _eventImpl]->target()];
}
- (id <DOMEventTarget>)currentTarget
{
- ERROR("unimplemented");
- return nil;
+ return [DOMNode _nodeWithImpl:[self _eventImpl]->currentTarget()];
}
- (unsigned short)eventPhase
{
- ERROR("unimplemented");
- return 0;
+ return [self _eventImpl]->eventPhase();
}
- (BOOL)bubbles
{
- ERROR("unimplemented");
- return NO;
+ return [self _eventImpl]->bubbles();
}
- (BOOL)cancelable
{
- ERROR("unimplemented");
- return NO;
+ return [self _eventImpl]->cancelable();
}
- (DOMTimeStamp)timeStamp
{
- ERROR("unimplemented");
- return nil;
+ return [self _eventImpl]->timeStamp();
}
- (void)stopPropagation
{
- ERROR("unimplemented");
+ [self _eventImpl]->stopPropagation();
}
- (void)preventDefault
{
- ERROR("unimplemented");
+ [self _eventImpl]->preventDefault();
}
- (void)initEvent:(NSString *)eventTypeArg :(BOOL)canBubbleArg :(BOOL)cancelableArg
{
- ERROR("unimplemented");
+ [self _eventImpl]->initEvent(eventTypeArg, canBubbleArg, cancelableArg);
+}
+
+ at end
+
+ at implementation DOMEvent (WebCoreInternal)
+
+- (EventImpl *)_eventImpl
+{
+ return DOM_cast<EventImpl *>(_internal);
+}
+
+- (id)_initWithEventImpl:(EventImpl *)impl
+{
+ ASSERT(impl);
+
+ [super _init];
+ _internal = DOM_cast<DOMObjectInternal *>(impl);
+ impl->ref();
+ addDOMWrapper(self, impl);
+ return self;
+}
+
++ (DOMEvent *)_eventWithImpl:(EventImpl *)impl
+{
+ if (!impl)
+ return nil;
+
+ id cachedInstance;
+ cachedInstance = getDOMWrapper(impl);
+ if (cachedInstance)
+ return [[cachedInstance retain] autorelease];
+
+ Class wrapperClass = nil;
+ if (impl->isMouseEvent()) {
+ wrapperClass = [DOMMouseEvent class];
+ } else if (impl->isMutationEvent()) {
+ wrapperClass = [DOMMutationEvent class];
+ } else if (impl->isUIEvent()) {
+ wrapperClass = [DOMUIEvent class];
+ } else {
+ wrapperClass = [DOMEvent class];
+ }
+ return [[[wrapperClass alloc] _initWithEventImpl:impl] autorelease];
}
@end
@implementation DOMMouseEvent
+- (MouseEventImpl *)_mouseEventImpl
+{
+ return static_cast<MouseEventImpl *>(DOM_cast<EventImpl *>(_internal));
+}
+
- (long)screenX
{
- ERROR("unimplemented");
- return 0;
+ return [self _mouseEventImpl]->screenX();
}
- (long)screenY
{
- ERROR("unimplemented");
- return 0;
+ return [self _mouseEventImpl]->screenY();
}
- (long)clientX
{
- ERROR("unimplemented");
- return 0;
+ return [self _mouseEventImpl]->clientX();
}
- (long)clientY
{
- ERROR("unimplemented");
- return 0;
+ return [self _mouseEventImpl]->clientY();
}
- (BOOL)ctrlKey
{
- ERROR("unimplemented");
- return NO;
+ return [self _mouseEventImpl]->ctrlKey();
}
- (BOOL)shiftKey
{
- ERROR("unimplemented");
- return NO;
+ return [self _mouseEventImpl]->shiftKey();
}
- (BOOL)altKey
{
- ERROR("unimplemented");
- return NO;
+ return [self _mouseEventImpl]->altKey();
}
- (BOOL)metaKey
{
- ERROR("unimplemented");
- return NO;
+ return [self _mouseEventImpl]->metaKey();
}
- (unsigned short)button
{
- ERROR("unimplemented");
- return 0;
+ return [self _mouseEventImpl]->button();
}
- (id <DOMEventTarget>)relatedTarget
{
- ERROR("unimplemented");
- return nil;
+ return [DOMNode _nodeWithImpl:[self _mouseEventImpl]->relatedTarget()];
}
- (void)initMouseEvent:(NSString *)typeArg :(BOOL)canBubbleArg :(BOOL)cancelableArg :(DOMAbstractView *)viewArg :(long)detailArg :(long)screenXArg :(long)screenYArg :(long)clientX :(long)clientY :(BOOL)ctrlKeyArg :(BOOL)altKeyArg :(BOOL)shiftKeyArg :(BOOL)metaKeyArg :(unsigned short)buttonArg :(id <DOMEventTarget>)relatedTargetArg
{
- ERROR("unimplemented");
+ [self _mouseEventImpl]->initMouseEvent(typeArg, canBubbleArg, cancelableArg,
+ [viewArg _abstractViewImpl], detailArg, screenXArg, screenYArg, clientX, clientY,
+ shiftKeyArg, ctrlKeyArg, altKeyArg, metaKeyArg, buttonArg,
+ [static_cast<DOMNode *>(relatedTargetArg) _nodeImpl]);
}
@end
@implementation DOMMutationEvent
+- (MutationEventImpl *)_mutationEventImpl
+{
+ return static_cast<MutationEventImpl *>(DOM_cast<EventImpl *>(_internal));
+}
+
- (DOMNode *)relatedNode
{
- ERROR("unimplemented");
- return nil;
+ return [DOMNode _nodeWithImpl:[self _mutationEventImpl]->relatedNode().handle()];
}
- (NSString *)prevValue
{
- ERROR("unimplemented");
- return nil;
+ return [self _mutationEventImpl]->prevValue();
}
- (NSString *)newValue
{
- ERROR("unimplemented");
- return nil;
+ return [self _mutationEventImpl]->newValue();
}
- (NSString *)attrName
{
- ERROR("unimplemented");
- return nil;
+ return [self _mutationEventImpl]->attrName();
}
- (unsigned short)attrChange
{
- ERROR("unimplemented");
- return 0;
+ return [self _mutationEventImpl]->attrChange();
}
- (void)initMutationEvent:(NSString *)typeArg :(BOOL)canBubbleArg :(BOOL)cancelableArg :(DOMNode *)relatedNodeArg :(NSString *)prevValueArg :(NSString *)newValueArg :(NSString *)attrNameArg :(unsigned short)attrChangeArg
{
- ERROR("unimplemented");
+ [self _mutationEventImpl]->initMutationEvent(typeArg, canBubbleArg, cancelableArg,
+ [relatedNodeArg _nodeImpl], prevValueArg, newValueArg, attrNameArg, attrChangeArg);
}
@end
@implementation DOMUIEvent
+- (UIEventImpl *)_UIEventImpl
+{
+ return static_cast<UIEventImpl *>(DOM_cast<EventImpl *>(_internal));
+}
+
- (DOMAbstractView *)view
{
- ERROR("unimplemented");
- return nil;
+ return [DOMAbstractView _abstractViewWithImpl:[self _UIEventImpl]->view()];
}
- (long)detail
{
- ERROR("unimplemented");
- return 0;
+ return [self _UIEventImpl]->detail();
}
- (void)initUIEvent:(NSString *)typeArg :(BOOL)canBubbleArg :(BOOL)cancelableArg :(DOMAbstractView *)viewArg :(long)detailArg
{
- ERROR("unimplemented");
+ [self _UIEventImpl]->initUIEvent(typeArg, canBubbleArg, cancelableArg, [viewArg _abstractViewImpl], detailArg);
}
@end
@@ -221,8 +274,10 @@
- (DOMEvent *)createEvent:(NSString *)eventType
{
- ERROR("unimplemented");
- return nil;
+ int exceptionCode = 0;
+ EventImpl *event = [self _documentImpl]->createEvent(eventType, exceptionCode);
+ raiseOnDOMError(exceptionCode);
+ return [DOMEvent _eventWithImpl:event];
}
@end
diff --git a/WebKit/DOM.subproj/DOMViews.h b/WebCore/kwq/DOMEventsInternal.h
similarity index 83%
copy from WebKit/DOM.subproj/DOMViews.h
copy to WebCore/kwq/DOMEventsInternal.h
index b143d9c..81c9229 100644
--- a/WebKit/DOM.subproj/DOMViews.h
+++ b/WebCore/kwq/DOMEventsInternal.h
@@ -4,7 +4,7 @@
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- * 1. Redistributions of source code must retain the above copyright
+ * 1. Redistributions of source exceptionCode must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
@@ -23,12 +23,13 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import <WebKit/DOMCore.h>
+#import "DOMEvents.h"
- at interface DOMAbstractView : DOMObject
-- (DOMDocument *)document;
- at end
+namespace DOM {
+ class EventImpl;
+}
- at interface DOMDocument (DOMDocumentView)
-- (DOMAbstractView *)defaultView;
+ at interface DOMEvent (WebCoreInternal)
++ (DOMEvent *)_eventWithImpl:(DOM::EventImpl *)impl;
+- (DOM::EventImpl *)_eventImpl;
@end
diff --git a/WebCore/kwq/DOMHTML.mm b/WebCore/kwq/DOMHTML.mm
index ff2deff..7869f42 100644
--- a/WebCore/kwq/DOMHTML.mm
+++ b/WebCore/kwq/DOMHTML.mm
@@ -25,28 +25,29 @@
#import "DOMHTML.h"
-#import <dom/dom_doc.h>
-#import <dom/dom_string.h>
-#import <dom/html_element.h>
-#import <dom/html_misc.h>
-#import <html/html_baseimpl.h>
-#import <html/html_blockimpl.h>
-#import <html/html_documentimpl.h>
-#import <html/html_elementimpl.h>
-#import <html/html_formimpl.h>
-#import <html/html_headimpl.h>
-#import <html/html_imageimpl.h>
-#import <html/html_inlineimpl.h>
-#import <html/html_listimpl.h>
-#import <html/html_miscimpl.h>
-#import <html/html_objectimpl.h>
-#import <html/html_tableimpl.h>
-#import <misc/htmlattrs.h>
-#import <xml/dom_elementimpl.h>
-#import <xml/dom_nodeimpl.h>
+#import "dom_doc.h"
+#import "dom_string.h"
+#import "html_element.h"
+#import "html_misc.h"
+#import "html_baseimpl.h"
+#import "html_blockimpl.h"
+#import "html_documentimpl.h"
+#import "html_elementimpl.h"
+#import "html_formimpl.h"
+#import "html_headimpl.h"
+#import "html_imageimpl.h"
+#import "html_inlineimpl.h"
+#import "html_listimpl.h"
+#import "html_miscimpl.h"
+#import "html_objectimpl.h"
+#import "html_tableimpl.h"
+#import "htmlattrs.h"
+#import "dom_elementimpl.h"
+#import "dom_nodeimpl.h"
#import "DOMExtensions.h"
#import "DOMInternal.h"
+#import "DOMHTMLInternal.h"
#import "KWQAssertions.h"
using DOM::Document;
@@ -94,6 +95,7 @@ using DOM::HTMLObjectElementImpl;
using DOM::HTMLOListElementImpl;
using DOM::HTMLOptGroupElementImpl;
using DOM::HTMLOptionElementImpl;
+using DOM::HTMLOptionsCollectionImpl;
using DOM::HTMLParagraphElementImpl;
using DOM::HTMLParamElementImpl;
using DOM::HTMLPreElementImpl;
@@ -209,12 +211,6 @@ using DOM::NodeImpl;
@implementation DOMHTMLOptionsCollection
-#if 0
-
-//
-// We need to implement a KHTML element to back this object
-//
-
- (void)dealloc
{
if (_internal) {
@@ -234,7 +230,7 @@ using DOM::NodeImpl;
return self;
}
-+ (HTMLOptionsCollection *)_optionsCollectionWithImpl:(HTMLOptionsCollectionImpl *)impl
++ (DOMHTMLOptionsCollection *)_optionsCollectionWithImpl:(HTMLOptionsCollectionImpl *)impl
{
if (!impl)
return nil;
@@ -252,32 +248,24 @@ using DOM::NodeImpl;
return DOM_cast<HTMLOptionsCollectionImpl *>(_internal);
}
-#endif
-
- (unsigned long)length
{
- //return [self _optionsCollectionImpl]->length();
- ERROR("unimplemented");
- return 0;
+ return [self _optionsCollectionImpl]->length();
}
- (void)setLength:(unsigned long)length
{
- ERROR("unimplemented");
+ [self _optionsCollectionImpl]->setLength(length);
}
- (DOMNode *)item:(unsigned long)index
{
- //return [DOMNode _nodeWithImpl:[self _optionsCollectionImpl]->item(index)];
- ERROR("unimplemented");
- return nil;
+ return [DOMNode _nodeWithImpl:[self _optionsCollectionImpl]->item(index)];
}
- (DOMNode *)namedItem:(NSString *)name
{
- //return [DOMNode _nodeWithImpl:[self _optionsCollectionImpl]->namedItem(name)];
- ERROR("unimplemented");
- return nil;
+ return [DOMNode _nodeWithImpl:[self _optionsCollectionImpl]->namedItem(name)];
}
@end
@@ -1048,9 +1036,7 @@ using DOM::NodeImpl;
- (DOMHTMLOptionsCollection *)options
{
- // We need to implement a khtml element to back the HTMLOptionsCollection object
- ASSERT_WITH_MESSAGE(0, "not implemented");
- return nil;
+ return [DOMHTMLOptionsCollection _optionsCollectionWithImpl:[self _selectElementImpl]->options()];
}
- (BOOL)disabled
diff --git a/WebCore/kwq/DOMViews.h b/WebCore/kwq/DOMHTMLInternal.h
similarity index 81%
copy from WebCore/kwq/DOMViews.h
copy to WebCore/kwq/DOMHTMLInternal.h
index b7777a7..ed1e636 100644
--- a/WebCore/kwq/DOMViews.h
+++ b/WebCore/kwq/DOMHTMLInternal.h
@@ -4,7 +4,7 @@
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- * 1. Redistributions of source code must retain the above copyright
+ * 1. Redistributions of source exceptionCode must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
@@ -23,14 +23,12 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import <WebCore/DOMCore.h>
+#import "DOMHTML.h"
- at class DOMDocumentView;
+namespace DOM {
+ class HTMLOptionsCollectionImpl;
+}
- at interface DOMAbstractView : DOMObject
-- (DOMDocumentView *)document;
- at end
-
- at interface DOMDocumentView : DOMObject
-- (DOMAbstractView *)defaultView;
+ at interface DOMHTMLOptionsCollection (WebCoreInternal)
++ (DOMHTMLOptionsCollection *)_optionsCollectionWithImpl:(DOM::HTMLOptionsCollectionImpl *)impl;
@end
diff --git a/WebCore/kwq/DOMViews.h b/WebCore/kwq/DOMViews.h
index b7777a7..b41a81f 100644
--- a/WebCore/kwq/DOMViews.h
+++ b/WebCore/kwq/DOMViews.h
@@ -25,12 +25,10 @@
#import <WebCore/DOMCore.h>
- at class DOMDocumentView;
-
@interface DOMAbstractView : DOMObject
-- (DOMDocumentView *)document;
+- (DOMDocument *)document;
@end
- at interface DOMDocumentView : DOMObject
+ at interface DOMDocument (DOMDocumentView)
- (DOMAbstractView *)defaultView;
@end
diff --git a/WebCore/kwq/KWQEditCommand.mm b/WebCore/kwq/DOMViews.mm
similarity index 52%
copy from WebCore/kwq/KWQEditCommand.mm
copy to WebCore/kwq/DOMViews.mm
index fffbe24..c2c64ab 100644
--- a/WebCore/kwq/KWQEditCommand.mm
+++ b/WebCore/kwq/DOMViews.mm
@@ -4,7 +4,7 @@
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- * 1. Redistributions of source code must retain the above copyright
+ * 1. Redistributions of source exceptionCode must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
@@ -23,39 +23,66 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import "KWQEditCommand.h"
+#import "DOMViews.h"
+#import "DOMInternal.h"
+#import "DOMViewsInternal.h"
#import "KWQAssertions.h"
-#import "htmlediting_impl.h"
-using khtml::EditCommandImpl;
+#import "dom_docimpl.h"
+#import "dom2_viewsimpl.h"
- at implementation KWQEditCommand
+using DOM::AbstractViewImpl;
-- (id)initWithEditCommandImpl:(EditCommandImpl *)impl
+ALLOW_DOM_CAST(AbstractViewImpl)
+
+ at implementation DOMAbstractView
+
+- (DOMDocument *)document
+{
+ return [DOMDocument _documentWithImpl:[self _abstractViewImpl]->document()];
+}
+
+ at end
+
+ at implementation DOMAbstractView (WebCoreInternal)
+
+- (AbstractViewImpl *)_abstractViewImpl
+{
+ return DOM_cast<AbstractViewImpl *>(_internal);
+}
+
+- (id)_initWithAbstractViewImpl:(AbstractViewImpl *)impl
{
ASSERT(impl);
- [super init];
- m_impl = impl;
+
+ [super _init];
+ _internal = DOM_cast<DOMObjectInternal *>(impl);
impl->ref();
+ addDOMWrapper(self, impl);
return self;
}
-- (void)dealloc
++ (DOMAbstractView *)_abstractViewWithImpl:(AbstractViewImpl *)impl
{
- if (m_impl)
- m_impl->deref();
- [super dealloc];
+ if (!impl)
+ return nil;
+
+ id cachedInstance;
+ cachedInstance = getDOMWrapper(impl);
+ if (cachedInstance)
+ return [[cachedInstance retain] autorelease];
+
+ return [[[DOMAbstractView alloc] _initWithAbstractViewImpl:impl] autorelease];
}
-+ (KWQEditCommand *)commandWithEditCommandImpl:(EditCommandImpl *)impl
-{
- return [[[KWQEditCommand alloc] initWithEditCommandImpl:impl] autorelease];
-}
+ at end
+
+ at implementation DOMDocument (DOMDocumentView)
-- (EditCommandImpl *)impl
+- (DOMAbstractView *)defaultView
{
- return m_impl;
+ return [DOMAbstractView _abstractViewWithImpl:[self _documentImpl]->defaultView()];
}
- at end
\ No newline at end of file
+ at end
diff --git a/WebCore/kwq/DOMViews.h b/WebCore/kwq/DOMViewsInternal.h
similarity index 80%
copy from WebCore/kwq/DOMViews.h
copy to WebCore/kwq/DOMViewsInternal.h
index b7777a7..750f9b4 100644
--- a/WebCore/kwq/DOMViews.h
+++ b/WebCore/kwq/DOMViewsInternal.h
@@ -4,7 +4,7 @@
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- * 1. Redistributions of source code must retain the above copyright
+ * 1. Redistributions of source exceptionCode must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
@@ -23,14 +23,13 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import <WebCore/DOMCore.h>
+#import "DOMViews.h"
- at class DOMDocumentView;
+namespace DOM {
+ class AbstractViewImpl;
+}
- at interface DOMAbstractView : DOMObject
-- (DOMDocumentView *)document;
- at end
-
- at interface DOMDocumentView : DOMObject
-- (DOMAbstractView *)defaultView;
+ at interface DOMAbstractView (WebCoreInternal)
++ (DOMAbstractView *)_abstractViewWithImpl:(DOM::AbstractViewImpl *)impl;
+- (DOM::AbstractViewImpl *)_abstractViewImpl;
@end
diff --git a/WebCore/kwq/KWQCompletion.h b/WebCore/kwq/KWQCompletion.h
deleted file mode 100644
index f4b2e99..0000000
--- a/WebCore/kwq/KWQCompletion.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (C) 2003 Apple Computer, Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef KWQCOMPLETION_H_
-#define KWQCOMPLETION_H_
-
-#include "KWQObject.h"
-#include "KWQStringList.h"
-
-class KCompletion : public QObject {
-public:
- void setItems(const QStringList &);
-};
-
-class KCompletionBase {
-public:
- virtual KCompletion *completionObject();
-};
-
-#endif
diff --git a/WebCore/kwq/KWQCompletion.mm b/WebCore/kwq/KWQCompletion.mm
deleted file mode 100644
index 5e7e002..0000000
--- a/WebCore/kwq/KWQCompletion.mm
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (C) 2003 Apple Computer, Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#import "KWQCompletion.h"
-#import "KWQLogging.h"
-
-void KCompletion::setItems(const QStringList &)
-{
- ERROR("not yet implemented");
-}
-
-KCompletion *KCompletionBase::completionObject()
-{
- ERROR("not yet implemented");
- return 0;
-}
diff --git a/WebCore/kwq/KWQCursor.h b/WebCore/kwq/KWQCursor.h
index e5cb87c..3eda51d 100644
--- a/WebCore/kwq/KWQCursor.h
+++ b/WebCore/kwq/KWQCursor.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2003 Apple Computer, Inc. All rights reserved.
+ * Copyright (C) 2004 Apple Computer, Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -37,8 +37,6 @@ class NSCursor;
class QCursor {
public:
- static QPoint pos();
-
QCursor();
QCursor(const QPixmap &);
QCursor(NSCursor *);
diff --git a/WebCore/kwq/KWQCursor.mm b/WebCore/kwq/KWQCursor.mm
index dbfda65..46cf35d 100644
--- a/WebCore/kwq/KWQCursor.mm
+++ b/WebCore/kwq/KWQCursor.mm
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2003 Apple Computer, Inc. All rights reserved.
+ * Copyright (C) 2004 Apple Computer, Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -41,6 +41,7 @@ QCursor::QCursor(NSCursor *cur)
QCursor::QCursor(const QPixmap &pixmap)
: cursor(nil)
{
+ // Needed for custom cursors.
ERROR("not yet implemented");
}
@@ -54,12 +55,6 @@ QCursor::~QCursor()
[cursor release];
}
-QPoint QCursor::pos()
-{
- LOG(NotYetImplemented, "not yet implemented");
- return QPoint();
-}
-
QCursor &QCursor::operator=(const QCursor &other)
{
[other.cursor retain];
diff --git a/WebCore/kwq/KWQFontInfo.h b/WebCore/kwq/KWQFontInfo.h
deleted file mode 100644
index 7afd89c..0000000
--- a/WebCore/kwq/KWQFontInfo.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2003 Apple Computer, Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef QFONTINFO_H_
-#define QFONTINFO_H_
-
-#include "KWQFont.h"
-
-class QFontInfo {
-public:
- QFontInfo(const QFont &);
- bool fixedPitch() const;
-
-private:
- QFont font;
-};
-
-#endif
diff --git a/WebCore/kwq/KWQFontInfo.mm b/WebCore/kwq/KWQFontInfo.mm
deleted file mode 100644
index 93d6788..0000000
--- a/WebCore/kwq/KWQFontInfo.mm
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (C) 2003 Apple Computer, Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#import "KWQFontInfo.h"
-#import "KWQLogging.h"
-
-QFontInfo::QFontInfo(const QFont &f)
- : font(f)
-{
-}
-
-bool QFontInfo::fixedPitch() const
-{
- ERROR("not yet implemented");
- return FALSE;
-}
diff --git a/WebCore/kwq/KWQFontMetrics.h b/WebCore/kwq/KWQFontMetrics.h
index 4510c8e..ff1ef46 100644
--- a/WebCore/kwq/KWQFontMetrics.h
+++ b/WebCore/kwq/KWQFontMetrics.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2003 Apple Computer, Inc. All rights reserved.
+ * Copyright (C) 2004 Apple Computer, Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -30,7 +30,6 @@
#include "KWQSize.h"
#include "KWQString.h"
#include "KWQFont.h"
-#include "KWQFontInfo.h"
class QFontMetricsPrivate;
@@ -68,8 +67,6 @@ public:
QSize size(int, const QString &) const;
- int rightBearing(QChar) const;
- int leftBearing(QChar) const;
int baselineOffset() const { return ascent(); }
private:
diff --git a/WebCore/kwq/KWQFontMetrics.mm b/WebCore/kwq/KWQFontMetrics.mm
index 5030a47..f2716af 100644
--- a/WebCore/kwq/KWQFontMetrics.mm
+++ b/WebCore/kwq/KWQFontMetrics.mm
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2003 Apple Computer, Inc. All rights reserved.
+ * Copyright (C) 2004 Apple Computer, Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -328,15 +328,3 @@ QSize QFontMetrics::size(int, const QString &qstring) const
{
return QSize(width(qstring), height());
}
-
-int QFontMetrics::rightBearing(QChar) const
-{
- ERROR("not yet implemented");
- return 0;
-}
-
-int QFontMetrics::leftBearing(QChar) const
-{
- ERROR("not yet implemented");
- return 0;
-}
diff --git a/WebCore/kwq/KWQKComboBox.h b/WebCore/kwq/KWQKComboBox.h
index a5e8555..6d0061c 100644
--- a/WebCore/kwq/KWQKComboBox.h
+++ b/WebCore/kwq/KWQKComboBox.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2003 Apple Computer, Inc. All rights reserved.
+ * Copyright (C) 2004 Apple Computer, Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -27,9 +27,8 @@
#define KCOMBOBOX_H_
#include "KWQComboBox.h"
-#include "KWQCompletion.h"
-class KComboBox : public QComboBox, public KCompletionBase {
+class KComboBox : public QComboBox {
public:
KComboBox(bool, QWidget *) { }
};
diff --git a/WebCore/kwq/KWQKCompletionBox.h b/WebCore/kwq/KWQKCompletionBox.h
deleted file mode 100644
index 4956d39..0000000
--- a/WebCore/kwq/KWQKCompletionBox.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (C) 2003 Apple Computer, Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef KCOMPLETIONBOX_H_
-#define KCOMPLETIONBOX_H_
-
-#include "KWQKListBox.h"
-#include "KWQKGlobalSettings.h"
-
-class KCompletionBox : public KListBox {
-public:
- KCompletionBox(QWidget *parent) : KListBox(parent) { }
-};
-
-#endif
diff --git a/WebCore/kwq/KWQKConfigBase.h b/WebCore/kwq/KWQKConfigBase.h
index 11b8fa7..1bb289c 100644
--- a/WebCore/kwq/KWQKConfigBase.h
+++ b/WebCore/kwq/KWQKConfigBase.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2003 Apple Computer, Inc. All rights reserved.
+ * Copyright (C) 2004 Apple Computer, Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -49,16 +49,8 @@ public:
int readNumEntry(const char *pKey, int nDefault=0) const;
unsigned int readUnsignedNumEntry(const KHTMLSettings *settings, const char *pKey, unsigned int nDefault=0) const;
- bool readBoolEntry(const char *pKey, bool nDefault=0) const;
-
QColor readColorEntry(const char *pKey, const QColor *pDefault=0L) const;
- // used only for form completions
- void writeEntry(const QString &pKey, const QStringList &rValue,
- char sep=',', bool bPersistent=true, bool bGlobal=false,
- bool bNLS=false);
- QStringList readListEntry(const QString &pKey, char sep=',') const;
-
private:
KConfig(const KConfig &);
diff --git a/WebCore/kwq/KWQKConfigBase.mm b/WebCore/kwq/KWQKConfigBase.mm
index 75de526..58451b9 100644
--- a/WebCore/kwq/KWQKConfigBase.mm
+++ b/WebCore/kwq/KWQKConfigBase.mm
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2003 Apple Computer, Inc. All rights reserved.
+ * Copyright (C) 2004 Apple Computer, Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -61,12 +61,6 @@ void KConfig::setGroup(const QString &pGroup)
}
}
-void KConfig::writeEntry(const QString &pKey, const QStringList &rValue,
- char sep, bool bPersistent, bool bGlobal, bool bNLS)
-{
- ERROR("not yet implemented");
-}
-
QString KConfig::readEntry(const char *pKey, const QString& aDefault) const
{
if (impl->isPluginInfo) {
@@ -111,7 +105,7 @@ QString KConfig::readEntry(const char *pKey, const QString& aDefault) const
return QString();
}
- ERROR("not yet implemented");
+ ERROR("config %s not implemented", pKey);
return QString();
}
@@ -124,11 +118,11 @@ int KConfig::readNumEntry(const char *pKey, int nDefault) const
return 0;
}
- ERROR("not yet implemented");
+ ERROR("config %s not implemented", pKey);
return nDefault;
}
-unsigned int KConfig::readUnsignedNumEntry(const KHTMLSettings *settings, const char *pKey, unsigned int nDefault) const
+unsigned KConfig::readUnsignedNumEntry(const KHTMLSettings *settings, const char *pKey, unsigned nDefault) const
{
if (impl->isKonquerorRC && strcmp(pKey, "WindowOpenPolicy") == 0) {
if (settings->JavaScriptCanOpenWindowsAutomatically()) {
@@ -137,13 +131,7 @@ unsigned int KConfig::readUnsignedNumEntry(const KHTMLSettings *settings, const
return 3;
}
}
- ERROR("not yet implemented");
- return nDefault;
-}
-
-bool KConfig::readBoolEntry(const char *pKey, bool nDefault) const
-{
- ERROR("not yet implemented");
+ ERROR("config %s not implemented", pKey);
return nDefault;
}
@@ -152,12 +140,6 @@ QColor KConfig::readColorEntry(const char *pKey, const QColor *pDefault) const
return pDefault ? *pDefault : QColor(0, 0, 0);
}
-QStringList KConfig::readListEntry(const QString &pKey, char sep) const
-{
- ERROR("not yet implemented");
- return QStringList();
-}
-
void RefreshPlugins(bool reload)
{
KWQ_BLOCK_EXCEPTIONS;
diff --git a/WebCore/kwq/KWQKIconLoader.h b/WebCore/kwq/KWQKIconLoader.h
deleted file mode 100644
index 842fca0..0000000
--- a/WebCore/kwq/KWQKIconLoader.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2003 Apple Computer, Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef KICONLOADER_H_
-#define KICONLOADER_H_
-
-#include "KWQPixmap.h"
-#include "KWQString.h"
-#include "KWQKInstance.h"
-
-class KIcon {
-public:
- enum Context { FileSystem, Desktop };
- enum States { DefaultState, DisabledState };
-};
-
-class KIconLoader {
-public:
- QPixmap loadIcon(const QString &name, int group, int size=0, int state=KIcon::DefaultState) const;
-};
-
-#endif
diff --git a/WebCore/kwq/KWQKIconLoader.mm b/WebCore/kwq/KWQKIconLoader.mm
deleted file mode 100644
index a9416c3..0000000
--- a/WebCore/kwq/KWQKIconLoader.mm
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright (C) 2003 Apple Computer, Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#import "KWQLogging.h"
-#import "KWQKIconLoader.h"
-
-QPixmap KIconLoader::loadIcon(const QString &name, int group, int size, int state) const
-{
- ERROR("not yet implemented");
- return QPixmap();
-}
diff --git a/WebCore/kwq/KWQKLineEdit.h b/WebCore/kwq/KWQKLineEdit.h
index c455e91..3ec6b05 100644
--- a/WebCore/kwq/KWQKLineEdit.h
+++ b/WebCore/kwq/KWQKLineEdit.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2003 Apple Computer, Inc. All rights reserved.
+ * Copyright (C) 2004 Apple Computer, Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -27,17 +27,7 @@
#define KLINEEDIT_H_
#include "KWQLineEdit.h"
-#include "KWQCompletion.h"
-#include "KWQKCompletionBox.h"
-class KLineEdit : public QLineEdit, public KCompletionBase {
-public:
- KLineEdit(Type t) : QLineEdit(t) { }
-
- void setContextMenuEnabled(bool showMenu) { }
- KCompletionBox *completionBox(bool create) { return 0; }
-
- int frameWidth() const { return 2; }
-};
+typedef QLineEdit KLineEdit;
#endif
diff --git a/WebCore/kwq/KWQKMimeType.h b/WebCore/kwq/KWQKMimeType.h
deleted file mode 100644
index 7fffced..0000000
--- a/WebCore/kwq/KWQKMimeType.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright (C) 2003 Apple Computer, Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef KMIMETYPE_H_
-#define KMIMETYPE_H_
-
-#include "KWQKGlobal.h"
-
-#include "KWQKURL.h"
-#include <sys/types.h>
-#include "KWQString.h"
-
-template<class T> class KSharedPtr {
-public:
- KSharedPtr() { object = 0; }
- T *operator->() { return object; }
-
-private:
- T *object;
-};
-
-class KMimeType {
-public:
- typedef KSharedPtr<KMimeType> Ptr;
-
- static Ptr findByURL(const KURL &, mode_t=0, bool=false, bool=false);
- static Ptr mimeType(QString serviceType);
- static QString defaultMimeType();
-
- ~KMimeType();
-
- QString name() const;
- QString comment() const;
-};
-
-#endif
diff --git a/WebCore/kwq/KWQKMimeType.mm b/WebCore/kwq/KWQKMimeType.mm
deleted file mode 100644
index a5a7dc1..0000000
--- a/WebCore/kwq/KWQKMimeType.mm
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright (C) 2003 Apple Computer, Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#import "KWQKMimeType.h"
-#import "KWQLogging.h"
-
-KMimeType::Ptr KMimeType::findByURL(const KURL &, mode_t, bool, bool)
-{
- ERROR("not yet implemented");
- return KMimeType::Ptr();
-}
-
-
-KMimeType::~KMimeType()
-{
- ERROR("not yet implemented");
-}
-
-
-QString KMimeType::name() const
-{
- ERROR("not yet implemented");
- return QString();
-}
-
-QString KMimeType::comment() const
-{
- ERROR("not yet implemented");
- return QString();
-}
-
-
-KMimeType::Ptr KMimeType::mimeType(QString serviceType)
-{
- ERROR("not yet implemented");
- return KMimeType::Ptr();
-}
-
-
-QString KMimeType::defaultMimeType()
-{
- ERROR("not yet implemented");
- return QString();
-}
-
diff --git a/WebCore/kwq/KWQKSimpleConfig.h b/WebCore/kwq/KWQKSimpleConfig.h
deleted file mode 100644
index 93abb6e..0000000
--- a/WebCore/kwq/KWQKSimpleConfig.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (C) 2003 Apple Computer, Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef KSIMPLECONFIG_H_
-#define KSIMPLECONFIG_H_
-
-#include "KWQKConfigBase.h"
-#include "KWQString.h"
-
-class KSimpleConfig : public KConfig {
-public:
- KSimpleConfig(const QString &, bool bReadOnly=false);
-};
-
-#endif
diff --git a/WebCore/kwq/KWQKSimpleConfig.mm b/WebCore/kwq/KWQKSimpleConfig.mm
deleted file mode 100644
index 70c4b63..0000000
--- a/WebCore/kwq/KWQKSimpleConfig.mm
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright (C) 2003 Apple Computer, Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#import "KWQKSimpleConfig.h"
-
-#import "KWQLogging.h"
-
-KSimpleConfig::KSimpleConfig(const QString &s, bool bReadOnly) : KConfig (s, bReadOnly)
-{
- ERROR("not yet implemented");
-}
diff --git a/WebCore/kwq/KWQSlot.mm b/WebCore/kwq/KWQSlot.mm
index a61c05a..e53900d 100644
--- a/WebCore/kwq/KWQSlot.mm
+++ b/WebCore/kwq/KWQSlot.mm
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2003 Apple Computer, Inc. All rights reserved.
+ * Copyright (C) 2004 Apple Computer, Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -53,7 +53,6 @@ using KJS::XMLHttpRequestQObject;
enum FunctionNumber {
signalFinishedParsing,
- slotAutoScroll,
slotChildCompleted,
slotChildCompletedWithBool,
slotChildStarted,
@@ -94,7 +93,6 @@ KWQSlot::KWQSlot(QObject *object, const char *member)
m_function = function; \
} else
- CASE(slotAutoScroll, (), KHTMLPart)
CASE(slotClicked, (), RenderFormElement)
CASE(slotChildCompleted, (), KHTMLPart)
CASE(slotChildStarted, (KIO::Job *), KHTMLPart)
@@ -181,7 +179,6 @@ void KWQSlot::call() const
switch (m_function) {
CASE(signalFinishedParsing, DocumentImpl, m_finishedParsing.call)
- CASE(slotAutoScroll, KHTMLPart, slotAutoScroll)
CASE(slotChildCompleted, KHTMLPart, slotChildCompleted)
CASE(slotClicked, RenderFormElement, slotClicked)
CASE(slotFinishedParsing, KHTMLPart, slotFinishedParsing)
diff --git a/WebCore/kwq/KWQTextStream.h b/WebCore/kwq/KWQTextStream.h
index 3aadca5..c341aee 100644
--- a/WebCore/kwq/KWQTextStream.h
+++ b/WebCore/kwq/KWQTextStream.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2003 Apple Computer, Inc. All rights reserved.
+ * Copyright (C) 2004 Apple Computer, Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -66,22 +66,4 @@ private:
QString *_string;
};
-class QTextOStream : public QTextStream {
-public:
- QTextOStream(QString *s) : QTextStream(s) { }
- QTextOStream(const QByteArray &ba) : QTextStream(ba) { }
-};
-
-class QTextIStream {
-public:
- QTextIStream(QString *s) : _string(s), _position(0) { }
- QString readLine();
-
-private:
- QTextIStream(const QTextIStream &);
- QTextIStream &operator=(const QTextIStream &);
-
- QString *_string;
- int _position;
-};
#endif
diff --git a/WebCore/kwq/KWQTextStream.mm b/WebCore/kwq/KWQTextStream.mm
index 3dfa3d3..6a00a05 100644
--- a/WebCore/kwq/KWQTextStream.mm
+++ b/WebCore/kwq/KWQTextStream.mm
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2003 Apple Computer, Inc. All rights reserved.
+ * Copyright (C) 2004 Apple Computer, Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -27,6 +27,8 @@
#import "KWQTextStream.h"
+const size_t integerOrPointerAsStringBufferSize = 100; // large enough for any integer or pointer in string format, including trailing null character
+
QTextStream::QTextStream(const QByteArray &ba)
: _hasByteArray(true), _byteArray(ba), _string(0)
{
@@ -53,42 +55,42 @@ QTextStream &QTextStream::operator<<(char c)
QTextStream &QTextStream::operator<<(short i)
{
- char buffer[10];
+ char buffer[integerOrPointerAsStringBufferSize];
sprintf(buffer, "%d", i);
return *this << buffer;
}
QTextStream &QTextStream::operator<<(unsigned short i)
{
- char buffer[10];
+ char buffer[integerOrPointerAsStringBufferSize];
sprintf(buffer, "%u", i);
return *this << buffer;
}
QTextStream &QTextStream::operator<<(int i)
{
- char buffer[10];
+ char buffer[integerOrPointerAsStringBufferSize];
sprintf(buffer, "%d", i);
return *this << buffer;
}
QTextStream &QTextStream::operator<<(unsigned i)
{
- char buffer[10];
+ char buffer[integerOrPointerAsStringBufferSize];
sprintf(buffer, "%u", i);
return *this << buffer;
}
QTextStream &QTextStream::operator<<(long i)
{
- char buffer[10];
+ char buffer[integerOrPointerAsStringBufferSize];
sprintf(buffer, "%ld", i);
return *this << buffer;
}
QTextStream &QTextStream::operator<<(unsigned long i)
{
- char buffer[10];
+ char buffer[integerOrPointerAsStringBufferSize];
sprintf(buffer, "%lu", i);
return *this << buffer;
}
@@ -129,7 +131,7 @@ QTextStream &QTextStream::operator<<(const QString &s)
QTextStream &QTextStream::operator<<(void *p)
{
- char buffer[10];
+ char buffer[integerOrPointerAsStringBufferSize];
sprintf(buffer, "%p", p);
return *this << buffer;
}
@@ -143,9 +145,3 @@ QTextStream &endl(QTextStream& stream)
{
return stream << '\n';
}
-
-QString QTextIStream::readLine()
-{
- ERROR("not yet implemented");
- return QString();
-}
diff --git a/WebCore/kwq/KWQToolTip.h b/WebCore/kwq/KWQToolTip.h
deleted file mode 100644
index fd4bc90..0000000
--- a/WebCore/kwq/KWQToolTip.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (C) 2003 Apple Computer, Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef QTOOLTIP_H_
-#define QTOOLTIP_H_
-
-#include "KWQPalette.h"
-
-class QToolTip {
-public:
- QToolTip(QWidget *) { }
- void tip(const QRect &r, const QString &s) { }
-
- static QPalette palette() { return QPalette(); }
-};
-
-#endif
diff --git a/WebCore/kwq/KWQWidget.h b/WebCore/kwq/KWQWidget.h
index 15a6580..fd2b312 100644
--- a/WebCore/kwq/KWQWidget.h
+++ b/WebCore/kwq/KWQWidget.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2003 Apple Computer, Inc. All rights reserved.
+ * Copyright (C) 2004 Apple Computer, Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -123,7 +123,6 @@ public:
QCursor cursor();
void unsetCursor();
bool event(QEvent *);
- bool focusNextPrevChild(bool);
bool hasMouseTracking() const;
void show();
diff --git a/WebCore/kwq/KWQWidget.mm b/WebCore/kwq/KWQWidget.mm
index cf54d11..3208757 100644
--- a/WebCore/kwq/KWQWidget.mm
+++ b/WebCore/kwq/KWQWidget.mm
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2003 Apple Computer, Inc. All rights reserved.
+ * Copyright (C) 2004 Apple Computer, Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -383,12 +383,6 @@ bool QWidget::event(QEvent *)
return false;
}
-bool QWidget::focusNextPrevChild(bool)
-{
- ERROR("not yet implemented");
- return true;
-}
-
bool QWidget::hasMouseTracking() const
{
return true;
diff --git a/WebCore/kwq/WebCoreBridge.mm b/WebCore/kwq/WebCoreBridge.mm
index 34fffd2..0f6fbf5 100644
--- a/WebCore/kwq/WebCoreBridge.mm
+++ b/WebCore/kwq/WebCoreBridge.mm
@@ -1368,7 +1368,7 @@ static HTMLFormElementImpl *formElementFromDOMElement(DOMElement *element)
if (!_part)
return;
- // NOTE: The enums *must* match the very similar ones declared in ktml_selection.h
+ // NOTE: The enums *must* match the very similar ones declared in dom_selection.h
Selection selection(_part->selection());
selection.modify(static_cast<Selection::EAlter>(alteration),
static_cast<Selection::EDirection>(direction),
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list