[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:25:19 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 19dd59704b6b7c46a8a0bf1f98822363938d8199
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Feb 20 17:11:28 2003 +0000
Reviewed by Trey.
- fixed 3177310 -- REGRESSION: "serif" mapped to "fixed"
Fixed a typo where the serif method was returning the fixed font name.
Also made this class use inlining for almost everything -- yields a miniscule
improvement in code size and speed, and increases brevity.
* kwq/KWQKHTMLSettings.h: Moved almost everything here.
* kwq/KWQKHTMLSettings.mm: Moved almost everything out of here.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3678 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index b0a3b74..b40e953 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,16 @@
+2003-02-20 Darin Adler <darin at apple.com>
+
+ Reviewed by Trey.
+
+ - fixed 3177310 -- REGRESSION: "serif" mapped to "fixed"
+
+ Fixed a typo where the serif method was returning the fixed font name.
+ Also made this class use inlining for almost everything -- yields a miniscule
+ improvement in code size and speed, and increases brevity.
+
+ * kwq/KWQKHTMLSettings.h: Moved almost everything here.
+ * kwq/KWQKHTMLSettings.mm: Moved almost everything out of here.
+
2003-02-19 David Hyatt <hyatt at apple.com>
Update layers to not fix their positions during setLayouted.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index b0a3b74..b40e953 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,16 @@
+2003-02-20 Darin Adler <darin at apple.com>
+
+ Reviewed by Trey.
+
+ - fixed 3177310 -- REGRESSION: "serif" mapped to "fixed"
+
+ Fixed a typo where the serif method was returning the fixed font name.
+ Also made this class use inlining for almost everything -- yields a miniscule
+ improvement in code size and speed, and increases brevity.
+
+ * kwq/KWQKHTMLSettings.h: Moved almost everything here.
+ * kwq/KWQKHTMLSettings.mm: Moved almost everything out of here.
+
2003-02-19 David Hyatt <hyatt at apple.com>
Update layers to not fix their positions during setLayouted.
diff --git a/WebCore/kwq/KWQKHTMLSettings.h b/WebCore/kwq/KWQKHTMLSettings.h
index c6c837c..176e3eb 100644
--- a/WebCore/kwq/KWQKHTMLSettings.h
+++ b/WebCore/kwq/KWQKHTMLSettings.h
@@ -43,58 +43,58 @@ public:
KHTMLSettings() {};
// Font settings
- const QString &stdFontName() const;
- const QString &fixedFontName() const;
- const QString &serifFontName() const;
- const QString &sansSerifFontName() const;
- const QString &cursiveFontName() const;
- const QString &fantasyFontName() const;
+ const QString &stdFontName() const { return _stdFontName; }
+ const QString &fixedFontName() const { return _fixedFontName; }
+ const QString &serifFontName() const { return _serifFontName; }
+ const QString &sansSerifFontName() const { return _sansSerifFontName; }
+ const QString &cursiveFontName() const { return _cursiveFontName; }
+ const QString &fantasyFontName() const { return _fantasyFontName; }
static const QString &settingsToCSS() { return QString::null; }
static const QString &encoding();
- int minFontSize() const;
- int mediumFontSize() const;
- int mediumFixedFontSize() const;
+ int minFontSize() const { return _minimumFontSize; }
+ int mediumFontSize() const { return _defaultFontSize; }
+ int mediumFixedFontSize() const { return _defaultFixedFontSize; }
static bool changeCursor() { return true; }
static bool isFormCompletionEnabled() { return false; }
static int maxFormCompletionItems() { return 0; }
- bool autoLoadImages() const;
+ bool autoLoadImages() const { return _willLoadImagesAutomatically; }
static KAnimationAdvice showAnimations() { return KAnimationEnabled; }
- bool isJavaScriptEnabled() const;
- bool JavaScriptCanOpenWindowsAutomatically() const;
- bool isJavaScriptEnabled(const QString &host) const { return isJavaScriptEnabled(); }
+ bool isJavaScriptEnabled() const { return _JavaScriptEnabled; }
+ bool JavaScriptCanOpenWindowsAutomatically() const { return _JavaScriptCanOpenWindowsAutomatically; }
+ bool isJavaScriptEnabled(const QString &host) const { return _JavaScriptEnabled; }
bool isJavaScriptDebugEnabled() const { return false; }
- bool isJavaEnabled() const;
- bool isJavaEnabled(const QString &host) const { return isJavaEnabled(); }
- bool isPluginsEnabled() const;
- bool isPluginsEnabled(const QString &host) const { return isPluginsEnabled(); }
+ bool isJavaEnabled() const { return _JavaEnabled; }
+ bool isJavaEnabled(const QString &host) const { return _JavaEnabled; }
+ bool isPluginsEnabled() const { return _pluginsEnabled; }
+ bool isPluginsEnabled(const QString &host) const { return _pluginsEnabled; }
- const QString &userStyleSheet();
+ const QString &userStyleSheet() { return _userStyleSheetLocation; }
- void setStdFontName(const QString &);
- void setFixedFontName(const QString &);
- void setSerifFontName(const QString &);
- void setSansSerifFontName(const QString &);
- void setCursiveFontName(const QString &);
- void setFantasyFontName(const QString &);
+ void setStdFontName(const QString &s) { _stdFontName = s; }
+ void setFixedFontName(const QString &s) { _fixedFontName = s; }
+ void setSerifFontName(const QString &s) { _serifFontName = s; }
+ void setSansSerifFontName(const QString &s) { _sansSerifFontName = s; }
+ void setCursiveFontName(const QString &s) { _cursiveFontName = s; }
+ void setFantasyFontName(const QString &s) { _fantasyFontName = s; }
- void setMinFontSize(int);
- void setMediumFontSize(int);
- void setMediumFixedFontSize(int);
+ void setMinFontSize(int s) { _minimumFontSize = s; }
+ void setMediumFontSize(int s) { _defaultFontSize = s; }
+ void setMediumFixedFontSize(int s) { _defaultFixedFontSize = s; }
- void setAutoLoadImages(bool);
- void setIsJavaScriptEnabled(bool);
- void setIsJavaEnabled(bool);
- void setArePluginsEnabled(bool);
- void setJavaScriptCanOpenWindowsAutomatically(bool);
+ void setAutoLoadImages(bool f) { _willLoadImagesAutomatically = f; }
+ void setIsJavaScriptEnabled(bool f) { _JavaScriptEnabled = f; }
+ void setIsJavaEnabled(bool f) { _JavaEnabled = f; }
+ void setArePluginsEnabled(bool f) { _pluginsEnabled = f; }
+ void setJavaScriptCanOpenWindowsAutomatically(bool f) { _JavaScriptCanOpenWindowsAutomatically = f; }
- void setUserStyleSheet(const QString &);
+ void setUserStyleSheet(const QString &s) { _userStyleSheetLocation = s; }
private:
QString _stdFontName;
diff --git a/WebCore/kwq/KWQKHTMLSettings.mm b/WebCore/kwq/KWQKHTMLSettings.mm
index 9b5bf81..c609c9e 100644
--- a/WebCore/kwq/KWQKHTMLSettings.mm
+++ b/WebCore/kwq/KWQKHTMLSettings.mm
@@ -25,158 +25,8 @@
#import "KWQKHTMLSettings.h"
-const QString &KHTMLSettings::stdFontName() const
-{
- return _stdFontName;
-}
-
-const QString &KHTMLSettings::fixedFontName() const
-{
- return _fixedFontName;
-}
-
-const QString &KHTMLSettings::serifFontName() const
-{
- return _fixedFontName;
-}
-
-const QString &KHTMLSettings::sansSerifFontName() const
-{
- return _sansSerifFontName;
-}
-
-const QString &KHTMLSettings::cursiveFontName() const
-{
- return _cursiveFontName;
-}
-
-const QString &KHTMLSettings::fantasyFontName() const
-{
- return _fantasyFontName;
-}
-
const QString &KHTMLSettings::encoding()
{
static QString latin1("latin1");
return latin1;
}
-
-int KHTMLSettings::minFontSize() const
-{
- return _minimumFontSize;
-}
-
-int KHTMLSettings::mediumFontSize() const
-{
- return _defaultFontSize;
-}
-
-int KHTMLSettings::mediumFixedFontSize() const
-{
- return _defaultFixedFontSize;
-}
-
-bool KHTMLSettings::isJavaEnabled() const
-{
- return _JavaEnabled;
-}
-
-bool KHTMLSettings::autoLoadImages() const
-{
- return _willLoadImagesAutomatically;
-}
-
-bool KHTMLSettings::isPluginsEnabled() const
-{
- return _pluginsEnabled;
-}
-
-bool KHTMLSettings::isJavaScriptEnabled() const
-{
- return _JavaScriptEnabled;
-}
-
-bool KHTMLSettings::JavaScriptCanOpenWindowsAutomatically() const
-{
- return _JavaScriptCanOpenWindowsAutomatically;
-}
-
-const QString &KHTMLSettings::userStyleSheet()
-{
- return _userStyleSheetLocation;
-}
-
-void KHTMLSettings::setStdFontName(const QString &n)
-{
- _stdFontName = n;
-}
-
-void KHTMLSettings::setFixedFontName(const QString &n)
-{
- _fixedFontName = n;
-}
-
-void KHTMLSettings::setSerifFontName(const QString &n)
-{
- _serifFontName = n;
-}
-
-void KHTMLSettings::setSansSerifFontName(const QString &n)
-{
- _sansSerifFontName = n;
-}
-
-void KHTMLSettings::setCursiveFontName(const QString &n)
-{
- _cursiveFontName = n;
-}
-
-void KHTMLSettings::setFantasyFontName(const QString &n)
-{
- _fantasyFontName = n;
-}
-
-void KHTMLSettings::setMinFontSize(int i)
-{
- _minimumFontSize = i;
-}
-
-void KHTMLSettings::setMediumFontSize(int i)
-{
- _defaultFontSize = i;
-}
-
-void KHTMLSettings::setMediumFixedFontSize(int i)
-{
- _defaultFixedFontSize = i;
-}
-
-void KHTMLSettings::setAutoLoadImages(bool b)
-{
- _willLoadImagesAutomatically = b;
-}
-
-void KHTMLSettings::setIsJavaScriptEnabled(bool b)
-{
- _JavaScriptEnabled = b;
-}
-
-void KHTMLSettings::setIsJavaEnabled(bool b)
-{
- _JavaEnabled = b;
-}
-
-void KHTMLSettings::setArePluginsEnabled(bool b)
-{
- _pluginsEnabled = b;
-}
-
-void KHTMLSettings::setJavaScriptCanOpenWindowsAutomatically(bool b)
-{
- _JavaScriptCanOpenWindowsAutomatically = b;
-}
-
-void KHTMLSettings::setUserStyleSheet(const QString &n)
-{
- _userStyleSheetLocation = n;
-}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list