<!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>[37155] 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/37155">37155</a></dd>
<dt>Author</dt> <dd>hyatt@apple.com</dd>
<dt>Date</dt> <dd>2008-10-01 13:58:19 -0700 (Wed, 01 Oct 2008)</dd>
</dl>

<h3>Log Message</h3>
<pre>2008-10-01  David Hyatt  &lt;hyatt@apple.com&gt;

        Make show/hide/setParentVisible cross-platform on ScrollView.

        Reviewed by Adam Roben

        * platform/ScrollView.cpp:
        (WebCore::ScrollView::setParentVisible):
        (WebCore::ScrollView::show):
        (WebCore::ScrollView::hide):
        * platform/ScrollView.h:
        * platform/win/ScrollViewWin.cpp:</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="#trunkWebCoreplatformmacScrollViewMacmm">trunk/WebCore/platform/mac/ScrollViewMac.mm</a></li>
<li><a href="#trunkWebCoreplatformwinScrollViewWincpp">trunk/WebCore/platform/win/ScrollViewWin.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/ChangeLog (37154 => 37155)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/ChangeLog        2008-10-01 20:41:56 UTC (rev 37154)
+++ trunk/WebCore/ChangeLog        2008-10-01 20:58:19 UTC (rev 37155)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2008-10-01  David Hyatt  &lt;hyatt@apple.com&gt;
+
+        Make show/hide/setParentVisible cross-platform on ScrollView.
+
+        Reviewed by Adam Roben
+
+        * platform/ScrollView.cpp:
+        (WebCore::ScrollView::setParentVisible):
+        (WebCore::ScrollView::show):
+        (WebCore::ScrollView::hide):
+        * platform/ScrollView.h:
+        * platform/win/ScrollViewWin.cpp:
+
</ins><span class="cx"> 2008-10-01  Kevin McCullough  &lt;kmccullough@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Dan Bernstein.
</span></span></pre></div>
<a id="trunkWebCoreplatformScrollViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/platform/ScrollView.cpp (37154 => 37155)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/platform/ScrollView.cpp        2008-10-01 20:41:56 UTC (rev 37154)
+++ trunk/WebCore/platform/ScrollView.cpp        2008-10-01 20:58:19 UTC (rev 37155)
</span><span class="lines">@@ -461,6 +461,49 @@
</span><span class="cx">     }
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+void ScrollView::setParentVisible(bool visible)
+{
+    if (isParentVisible() == visible)
+        return;
+    
+    Widget::setParentVisible(visible);
+
+    if (!isVisible())
+        return;
+        
+    HashSet&lt;Widget*&gt;::iterator end = m_children.end();
+    for (HashSet&lt;Widget*&gt;::iterator it = m_children.begin(); it != end; ++it)
+        (*it)-&gt;setParentVisible(visible);
+}
+
+void ScrollView::show()
+{
+    if (!isSelfVisible()) {
+        setSelfVisible(true);
+        if (isParentVisible()) {
+            HashSet&lt;Widget*&gt;::iterator end = m_children.end();
+            for (HashSet&lt;Widget*&gt;::iterator it = m_children.begin(); it != end; ++it)
+                (*it)-&gt;setParentVisible(true);
+        }
+    }
+
+    Widget::show();
+}
+
+void ScrollView::hide()
+{
+    if (isSelfVisible()) {
+        if (isParentVisible()) {
+            HashSet&lt;Widget*&gt;::iterator end = m_children.end();
+            for (HashSet&lt;Widget*&gt;::iterator it = m_children.begin(); it != end; ++it)
+                (*it)-&gt;setParentVisible(false);
+        }
+        setSelfVisible(false);
+    }
+
+    Widget::hide();
+}
+
</ins><span class="cx"> #if !PLATFORM(MAC)
</span><span class="cx"> void ScrollView::platformSetCanBlitOnScroll()
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkWebCoreplatformScrollViewh"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/platform/ScrollView.h (37154 => 37155)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/platform/ScrollView.h        2008-10-01 20:41:56 UTC (rev 37154)
+++ trunk/WebCore/platform/ScrollView.h        2008-10-01 20:58:19 UTC (rev 37155)
</span><span class="lines">@@ -189,6 +189,11 @@
</span><span class="cx">     // Widget override.  Handles painting of the contents of the view as well as the scrollbars.
</span><span class="cx">     virtual void paint(GraphicsContext*, const IntRect&amp;);
</span><span class="cx"> 
</span><ins>+    // Widget overrides to ensure that our children's visibility status is kept up to date when we get shown and hidden.
+    virtual void show();
+    virtual void hide();
+    virtual void setParentVisible(bool);
+    
</ins><span class="cx"> protected:
</span><span class="cx">     virtual void repaintContentRectangle(const IntRect&amp;, bool now = false);
</span><span class="cx">     virtual void paintContents(GraphicsContext*, const IntRect&amp; damageRect) = 0;
</span><span class="lines">@@ -264,10 +269,6 @@
</span><span class="cx"> 
</span><span class="cx">     void printPanScrollIcon(const IntPoint&amp;);
</span><span class="cx">     void removePanScrollIcon();
</span><del>-
-    virtual void show();
-    virtual void hide();
-    virtual void setParentVisible(bool);
</del><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="cx"> #if PLATFORM(QT)
</span></span></pre></div>
<a id="trunkWebCoreplatformmacScrollViewMacmm"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/platform/mac/ScrollViewMac.mm (37154 => 37155)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/platform/mac/ScrollViewMac.mm        2008-10-01 20:41:56 UTC (rev 37154)
+++ trunk/WebCore/platform/mac/ScrollViewMac.mm        2008-10-01 20:58:19 UTC (rev 37155)
</span><span class="lines">@@ -58,6 +58,14 @@
</span><span class="cx">     return static_cast&lt;NSScrollView&lt;WebCoreFrameScrollView&gt; *&gt;(platformWidget());
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+NSView *ScrollView::documentView() const
+{
+    BEGIN_BLOCK_OBJC_EXCEPTIONS;
+    return [scrollView() documentView];
+    END_BLOCK_OBJC_EXCEPTIONS;
+    return nil;
+}
+
</ins><span class="cx"> void ScrollView::platformAddChild(Widget* child)
</span><span class="cx"> {
</span><span class="cx">     BEGIN_BLOCK_OBJC_EXCEPTIONS;
</span><span class="lines">@@ -208,14 +216,6 @@
</span><span class="cx">     return IntPoint();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-NSView *ScrollView::documentView() const
-{
-    BEGIN_BLOCK_OBJC_EXCEPTIONS;
-    return [scrollView() documentView];
-    END_BLOCK_OBJC_EXCEPTIONS;
-    return nil;
-}
-
</del><span class="cx"> bool ScrollView::isOffscreen() const
</span><span class="cx"> {
</span><span class="cx">     return ![platformWidget() window] || ![[platformWidget() window] isVisible];
</span></span></pre></div>
<a id="trunkWebCoreplatformwinScrollViewWincpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/platform/win/ScrollViewWin.cpp (37154 => 37155)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/platform/win/ScrollViewWin.cpp        2008-10-01 20:41:56 UTC (rev 37154)
+++ trunk/WebCore/platform/win/ScrollViewWin.cpp        2008-10-01 20:58:19 UTC (rev 37155)
</span><span class="lines">@@ -356,48 +356,6 @@
</span><span class="cx">     invalidate();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void ScrollView::setParentVisible(bool visible)
-{
-    if (isParentVisible() == visible)
-        return;
-    
-    Widget::setParentVisible(visible);
-
-    if (isVisible()) {
-        HashSet&lt;Widget*&gt;::iterator end = m_children.end();
-        for (HashSet&lt;Widget*&gt;::iterator it = m_children.begin(); it != end; ++it)
-            (*it)-&gt;setParentVisible(visible);
-    }
-}
-
-void ScrollView::show()
-{
-    if (!isSelfVisible()) {
-        setSelfVisible(true);
-        if (isParentVisible()) {
-            HashSet&lt;Widget*&gt;::iterator end = m_children.end();
-            for (HashSet&lt;Widget*&gt;::iterator it = m_children.begin(); it != end; ++it)
-                (*it)-&gt;setParentVisible(true);
-        }
-    }
-
-    Widget::show();
-}
-
-void ScrollView::hide()
-{
-    if (isSelfVisible()) {
-        if (isParentVisible()) {
-            HashSet&lt;Widget*&gt;::iterator end = m_children.end();
-            for (HashSet&lt;Widget*&gt;::iterator it = m_children.begin(); it != end; ++it)
-                (*it)-&gt;setParentVisible(false);
-        }
-        setSelfVisible(false);
-    }
-
-    Widget::hide();
-}
-
</del><span class="cx"> void ScrollView::addToDirtyRegion(const IntRect&amp; containingWindowRect)
</span><span class="cx"> {
</span><span class="cx">     ASSERT(isFrameView());
</span></span></pre>
</div>
</div>

</body>
</html>