[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
sullivan
sullivan at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 05:58:21 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 8ce110d0d2f9246f937135cac593d49b8bbd0975
Author: sullivan <sullivan at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Mar 22 19:59:50 2002 +0000
* WebView.subproj/IFWebView.mm: (-[IFWebView reapplyStyles]):
Removed stale FIXME.
Made changing font sizes work immediately (other than an
unrelated crash).
* src/kwq/KWQKHTMLSettings.mm:
(KHTMLSettings::KHTMLSettings),
(KHTMLSettings::fontSizes): Moved defaults-fetching code from
constructor to accessor, so it doesn't get out of synch with
preference changes.
* src/kwq/khtml/khtml_settings.h: Added "mutable" keyword
to declaration of m_fontSizes, so the other change would compile.
* BrowserDocument.m: (-[BrowserDocument reapplyStyles:]):
Added call to -[IFWebView setNeedsLayout:YES]. This causes
a sporadic but frequent crashing bug when changing fonts
and styles from the Preferences. I'm going to hand lucky
Richard a bug on that.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@806 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 39ed912..96f95be 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,17 @@
+2002-03-22 John Sullivan <sullivan at apple.com>
+
+ Made changing font sizes work immediately (other than an
+ unrelated crash).
+
+ * src/kwq/KWQKHTMLSettings.mm:
+ (KHTMLSettings::KHTMLSettings),
+ (KHTMLSettings::fontSizes): Moved defaults-fetching code from
+ constructor to accessor, so it doesn't get out of synch with
+ preference changes.
+
+ * src/kwq/khtml/khtml_settings.h: Added "mutable" keyword
+ to declaration of m_fontSizes, so the other change would compile.
+
2002-03-22 Kenneth Kocienda <kocienda at apple.com>
Moved KWQKloader to the new thread-safe API for accessing handle attributes.
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 39ed912..96f95be 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,17 @@
+2002-03-22 John Sullivan <sullivan at apple.com>
+
+ Made changing font sizes work immediately (other than an
+ unrelated crash).
+
+ * src/kwq/KWQKHTMLSettings.mm:
+ (KHTMLSettings::KHTMLSettings),
+ (KHTMLSettings::fontSizes): Moved defaults-fetching code from
+ constructor to accessor, so it doesn't get out of synch with
+ preference changes.
+
+ * src/kwq/khtml/khtml_settings.h: Added "mutable" keyword
+ to declaration of m_fontSizes, so the other change would compile.
+
2002-03-22 Kenneth Kocienda <kocienda at apple.com>
Moved KWQKloader to the new thread-safe API for accessing handle attributes.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 39ed912..96f95be 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,17 @@
+2002-03-22 John Sullivan <sullivan at apple.com>
+
+ Made changing font sizes work immediately (other than an
+ unrelated crash).
+
+ * src/kwq/KWQKHTMLSettings.mm:
+ (KHTMLSettings::KHTMLSettings),
+ (KHTMLSettings::fontSizes): Moved defaults-fetching code from
+ constructor to accessor, so it doesn't get out of synch with
+ preference changes.
+
+ * src/kwq/khtml/khtml_settings.h: Added "mutable" keyword
+ to declaration of m_fontSizes, so the other change would compile.
+
2002-03-22 Kenneth Kocienda <kocienda at apple.com>
Moved KWQKloader to the new thread-safe API for accessing handle attributes.
diff --git a/WebCore/kwq/KWQKHTMLSettings.h b/WebCore/kwq/KWQKHTMLSettings.h
index 2b95732..e38a363 100644
--- a/WebCore/kwq/KWQKHTMLSettings.h
+++ b/WebCore/kwq/KWQKHTMLSettings.h
@@ -72,7 +72,7 @@ public:
int maxFormCompletionItems() const;
private:
- QValueList<int> m_fontSizes;
+ mutable QValueList<int> m_fontSizes;
QString m_fontFamilies;
QFont::CharSet m_charSet;
};
diff --git a/WebCore/kwq/KWQKHTMLSettings.mm b/WebCore/kwq/KWQKHTMLSettings.mm
index e3244d2..29f8b71 100644
--- a/WebCore/kwq/KWQKHTMLSettings.mm
+++ b/WebCore/kwq/KWQKHTMLSettings.mm
@@ -30,16 +30,6 @@ static const QString *DEFAULT_ENCODING = NULL;
KHTMLSettings::KHTMLSettings()
{
- // set available font families...ask the system
- unsigned int i;
- NSArray *fontSizeArray;
-
- m_fontSizes.clear();
- fontSizeArray = [[NSUserDefaults standardUserDefaults] arrayForKey:@"WebKitFontSizes"];
- for(i=0; i<[fontSizeArray count]; i++){
- m_fontSizes << [[fontSizeArray objectAtIndex:i] intValue];
- }
-
m_charSet = QFont::Latin1;
}
@@ -135,7 +125,18 @@ void KHTMLSettings::setScript(QFont::CharSet c)
const QValueList<int> &KHTMLSettings::fontSizes() const
{
- //may want to re-fetch font sizes from defaults here
+ unsigned int i;
+ NSArray *fontSizeArray;
+
+ // fetch sizes from defaults, since they might have changed. This may turn out to
+ // be a performance problem, in which case we'll need to add API for refetching
+ // the sizes, which would be called when we reapply styles.
+ m_fontSizes.clear();
+ fontSizeArray = [[NSUserDefaults standardUserDefaults] arrayForKey:@"WebKitFontSizes"];
+ for(i=0; i<[fontSizeArray count]; i++){
+ m_fontSizes << [[fontSizeArray objectAtIndex:i] intValue];
+ }
+
return m_fontSizes;
}
diff --git a/WebCore/kwq/khtml/khtml_settings.h b/WebCore/kwq/khtml/khtml_settings.h
index 2b95732..e38a363 100644
--- a/WebCore/kwq/khtml/khtml_settings.h
+++ b/WebCore/kwq/khtml/khtml_settings.h
@@ -72,7 +72,7 @@ public:
int maxFormCompletionItems() const;
private:
- QValueList<int> m_fontSizes;
+ mutable QValueList<int> m_fontSizes;
QString m_fontFamilies;
QFont::CharSet m_charSet;
};
diff --git a/WebCore/src/kwq/KWQKHTMLSettings.mm b/WebCore/src/kwq/KWQKHTMLSettings.mm
index e3244d2..29f8b71 100644
--- a/WebCore/src/kwq/KWQKHTMLSettings.mm
+++ b/WebCore/src/kwq/KWQKHTMLSettings.mm
@@ -30,16 +30,6 @@ static const QString *DEFAULT_ENCODING = NULL;
KHTMLSettings::KHTMLSettings()
{
- // set available font families...ask the system
- unsigned int i;
- NSArray *fontSizeArray;
-
- m_fontSizes.clear();
- fontSizeArray = [[NSUserDefaults standardUserDefaults] arrayForKey:@"WebKitFontSizes"];
- for(i=0; i<[fontSizeArray count]; i++){
- m_fontSizes << [[fontSizeArray objectAtIndex:i] intValue];
- }
-
m_charSet = QFont::Latin1;
}
@@ -135,7 +125,18 @@ void KHTMLSettings::setScript(QFont::CharSet c)
const QValueList<int> &KHTMLSettings::fontSizes() const
{
- //may want to re-fetch font sizes from defaults here
+ unsigned int i;
+ NSArray *fontSizeArray;
+
+ // fetch sizes from defaults, since they might have changed. This may turn out to
+ // be a performance problem, in which case we'll need to add API for refetching
+ // the sizes, which would be called when we reapply styles.
+ m_fontSizes.clear();
+ fontSizeArray = [[NSUserDefaults standardUserDefaults] arrayForKey:@"WebKitFontSizes"];
+ for(i=0; i<[fontSizeArray count]; i++){
+ m_fontSizes << [[fontSizeArray objectAtIndex:i] intValue];
+ }
+
return m_fontSizes;
}
diff --git a/WebCore/src/kwq/khtml/khtml_settings.h b/WebCore/src/kwq/khtml/khtml_settings.h
index 2b95732..e38a363 100644
--- a/WebCore/src/kwq/khtml/khtml_settings.h
+++ b/WebCore/src/kwq/khtml/khtml_settings.h
@@ -72,7 +72,7 @@ public:
int maxFormCompletionItems() const;
private:
- QValueList<int> m_fontSizes;
+ mutable QValueList<int> m_fontSizes;
QString m_fontFamilies;
QFont::CharSet m_charSet;
};
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 974e203..a1f2ac9 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,8 @@
+2002-03-22 John Sullivan <sullivan at apple.com>
+
+ * WebView.subproj/IFWebView.mm: (-[IFWebView reapplyStyles]):
+ Removed stale FIXME.
+
2002-03-22 Richard Williamson <rjw at apple.com>
Fixed reapplyStyles to use new KDE3 recalcStyle function.
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 974e203..a1f2ac9 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,8 @@
+2002-03-22 John Sullivan <sullivan at apple.com>
+
+ * WebView.subproj/IFWebView.mm: (-[IFWebView reapplyStyles]):
+ Removed stale FIXME.
+
2002-03-22 Richard Williamson <rjw at apple.com>
Fixed reapplyStyles to use new KDE3 recalcStyle function.
diff --git a/WebKit/WebView.subproj/IFWebView.mm b/WebKit/WebView.subproj/IFWebView.mm
index 9afc40d..82722c0 100644
--- a/WebKit/WebView.subproj/IFWebView.mm
+++ b/WebKit/WebView.subproj/IFWebView.mm
@@ -133,15 +133,7 @@
if (((IFWebViewPrivate *)_viewPrivate)->needsToApplyStyles){
WEBKITDEBUGLEVEL (WEBKIT_LOG_VIEW, "doing layout\n");
//double start = CFAbsoluteTimeGetCurrent();
-
-
-// FIXME: This is commented out because it fails to compile with KDE3 merge.
-// We need to replace it with whatever the new equivalent is.
-
widget->part()->xmlDocImpl()->recalcStyle(DOM::NodeImpl::Force);
-
-
-
//WebKitDebugAtLevel (WEBKIT_LOG_TIMING, "apply style time %e\n", CFAbsoluteTimeGetCurrent() - start);
((IFWebViewPrivate *)_viewPrivate)->needsToApplyStyles = NO;
}
diff --git a/WebKit/WebView.subproj/WebFrameView.m b/WebKit/WebView.subproj/WebFrameView.m
index 9afc40d..82722c0 100644
--- a/WebKit/WebView.subproj/WebFrameView.m
+++ b/WebKit/WebView.subproj/WebFrameView.m
@@ -133,15 +133,7 @@
if (((IFWebViewPrivate *)_viewPrivate)->needsToApplyStyles){
WEBKITDEBUGLEVEL (WEBKIT_LOG_VIEW, "doing layout\n");
//double start = CFAbsoluteTimeGetCurrent();
-
-
-// FIXME: This is commented out because it fails to compile with KDE3 merge.
-// We need to replace it with whatever the new equivalent is.
-
widget->part()->xmlDocImpl()->recalcStyle(DOM::NodeImpl::Force);
-
-
-
//WebKitDebugAtLevel (WEBKIT_LOG_TIMING, "apply style time %e\n", CFAbsoluteTimeGetCurrent() - start);
((IFWebViewPrivate *)_viewPrivate)->needsToApplyStyles = NO;
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list