<!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>[37203] trunk</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/37203">37203</a></dd>
<dt>Author</dt> <dd>kevino@webkit.org</dd>
<dt>Date</dt> <dd>2008-10-02 12:59:35 -0700 (Thu, 02 Oct 2008)</dd>
</dl>

<h3>Log Message</h3>
<pre>wx build fixes after Frame/ScrollView changes.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkWebCoreChangeLog">trunk/WebCore/ChangeLog</a></li>
<li><a href="#trunkWebCoreWebCoreSourcesbkl">trunk/WebCore/WebCoreSources.bkl</a></li>
<li><a href="#trunkWebCoreplatformwxScrollViewWxcpp">trunk/WebCore/platform/wx/ScrollViewWx.cpp</a></li>
<li><a href="#trunkWebKitwxChangeLog">trunk/WebKit/wx/ChangeLog</a></li>
<li><a href="#trunkWebKitwxWebViewcpp">trunk/WebKit/wx/WebView.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/ChangeLog (37202 => 37203)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/ChangeLog        2008-10-02 19:33:42 UTC (rev 37202)
+++ trunk/WebCore/ChangeLog        2008-10-02 19:59:35 UTC (rev 37203)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2008-10-02  Kevin Ollivier  &lt;kevino@theolliviers.com&gt;
+
+        wx build fixes after Frame/ScrollView changes.
+
+        * WebCoreSources.bkl:
+        * platform/wx/ScrollViewWx.cpp:
+        (WebCore::ScrollView::platformContentsToScreen):
+        (WebCore::ScrollView::platformScreenToContents):
+        (WebCore::ScrollView::platformIsOffscreen):
+
</ins><span class="cx"> 2008-10-02  Brett Wilson  &lt;brettw@chromium.org&gt;
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Sam Weinig
</span></span></pre></div>
<a id="trunkWebCoreWebCoreSourcesbkl"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/WebCoreSources.bkl (37202 => 37203)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/WebCoreSources.bkl        2008-10-02 19:33:42 UTC (rev 37202)
+++ trunk/WebCore/WebCoreSources.bkl        2008-10-02 19:59:35 UTC (rev 37203)
</span><span class="lines">@@ -36,7 +36,6 @@
</span><span class="cx">         bindings/js/GCController.cpp
</span><span class="cx">         bindings/js/JSAttrCustom.cpp
</span><span class="cx">         bindings/js/JSAudioConstructor.cpp
</span><del>-        bindings/js/JSCanvasPixelArrayCustom.cpp
</del><span class="cx">         bindings/js/JSCanvasRenderingContext2DCustom.cpp
</span><span class="cx">         bindings/js/JSClipboardCustom.cpp
</span><span class="cx">         bindings/js/JSConsoleCustom.cpp
</span><span class="lines">@@ -77,6 +76,7 @@
</span><span class="cx">         bindings/js/JSHTMLOptionsCollectionCustom.cpp
</span><span class="cx">         bindings/js/JSHTMLSelectElementCustom.cpp
</span><span class="cx">         bindings/js/JSImageConstructor.cpp
</span><ins>+        bindings/js/JSImageDataCustom.cpp
</ins><span class="cx">         bindings/js/JSInspectedObjectWrapper.cpp
</span><span class="cx">         bindings/js/JSInspectorCallbackWrapper.cpp
</span><span class="cx">         bindings/js/JSJavaScriptCallFrameCustom.cpp
</span></span></pre></div>
<a id="trunkWebCoreplatformwxScrollViewWxcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/platform/wx/ScrollViewWx.cpp (37202 => 37203)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/platform/wx/ScrollViewWx.cpp        2008-10-02 19:33:42 UTC (rev 37202)
+++ trunk/WebCore/platform/wx/ScrollViewWx.cpp        2008-10-02 19:59:35 UTC (rev 37203)
</span><span class="lines">@@ -321,4 +321,28 @@
</span><span class="cx">     }
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+IntRect ScrollView::platformContentsToScreen(const IntRect&amp; rect) const
+{
+    if (platformWidget()) {
+        wxRect wxrect = rect;
+        platformWidget()-&gt;ClientToScreen(&amp;wxrect.x, &amp;wxrect.y);
+        return wxrect;
+    }
+    return IntRect();
</ins><span class="cx"> }
</span><ins>+
+IntPoint ScrollView::platformScreenToContents(const IntPoint&amp; point) const
+{
+    if (platformWidget()) {
+        return platformWidget()-&gt;ScreenToClient(point);
+    }
+    return IntPoint();
+}
+
+bool ScrollView::platformIsOffscreen() const
+{
+    return !platformWidget() || !platformWidget()-&gt;IsShownOnScreen();
+}
+
+
+}
</ins></span></pre></div>
<a id="trunkWebKitwxChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebKit/wx/ChangeLog (37202 => 37203)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/wx/ChangeLog        2008-10-02 19:33:42 UTC (rev 37202)
+++ trunk/WebKit/wx/ChangeLog        2008-10-02 19:59:35 UTC (rev 37203)
</span><span class="lines">@@ -1,3 +1,10 @@
</span><ins>+2008-10-02  Kevin Ollivier  &lt;kevino@theolliviers.com&gt;
+
+        wx build fixes after Frame/ScrollView changes.
+
+        * WebView.cpp:
+        (wxWebView::OnPaint):
+
</ins><span class="cx"> 2008-10-01  David Hyatt  &lt;hyatt@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=21282
</span></span></pre></div>
<a id="trunkWebKitwxWebViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebKit/wx/WebView.cpp (37202 => 37203)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/wx/WebView.cpp        2008-10-02 19:33:42 UTC (rev 37202)
+++ trunk/WebKit/wx/WebView.cpp        2008-10-02 19:59:35 UTC (rev 37203)
</span><span class="lines">@@ -432,7 +432,7 @@
</span><span class="cx">                 if (frame-&gt;view()-&gt;needsLayout())
</span><span class="cx">                     frame-&gt;view()-&gt;layout();
</span><span class="cx"> 
</span><del>-                frame-&gt;paint(gc, paintRect);
</del><ins>+                frame-&gt;view()-&gt;paint(gc, paintRect);
</ins><span class="cx">             }
</span><span class="cx">             delete gc;
</span><span class="cx">         }
</span></span></pre>
</div>
</div>

</body>
</html>