[prev in list] [next in list] [prev in thread] [next in thread] 

List:       webkit-changes
Subject:    [webkit-changes] [43858] trunk/WebCore
From:       ariya () webkit ! org
Date:       2009-05-19 15:11:51
Message-ID: 20090519151157.AEB391B201DB () beta ! macosforge ! org
[Download RAW message or body]

[Attachment #2 (text/html)]

<!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" />
<title>[43858] trunk/WebCore</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { 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 #fa0 solid; padding: \
6px; } #logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em \
0; } #logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg \
h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; } \
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; \
} #logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: \
-1.5em; padding-left: 1.5em; } #logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em \
1em 0 1em; background: white;} #logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid \
#fa0; border-bottom: 1px solid #fa0; background: #fff; } #logmsg table th { \
text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted \
#fa0; } #logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: \
0.2em 0.5em; } #logmsg table thead th { text-align: center; border-bottom: 1px solid \
#fa0; } #logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#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>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a \
href="http://trac.webkit.org/projects/webkit/changeset/43858">43858</a></dd> \
<dt>Author</dt> <dd>ariya@webkit.org</dd> <dt>Date</dt> <dd>2009-05-19 08:11:45 -0700 \
(Tue, 19 May 2009)</dd> </dl>

<h3>Log Message</h3>
<pre>2009-05-19  Kenneth Rohde Christiansen  \
&lt;kenneth.christiansen@openbossa.org&gt;

        Reviewed by Ariya Hidayat.

        The Qt port has code that disables scrolling optimizations
        when the root contains native windows, such as windowed plugins.

        This code broke when detaching iframes containing windowed
        plugins.

        Each ScrollView now knows how many native windows it and its
        children contain, and when it is detached, that number is
        substracted from its old parents.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkWebCoreChangeLog">trunk/WebCore/ChangeLog</a></li>
<li><a href="#trunkWebCoreplatformScrollViewcpp">trunk/WebCore/platform/ScrollView.cpp</a></li>
 <li><a href="#trunkWebCoreplatformScrollViewh">trunk/WebCore/platform/ScrollView.h</a></li>
 <li><a href="#trunkWebCoreplatformqtScrollViewQtcpp">trunk/WebCore/platform/qt/ScrollViewQt.cpp</a></li>
 </ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/ChangeLog (43857 => 43858)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/ChangeLog	2009-05-19 11:45:51 UTC (rev 43857)
+++ trunk/WebCore/ChangeLog	2009-05-19 15:11:45 UTC (rev 43858)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2009-05-19  Kenneth Rohde Christiansen  \
&lt;kenneth.christiansen@openbossa.org&gt; +
+        Reviewed by Ariya Hidayat.
+
+        The Qt port has code that disables scrolling optimizations
+        when the root contains native windows, such as windowed plugins.
+
+        This code broke when detaching iframes containing windowed
+        plugins.
+
+        Each ScrollView now knows how many native windows it and its
+        children contain, and when it is detached, that number is
+        substracted from its old parents.
+
+        * platform/ScrollView.cpp:
+        (WebCore::ScrollView::scrollContents):
+        (WebCore::ScrollView::setParent):
+        * platform/ScrollView.h:
+        * platform/qt/ScrollViewQt.cpp:
+        (WebCore::ScrollView::adjustWidgetsPreventingBlittingCount):
+        (WebCore::ScrollView::platformAddChild):
+        (WebCore::ScrollView::platformRemoveChild):
+
</ins><span class="cx"> 2009-05-18  David Kilzer  &lt;ddkilzer@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Tiger build fix for r43850
</span></span></pre></div>
<a id="trunkWebCoreplatformScrollViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/platform/ScrollView.cpp (43857 => \
43858)</h4> <pre class="diff"><span>
<span class="info">--- trunk/WebCore/platform/ScrollView.cpp	2009-05-19 11:45:51 UTC \
                (rev 43857)
+++ trunk/WebCore/platform/ScrollView.cpp	2009-05-19 15:11:45 UTC (rev 43858)
</span><span class="lines">@@ -493,7 +493,7 @@
</span><span class="cx">        hostWindow()-&gt;scroll(-scrollDelta, scrollViewRect, \
clipRect); </span><span class="cx">     } else { 
</span><span class="cx">        // We need to go ahead and repaint the entire backing \
store.  Do it now before moving the </span><del>-       // plugins.
</del><ins>+       // windowed plugins.
</ins><span class="cx">        hostWindow()-&gt;repaint(updateRect, true, false, \
true); // Invalidate the backing store and repaint it synchronously </span><span \
class="cx">     } </span><span class="cx"> 
</span><span class="lines">@@ -574,8 +574,16 @@
</span><span class="cx">     if (m_scrollbarsAvoidingResizer &amp;&amp; parent())
</span><span class="cx">         \
parent()-&gt;adjustScrollbarsAvoidingResizerCount(-m_scrollbarsAvoidingResizer); \
</span><span class="cx">  </span><ins>+#if PLATFORM(QT)
+    if (m_widgetsPreventingBlitting &amp;&amp; parent())
+        parent()-&gt;adjustWidgetsPreventingBlittingCount(-m_widgetsPreventingBlitting);
 +
