<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[24814] trunk/WebCore</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/24814">24814</a></dd>
<dt>Author</dt> <dd>treat</dd>
<dt>Date</dt> <dd>2007-08-01 19:24:33 -0700 (Wed, 01 Aug 2007)</dd>
</dl>
<h3>Log Message</h3>
<pre>Do not call update or repaint from inside a paint event.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkWebCoreChangeLog">trunk/WebCore/ChangeLog</a></li>
<li><a href="#trunkWebCoreplatformqtScrollViewQtcpp">trunk/WebCore/platform/qt/ScrollViewQt.cpp</a></li>
<li><a href="#trunkWebCoreplatformqtWidgetQtcpp">trunk/WebCore/platform/qt/WidgetQt.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/ChangeLog (24813 => 24814)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/ChangeLog 2007-08-02 01:43:19 UTC (rev 24813)
+++ trunk/WebCore/ChangeLog 2007-08-02 02:24:33 UTC (rev 24814)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2007-08-01 Adam Treat <treat@kde.org>
+
+ Reviewed by George Staikos.
+
+ Do not call update or paint from inside a paint event.
+
+ * platform/qt/ScrollViewQt.cpp:
+ (WebCore::ScrollView::updateContents):
+ * platform/qt/WidgetQt.cpp:
+ (WebCore::Widget::invalidateRect):
+
</ins><span class="cx"> 2007-08-01 Timothy Hatcher <timothy@apple.com>
</span><span class="cx">
</span><span class="cx"> Reviewed by Justin.
</span></span></pre></div>
<a id="trunkWebCoreplatformqtScrollViewQtcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/platform/qt/ScrollViewQt.cpp (24813 => 24814)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/platform/qt/ScrollViewQt.cpp 2007-08-02 01:43:19 UTC (rev 24813)
+++ trunk/WebCore/platform/qt/ScrollViewQt.cpp 2007-08-02 02:24:33 UTC (rev 24814)
</span><span class="lines">@@ -216,14 +216,21 @@
</span><span class="cx"> else
</span><span class="cx"> m_data->m_dirtyRegion = QRegion(containingWindowRect);
</span><span class="cx">
</span><del>- if (now)
</del><ins>+ bool painting = containingWindow()->testAttribute(Qt::WA_WState_InPaintEvent);
+ if (painting && now) {
+ QWebPage *page = qobject_cast<QWebPage*>(containingWindow());
+ QPainter p(page);
+ page->mainFrame()->render(&p, m_data->m_dirtyRegion.boundingRect());
+ } else if (now) {
</ins><span class="cx"> containingWindow()->repaint(m_data->m_dirtyRegion.boundingRect());
</span><del>- else
</del><ins>+ } else {
</ins><span class="cx"> containingWindow()->update(m_data->m_dirtyRegion.boundingRect());
</span><ins>+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ScrollView::update()
</span><span class="cx"> {
</span><ins>+ Q_ASSERT(!containingWindow()->testAttribute(Qt::WA_WState_InPaintEvent));
</ins><span class="cx"> containingWindow()->update(frameGeometry());
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkWebCoreplatformqtWidgetQtcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/platform/qt/WidgetQt.cpp (24813 => 24814)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/platform/qt/WidgetQt.cpp 2007-08-02 01:43:19 UTC (rev 24813)
+++ trunk/WebCore/platform/qt/WidgetQt.cpp 2007-08-02 02:24:33 UTC (rev 24814)
</span><span class="lines">@@ -43,6 +43,7 @@
</span><span class="cx">
</span><span class="cx"> #include "qwebframe.h"
</span><span class="cx"> #include "qwebpage.h"
</span><ins>+#include <QPainter>
</ins><span class="cx">
</span><span class="cx"> #include <QDebug>
</span><span class="cx">
</span><span class="lines">@@ -201,10 +202,19 @@
</span><span class="cx"> IntRect clipRect = windowClipRect();
</span><span class="cx"> windowRect.intersect(clipRect);
</span><span class="cx">
</span><del>- if (qwidget()) { //regular frameview
- qwidget()->update(windowRect);
- } else if (parent()) { //scrollbars
- parent()->qwidget()->update(windowRect);
</del><ins>+ QWidget *canvas = qwidget(); //regular frameview
+ if (!canvas && parent())
+ canvas = parent()->qwidget(); //scrollbars
+
+ Q_ASSERT(canvas);
+
+ bool painting = canvas->testAttribute(Qt::WA_WState_InPaintEvent);
+ if (painting) {
+ QWebPage *page = qobject_cast<QWebPage*>(canvas);
+ QPainter p(page);
+ page->mainFrame()->render(&p, windowRect);
+ } else {
+ canvas->update(windowRect);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>