[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 06:32:38 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 9d10b5af96e5338bd5198a62c8a8cfafe8e3fc11
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Aug 19 20:11:04 2002 +0000
Put in more robust version of the next/previous key view checking
that matches what I did in WebHTMLView.
* kwq/KWQNSTextField.h: Add inNextValidKeyView instance variable.
* kwq/KWQNSTextField.mm:
(-[KWQNSTextField dealloc]): No need to nil out widget.
(-[KWQNSTextField nextKeyView]): Only do the computation when called from nextValidKeyView.
(-[KWQNSTextField previousKeyView]): Only do the computation when called from previousValidKeyView.
(-[KWQNSTextField nextValidKeyView]): Set boolean.
(-[KWQNSTextField previousValidKeyView]): Set boolean.
(-[KWQSecureTextField nextKeyView]): Only do the computation when called from nextValidKeyView.
(-[KWQSecureTextField previousKeyView]): Only do the computation when called from nextValidKeyView.
(-[KWQSecureTextField nextValidKeyView]): Set boolean.
(-[KWQSecureTextField previousValidKeyView]): Set boolean.
Unrelated change.
* kwq/mac-encodings.txt: Add an encoding name of gb18030, since I saw mention of it in bug 3002016.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1867 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index faaf602..c8c6533 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,5 +1,26 @@
2002-08-19 Darin Adler <darin at apple.com>
+ Put in more robust version of the next/previous key view checking
+ that matches what I did in WebHTMLView.
+
+ * kwq/KWQNSTextField.h: Add inNextValidKeyView instance variable.
+ * kwq/KWQNSTextField.mm:
+ (-[KWQNSTextField dealloc]): No need to nil out widget.
+ (-[KWQNSTextField nextKeyView]): Only do the computation when called from nextValidKeyView.
+ (-[KWQNSTextField previousKeyView]): Only do the computation when called from previousValidKeyView.
+ (-[KWQNSTextField nextValidKeyView]): Set boolean.
+ (-[KWQNSTextField previousValidKeyView]): Set boolean.
+ (-[KWQSecureTextField nextKeyView]): Only do the computation when called from nextValidKeyView.
+ (-[KWQSecureTextField previousKeyView]): Only do the computation when called from nextValidKeyView.
+ (-[KWQSecureTextField nextValidKeyView]): Set boolean.
+ (-[KWQSecureTextField previousValidKeyView]): Set boolean.
+
+ Unrelated change.
+
+ * kwq/mac-encodings.txt: Add an encoding name of gb18030, since I saw mention of it in bug 3002016.
+
+2002-08-19 Darin Adler <darin at apple.com>
+
Support so that WebKit can tab into a web view's fields.
* kwq/KWQKHTMLPartImpl.h: Made another nextKeyView() version public.
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index faaf602..c8c6533 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,26 @@
2002-08-19 Darin Adler <darin at apple.com>
+ Put in more robust version of the next/previous key view checking
+ that matches what I did in WebHTMLView.
+
+ * kwq/KWQNSTextField.h: Add inNextValidKeyView instance variable.
+ * kwq/KWQNSTextField.mm:
+ (-[KWQNSTextField dealloc]): No need to nil out widget.
+ (-[KWQNSTextField nextKeyView]): Only do the computation when called from nextValidKeyView.
+ (-[KWQNSTextField previousKeyView]): Only do the computation when called from previousValidKeyView.
+ (-[KWQNSTextField nextValidKeyView]): Set boolean.
+ (-[KWQNSTextField previousValidKeyView]): Set boolean.
+ (-[KWQSecureTextField nextKeyView]): Only do the computation when called from nextValidKeyView.
+ (-[KWQSecureTextField previousKeyView]): Only do the computation when called from nextValidKeyView.
+ (-[KWQSecureTextField nextValidKeyView]): Set boolean.
+ (-[KWQSecureTextField previousValidKeyView]): Set boolean.
+
+ Unrelated change.
+
+ * kwq/mac-encodings.txt: Add an encoding name of gb18030, since I saw mention of it in bug 3002016.
+
+2002-08-19 Darin Adler <darin at apple.com>
+
Support so that WebKit can tab into a web view's fields.
* kwq/KWQKHTMLPartImpl.h: Made another nextKeyView() version public.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index faaf602..c8c6533 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,26 @@
2002-08-19 Darin Adler <darin at apple.com>
+ Put in more robust version of the next/previous key view checking
+ that matches what I did in WebHTMLView.
+
+ * kwq/KWQNSTextField.h: Add inNextValidKeyView instance variable.
+ * kwq/KWQNSTextField.mm:
+ (-[KWQNSTextField dealloc]): No need to nil out widget.
+ (-[KWQNSTextField nextKeyView]): Only do the computation when called from nextValidKeyView.
+ (-[KWQNSTextField previousKeyView]): Only do the computation when called from previousValidKeyView.
+ (-[KWQNSTextField nextValidKeyView]): Set boolean.
+ (-[KWQNSTextField previousValidKeyView]): Set boolean.
+ (-[KWQSecureTextField nextKeyView]): Only do the computation when called from nextValidKeyView.
+ (-[KWQSecureTextField previousKeyView]): Only do the computation when called from nextValidKeyView.
+ (-[KWQSecureTextField nextValidKeyView]): Set boolean.
+ (-[KWQSecureTextField previousValidKeyView]): Set boolean.
+
+ Unrelated change.
+
+ * kwq/mac-encodings.txt: Add an encoding name of gb18030, since I saw mention of it in bug 3002016.
+
+2002-08-19 Darin Adler <darin at apple.com>
+
Support so that WebKit can tab into a web view's fields.
* kwq/KWQKHTMLPartImpl.h: Made another nextKeyView() version public.
diff --git a/WebCore/kwq/KWQNSTextField.h b/WebCore/kwq/KWQNSTextField.h
index 7ed5cfd..fb78e3c 100644
--- a/WebCore/kwq/KWQNSTextField.h
+++ b/WebCore/kwq/KWQNSTextField.h
@@ -37,6 +37,7 @@ class QLineEdit;
NSTextField *secureField;
KWQTextFieldFormatter *formatter;
BOOL edited;
+ BOOL inNextValidKeyView;
}
- initWithQLineEdit:(QLineEdit *)widget;
diff --git a/WebCore/kwq/KWQNSTextField.mm b/WebCore/kwq/KWQNSTextField.mm
index 19818cf..885c2dd 100644
--- a/WebCore/kwq/KWQNSTextField.mm
+++ b/WebCore/kwq/KWQNSTextField.mm
@@ -56,6 +56,7 @@
{
QWidget *widget;
BOOL inSetFrameSize;
+ BOOL inNextValidKeyView;
}
- initWithQWidget:(QWidget *)widget;
@@ -106,9 +107,6 @@
- (void)dealloc
{
- // Set widget to 0 so that nextKeyView and previousKeyView will return nil.
- widget = 0;
-
[secureField release];
[formatter release];
[super dealloc];
@@ -228,12 +226,32 @@
- (NSView *)nextKeyView
{
- return KWQKHTMLPartImpl::nextKeyView(widget, KWQSelectingNext);
+ return inNextValidKeyView
+ ? KWQKHTMLPartImpl::nextKeyView(widget, KWQSelectingNext)
+ : [super nextKeyView];
}
- (NSView *)previousKeyView
{
- return KWQKHTMLPartImpl::nextKeyView(widget, KWQSelectingPrevious);
+ return inNextValidKeyView
+ ? KWQKHTMLPartImpl::nextKeyView(widget, KWQSelectingPrevious)
+ : [super previousKeyView];
+}
+
+- (NSView *)nextValidKeyView
+{
+ inNextValidKeyView = YES;
+ NSView *view = [super nextValidKeyView];
+ inNextValidKeyView = NO;
+ return view;
+}
+
+- (NSView *)previousValidKeyView
+{
+ inNextValidKeyView = YES;
+ NSView *view = [super previousValidKeyView];
+ inNextValidKeyView = NO;
+ return view;
}
@end
@@ -329,22 +347,34 @@
return [super init];
}
-- (void)dealloc
+- (NSView *)nextKeyView
{
- // Set widget to 0 so that nextKeyView and previousKeyView will return nil.
- widget = 0;
-
- [super dealloc];
+ return inNextValidKeyView
+ ? KWQKHTMLPartImpl::nextKeyView(widget, KWQSelectingNext)
+ : [super nextKeyView];
}
-- (NSView *)nextKeyView
+- (NSView *)previousKeyView
{
- return KWQKHTMLPartImpl::nextKeyView(widget, KWQSelectingNext);
+ return inNextValidKeyView
+ ? KWQKHTMLPartImpl::nextKeyView(widget, KWQSelectingPrevious)
+ : [super previousKeyView];
}
-- (NSView *)previousKeyView
+- (NSView *)nextValidKeyView
+{
+ inNextValidKeyView = YES;
+ NSView *view = [super nextValidKeyView];
+ inNextValidKeyView = NO;
+ return view;
+}
+
+- (NSView *)previousValidKeyView
{
- return KWQKHTMLPartImpl::nextKeyView(widget, KWQSelectingPrevious);
+ inNextValidKeyView = YES;
+ NSView *view = [super previousValidKeyView];
+ inNextValidKeyView = NO;
+ return view;
}
// These next two methods are the workaround for bug 3024443.
diff --git a/WebCore/kwq/KWQTextField.h b/WebCore/kwq/KWQTextField.h
index 7ed5cfd..fb78e3c 100644
--- a/WebCore/kwq/KWQTextField.h
+++ b/WebCore/kwq/KWQTextField.h
@@ -37,6 +37,7 @@ class QLineEdit;
NSTextField *secureField;
KWQTextFieldFormatter *formatter;
BOOL edited;
+ BOOL inNextValidKeyView;
}
- initWithQLineEdit:(QLineEdit *)widget;
diff --git a/WebCore/kwq/KWQTextField.mm b/WebCore/kwq/KWQTextField.mm
index 19818cf..885c2dd 100644
--- a/WebCore/kwq/KWQTextField.mm
+++ b/WebCore/kwq/KWQTextField.mm
@@ -56,6 +56,7 @@
{
QWidget *widget;
BOOL inSetFrameSize;
+ BOOL inNextValidKeyView;
}
- initWithQWidget:(QWidget *)widget;
@@ -106,9 +107,6 @@
- (void)dealloc
{
- // Set widget to 0 so that nextKeyView and previousKeyView will return nil.
- widget = 0;
-
[secureField release];
[formatter release];
[super dealloc];
@@ -228,12 +226,32 @@
- (NSView *)nextKeyView
{
- return KWQKHTMLPartImpl::nextKeyView(widget, KWQSelectingNext);
+ return inNextValidKeyView
+ ? KWQKHTMLPartImpl::nextKeyView(widget, KWQSelectingNext)
+ : [super nextKeyView];
}
- (NSView *)previousKeyView
{
- return KWQKHTMLPartImpl::nextKeyView(widget, KWQSelectingPrevious);
+ return inNextValidKeyView
+ ? KWQKHTMLPartImpl::nextKeyView(widget, KWQSelectingPrevious)
+ : [super previousKeyView];
+}
+
+- (NSView *)nextValidKeyView
+{
+ inNextValidKeyView = YES;
+ NSView *view = [super nextValidKeyView];
+ inNextValidKeyView = NO;
+ return view;
+}
+
+- (NSView *)previousValidKeyView
+{
+ inNextValidKeyView = YES;
+ NSView *view = [super previousValidKeyView];
+ inNextValidKeyView = NO;
+ return view;
}
@end
@@ -329,22 +347,34 @@
return [super init];
}
-- (void)dealloc
+- (NSView *)nextKeyView
{
- // Set widget to 0 so that nextKeyView and previousKeyView will return nil.
- widget = 0;
-
- [super dealloc];
+ return inNextValidKeyView
+ ? KWQKHTMLPartImpl::nextKeyView(widget, KWQSelectingNext)
+ : [super nextKeyView];
}
-- (NSView *)nextKeyView
+- (NSView *)previousKeyView
{
- return KWQKHTMLPartImpl::nextKeyView(widget, KWQSelectingNext);
+ return inNextValidKeyView
+ ? KWQKHTMLPartImpl::nextKeyView(widget, KWQSelectingPrevious)
+ : [super previousKeyView];
}
-- (NSView *)previousKeyView
+- (NSView *)nextValidKeyView
+{
+ inNextValidKeyView = YES;
+ NSView *view = [super nextValidKeyView];
+ inNextValidKeyView = NO;
+ return view;
+}
+
+- (NSView *)previousValidKeyView
{
- return KWQKHTMLPartImpl::nextKeyView(widget, KWQSelectingPrevious);
+ inNextValidKeyView = YES;
+ NSView *view = [super previousValidKeyView];
+ inNextValidKeyView = NO;
+ return view;
}
// These next two methods are the workaround for bug 3024443.
diff --git a/WebCore/kwq/mac-encodings.txt b/WebCore/kwq/mac-encodings.txt
index f2815ef..4649408 100644
--- a/WebCore/kwq/mac-encodings.txt
+++ b/WebCore/kwq/mac-encodings.txt
@@ -10,7 +10,7 @@ NextStepLatin: x-nextstep
ASCII: us-ascii, iso-ir-6us
Unicode # utf-16be, unicodeFFFE, unicode? (would this help us?)
# Note the bogus entry to make UTF-16 mean UTF-8.
- # We do this because Internet Explorere does, and because web pages say UTF-16 and mean UTF-8.
+ # We do this because Internet Explorer does, and because web pages say UTF-16 and mean UTF-8.
# See bug 2969378 and http://zingermans.com/ for a concrete example.
# It's not clear what to do about 16-bit encodings in general.
UTF8: utf-8, unicode-1-1-utf-8, unicode-2-0-utf-8, x-unicode-2-0-utf-8, utf-16
@@ -118,7 +118,7 @@ JIS_C6226_78: JIS_C6226-1978
ShiftJIS_X0213_00
GB_2312_80: gb_2312-80, csGB231280, gb2312-80, gb231280
GBK_95: x-gbk
-GB_18030_2000
+GB_18030_2000: GB18030
KSC_5601_87: KS_C_5601-1987, ks_c_5601_1987, ks_c_5601, ksc5601
KSC_5601_92_Johab
CNS_11643_92_P1
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list