+    if (m_widgetsPreventingBlitting &amp;&amp; parentView)
+        parentView-&gt;adjustWidgetsPreventingBlittingCount(m_widgetsPreventingBlitting);
 +#endif
+
</ins><span class="cx">     Widget::setParent(parentView);
</span><del>-    
</del><ins>+
</ins><span class="cx">     if (m_scrollbarsAvoidingResizer &amp;&amp; parent())
</span><span class="cx">         \
parent()-&gt;adjustScrollbarsAvoidingResizerCount(m_scrollbarsAvoidingResizer); \
</span><span class="cx"> } </span></span></pre></div>
<a id="trunkWebCoreplatformScrollViewh"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/platform/ScrollView.h (43857 => \
43858)</h4> <pre class="diff"><span>
<span class="info">--- trunk/WebCore/platform/ScrollView.h	2009-05-19 11:45:51 UTC \
                (rev 43857)
+++ trunk/WebCore/platform/ScrollView.h	2009-05-19 15:11:45 UTC (rev 43858)
</span><span class="lines">@@ -295,9 +295,11 @@
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="cx"> #if PLATFORM(QT)
</span><ins>+public:
+    void adjustWidgetsPreventingBlittingCount(int delta);
</ins><span class="cx"> private:
</span><del>-    bool rootPreventsBlitting() const { return \
                root()-&gt;m_widgetsThatPreventBlitting &gt; 0; }
-    unsigned m_widgetsThatPreventBlitting;
</del><ins>+    bool rootPreventsBlitting() const { return \
root()-&gt;m_widgetsPreventingBlitting &gt; 0; } +    unsigned \
m_widgetsPreventingBlitting; </ins><span class="cx"> #else
</span><span class="cx">     bool rootPreventsBlitting() const { return false; }
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkWebCoreplatformqtScrollViewQtcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/platform/qt/ScrollViewQt.cpp (43857 \
=> 43858)</h4> <pre class="diff"><span>
<span class="info">--- trunk/WebCore/platform/qt/ScrollViewQt.cpp	2009-05-19 11:45:51 \
                UTC (rev 43857)
+++ trunk/WebCore/platform/qt/ScrollViewQt.cpp	2009-05-19 15:11:45 UTC (rev 43858)
</span><span class="lines">@@ -36,27 +36,33 @@
</span><span class="cx"> 
</span><span class="cx"> void ScrollView::platformInit()
</span><span class="cx"> {
</span><del>-    m_widgetsThatPreventBlitting = 0;
</del><ins>+    m_widgetsPreventingBlitting = 0;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void ScrollView::platformDestroy()
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void ScrollView::platformAddChild(Widget* child)
</del><ins>+// Windowed plugins are using native windows and are thus preventing
+// us from doing any kind of scrolling optimization.
+
+void ScrollView::adjustWidgetsPreventingBlittingCount(int delta)
</ins><span class="cx"> {
</span><del>-    root()-&gt;m_widgetsThatPreventBlitting++;
</del><ins>+    m_widgetsPreventingBlitting += delta;
</ins><span class="cx">     if (parent())
</span><del>-        parent()-&gt;platformAddChild(child);
</del><ins>+        parent()-&gt;adjustWidgetsPreventingBlittingCount(delta);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><ins>+void ScrollView::platformAddChild(Widget* child)
+{
+    adjustWidgetsPreventingBlittingCount(1);
+}
+
</ins><span class="cx"> void ScrollView::platformRemoveChild(Widget* child)
</span><span class="cx"> {
</span><del>-    ASSERT(root()-&gt;m_widgetsThatPreventBlitting);
-    root()-&gt;m_widgetsThatPreventBlitting--;
</del><span class="cx">     child-&gt;hide();
</span><ins>+    adjustWidgetsPreventingBlittingCount(-1);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> }
</span><del>-
</del><span class="cx"> // vim: ts=4 sw=4 et
</span></span></pre>
</div>
</div>

</body>
</html>



_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes


[prev in list] [next in list] [prev in thread] [next in thread]

Configure | About | News | Add a list | Sponsored by KoreLogic