[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 07:28:43 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 529273c6fb92254b4d8b2916034d04bca0253725
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Mar 11 01:53:06 2003 +0000
WebCore:
Reviewed by Maciej.
- fixed 3010915 -- mouse wheel won't scroll the main document when you are over [i]frame
* kwq/WebCoreScrollView.h: Added.
* kwq/WebCoreScrollView.m: Added. Overrides scrollWheel to "do the right thing".
* WebCore.pbproj/project.pbxproj: Added WebCoreScrollView, and made it SPI so WebKit can use it.
* WebCore.exp: Exported WebCoreScrollView so WebKit can use it.
* WebCore-combined.exp: Regenerated.
* kwq/KWQListBox.mm: Made KWQListBoxScrollView a subclass of WebCoreScrollView instead of NSScrollView.
* kwq/KWQTextArea.h: Made KWQTextArea a subclass of WebCoreScrollView instead of NSScrollView.
- other changes
* kwq/KWQComboBox.mm: Make the workaround for the position of text in the pop-up
compile only when we build on Jaguar. That way a Jaguar-built Safari looks perfect on
Jaguar and a Panther built one looks perfect on Panther.
* kwq/KWQKHTMLPart.mm: Reformatted some method calls.
WebKit:
Reviewed by Maciej.
- fixed 3010915 -- mouse wheel won't scroll the main document when you are over [i]frame
* WebView.subproj/WebDynamicScrollBarsView.h: Made WebDynamicScrollBarsView a subclass of
WebCoreScrollView instead of NSScrollView.
- other changes
* WebView.subproj/WebFramePrivate.m: (-[WebFrame _actionInformationForNavigationType:event:originalURL:):
Fix problem where you would not get any information if the click was on a subview of the
WebHTMLView, like a form control.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3792 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 3a711f8..339b15f 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,26 @@
+2003-03-10 Darin Adler <darin at apple.com>
+
+ Reviewed by Maciej.
+
+ - fixed 3010915 -- mouse wheel won't scroll the main document when you are over [i]frame
+
+ * kwq/WebCoreScrollView.h: Added.
+ * kwq/WebCoreScrollView.m: Added. Overrides scrollWheel to "do the right thing".
+ * WebCore.pbproj/project.pbxproj: Added WebCoreScrollView, and made it SPI so WebKit can use it.
+ * WebCore.exp: Exported WebCoreScrollView so WebKit can use it.
+ * WebCore-combined.exp: Regenerated.
+
+ * kwq/KWQListBox.mm: Made KWQListBoxScrollView a subclass of WebCoreScrollView instead of NSScrollView.
+ * kwq/KWQTextArea.h: Made KWQTextArea a subclass of WebCoreScrollView instead of NSScrollView.
+
+ - other changes
+
+ * kwq/KWQComboBox.mm: Make the workaround for the position of text in the pop-up
+ compile only when we build on Jaguar. That way a Jaguar-built Safari looks perfect on
+ Jaguar and a Panther built one looks perfect on Panther.
+
+ * kwq/KWQKHTMLPart.mm: Reformatted some method calls.
+
2003-03-09 David Hyatt <hyatt at apple.com>
Fix compacts and run-ins to work a lot better than they did
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 3a711f8..339b15f 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,26 @@
+2003-03-10 Darin Adler <darin at apple.com>
+
+ Reviewed by Maciej.
+
+ - fixed 3010915 -- mouse wheel won't scroll the main document when you are over [i]frame
+
+ * kwq/WebCoreScrollView.h: Added.
+ * kwq/WebCoreScrollView.m: Added. Overrides scrollWheel to "do the right thing".
+ * WebCore.pbproj/project.pbxproj: Added WebCoreScrollView, and made it SPI so WebKit can use it.
+ * WebCore.exp: Exported WebCoreScrollView so WebKit can use it.
+ * WebCore-combined.exp: Regenerated.
+
+ * kwq/KWQListBox.mm: Made KWQListBoxScrollView a subclass of WebCoreScrollView instead of NSScrollView.
+ * kwq/KWQTextArea.h: Made KWQTextArea a subclass of WebCoreScrollView instead of NSScrollView.
+
+ - other changes
+
+ * kwq/KWQComboBox.mm: Make the workaround for the position of text in the pop-up
+ compile only when we build on Jaguar. That way a Jaguar-built Safari looks perfect on
+ Jaguar and a Panther built one looks perfect on Panther.
+
+ * kwq/KWQKHTMLPart.mm: Reformatted some method calls.
+
2003-03-09 David Hyatt <hyatt at apple.com>
Fix compacts and run-ins to work a lot better than they did
diff --git a/WebCore/WebCore-combined.exp b/WebCore/WebCore-combined.exp
index 37a3f4c..3eaa334 100644
--- a/WebCore/WebCore-combined.exp
+++ b/WebCore/WebCore-combined.exp
@@ -5,6 +5,7 @@
.objc_class_name_WebCoreHistory
.objc_class_name_WebCoreImageRendererFactory
.objc_class_name_WebCoreJavaScript
+.objc_class_name_WebCoreScrollView
.objc_class_name_WebCoreSettings
.objc_class_name_WebCoreTextRendererFactory
.objc_class_name_WebCoreViewFactory
diff --git a/WebCore/WebCore.exp b/WebCore/WebCore.exp
index a3e7db0..d0db494 100644
--- a/WebCore/WebCore.exp
+++ b/WebCore/WebCore.exp
@@ -5,6 +5,7 @@
.objc_class_name_WebCoreHistory
.objc_class_name_WebCoreImageRendererFactory
.objc_class_name_WebCoreJavaScript
+.objc_class_name_WebCoreScrollView
.objc_class_name_WebCoreSettings
.objc_class_name_WebCoreTextRendererFactory
.objc_class_name_WebCoreViewFactory
diff --git a/WebCore/WebCore.pbproj/project.pbxproj b/WebCore/WebCore.pbproj/project.pbxproj
index 6c8c313..ff05133 100644
--- a/WebCore/WebCore.pbproj/project.pbxproj
+++ b/WebCore/WebCore.pbproj/project.pbxproj
@@ -181,154 +181,19 @@
0867D69DFE84028FC02AAC07 = {
buildActionMask = 2147483647;
files = (
- F587855702DE375901EA4122,
- F587855E02DE375901EA4122,
- F587856502DE375901EA4122,
- F587856C02DE375901EA4122,
- F587856D02DE375901EA4122,
- F587857502DE375901EA4122,
- F587858002DE375901EA4122,
- F587858C02DE375901EA4122,
- F58785A502DE375901EA4122,
- F58785A702DE375901EA4122,
- F58785A902DE375901EA4122,
- F58785AA02DE375901EA4122,
- F58785AD02DE375901EA4122,
- F58785B702DE375901EA4122,
- F58785BC02DE375901EA4122,
- F58785C702DE375901EA4122,
- F58785CD02DE375901EA4122,
- F58785D002DE375901EA4122,
- F58785D202DE375901EA4122,
- F58785D502DE375901EA4122,
- F58785D902DE375901EA4122,
- F58785DB02DE375901EA4122,
- F58785DE02DE375901EA4122,
- F58785DF02DE375901EA4122,
- F58785E002DE375901EA4122,
- F58785E202DE375901EA4122,
- F58785E302DE375901EA4122,
- F58785E402DE375901EA4122,
- F58785E602DE375901EA4122,
- F58785EC02DE37CB01EA4122,
- F587860602DE382001EA4122,
- F587860702DE382001EA4122,
- F587860902DE382001EA4122,
- F587860A02DE382001EA4122,
- F587860B02DE382001EA4122,
- F587860C02DE382001EA4122,
- F587860D02DE382001EA4122,
- F587860E02DE382001EA4122,
- F587860F02DE382001EA4122,
- F587861002DE382001EA4122,
- F587861202DE382001EA4122,
- F587861302DE382001EA4122,
- F587861402DE382001EA4122,
- F587861502DE382001EA4122,
- F587861602DE382001EA4122,
- F587861802DE382001EA4122,
- F587861A02DE382001EA4122,
- F587861B02DE382001EA4122,
- F587862602DE398401EA4122,
- F587862702DE398401EA4122,
- F587862802DE398401EA4122,
- F587862902DE398401EA4122,
- F587862A02DE398401EA4122,
- F587862B02DE398401EA4122,
- F587863102DE39E601EA4122,
- F587863B02DE3A1401EA4122,
- F587863C02DE3A1401EA4122,
- F587863D02DE3A1401EA4122,
- F587863F02DE3A1401EA4122,
- F587864202DE3A1401EA4122,
- F587864602DE3A7701EA4122,
- F587864702DE3A7701EA4122,
- F587865402DE3A9A01EA4122,
- F587865502DE3A9A01EA4122,
- F587865602DE3A9A01EA4122,
- F587865702DE3A9A01EA4122,
- F587865802DE3A9A01EA4122,
- F587865902DE3A9A01EA4122,
- F587865D02DE3A9A01EA4122,
- F587866502DE3B1101EA4122,
- F587866E02DE3B3201EA4122,
- F587866F02DE3B3201EA4122,
- F587867002DE3B3201EA4122,
- F587867102DE3B3201EA4122,
- F587867202DE3B3201EA4122,
- F587867302DE3B3201EA4122,
- F587867402DE3B3201EA4122,
- F58786C702DE3B8601EA4122,
- F58786C802DE3B8601EA4122,
- F58786CA02DE3B8601EA4122,
- F58786CC02DE3B8601EA4122,
- F58786CD02DE3B8601EA4122,
- F58786CE02DE3B8601EA4122,
- F58786CF02DE3B8601EA4122,
- F58786D102DE3B8601EA4122,
- F58786D202DE3B8601EA4122,
- F58786D302DE3B8601EA4122,
- F58786D402DE3B8601EA4122,
- F58786D502DE3B8601EA4122,
- F58786D602DE3B8601EA4122,
- F58786D702DE3B8601EA4122,
- F58786D902DE3B8601EA4122,
- F58786DA02DE3B8601EA4122,
- F58786DB02DE3B8601EA4122,
- F58786DD02DE3B8601EA4122,
- F58786DE02DE3B8601EA4122,
- F58786DF02DE3B8601EA4122,
- F58786E102DE3B8601EA4122,
- F58786E302DE3B8601EA4122,
- F58786E702DE3B8601EA4122,
- F58786E802DE3B8601EA4122,
- F58786E902DE3B8601EA4122,
- F58786EA02DE3B8601EA4122,
- F58786EB02DE3B8601EA4122,
- F58786EC02DE3B8601EA4122,
- F58786EE02DE3B8601EA4122,
- F58786EF02DE3B8601EA4122,
- F58786F002DE3B8601EA4122,
- F58786F202DE3B8601EA4122,
- F58786F302DE3B8601EA4122,
- F58786F402DE3B8601EA4122,
- F58786F502DE3B8601EA4122,
- F58786F602DE3B8601EA4122,
- F58786F702DE3B8601EA4122,
- F58786F802DE3B8601EA4122,
- F58786F902DE3B8601EA4122,
- F58786FB02DE3B8601EA4122,
- F58786FC02DE3B8601EA4122,
- F58786FD02DE3B8601EA4122,
- F58786FE02DE3B8601EA4122,
- F58786FF02DE3B8601EA4122,
- F587870002DE3B8601EA4122,
- F587870102DE3B8601EA4122,
- F587870202DE3B8601EA4122,
- F587870302DE3B8601EA4122,
- F587870402DE3B8601EA4122,
- F587870502DE3B8601EA4122,
- F587870602DE3B8601EA4122,
- F587870702DE3B8601EA4122,
- F587870802DE3B8601EA4122,
- F587870902DE3B8601EA4122,
- F587870A02DE3B8601EA4122,
- F587870B02DE3B8601EA4122,
- F587870C02DE3B8601EA4122,
- F587870D02DE3B8601EA4122,
- F587870E02DE3B8601EA4122,
- F587870F02DE3B8601EA4122,
- F587871002DE3B8601EA4122,
- F587871102DE3B8601EA4122,
- F587871202DE3B8601EA4122,
- F587871302DE3B8601EA4122,
- F587871402DE3B8601EA4122,
- F587871502DE3B8601EA4122,
- F587871602DE3B8601EA4122,
- F523D15B02DE42AD018635CA,
- F523D15D02DE42AD018635CA,
- F523D15F02DE42AD018635CA,
- F523D16102DE42AD018635CA,
+ 93F12CC803CD0AE60000011C,
+ 93F12CA403CCFD570000011C,
+ 93F12CA503CCFD570000011C,
+ 93F12CA603CCFD570000011C,
+ 93F12CA703CCFD570000011C,
+ 93F12CA803CCFD570000011C,
+ 93F12CA903CCFD570000011C,
+ 93F12CAA03CCFD570000011C,
+ 93F12CAB03CCFD570000011C,
+ 93F12CAF03CCFD570000011C,
+ 93F12CB103CCFD570000011C,
+ 93F12CB303CCFD570000011C,
+ BC8F618D040594BA00A80004,
F523D17502DE42E7018635CA,
F523D17702DE42E7018635CA,
F523D17902DE42E7018635CA,
@@ -337,9 +202,14 @@
F523D17F02DE42E7018635CA,
F523D18102DE42E7018635CA,
F523D18302DE42E7018635CA,
+ BC8F618E040594BA00A80004,
F523D1BD02DE4322018635CA,
F523D1BF02DE4322018635CA,
F523D1C102DE4322018635CA,
+ F523D1D402DE4322018635CA,
+ F523D1D602DE4322018635CA,
+ F523D1D802DE4322018635CA,
+ F523D1DA02DE4322018635CA,
F523D1C202DE4322018635CA,
F523D1C402DE4322018635CA,
F523D1C602DE4322018635CA,
@@ -350,10 +220,6 @@
F523D1CE02DE4322018635CA,
F523D1D002DE4322018635CA,
F523D1D202DE4322018635CA,
- F523D1D402DE4322018635CA,
- F523D1D602DE4322018635CA,
- F523D1D802DE4322018635CA,
- F523D1DA02DE4322018635CA,
F523D1DC02DE4322018635CA,
F523D1DE02DE4322018635CA,
F523D1E002DE4322018635CA,
@@ -401,6 +267,11 @@
F523D27002DE4396018635CA,
F523D27202DE4396018635CA,
F523D27402DE4396018635CA,
+ F523D15B02DE42AD018635CA,
+ F523D15D02DE42AD018635CA,
+ F523D15F02DE42AD018635CA,
+ F523D16102DE42AD018635CA,
+ BC7294FA03804B3C00A80166,
F523D28B02DE43D7018635CA,
F523D28D02DE43D7018635CA,
F523D28F02DE43D7018635CA,
@@ -408,14 +279,16 @@
F523D29302DE43D7018635CA,
F523D29402DE43D7018635CA,
F523D29502DE43D7018635CA,
- F523D29602DE43D7018635CA,
F523D29802DE43D7018635CA,
+ F523D29602DE43D7018635CA,
F523D29A02DE43D7018635CA,
F523D29B02DE43D7018635CA,
F523D2C902DE4438018635CA,
F523D2CB02DE4438018635CA,
F523D2CD02DE4438018635CA,
F523D2CF02DE4438018635CA,
+ BC7294FE03804B5600A80166,
+ BC7C965303E9EE7000A80004,
F523D2D102DE4438018635CA,
F523D2D302DE4438018635CA,
F523D2D502DE4438018635CA,
@@ -425,6 +298,9 @@
F523D2DE02DE4438018635CA,
F523D2E102DE4438018635CA,
F523D2E302DE4438018635CA,
+ BC7C965503E9EE7000A80004,
+ F690CFEC031C47F401CA2AC4,
+ BCC60E5903F5055A00A80004,
F523D2E502DE4438018635CA,
F523D2E702DE4438018635CA,
F523D2E902DE4438018635CA,
@@ -432,65 +308,190 @@
F523D2EE02DE4438018635CA,
F523D2F002DE4438018635CA,
F523D2F202DE4438018635CA,
+ BCF0192703D3802200B2D04D,
+ F523D31A02DE4476018635CA,
+ F523D31C02DE4476018635CA,
+ F523D31E02DE4476018635CA,
+ F523D32002DE4476018635CA,
F523D30D02DE4476018635CA,
F523D31002DE4476018635CA,
F523D31202DE4476018635CA,
F523D31402DE4476018635CA,
F523D31602DE4476018635CA,
F523D31802DE4476018635CA,
- F523D31A02DE4476018635CA,
- F523D31C02DE4476018635CA,
- F523D31E02DE4476018635CA,
- F523D32002DE4476018635CA,
F523D32202DE4476018635CA,
- F5B2A4FE02E2220F018635CB,
- F5B2A52D02E22573018635CB,
- F565AE8702ECA583018635CA,
+ F58786C702DE3B8601EA4122,
+ F587855702DE375901EA4122,
+ 9377FB57032C235C008635CE,
+ F58786CA02DE3B8601EA4122,
+ F58786CC02DE3B8601EA4122,
+ F58786CD02DE3B8601EA4122,
+ F58786CE02DE3B8601EA4122,
+ F58786D402DE3B8601EA4122,
+ F587855E02DE375901EA4122,
+ F58786CF02DE3B8601EA4122,
+ F58786D102DE3B8601EA4122,
+ F58786D202DE3B8601EA4122,
+ F58786D302DE3B8601EA4122,
+ F587856502DE375901EA4122,
+ F58786D502DE3B8601EA4122,
+ F58785EC02DE37CB01EA4122,
354F248B02EE28590ACA2ACA,
+ F58786D602DE3B8601EA4122,
+ F587856C02DE375901EA4122,
+ F58786D702DE3B8601EA4122,
+ F587856D02DE375901EA4122,
+ 931C8A180380288B008635CE,
+ F58786D902DE3B8601EA4122,
+ F58786DA02DE3B8601EA4122,
+ 93CCF7D6033BD43C008635CE,
+ F58786DB02DE3B8601EA4122,
+ 9394E0AB03AA60FB008635CE,
+ F58786DD02DE3B8601EA4122,
+ F58786DE02DE3B8601EA4122,
+ F587857502DE375901EA4122,
+ F58786E102DE3B8601EA4122,
+ F58786E702DE3B8601EA4122,
+ F58786E302DE3B8601EA4122,
+ F587860602DE382001EA4122,
+ F587860702DE382001EA4122,
+ F587862702DE398401EA4122,
+ F587862802DE398401EA4122,
+ F587860902DE382001EA4122,
+ F587858002DE375901EA4122,
+ F587862902DE398401EA4122,
+ F587860A02DE382001EA4122,
+ F587863102DE39E601EA4122,
+ F587865702DE3A9A01EA4122,
+ F587860B02DE382001EA4122,
+ F587860C02DE382001EA4122,
+ F587863C02DE3A1401EA4122,
+ F587863D02DE3A1401EA4122,
+ F587863F02DE3A1401EA4122,
+ F587858C02DE375901EA4122,
+ F587863B02DE3A1401EA4122,
+ F587864202DE3A1401EA4122,
+ F587865402DE3A9A01EA4122,
+ F587865D02DE3A9A01EA4122,
+ F587860D02DE382001EA4122,
+ F587865802DE3A9A01EA4122,
+ F587860E02DE382001EA4122,
+ F587864602DE3A7701EA4122,
+ F587864702DE3A7701EA4122,
+ F587865502DE3A9A01EA4122,
+ F587865602DE3A9A01EA4122,
+ F587862602DE398401EA4122,
+ F587860F02DE382001EA4122,
+ F587862A02DE398401EA4122,
+ F587862B02DE398401EA4122,
+ F587861002DE382001EA4122,
+ F587865902DE3A9A01EA4122,
+ F587866E02DE3B3201EA4122,
+ F587866F02DE3B3201EA4122,
+ F587867002DE3B3201EA4122,
+ F587867102DE3B3201EA4122,
+ F587867202DE3B3201EA4122,
+ F587867302DE3B3201EA4122,
+ F587867402DE3B3201EA4122,
+ F587866502DE3B1101EA4122,
+ F587861202DE382001EA4122,
+ F587861502DE382001EA4122,
+ F587861402DE382001EA4122,
+ F587861602DE382001EA4122,
+ F587861802DE382001EA4122,
+ F587861A02DE382001EA4122,
+ F587861B02DE382001EA4122,
+ F58786E802DE3B8601EA4122,
+ F58786E902DE3B8601EA4122,
+ F58785A502DE375901EA4122,
+ F58785A702DE375901EA4122,
+ F58785A902DE375901EA4122,
+ 93861DE1032C2E52008635CE,
+ F58786EB02DE3B8601EA4122,
+ F58785AA02DE375901EA4122,
+ F58786C802DE3B8601EA4122,
+ F58786EE02DE3B8601EA4122,
+ F583D50303140623018635CE,
+ F58786EF02DE3B8601EA4122,
+ F58786F002DE3B8601EA4122,
+ 9394E0A603AA5BBE008635CE,
+ F58786F202DE3B8601EA4122,
+ F58786F302DE3B8601EA4122,
+ F58786F402DE3B8601EA4122,
+ F58786F502DE3B8601EA4122,
+ F58786F602DE3B8601EA4122,
+ F58786F702DE3B8601EA4122,
+ F58786F802DE3B8601EA4122,
+ F58786FB02DE3B8601EA4122,
+ F58786FC02DE3B8601EA4122,
+ F58785B702DE375901EA4122,
+ F58786EA02DE3B8601EA4122,
+ F58786FE02DE3B8601EA4122,
+ F587870902DE3B8601EA4122,
+ F587871502DE3B8601EA4122,
+ F587870102DE3B8601EA4122,
+ F587870202DE3B8601EA4122,
+ F587870302DE3B8601EA4122,
+ F58785BC02DE375901EA4122,
+ F587870402DE3B8601EA4122,
+ F587870502DE3B8601EA4122,
+ 93955A4303D72932008635CE,
+ 93386B92037045B3008635CE,
+ F587870602DE3B8601EA4122,
F5117BCD02F9FFEF018635CE,
+ F587870702DE3B8601EA4122,
F5117BCF02F9FFEF018635CE,
- F56234E103026D7301629B47,
- F583D50303140623018635CE,
- F5517DC4031AB56301A80180,
- F690CFEC031C47F401CA2AC4,
- 9377FB57032C235C008635CE,
- 93861DE1032C2E52008635CE,
- 93CCF7D6033BD43C008635CE,
+ F587870802DE3B8601EA4122,
+ F587870A02DE3B8601EA4122,
+ F587870B02DE3B8601EA4122,
+ F587870C02DE3B8601EA4122,
+ F587870D02DE3B8601EA4122,
+ F58785C702DE375901EA4122,
+ F587870E02DE3B8601EA4122,
+ F587870F02DE3B8601EA4122,
+ F58785AD02DE375901EA4122,
+ F587871002DE3B8601EA4122,
+ F587871102DE3B8601EA4122,
+ F587871202DE3B8601EA4122,
+ F587871302DE3B8601EA4122,
+ F58785CD02DE375901EA4122,
+ F587871402DE3B8601EA4122,
+ F58785D002DE375901EA4122,
+ F58785D202DE375901EA4122,
+ F587871602DE3B8601EA4122,
+ F58785D502DE375901EA4122,
+ 931BFCD403D4AEE5008635CE,
+ 931BFCD803D4AEFD008635CE,
+ 931BFCD003D4AEDA008635CE,
+ F58785D902DE375901EA4122,
+ F5B2A4FE02E2220F018635CB,
+ F58785DB02DE375901EA4122,
F565A2740352509B01A80180,
F565A27D035284E301A80180,
+ F56234E103026D7301629B47,
+ 6504A7BF03DCE19800000124,
+ F58785DE02DE375901EA4122,
+ F5517DC4031AB56301A80180,
+ F58785DF02DE375901EA4122,
+ F58785E002DE375901EA4122,
+ F5B2A52D02E22573018635CB,
+ F58785E202DE375901EA4122,
+ 9325AAB9041D0E9A00A9CAC5,
+ F565AE8702ECA583018635CA,
+ F58785E302DE375901EA4122,
+ F58785E402DE375901EA4122,
+ 517FA6B30370BD6100CA2D3A,
+ F58785E602DE375901EA4122,
F5EDAAF7035345D901A80180,
F5EDAAF8035345D901A80180,
F5EDAAFA035345D901A80180,
- 93386B92037045B3008635CE,
- 517FA6B30370BD6100CA2D3A,
- 931C8A180380288B008635CE,
- BC7294FA03804B3C00A80166,
- BC7294FE03804B5600A80166,
- 9394E0A603AA5BBE008635CE,
- 9394E0AB03AA60FB008635CE,
- 93F12CA403CCFD570000011C,
- 93F12CA503CCFD570000011C,
- 93F12CA603CCFD570000011C,
- 93F12CA703CCFD570000011C,
- 93F12CA803CCFD570000011C,
- 93F12CA903CCFD570000011C,
- 93F12CAA03CCFD570000011C,
- 93F12CAB03CCFD570000011C,
- 93F12CAF03CCFD570000011C,
- 93F12CB103CCFD570000011C,
- 93F12CB303CCFD570000011C,
- 93F12CC803CD0AE60000011C,
- BCF0192703D3802200B2D04D,
- 931BFCD003D4AEDA008635CE,
- 931BFCD403D4AEE5008635CE,
- 931BFCD803D4AEFD008635CE,
- 93955A4303D72932008635CE,
- 6504A7BF03DCE19800000124,
- BC7C965303E9EE7000A80004,
- BC7C965503E9EE7000A80004,
- BCC60E5903F5055A00A80004,
- BC8F618D040594BA00A80004,
- BC8F618E040594BA00A80004,
+ F587861502DE382001EA4122,
+ F58786DF02DE3B8601EA4122,
+ F58786EC02DE3B8601EA4122,
+ F58786F902DE3B8601EA4122,
+ F58786FD02DE3B8601EA4122,
+ F587870902DE3B8601EA4122,
+ F587871502DE3B8601EA4122,
);
isa = PBXHeadersBuildPhase;
runOnlyForDeploymentPostprocessing = 0;
@@ -738,6 +739,7 @@
BCC60E5803F5055A00A80004,
BC8F61880405949900A80004,
BC8F61890405949900A80004,
+ 9325AABA041D0E9A00A9CAC5,
);
isa = PBXSourcesBuildPhase;
runOnlyForDeploymentPostprocessing = 0;
@@ -1024,6 +1026,33 @@
settings = {
};
};
+ 9325AAB7041D0E9A00A9CAC5 = {
+ fileEncoding = 4;
+ isa = PBXFileReference;
+ path = WebCoreScrollView.h;
+ refType = 4;
+ };
+ 9325AAB8041D0E9A00A9CAC5 = {
+ fileEncoding = 4;
+ isa = PBXFileReference;
+ path = WebCoreScrollView.m;
+ refType = 4;
+ };
+ 9325AAB9041D0E9A00A9CAC5 = {
+ fileRef = 9325AAB7041D0E9A00A9CAC5;
+ isa = PBXBuildFile;
+ settings = {
+ ATTRIBUTES = (
+ Private,
+ );
+ };
+ };
+ 9325AABA041D0E9A00A9CAC5 = {
+ fileRef = 9325AAB8041D0E9A00A9CAC5;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
93386B90037045B3008635CE = {
fileEncoding = 4;
isa = PBXFileReference;
@@ -6420,6 +6449,8 @@
F5B2A52B02E22573018635CB,
F5B2A52C02E22573018635CB,
F587855002DE375901EA4122,
+ 9325AAB7041D0E9A00A9CAC5,
+ 9325AAB8041D0E9A00A9CAC5,
F565AE8502ECA583018635CA,
F565AE8602ECA583018635CA,
F587855102DE375901EA4122,
@@ -6632,12 +6663,6 @@
settings = {
};
};
- F587861302DE382001EA4122 = {
- fileRef = F58785FD02DE382001EA4122;
- isa = PBXBuildFile;
- settings = {
- };
- };
F587861402DE382001EA4122 = {
fileRef = F58785FE02DE382001EA4122;
isa = PBXBuildFile;
@@ -7824,18 +7849,6 @@
settings = {
};
};
- F58786FF02DE3B8601EA4122 = {
- fileRef = F58786AE02DE3B8601EA4122;
- isa = PBXBuildFile;
- settings = {
- };
- };
- F587870002DE3B8601EA4122 = {
- fileRef = F58786AF02DE3B8601EA4122;
- isa = PBXBuildFile;
- settings = {
- };
- };
F587870102DE3B8601EA4122 = {
fileRef = F58786B002DE3B8601EA4122;
isa = PBXBuildFile;
diff --git a/WebCore/kwq/KWQComboBox.mm b/WebCore/kwq/KWQComboBox.mm
index 31fa51c..740f959 100644
--- a/WebCore/kwq/KWQComboBox.mm
+++ b/WebCore/kwq/KWQComboBox.mm
@@ -40,7 +40,11 @@ using khtml::RenderWidget;
#define LEFT_MARGIN 3
#define RIGHT_MARGIN 3
+#if MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_2
#define TEXT_VERTICAL_NUDGE 1
+#else
+#define TEXT_VERTICAL_NUDGE 0
+#endif
// This is the 2-pixel CELLOFFSET for bordered cells from NSCell.
#define VERTICAL_FUDGE_FACTOR 2
@@ -236,6 +240,8 @@ int QComboBox::currentItem() const
return result;
}
+#if TEXT_VERTICAL_NUDGE
+
- (void)drawInteriorWithFrame:(NSRect)cellFrame inView:(NSView *)controlView
{
cellFrame.origin.y += TEXT_VERTICAL_NUDGE;
@@ -243,6 +249,8 @@ int QComboBox::currentItem() const
[super drawInteriorWithFrame:cellFrame inView:controlView];
}
+#endif
+
- (QWidget *)widget
{
return widget;
diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index 3dd2bfb..72db9f7 100644
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -167,13 +167,25 @@ bool KWQKHTMLPart::openURL(const KURL &url)
// FIXME: The lack of args here to get the reload flag from
// indicates a problem in how we use KHTMLPart::processObjectRequest,
// where we are opening the URL before the args are set up.
- [_bridge loadURL:url.url().getNSString() referrer:[_bridge referrer] reload:NO target:nil triggeringEvent:nil form:nil formValues:nil];
+ [_bridge loadURL:url.url().getNSString()
+ referrer:[_bridge referrer]
+ reload:NO
+ target:nil
+ triggeringEvent:nil
+ form:nil
+ formValues:nil];
return true;
}
void KWQKHTMLPart::openURLRequest(const KURL &url, const URLArgs &args)
{
- [_bridge loadURL:url.url().getNSString() referrer:[_bridge referrer] reload:args.reload target:args.frameName.getNSString() triggeringEvent:nil form:nil formValues:nil];
+ [_bridge loadURL:url.url().getNSString()
+ referrer:[_bridge referrer]
+ reload:args.reload
+ target:args.frameName.getNSString()
+ triggeringEvent:nil
+ form:nil
+ formValues:nil];
}
void KWQKHTMLPart::didNotOpenURL(const QString &URL)
@@ -384,11 +396,11 @@ void KWQKHTMLPart::recordFormValue(const QString &name, const QString &value, HT
void KWQKHTMLPart::submitForm(const KURL &url, const URLArgs &args)
{
QString URLString = url.url();
- WebCoreBridge *target = args.frameName.length() == 0 ? _bridge : [_bridge findFrameNamed:args.frameName.getNSString()];
- KHTMLPart *targetPart = [target part];
// The form multi-submit logic here is only right when we are submitting a form that affects this frame.
// Eventually when we find a better fix we can remove this altogether.
+ WebCoreBridge *target = args.frameName.isEmpty() ? _bridge : [_bridge findFrameNamed:args.frameName.getNSString()];
+ KHTMLPart *targetPart = [target part];
bool willReplaceThisFrame = false;
for (KHTMLPart *p = this; p; p = p->parentPart()) {
if (p == targetPart) {
@@ -410,23 +422,22 @@ void KWQKHTMLPart::submitForm(const KURL &url, const URLArgs &args)
if (!args.doPost()) {
[_bridge loadURL:URLString.getNSString()
- referrer:[_bridge referrer]
- reload:args.reload
- target:args.frameName.getNSString()
- triggeringEvent:_currentEvent
- form:_formAboutToBeSubmitted
- formValues:_formValuesAboutToBeSubmitted];
+ referrer:[_bridge referrer]
+ reload:args.reload
+ target:args.frameName.getNSString()
+ triggeringEvent:_currentEvent
+ form:_formAboutToBeSubmitted
+ formValues:_formValuesAboutToBeSubmitted];
} else {
- QString contentType = args.contentType();
- ASSERT(contentType.startsWith("Content-Type: "));
+ ASSERT(args.contentType().startsWith("Content-Type: "));
[_bridge postWithURL:URLString.getNSString()
- referrer:[_bridge referrer]
- target:args.frameName.getNSString()
- data:[NSData dataWithBytes:args.postData.data() length:args.postData.size()]
- contentType:contentType.mid(14).getNSString()
- triggeringEvent:_currentEvent
- form:_formAboutToBeSubmitted
- formValues:_formValuesAboutToBeSubmitted];
+ referrer:[_bridge referrer]
+ target:args.frameName.getNSString()
+ data:[NSData dataWithBytes:args.postData.data() length:args.postData.size()]
+ contentType:args.contentType().mid(14).getNSString()
+ triggeringEvent:_currentEvent
+ form:_formAboutToBeSubmitted
+ formValues:_formValuesAboutToBeSubmitted];
}
clearRecordedFormValues();
}
@@ -451,7 +462,13 @@ void KWQKHTMLPart::slotData(NSString *encoding, bool forceEncoding, const char *
void KWQKHTMLPart::urlSelected(const KURL &url, int button, int state, const URLArgs &args)
{
- [_bridge loadURL:url.url().getNSString() referrer:[_bridge referrer] reload:args.reload target:args.frameName.getNSString() triggeringEvent:_currentEvent form:nil formValues:nil];
+ [_bridge loadURL:url.url().getNSString()
+ referrer:[_bridge referrer]
+ reload:args.reload
+ target:args.frameName.getNSString()
+ triggeringEvent:_currentEvent
+ form:nil
+ formValues:nil];
}
class KWQPluginPart : public ReadOnlyPart
diff --git a/WebCore/kwq/KWQListBox.mm b/WebCore/kwq/KWQListBox.mm
index 4a70fc6..f345339 100644
--- a/WebCore/kwq/KWQListBox.mm
+++ b/WebCore/kwq/KWQListBox.mm
@@ -26,10 +26,11 @@
#import "KWQListBox.h"
#import "KWQAssertions.h"
+#import "WebCoreScrollView.h"
#define MIN_LINES 4 /* ensures we have a scroll bar */
- at interface KWQListBoxScrollView : NSScrollView
+ at interface KWQListBoxScrollView : WebCoreScrollView
{
}
@end
diff --git a/WebCore/kwq/KWQTextArea.h b/WebCore/kwq/KWQTextArea.h
index 1048319..aacce96 100644
--- a/WebCore/kwq/KWQTextArea.h
+++ b/WebCore/kwq/KWQTextArea.h
@@ -23,13 +23,13 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import <Cocoa/Cocoa.h>
+#import <WebCore/WebCoreScrollView.h>
@class KWQTextAreaTextView;
class QTextEdit;
@protocol KWQWidgetHolder;
- at interface KWQTextArea : NSScrollView <KWQWidgetHolder>
+ at interface KWQTextArea : WebCoreScrollView <KWQWidgetHolder>
{
KWQTextAreaTextView *textView;
QTextEdit *widget;
diff --git a/WebCore/kwq/KWQCollection.mm b/WebCore/kwq/WebCoreScrollView.h
similarity index 94%
copy from WebCore/kwq/KWQCollection.mm
copy to WebCore/kwq/WebCoreScrollView.h
index 2fc565f..5435e2f 100644
--- a/WebCore/kwq/KWQCollection.mm
+++ b/WebCore/kwq/WebCoreScrollView.h
@@ -23,8 +23,9 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import "KWQCollection.h"
+#import <AppKit/AppKit.h>
-QPtrCollection::~QPtrCollection()
+ at interface WebCoreScrollView : NSScrollView
{
}
+ at end
diff --git a/WebCore/kwq/KWQFile.mm b/WebCore/kwq/WebCoreScrollView.m
similarity index 60%
copy from WebCore/kwq/KWQFile.mm
copy to WebCore/kwq/WebCoreScrollView.m
index e59560b..8b811ad 100644
--- a/WebCore/kwq/KWQFile.mm
+++ b/WebCore/kwq/WebCoreScrollView.m
@@ -23,63 +23,34 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import "KWQFile.h"
+#import "WebCoreScrollView.h"
-QFile::QFile(const QString &n) : name(strdup([n.getNSString() fileSystemRepresentation])), fd(-1)
-{
-}
-
-QFile::~QFile()
-{
- free(name);
-}
-
-bool QFile::exists() const
-{
- return access(name, F_OK) == 0;
-}
+ at implementation WebCoreScrollView
-bool QFile::open(int mode)
+- (void)scrollWheel:(NSEvent *)event
{
- close();
+ NSPoint origin = [[self contentView] bounds].origin;
- if (mode == IO_ReadOnly) {
- fd = ::open(name, O_RDONLY);
+ // Compute a new origin as if we had scrolled a little bit.
+ // If we constrain this and nothing happens, that means we're already scrolled to the limit.
+ NSPoint newOrigin = origin;
+ if ([event deltaX] > 0) {
+ newOrigin.x -= 1;
+ } else if ([event deltaX] < 0) {
+ newOrigin.x += 1;
}
-
- return fd != -1;
-}
-
-void QFile::close()
-{
- if (fd != -1) {
- ::close(fd);
+ if ([event deltaY] > 0) {
+ newOrigin.y -= 1;
+ } else if ([event deltaY] < 0) {
+ newOrigin.y += 1;
}
- fd = -1;
-}
-
-int QFile::readBlock(char *data, uint bytesToRead)
-{
- if (fd == -1) {
- return -1;
+ // If we are already scrolled to the limit, pass on this event, and send it on to the next responder
+ if (NSEqualPoints(origin, [[self contentView] constrainScrollPoint:newOrigin])) {
+ [[self nextResponder] tryToPerform:@selector(scrollWheel:) with:event];
} else {
- return read(fd, data, bytesToRead);
+ [super scrollWheel:event];
}
}
-uint QFile::size() const
-{
- struct stat statbuf;
-
- if (stat(name, &statbuf) == 0) {
- return statbuf.st_size;
- } else {
- return 0;
- }
-}
-
-bool QFile::exists(const QString &path)
-{
- return QFile(path).exists();
-}
+ at end
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 6a1f0a0..122bc07 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,18 @@
+2003-03-10 Darin Adler <darin at apple.com>
+
+ Reviewed by Maciej.
+
+ - fixed 3010915 -- mouse wheel won't scroll the main document when you are over [i]frame
+
+ * WebView.subproj/WebDynamicScrollBarsView.h: Made WebDynamicScrollBarsView a subclass of
+ WebCoreScrollView instead of NSScrollView.
+
+ - other changes
+
+ * WebView.subproj/WebFramePrivate.m: (-[WebFrame _actionInformationForNavigationType:event:originalURL:):
+ Fix problem where you would not get any information if the click was on a subview of the
+ WebHTMLView, like a form control.
+
2003-03-10 Chris Blumenberg <cblu at apple.com>
Fixed some download-related leaks. Primarily, we were leaking the data source that started the download. The data source is now immediately released when it becomes a download.
diff --git a/WebKit/WebView.subproj/WebDynamicScrollBarsView.h b/WebKit/WebView.subproj/WebDynamicScrollBarsView.h
index c492cec..09c902c 100644
--- a/WebKit/WebView.subproj/WebDynamicScrollBarsView.h
+++ b/WebKit/WebView.subproj/WebDynamicScrollBarsView.h
@@ -6,14 +6,13 @@
// Copyright (c) 2001, 2002 Apple Computer, Inc. All rights reserved.
//
-#import <Cocoa/Cocoa.h>
-
#import <WebCore/WebCoreFrameView.h>
+#import <WebCore/WebCoreScrollView.h>
// FIXME 2980779: This has grown to be more than just a dynamic scroll bar view,
// and it no longer works outside of WebKit.
- at interface WebDynamicScrollBarsView : NSScrollView <WebCoreFrameView>
+ at interface WebDynamicScrollBarsView : WebCoreScrollView <WebCoreFrameView>
{
BOOL disallowsScrolling;
BOOL suppressLayout;
diff --git a/WebKit/WebView.subproj/WebFramePrivate.m b/WebKit/WebView.subproj/WebFramePrivate.m
index db66c18..0ba874a 100644
--- a/WebKit/WebView.subproj/WebFramePrivate.m
+++ b/WebKit/WebView.subproj/WebFramePrivate.m
@@ -1232,7 +1232,13 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
{
NSView *topViewInEventWindow = [[event window] contentView];
NSView *viewContainingPoint = [topViewInEventWindow hitTest:[topViewInEventWindow convertPoint:[event locationInWindow] fromView:nil]];
- if ([viewContainingPoint isKindOfClass:[WebHTMLView class]]) {
+ while (viewContainingPoint != nil) {
+ if ([viewContainingPoint isKindOfClass:[WebHTMLView class]]) {
+ break;
+ }
+ viewContainingPoint = [viewContainingPoint superview];
+ }
+ if (viewContainingPoint != nil) {
NSPoint point = [viewContainingPoint convertPoint:[event locationInWindow] fromView:nil];
NSDictionary *elementInfo = [(WebHTMLView *)viewContainingPoint _elementAtPoint:point];
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list