[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:09:11 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit f552cb6cecd43f4574b79daffb79bb1f9af5b19d
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Apr 23 22:43:45 2002 +0000
* khtml/css/css_valueimpl.cpp:
(CSSPrimitiveValueImpl::computeLengthFloat):
* khtml/css/cssstyleselector.cpp:
(CSSStyleSelector::computeFontSizes):
Remove our 72/96 dpi changes. They weren't doing much good.
But this doesn't fix all the 72/96 dpi issues. It's just the start.
* kwq/khtml/khtml_settings.h:
* kwq/KWQKHTMLSettings.mm:
Remove some unused stuff: charset(), setCharset(), availableFamilies(),
fontSizes(), SCREEN_RESOLUTION.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1068 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 14076a6..24b3fef 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,17 @@
+2002-04-23 Darin Adler <darin at apple.com>
+
+ * khtml/css/css_valueimpl.cpp:
+ (CSSPrimitiveValueImpl::computeLengthFloat):
+ * khtml/css/cssstyleselector.cpp:
+ (CSSStyleSelector::computeFontSizes):
+ Remove our 72/96 dpi changes. They weren't doing much good.
+ But this doesn't fix all the 72/96 dpi issues. It's just the start.
+
+ * kwq/khtml/khtml_settings.h:
+ * kwq/KWQKHTMLSettings.mm:
+ Remove some unused stuff: charset(), setCharset(), availableFamilies(),
+ fontSizes(), SCREEN_RESOLUTION.
+
2002-04-23 Kenneth Kocienda <kocienda at apple.com>
Reviewed by: Darin Adler
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 14076a6..24b3fef 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,17 @@
+2002-04-23 Darin Adler <darin at apple.com>
+
+ * khtml/css/css_valueimpl.cpp:
+ (CSSPrimitiveValueImpl::computeLengthFloat):
+ * khtml/css/cssstyleselector.cpp:
+ (CSSStyleSelector::computeFontSizes):
+ Remove our 72/96 dpi changes. They weren't doing much good.
+ But this doesn't fix all the 72/96 dpi issues. It's just the start.
+
+ * kwq/khtml/khtml_settings.h:
+ * kwq/KWQKHTMLSettings.mm:
+ Remove some unused stuff: charset(), setCharset(), availableFamilies(),
+ fontSizes(), SCREEN_RESOLUTION.
+
2002-04-23 Kenneth Kocienda <kocienda at apple.com>
Reviewed by: Darin Adler
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 14076a6..24b3fef 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,17 @@
+2002-04-23 Darin Adler <darin at apple.com>
+
+ * khtml/css/css_valueimpl.cpp:
+ (CSSPrimitiveValueImpl::computeLengthFloat):
+ * khtml/css/cssstyleselector.cpp:
+ (CSSStyleSelector::computeFontSizes):
+ Remove our 72/96 dpi changes. They weren't doing much good.
+ But this doesn't fix all the 72/96 dpi issues. It's just the start.
+
+ * kwq/khtml/khtml_settings.h:
+ * kwq/KWQKHTMLSettings.mm:
+ Remove some unused stuff: charset(), setCharset(), availableFamilies(),
+ fontSizes(), SCREEN_RESOLUTION.
+
2002-04-23 Kenneth Kocienda <kocienda at apple.com>
Reviewed by: Darin Adler
diff --git a/WebCore/khtml/css/css_valueimpl.cpp b/WebCore/khtml/css/css_valueimpl.cpp
index 8bdbd69..0056cde 100644
--- a/WebCore/khtml/css/css_valueimpl.cpp
+++ b/WebCore/khtml/css/css_valueimpl.cpp
@@ -394,14 +394,8 @@ float CSSPrimitiveValueImpl::computeLengthFloat( khtml::RenderStyle *style, QPai
float dpiY = 72.; // fallback
if ( devMetrics )
dpiY = devMetrics->logicalDpiY();
-#ifdef APPLE_CHANGES
- // FIXME: SCREEN_RESOLUTION hack good enough to keep?
- if ( !khtml::printpainter && dpiY < SCREEN_RESOLUTION )
- dpiY = SCREEN_RESOLUTION;
-#else /* APPLE_CHANGES not defined */
if ( !khtml::printpainter && dpiY < 96 )
dpiY = 96.;
-#endif /* APPLE_CHANGES not defined */
float factor = 1.;
switch(type)
diff --git a/WebCore/khtml/css/cssstyleselector.cpp b/WebCore/khtml/css/cssstyleselector.cpp
index b877322..577c34e 100644
--- a/WebCore/khtml/css/cssstyleselector.cpp
+++ b/WebCore/khtml/css/cssstyleselector.cpp
@@ -226,11 +226,7 @@ void CSSStyleSelector::computeFontSizes(QPaintDeviceMetrics* paintDeviceMetrics,
{
// ### get rid of float / double
float toPix = paintDeviceMetrics->logicalDpiY()/72.;
-#ifdef APPLE_CHANGES
- if (toPix < SCREEN_RESOLUTION/72) toPix = SCREEN_RESOLUTION/72;
-#else
if (toPix < 96./72.) toPix = 96./72.;
-#endif
m_fontSizes.clear();
const float factor = 1.2;
diff --git a/WebCore/kwq/KWQKHTMLSettings.h b/WebCore/kwq/KWQKHTMLSettings.h
index b1430bf..81a6ad4 100644
--- a/WebCore/kwq/KWQKHTMLSettings.h
+++ b/WebCore/kwq/KWQKHTMLSettings.h
@@ -26,22 +26,15 @@
#ifndef KHTML_SETTINGS_H_
#define KHTML_SETTINGS_H_
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <qstring.h>
#include <qstringlist.h>
#include <qfont.h>
#include <qmap.h>
-// FIXME: I am resetting the default screen resolution to 72
-#define SCREEN_RESOLUTION 72.0f
-
class KHTMLSettings
{
public:
- KHTMLSettings::KHTMLSettings();
+ KHTMLSettings();
// Font settings
QString stdFontName() const;
@@ -53,28 +46,20 @@ public:
QString settingsToCSS() const;
- QFont::CharSet charset() const;
- void setCharset( QFont::CharSet c );
-
const QString &encoding() const;
int minFontSize() const;
int mediumFontSize() const;
- static QString availableFamilies();
QFont::CharSet script() const;
void setScript( QFont::CharSet c );
- const QValueList<int> &fontSizes() const;
-
bool changeCursor() const;
bool isFormCompletionEnabled() const;
int maxFormCompletionItems() const;
private:
- 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 06af5aa..3ef2d3b 100644
--- a/WebCore/kwq/KWQKHTMLSettings.mm
+++ b/WebCore/kwq/KWQKHTMLSettings.mm
@@ -25,9 +25,6 @@
#include <kwqdebug.h>
#include <khtml_settings.h>
-// FIXME: remove this hack
-static const QString *DEFAULT_ENCODING = NULL;
-
KHTMLSettings::KHTMLSettings()
{
m_charSet = QFont::Latin1;
@@ -75,102 +72,51 @@ QString KHTMLSettings::settingsToCSS() const
return QString();
}
-QFont::CharSet KHTMLSettings::charset() const
-{
- return m_charSet;
-}
-
-
-void KHTMLSettings::setCharset( QFont::CharSet c )
-{
- m_charSet = c;
-}
-
-
const QString &KHTMLSettings::encoding() const
{
- _logNotYetImplemented();
// FIXME: remove this hack
+ static const QString *DEFAULT_ENCODING = NULL;
+ _logNotYetImplemented();
if (DEFAULT_ENCODING == NULL) {
DEFAULT_ENCODING = new QString(NSSTRING_TO_QSTRING(@"NSISOLatin1StringEncoding"));
}
return *DEFAULT_ENCODING;
}
-
int KHTMLSettings::minFontSize() const
{
return [[NSUserDefaults standardUserDefaults] integerForKey:@"WebKitMinimumFontSize"];
}
-
int KHTMLSettings::mediumFontSize() const
{
return [[NSUserDefaults standardUserDefaults] integerForKey:@"WebKitMediumFontSize"];
}
-
-static QString *_availableFamiles = 0;
-QString KHTMLSettings::availableFamilies()
-{
- if (_availableFamiles == 0)
- _availableFamiles = new QString(NSSTRING_TO_QSTRING([[[NSFontManager sharedFontManager]
- availableFontFamilies] componentsJoinedByString:@","]));
- return *_availableFamiles;
-}
-
-
QFont::CharSet KHTMLSettings::script() const
{
return m_charSet;
}
-
void KHTMLSettings::setScript(QFont::CharSet c)
{
m_charSet = c;
}
-
-const QValueList<int> &KHTMLSettings::fontSizes() const
-{
- 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;
-}
-
-
bool KHTMLSettings::changeCursor() const
{
_logNotYetImplemented();
return FALSE;
}
-
bool KHTMLSettings::isFormCompletionEnabled() const
{
_logNotYetImplemented();
return FALSE;
}
-
int KHTMLSettings::maxFormCompletionItems() const
{
_logNotYetImplemented();
return 0;
-
}
-
-
-
-
diff --git a/WebCore/kwq/khtml/khtml_settings.h b/WebCore/kwq/khtml/khtml_settings.h
index b1430bf..81a6ad4 100644
--- a/WebCore/kwq/khtml/khtml_settings.h
+++ b/WebCore/kwq/khtml/khtml_settings.h
@@ -26,22 +26,15 @@
#ifndef KHTML_SETTINGS_H_
#define KHTML_SETTINGS_H_
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <qstring.h>
#include <qstringlist.h>
#include <qfont.h>
#include <qmap.h>
-// FIXME: I am resetting the default screen resolution to 72
-#define SCREEN_RESOLUTION 72.0f
-
class KHTMLSettings
{
public:
- KHTMLSettings::KHTMLSettings();
+ KHTMLSettings();
// Font settings
QString stdFontName() const;
@@ -53,28 +46,20 @@ public:
QString settingsToCSS() const;
- QFont::CharSet charset() const;
- void setCharset( QFont::CharSet c );
-
const QString &encoding() const;
int minFontSize() const;
int mediumFontSize() const;
- static QString availableFamilies();
QFont::CharSet script() const;
void setScript( QFont::CharSet c );
- const QValueList<int> &fontSizes() const;
-
bool changeCursor() const;
bool isFormCompletionEnabled() const;
int maxFormCompletionItems() const;
private:
- mutable QValueList<int> m_fontSizes;
- QString m_fontFamilies;
QFont::CharSet m_charSet;
};
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list