Commit bbe89dd8 authored by darin's avatar darin
Browse files

* 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
parent 8356c2e7
2002-09-04 Darin Adler <darin@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@apple.com>
Tweak the damage rect testing to account for the fact that a child
......
2002-09-04 Darin Adler <darin@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@apple.com>
Tweak the damage rect testing to account for the fact that a child
......
2002-09-04 Darin Adler <darin@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@apple.com>
Tweak the damage rect testing to account for the fact that a child
......
......@@ -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";
......
......@@ -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];
}
......
......@@ -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)
......
......@@ -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;
}
}
......@@ -30,7 +30,6 @@
}
+ (WebCoreCookieAdapter *)sharedAdapter;
- init;
- (BOOL)cookiesEnabled;
- (NSString *)cookiesForURL:(NSURL *)url;
......
......@@ -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;
......
......@@ -32,7 +32,6 @@
}
+ (WebCoreImageRendererFactory *)sharedFactory;
- init;
- (id <WebCoreImageRenderer>)imageRenderer;
- (id <WebCoreImageRenderer>)imageRendererWithBytes: (const void *)bytes length:(unsigned)length;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment