[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:36:02 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit bbe89dd8107b2bc43426d85d6c2edd2ea1b01c2d
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Sep 4 15:04:50 2002 +0000
* WebCore.pbproj/project.pbxproj:
* kwq/KWQObject.mm:
* kwq/KWQPainter.mm:
* kwq/KWQTimer.mm:
* kwq/WebCoreCookieAdapter.h:
* kwq/WebCoreImageRenderer.h:
* kwq/WebCoreImageRendererFactory.h:
Tweaks, no substantive changes.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1956 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 599c1c5..ed2ce7e 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,14 @@
+2002-09-04 Darin Adler <darin at apple.com>
+
+ * WebCore.pbproj/project.pbxproj:
+ * kwq/KWQObject.mm:
+ * kwq/KWQPainter.mm:
+ * kwq/KWQTimer.mm:
+ * kwq/WebCoreCookieAdapter.h:
+ * kwq/WebCoreImageRenderer.h:
+ * kwq/WebCoreImageRendererFactory.h:
+ Tweaks, no substantive changes.
+
2002-09-02 David Hyatt <hyatt at apple.com>
Tweak the damage rect testing to account for the fact that a child
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 599c1c5..ed2ce7e 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,14 @@
+2002-09-04 Darin Adler <darin at apple.com>
+
+ * WebCore.pbproj/project.pbxproj:
+ * kwq/KWQObject.mm:
+ * kwq/KWQPainter.mm:
+ * kwq/KWQTimer.mm:
+ * kwq/WebCoreCookieAdapter.h:
+ * kwq/WebCoreImageRenderer.h:
+ * kwq/WebCoreImageRendererFactory.h:
+ Tweaks, no substantive changes.
+
2002-09-02 David Hyatt <hyatt at apple.com>
Tweak the damage rect testing to account for the fact that a child
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 599c1c5..ed2ce7e 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,14 @@
+2002-09-04 Darin Adler <darin at apple.com>
+
+ * WebCore.pbproj/project.pbxproj:
+ * kwq/KWQObject.mm:
+ * kwq/KWQPainter.mm:
+ * kwq/KWQTimer.mm:
+ * kwq/WebCoreCookieAdapter.h:
+ * kwq/WebCoreImageRenderer.h:
+ * kwq/WebCoreImageRendererFactory.h:
+ Tweaks, no substantive changes.
+
2002-09-02 David Hyatt <hyatt at apple.com>
Tweak the damage rect testing to account for the fact that a child
diff --git a/WebCore/WebCore.pbproj/project.pbxproj b/WebCore/WebCore.pbproj/project.pbxproj
index 9984f99..1205f3e 100644
--- a/WebCore/WebCore.pbproj/project.pbxproj
+++ b/WebCore/WebCore.pbproj/project.pbxproj
@@ -72,6 +72,7 @@
F58C8A07025BD3BC018635CA,
F531DDEC02F0C34D018635CA,
);
+ hasScannedForEncodings = 1;
isa = PBXProject;
knownRegions = (
English,
@@ -5781,6 +5782,8 @@
F56234DF03026D7301629B47,
F56234E003026D7301629B47,
F587854C02DE375901EA4122,
+ F5517DC2031AB56301A80180,
+ F5517DC3031AB56301A80180,
F587854D02DE375901EA4122,
F587854E02DE375901EA4122,
F587854F02DE375901EA4122,
@@ -5798,8 +5801,6 @@
F587855502DE375901EA4122,
F58EF58E02DFDFB7018635CA,
F58EF58D02DFDFB7018635CA,
- F5517DC2031AB56301A80180,
- F5517DC3031AB56301A80180,
);
isa = PBXGroup;
name = "WebCore SPI";
diff --git a/WebCore/kwq/KWQObject.mm b/WebCore/kwq/KWQObject.mm
index 876332d..7c772f5 100644
--- a/WebCore/kwq/KWQObject.mm
+++ b/WebCore/kwq/KWQObject.mm
@@ -125,14 +125,14 @@ void QObject::timerEvent(QTimerEvent *te)
{
}
-int QObject:: startTimer(int milliseconds)
+int QObject::startTimer(int milliseconds)
{
static int timerCount = 1;
NSNumber *timerId = [NSNumber numberWithInt: timerCount];
- if (timers == nil){
- // The timers dictionary itself leaks, but the contents are removed
+ if (timers == nil) {
+ // The global timers dictionary itself leaks, but the contents are removed
// when a timer expires or is killed.
timers = [[NSMutableDictionary alloc] init];
}
diff --git a/WebCore/kwq/KWQPainter.mm b/WebCore/kwq/KWQPainter.mm
index 2f296e0..86d0134 100644
--- a/WebCore/kwq/KWQPainter.mm
+++ b/WebCore/kwq/KWQPainter.mm
@@ -36,13 +36,12 @@
#import <WebCoreTextRenderer.h>
#import <WebCoreImageRenderer.h>
-struct QPState { // painter state
- QPState() : exclusiveOrMode(false), paintingDisabled(false) { }
+struct QPState {
+ QPState() : paintingDisabled(false) { }
QFont font;
QPen pen;
QBrush brush;
QRegion clip;
- bool exclusiveOrMode;
bool paintingDisabled;
};
@@ -117,6 +116,7 @@ QRect QPainter::xForm(const QRect &aRect) const
void QPainter::save()
{
data->stack.push(new QPState(data->state));
+
[NSGraphicsContext saveGraphicsState];
}
@@ -182,7 +182,7 @@ void QPainter::drawLine(int x1, int y1, int x2, int y2)
if (y1 != y2)
p2.y -= width;
- NSBezierPath *path = [NSBezierPath bezierPath];
+ NSBezierPath *path = [[NSBezierPath alloc] init];
[path setLineWidth:width];
switch (penStyle) {
@@ -208,6 +208,8 @@ void QPainter::drawLine(int x1, int y1, int x2, int y2)
_setColorFromPen();
[path stroke];
+
+ [path release];
}
@@ -411,12 +413,11 @@ void QPainter::addClip(const QRect &rect)
Qt::RasterOp QPainter::rasterOp() const
{
- return data->state.exclusiveOrMode ? XorROP : CopyROP;
+ return CopyROP;
}
-void QPainter::setRasterOp(RasterOp op)
+void QPainter::setRasterOp(RasterOp)
{
- data->state.exclusiveOrMode = op == XorROP;
}
void QPainter::setPaintingDisabled(bool f)
diff --git a/WebCore/kwq/KWQTimer.mm b/WebCore/kwq/KWQTimer.mm
index c455312..27446e3 100644
--- a/WebCore/kwq/KWQTimer.mm
+++ b/WebCore/kwq/KWQTimer.mm
@@ -52,7 +52,7 @@
@end
QTimer::QTimer()
- : m_timer(0), m_monitorFunction(0), m_timeoutSignal(this, SIGNAL(timeout()))
+ : m_timer(nil), m_monitorFunction(0), m_timeoutSignal(this, SIGNAL(timeout()))
{
}
@@ -83,7 +83,7 @@ void QTimer::stop()
[m_timer invalidate];
[m_timer release];
- m_timer = 0;
+ m_timer = nil;
if (m_monitorFunction) {
m_monitorFunction(m_monitorFunctionContext);
@@ -103,6 +103,6 @@ void QTimer::fire()
if (![m_timer isValid]) {
[m_timer release];
- m_timer = 0;
+ m_timer = nil;
}
}
diff --git a/WebCore/kwq/WebCoreCookieAdapter.h b/WebCore/kwq/WebCoreCookieAdapter.h
index d74b4b7..92a7515 100644
--- a/WebCore/kwq/WebCoreCookieAdapter.h
+++ b/WebCore/kwq/WebCoreCookieAdapter.h
@@ -30,7 +30,6 @@
}
+ (WebCoreCookieAdapter *)sharedAdapter;
-- init;
- (BOOL)cookiesEnabled;
- (NSString *)cookiesForURL:(NSURL *)url;
diff --git a/WebCore/kwq/WebCoreImageRenderer.h b/WebCore/kwq/WebCoreImageRenderer.h
index 7da0699..934efe5 100644
--- a/WebCore/kwq/WebCoreImageRenderer.h
+++ b/WebCore/kwq/WebCoreImageRenderer.h
@@ -30,7 +30,7 @@
- (BOOL)incrementalLoadWithBytes:(const void *)bytes length:(unsigned)length complete:(BOOL)isComplete;
- (NSSize)size;
-- (void)resize: (NSSize)s;
+- (void)resize:(NSSize)s;
- (void)beginAnimationInRect:(NSRect)ir fromRect:(NSRect)fr;
- (void)stopAnimation;
- (void)tileInRect:(NSRect)r fromPoint:(NSPoint)p;
diff --git a/WebCore/kwq/WebCoreImageRendererFactory.h b/WebCore/kwq/WebCoreImageRendererFactory.h
index 1fa8377..88825fb 100644
--- a/WebCore/kwq/WebCoreImageRendererFactory.h
+++ b/WebCore/kwq/WebCoreImageRendererFactory.h
@@ -32,7 +32,6 @@
}
+ (WebCoreImageRendererFactory *)sharedFactory;
-- init;
- (id <WebCoreImageRenderer>)imageRenderer;
- (id <WebCoreImageRenderer>)imageRendererWithBytes: (const void *)bytes length:(unsigned)length;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list