[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
rjw
rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 06:50:30 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit deddce4d09a5bb83ad8c9f9f03fdc83e3d46e1f2
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Oct 17 01:08:21 2002 +0000
i Fixed a few regressions in drawing of frame resize handle
in preparation for drawing frame borders and completing
2982466.
* khtml/rendering/render_frames.cpp:
(RenderFrameSet::userResize):
* kwq/KWQPainter.mm:
(QPainter::drawRect):
* kwq/qt/qscrollview.h:
* kwq/KWQScrollView.mm:
(QScrollView::updateContents):
* kwq/KWQWidget.mm:
(QWidget::enableFlushDrawing):
Use static_cast everywhere DOM::NodeImpl is cast to
subclass.
* kwq/WebCoreDOMNode.mm:
(-[WebCoreDOMNode DOM::]):
(-[WebCoreDOMNodeList DOM::]):
(-[WebCoreDOMNamedNodeMap DOM::]):
(-[WebCoreDOMAttr DOM::]):
Added some drawing debug code (ifdef excluded).
* WebView.subproj/WebHTMLView.m:
(-[WebHTMLView drawRect:]):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2349 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index ee9e4f6..21ec07f 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,28 @@
+2002-10-16 Richard Williamson <rjw at apple.com>
+
+ Fixed a few regressions in drawing of frame resize handle
+ in preparation for drawing frame borders and completing
+ 2982466.
+
+ * khtml/rendering/render_frames.cpp:
+ (RenderFrameSet::userResize):
+ * kwq/KWQPainter.mm:
+ (QPainter::drawRect):
+ * kwq/qt/qscrollview.h:
+ * kwq/KWQScrollView.mm:
+ (QScrollView::updateContents):
+ * kwq/KWQWidget.mm:
+ (QWidget::enableFlushDrawing):
+
+ Use static_cast everywhere DOM::NodeImpl is cast to
+ subclass.
+
+ * kwq/WebCoreDOMNode.mm:
+ (-[WebCoreDOMNode DOM::]):
+ (-[WebCoreDOMNodeList DOM::]):
+ (-[WebCoreDOMNamedNodeMap DOM::]):
+ (-[WebCoreDOMAttr DOM::]):
+
2002-10-16 David Hyatt <hyatt at apple.com>
Fix crash on pages with bulleted lists. Making sure the list
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index ee9e4f6..21ec07f 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,28 @@
+2002-10-16 Richard Williamson <rjw at apple.com>
+
+ Fixed a few regressions in drawing of frame resize handle
+ in preparation for drawing frame borders and completing
+ 2982466.
+
+ * khtml/rendering/render_frames.cpp:
+ (RenderFrameSet::userResize):
+ * kwq/KWQPainter.mm:
+ (QPainter::drawRect):
+ * kwq/qt/qscrollview.h:
+ * kwq/KWQScrollView.mm:
+ (QScrollView::updateContents):
+ * kwq/KWQWidget.mm:
+ (QWidget::enableFlushDrawing):
+
+ Use static_cast everywhere DOM::NodeImpl is cast to
+ subclass.
+
+ * kwq/WebCoreDOMNode.mm:
+ (-[WebCoreDOMNode DOM::]):
+ (-[WebCoreDOMNodeList DOM::]):
+ (-[WebCoreDOMNamedNodeMap DOM::]):
+ (-[WebCoreDOMAttr DOM::]):
+
2002-10-16 David Hyatt <hyatt at apple.com>
Fix crash on pages with bulleted lists. Making sure the list
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index ee9e4f6..21ec07f 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,28 @@
+2002-10-16 Richard Williamson <rjw at apple.com>
+
+ Fixed a few regressions in drawing of frame resize handle
+ in preparation for drawing frame borders and completing
+ 2982466.
+
+ * khtml/rendering/render_frames.cpp:
+ (RenderFrameSet::userResize):
+ * kwq/KWQPainter.mm:
+ (QPainter::drawRect):
+ * kwq/qt/qscrollview.h:
+ * kwq/KWQScrollView.mm:
+ (QScrollView::updateContents):
+ * kwq/KWQWidget.mm:
+ (QWidget::enableFlushDrawing):
+
+ Use static_cast everywhere DOM::NodeImpl is cast to
+ subclass.
+
+ * kwq/WebCoreDOMNode.mm:
+ (-[WebCoreDOMNode DOM::]):
+ (-[WebCoreDOMNodeList DOM::]):
+ (-[WebCoreDOMNamedNodeMap DOM::]):
+ (-[WebCoreDOMAttr DOM::]):
+
2002-10-16 David Hyatt <hyatt at apple.com>
Fix crash on pages with bulleted lists. Making sure the list
diff --git a/WebCore/khtml/rendering/render_frames.cpp b/WebCore/khtml/rendering/render_frames.cpp
index 90ed339..a39ab3d 100644
--- a/WebCore/khtml/rendering/render_frames.cpp
+++ b/WebCore/khtml/rendering/render_frames.cpp
@@ -463,7 +463,7 @@ bool RenderFrameSet::userResize( MouseEventImpl *evt )
// the damage rect alone isn't sufficient. areas outside
// the specified rect are getting partially drawn.
v->updateContents(v->contentsX(), v->contentsY(),
- v->visibleWidth(), v->visibleHeight());
+ v->visibleWidth(), v->visibleHeight(), true);
//root()->view()->displayRect( m_oldpos + sw/2 - rBord , r.y(), 2*rBord, r.height() );
#else
paint.drawRect( m_oldpos + sw/2 - rBord , r.y(),
@@ -471,6 +471,8 @@ bool RenderFrameSet::userResize( MouseEventImpl *evt )
#endif
if ( p >= 0 ){
#ifdef APPLE_CHANGES
+ paint.setPen( Qt::NoPen );
+ paint.setBrush( Qt::gray );
v->setDrawingAlpha((float)0.25);
paint.drawRect( p + sw/2 - rBord, r.y(), 2*rBord, r.height() );
v->setDrawingAlpha((float)1.0);
@@ -485,7 +487,7 @@ bool RenderFrameSet::userResize( MouseEventImpl *evt )
// the damage rect alone isn't sufficient. areas outside
// the specified rect are getting partially drawn.
v->updateContents(v->contentsX(), v->contentsY(),
- v->visibleWidth(), v->visibleHeight());
+ v->visibleWidth(), v->visibleHeight(), true);
//root()->view()->displayRect( r.x(), m_oldpos + sw/2 - rBord, r.width(), 2*rBord );
#else
paint.drawRect( r.x(), m_oldpos + sw/2 - rBord,
@@ -493,6 +495,8 @@ bool RenderFrameSet::userResize( MouseEventImpl *evt )
#endif
if ( p >= 0 ){
#ifdef APPLE_CHANGES
+ paint.setPen( Qt::NoPen );
+ paint.setBrush( Qt::gray );
v->setDrawingAlpha((float)0.25);
paint.drawRect( r.x(), p + sw/2 - rBord, r.width(), 2*rBord );
v->setDrawingAlpha((float)1.0);
diff --git a/WebCore/kwq/KWQPainter.mm b/WebCore/kwq/KWQPainter.mm
index 6dae440..460a966 100644
--- a/WebCore/kwq/KWQPainter.mm
+++ b/WebCore/kwq/KWQPainter.mm
@@ -141,7 +141,8 @@ void QPainter::drawRect(int x, int y, int w, int h)
if (data->state.brush.style() != NoBrush) {
_setColorFromBrush();
- NSRectFill(NSMakeRect(x, y, w, h));
+
+ NSRectFillUsingOperation (NSMakeRect(x,y,w,h), NSCompositeSourceOver);
}
if (data->state.pen.style() != NoPen) {
_setColorFromPen();
diff --git a/WebCore/kwq/KWQScrollView.h b/WebCore/kwq/KWQScrollView.h
index ba20272..0aefa6e 100644
--- a/WebCore/kwq/KWQScrollView.h
+++ b/WebCore/kwq/KWQScrollView.h
@@ -60,8 +60,8 @@ public:
int childY(QWidget *child);
virtual void resizeContents(int w, int h);
- void updateContents(int x, int y, int w, int h);
- void updateContents(const QRect &r);
+ void updateContents(int x, int y, int w, int h, bool now=false);
+ void updateContents(const QRect &r, bool now=false);
void repaintContents(int x, int y, int w, int h, bool erase = true);
QPoint contentsToViewport(const QPoint &);
void contentsToViewport(int x, int y, int& vx, int& vy);
diff --git a/WebCore/kwq/KWQScrollView.mm b/WebCore/kwq/KWQScrollView.mm
index c85979a..a198201 100644
--- a/WebCore/kwq/KWQScrollView.mm
+++ b/WebCore/kwq/KWQScrollView.mm
@@ -239,19 +239,22 @@ void QScrollView::resizeContents(int w, int h)
}
}
-void QScrollView::updateContents(int x, int y, int w, int h)
+void QScrollView::updateContents(int x, int y, int w, int h, bool now)
{
- updateContents(QRect(x, y, w, h));
+ updateContents(QRect(x, y, w, h), now);
}
-void QScrollView::updateContents(const QRect &rect)
+void QScrollView::updateContents(const QRect &rect, bool now)
{
NSView *view = getView();
if ([view _KWQ_isScrollView])
view = [view _KWQ_getDocumentView];
- [view setNeedsDisplayInRect:rect];
+ if (now)
+ [view displayRect: rect];
+ else
+ [view setNeedsDisplayInRect:rect];
}
void QScrollView::repaintContents(int x, int y, int w, int h, bool erase)
diff --git a/WebCore/kwq/KWQWidget.mm b/WebCore/kwq/KWQWidget.mm
index 5ab91af..0d19b42 100644
--- a/WebCore/kwq/KWQWidget.mm
+++ b/WebCore/kwq/KWQWidget.mm
@@ -380,7 +380,7 @@ void QWidget::enableFlushDrawing()
{
NSWindow *window = [getView() window];
[window enableFlushWindow];
- [window flushWindowIfNeeded];
+ [window flushWindow];
}
void QWidget::setDrawingAlpha(float alpha)
diff --git a/WebCore/kwq/WebCoreDOMNode.mm b/WebCore/kwq/WebCoreDOMNode.mm
index 3defe67..e865300 100644
--- a/WebCore/kwq/WebCoreDOMNode.mm
+++ b/WebCore/kwq/WebCoreDOMNode.mm
@@ -56,7 +56,7 @@ DOM::ProcessingInstruction DOM::ProcessingInstructionImpl::createInstance(Proces
- (DOM::NodeImpl *)impl
{
- return (DOM::NodeImpl *)impl;
+ return impl;
}
- (void)dealloc
@@ -272,7 +272,7 @@ DOM::ProcessingInstruction DOM::ProcessingInstructionImpl::createInstance(Proces
- (DOM::NodeListImpl *)impl
{
- return (DOM::NodeListImpl *)impl;
+ return impl;
}
- (void)dealloc
@@ -313,7 +313,7 @@ DOM::ProcessingInstruction DOM::ProcessingInstructionImpl::createInstance(Proces
- (DOM::NamedNodeMapImpl *)impl
{
- return (DOM::NamedNodeMapImpl *)impl;
+ return impl;
}
- (void)dealloc
@@ -388,7 +388,7 @@ DOM::ProcessingInstruction DOM::ProcessingInstructionImpl::createInstance(Proces
- (DOM::AttrImpl *)attrImpl
{
- return (DOM::AttrImpl *)impl;
+ return static_cast<DOM::AttrImpl *>(impl);
}
- (NSString *)name
@@ -432,7 +432,7 @@ DOM::ProcessingInstruction DOM::ProcessingInstructionImpl::createInstance(Proces
{
return [[(WebCoreDOMDocumentFragment *)[[self class] alloc] initWithImpl: _impl] autorelease];
}
-- (DOM::DocumentFragmentImpl *)documentFragmentImpl { return (DOM::DocumentFragmentImpl *)impl; }
+- (DOM::DocumentFragmentImpl *)documentFragmentImpl { return static_cast<DOM::DocumentFragmentImpl *>(impl); }
// No additional methods.
@end
@@ -440,7 +440,7 @@ DOM::ProcessingInstruction DOM::ProcessingInstructionImpl::createInstance(Proces
@implementation WebCoreDOMElement
+ (WebCoreDOMElement *)elementWithImpl: (DOM::ElementImpl *)_impl { return [[(WebCoreDOMElement *)[[self class] alloc] initWithImpl: _impl] autorelease]; }
-- (DOM::ElementImpl *)elementImpl { return (DOM::ElementImpl *)impl; }
+- (DOM::ElementImpl *)elementImpl { return static_cast<DOM::ElementImpl *>(impl); }
- (NSString *)tagName
{
@@ -569,14 +569,14 @@ DOM::ProcessingInstruction DOM::ProcessingInstructionImpl::createInstance(Proces
@implementation WebCoreDOMEntityReference
+ (WebCoreDOMEntityReference *)entityReferenceWithImpl: (DOM::EntityReferenceImpl *)_impl { return [[(WebCoreDOMEntityReference *)[[self class] alloc] initWithImpl: _impl] autorelease]; }
-- (DOM::EntityReferenceImpl *)entityReferenceImpl { return (DOM::EntityReferenceImpl *)impl; }
+- (DOM::EntityReferenceImpl *)entityReferenceImpl { return static_cast<DOM::EntityReferenceImpl *>(impl); }
@end
@implementation WebCoreDOMCharacterData
+ (WebCoreDOMCharacterData *)commentWithImpl: (DOM::CharacterDataImpl *)_impl { return [[(WebCoreDOMCharacterData *)[[self class] alloc] initWithImpl: _impl] autorelease]; }
-- (DOM::CharacterDataImpl *)characterDataImpl { return (DOM::CharacterDataImpl *)impl; }
+- (DOM::CharacterDataImpl *)characterDataImpl { return static_cast<DOM::CharacterDataImpl *>(impl); }
- (NSString *)data
{
@@ -633,7 +633,7 @@ DOM::ProcessingInstruction DOM::ProcessingInstructionImpl::createInstance(Proces
@implementation WebCoreDOMComment
+ (WebCoreDOMComment *)commentWithImpl: (DOM::CommentImpl *)_impl { return [[(WebCoreDOMComment *)[[self class] alloc] initWithImpl: _impl] autorelease]; }
-- (DOM::CommentImpl *)commentImpl { return (DOM::CommentImpl *)impl; }
+- (DOM::CommentImpl *)commentImpl { return static_cast<DOM::CommentImpl *>(impl); }
// No additional methods.
@@ -642,7 +642,7 @@ DOM::ProcessingInstruction DOM::ProcessingInstructionImpl::createInstance(Proces
@implementation WebCoreDOMText
+ (WebCoreDOMText *)textWithImpl: (DOM::TextImpl *)_impl { return [[(WebCoreDOMText *)[[self class] alloc] initWithImpl: _impl] autorelease]; }
-- (DOM::TextImpl *)textImpl { return (DOM::TextImpl *)impl; }
+- (DOM::TextImpl *)textImpl { return static_cast<DOM::TextImpl *>(impl); }
- (id<WebDOMText>)splitText: (unsigned long)offset
{
@@ -658,7 +658,7 @@ DOM::ProcessingInstruction DOM::ProcessingInstructionImpl::createInstance(Proces
{
return [[(WebCoreDOMCDATASection *)[[self class] alloc] initWithImpl: _impl] autorelease];
}
-- (DOM::CDATASectionImpl *)CDATASectionImpl { return (DOM::CDATASectionImpl *)impl; }
+- (DOM::CDATASectionImpl *)CDATASectionImpl { return static_cast<DOM::CDATASectionImpl *>(impl); }
// No additional methods.
@end
@@ -667,7 +667,7 @@ DOM::ProcessingInstruction DOM::ProcessingInstructionImpl::createInstance(Proces
+ (WebCoreDOMProcessingInstruction *)processingInstructionWithImpl: (DOM::ProcessingInstructionImpl *)_impl
{ return [[(WebCoreDOMProcessingInstruction *)[[self class] alloc] initWithImpl: _impl] autorelease]; }
-- (DOM::ProcessingInstructionImpl *)processingInstructionImpl { return (DOM::ProcessingInstructionImpl *)impl; }
+- (DOM::ProcessingInstructionImpl *)processingInstructionImpl { return static_cast<DOM::ProcessingInstructionImpl *>(impl); }
- (NSString *)target;
{
diff --git a/WebCore/kwq/qt/qscrollview.h b/WebCore/kwq/qt/qscrollview.h
index ba20272..0aefa6e 100644
--- a/WebCore/kwq/qt/qscrollview.h
+++ b/WebCore/kwq/qt/qscrollview.h
@@ -60,8 +60,8 @@ public:
int childY(QWidget *child);
virtual void resizeContents(int w, int h);
- void updateContents(int x, int y, int w, int h);
- void updateContents(const QRect &r);
+ void updateContents(int x, int y, int w, int h, bool now=false);
+ void updateContents(const QRect &r, bool now=false);
void repaintContents(int x, int y, int w, int h, bool erase = true);
QPoint contentsToViewport(const QPoint &);
void contentsToViewport(int x, int y, int& vx, int& vy);
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 029e3e3..4e4204c 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,10 @@
+2002-10-16 Richard Williamson <rjw at apple.com>
+
+ Added some drawing debug code (ifdef excluded).
+
+ * WebView.subproj/WebHTMLView.m:
+ (-[WebHTMLView drawRect:]):
+
2002-10-16 Darin Adler <darin at apple.com>
Fixed anomalies with plugin positioning caused by my switch to
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 029e3e3..4e4204c 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,10 @@
+2002-10-16 Richard Williamson <rjw at apple.com>
+
+ Added some drawing debug code (ifdef excluded).
+
+ * WebView.subproj/WebHTMLView.m:
+ (-[WebHTMLView drawRect:]):
+
2002-10-16 Darin Adler <darin at apple.com>
Fixed anomalies with plugin positioning caused by my switch to
diff --git a/WebKit/WebView.subproj/WebHTMLView.m b/WebKit/WebView.subproj/WebHTMLView.m
index 4f761f8..7b9acca 100644
--- a/WebKit/WebView.subproj/WebHTMLView.m
+++ b/WebKit/WebView.subproj/WebHTMLView.m
@@ -407,6 +407,13 @@
if ([WebTextRenderer shouldBufferTextDrawing] && focusView)
[[WebTextRendererFactory sharedFactory] startCoalesceTextDrawing];
+#ifdef DEBUG_DRAWING
+ if ([[self _bridge] isFrameSet]){
+ [[NSColor redColor] set];
+ NSRectFill(rect);
+ }
+#endif
+
//double start = CFAbsoluteTimeGetCurrent();
[[self _bridge] drawRect:rect];
//LOG(Timing, "draw time %e", CFAbsoluteTimeGetCurrent() - start);
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list