<!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>[37254] 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/37254">37254</a></dd>
<dt>Author</dt> <dd>hyatt@apple.com</dd>
<dt>Date</dt> <dd>2008-10-03 14:16:13 -0700 (Fri, 03 Oct 2008)</dd>
</dl>

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

        Fix Windows/Qt build bustage.

        Reviewed by ggaren

        * loader/EmptyClients.h:
        (WebCore::EmptyChromeClient::platformWindow):
        * page/Chrome.cpp:
        (WebCore::Chrome::platformWindow):
        * page/Chrome.h:
        * page/ChromeClient.h:
        * platform/HostWindow.h:
        * platform/qt/PlatformScreenQt.cpp:
        (WebCore::screenDepth):
        (WebCore::screenDepthPerComponent):
        (WebCore::screenIsMonochrome):
        (WebCore::screenRect):
        (WebCore::screenAvailableRect):
        * platform/qt/PopupMenuQt.cpp:
        (WebCore::PopupMenu::show):
        * platform/win/PopupMenuWin.cpp:
        (WebCore::PopupMenu::show):
        (WebCore::PopupMenu::calculatePositionAndSize):
        (WebCore::PopupWndProc):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkWebCoreChangeLog">trunk/WebCore/ChangeLog</a></li>
<li><a href="#trunkWebCoreloaderEmptyClientsh">trunk/WebCore/loader/EmptyClients.h</a></li>
<li><a href="#trunkWebCorepageChromecpp">trunk/WebCore/page/Chrome.cpp</a></li>
<li><a href="#trunkWebCorepageChromeh">trunk/WebCore/page/Chrome.h</a></li>
<li><a href="#trunkWebCorepageChromeClienth">trunk/WebCore/page/ChromeClient.h</a></li>
<li><a href="#trunkWebCoreplatformHostWindowh">trunk/WebCore/platform/HostWindow.h</a></li>
<li><a href="#trunkWebCoreplatformqtPlatformScreenQtcpp">trunk/WebCore/platform/qt/PlatformScreenQt.cpp</a></li>
<li><a href="#trunkWebCoreplatformqtPopupMenuQtcpp">trunk/WebCore/platform/qt/PopupMenuQt.cpp</a></li>
<li><a href="#trunkWebCoreplatformwinPopupMenuWincpp">trunk/WebCore/platform/win/PopupMenuWin.cpp</a></li>
<li><a href="#trunkWebKitgtkWebCoreSupportChromeClientGtkcpp">trunk/WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp</a></li>
<li><a href="#trunkWebKitgtkWebCoreSupportChromeClientGtkh">trunk/WebKit/gtk/WebCoreSupport/ChromeClientGtk.h</a></li>
<li><a href="#trunkWebKitmacWebCoreSupportWebChromeClienth">trunk/WebKit/mac/WebCoreSupport/WebChromeClient.h</a></li>
<li><a href="#trunkWebKitmacWebCoreSupportWebChromeClientmm">trunk/WebKit/mac/WebCoreSupport/WebChromeClient.mm</a></li>
<li><a href="#trunkWebKitqtWebCoreSupportChromeClientQtcpp">trunk/WebKit/qt/WebCoreSupport/ChromeClientQt.cpp</a></li>
<li><a href="#trunkWebKitqtWebCoreSupportChromeClientQth">trunk/WebKit/qt/WebCoreSupport/ChromeClientQt.h</a></li>
<li><a href="#trunkWebKitwinWebCoreSupportWebChromeClientcpp">trunk/WebKit/win/WebCoreSupport/WebChromeClient.cpp</a></li>
<li><a href="#trunkWebKitwinWebCoreSupportWebChromeClienth">trunk/WebKit/win/WebCoreSupport/WebChromeClient.h</a></li>
<li><a href="#trunkWebKitwxWebKitSupportChromeClientWxcpp">trunk/WebKit/wx/WebKitSupport/ChromeClientWx.cpp</a></li>
<li><a href="#trunkWebKitwxWebKitSupportChromeClientWxh">trunk/WebKit/wx/WebKitSupport/ChromeClientWx.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/ChangeLog (37253 => 37254)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/ChangeLog        2008-10-03 20:56:50 UTC (rev 37253)
+++ trunk/WebCore/ChangeLog        2008-10-03 21:16:13 UTC (rev 37254)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2008-10-03  David Hyatt  &lt;hyatt@apple.com&gt;
+
+        Fix Windows/Qt build bustage.
+
+        Reviewed by ggaren
+
+        * loader/EmptyClients.h:
+        (WebCore::EmptyChromeClient::platformWindow):
+        * page/Chrome.cpp:
+        (WebCore::Chrome::platformWindow):
+        * page/Chrome.h:
+        * page/ChromeClient.h:
+        * platform/HostWindow.h:
+        * platform/qt/PlatformScreenQt.cpp:
+        (WebCore::screenDepth):
+        (WebCore::screenDepthPerComponent):
+        (WebCore::screenIsMonochrome):
+        (WebCore::screenRect):
+        (WebCore::screenAvailableRect):
+        * platform/qt/PopupMenuQt.cpp:
+        (WebCore::PopupMenu::show):
+        * platform/win/PopupMenuWin.cpp:
+        (WebCore::PopupMenu::show):
+        (WebCore::PopupMenu::calculatePositionAndSize):
+        (WebCore::PopupWndProc):
+
</ins><span class="cx"> 2008-10-03  Simon Fraser  &lt;simon.fraser@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Dave Hyatt
</span></span></pre></div>
<a id="trunkWebCoreloaderEmptyClientsh"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/loader/EmptyClients.h (37253 => 37254)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/loader/EmptyClients.h        2008-10-03 20:56:50 UTC (rev 37253)
+++ trunk/WebCore/loader/EmptyClients.h        2008-10-03 21:16:13 UTC (rev 37254)
</span><span class="lines">@@ -117,6 +117,7 @@
</span><span class="cx">     virtual void scroll(const IntSize&amp; scrollDelta, const IntRect&amp; rectToScroll, const IntRect&amp; clipRect) { }
</span><span class="cx">     virtual IntPoint screenToWindow(const IntPoint&amp; p) const { return p; }
</span><span class="cx">     virtual IntRect windowToScreen(const IntRect&amp; r) const { return r; }
</span><ins>+    virtual PlatformWidget platformWindow() const { return 0; }
</ins><span class="cx"> 
</span><span class="cx">     virtual void mouseDidMoveOverElement(const HitTestResult&amp;, unsigned modifierFlags) { }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkWebCorepageChromecpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/page/Chrome.cpp (37253 => 37254)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/page/Chrome.cpp        2008-10-03 20:56:50 UTC (rev 37253)
+++ trunk/WebCore/page/Chrome.cpp        2008-10-03 21:16:13 UTC (rev 37254)
</span><span class="lines">@@ -96,6 +96,11 @@
</span><span class="cx">     return m_client-&gt;windowToScreen(rect);
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+PlatformWidget Chrome::platformWindow() const
+{
+    return m_client-&gt;platformWindow();
+}
+
</ins><span class="cx"> void Chrome::setWindowRect(const FloatRect&amp; rect) const
</span><span class="cx"> {
</span><span class="cx">     m_client-&gt;setWindowRect(rect);
</span></span></pre></div>
<a id="trunkWebCorepageChromeh"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/page/Chrome.h (37253 => 37254)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/page/Chrome.h        2008-10-03 20:56:50 UTC (rev 37253)
+++ trunk/WebCore/page/Chrome.h        2008-10-03 21:16:13 UTC (rev 37254)
</span><span class="lines">@@ -57,7 +57,8 @@
</span><span class="cx">         virtual void scroll(const IntSize&amp; scrollDelta, const IntRect&amp; rectToScroll, const IntRect&amp; clipRect);
</span><span class="cx">         virtual IntPoint screenToWindow(const IntPoint&amp;) const;
</span><span class="cx">         virtual IntRect windowToScreen(const IntRect&amp;) const;
</span><del>-    
</del><ins>+        virtual PlatformWidget platformWindow() const;
+
</ins><span class="cx">         void setWindowRect(const FloatRect&amp;) const;
</span><span class="cx">         FloatRect windowRect() const;
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkWebCorepageChromeClienth"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/page/ChromeClient.h (37253 => 37254)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/page/ChromeClient.h        2008-10-03 20:56:50 UTC (rev 37253)
+++ trunk/WebCore/page/ChromeClient.h        2008-10-03 21:16:13 UTC (rev 37254)
</span><span class="lines">@@ -23,6 +23,7 @@
</span><span class="cx"> #include &quot;GraphicsContext.h&quot;
</span><span class="cx"> #include &quot;FocusDirection.h&quot;
</span><span class="cx"> #include &quot;ScrollTypes.h&quot;
</span><ins>+#include &quot;HostWindow.h&quot;
</ins><span class="cx"> #include &lt;wtf/Forward.h&gt;
</span><span class="cx"> #include &lt;wtf/Vector.h&gt;
</span><span class="cx"> 
</span><span class="lines">@@ -114,6 +115,7 @@
</span><span class="cx">         virtual void scroll(const IntSize&amp; scrollDelta, const IntRect&amp; rectToScroll, const IntRect&amp; clipRect) = 0;
</span><span class="cx">         virtual IntPoint screenToWindow(const IntPoint&amp;) const = 0;
</span><span class="cx">         virtual IntRect windowToScreen(const IntRect&amp;) const = 0;
</span><ins>+        virtual PlatformWidget platformWindow() const = 0;
</ins><span class="cx">         // End methods used by HostWindow.
</span><span class="cx"> 
</span><span class="cx">         virtual void mouseDidMoveOverElement(const HitTestResult&amp;, unsigned modifierFlags) = 0;
</span></span></pre></div>
<a id="trunkWebCoreplatformHostWindowh"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/platform/HostWindow.h (37253 => 37254)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/platform/HostWindow.h        2008-10-03 20:56:50 UTC (rev 37253)
+++ trunk/WebCore/platform/HostWindow.h        2008-10-03 21:16:13 UTC (rev 37254)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx"> 
</span><span class="cx"> #include &lt;wtf/Noncopyable.h&gt;
</span><span class="cx"> #include &quot;IntRect.h&quot;
</span><ins>+#include &quot;Widget.h&quot;
</ins><span class="cx"> 
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> 
</span><span class="lines">@@ -51,6 +52,9 @@
</span><span class="cx">     // Methods for doing coordinate conversions to and from screen coordinates.
</span><span class="cx">     virtual IntPoint screenToWindow(const IntPoint&amp;) const = 0;
</span><span class="cx">     virtual IntRect windowToScreen(const IntRect&amp;) const = 0;
</span><ins>+    
+    // Method for retrieving the native window.
+    virtual PlatformWidget platformWindow() const = 0;
</ins><span class="cx"> };
</span><span class="cx"> 
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkWebCoreplatformqtPlatformScreenQtcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/platform/qt/PlatformScreenQt.cpp (37253 => 37254)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/platform/qt/PlatformScreenQt.cpp        2008-10-03 20:56:50 UTC (rev 37253)
+++ trunk/WebCore/platform/qt/PlatformScreenQt.cpp        2008-10-03 21:16:13 UTC (rev 37254)
</span><span class="lines">@@ -42,34 +42,34 @@
</span><span class="cx"> int screenDepth(Widget* w)
</span><span class="cx"> {
</span><span class="cx">     QDesktopWidget* d = QApplication::desktop();
</span><del>-    QWidget *view = w-&gt;containingWindow();
</del><ins>+    QWidget *view = w-&gt;root()-&gt;hostWindow()-&gt;platformWindow();
</ins><span class="cx">     int screenNumber = view ? d-&gt;screenNumber(view) : 0;
</span><span class="cx">     return d-&gt;screen(screenNumber)-&gt;depth();
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> int screenDepthPerComponent(Widget* w)
</span><span class="cx"> {
</span><del>-    QWidget *view = w-&gt;containingWindow();
</del><ins>+    QWidget *view = w-&gt;root()-&gt;hostWindow()-&gt;platformWindow();
</ins><span class="cx">     return view ? view-&gt;depth() : QApplication::desktop()-&gt;screen(0)-&gt;depth();
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> bool screenIsMonochrome(Widget* w)
</span><span class="cx"> {
</span><span class="cx">     QDesktopWidget* d = QApplication::desktop();
</span><del>-    QWidget *view = w-&gt;containingWindow();
</del><ins>+    QWidget *view = w-&gt;root()-&gt;hostWindow()-&gt;platformWindow();
</ins><span class="cx">     int screenNumber = view ? d-&gt;screenNumber(view) : 0;
</span><span class="cx">     return d-&gt;screen(screenNumber)-&gt;numColors() &lt; 2;
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> FloatRect screenRect(Widget* w)
</span><span class="cx"> {
</span><del>-    QRect r = QApplication::desktop()-&gt;screenGeometry(w-&gt;containingWindow());
</del><ins>+    QRect r = QApplication::desktop()-&gt;screenGeometry(w-&gt;root()-&gt;hostWindow()-&gt;platformWindow());
</ins><span class="cx">     return FloatRect(r.x(), r.y(), r.width(), r.height());
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> FloatRect screenAvailableRect(Widget* w)
</span><span class="cx"> {
</span><del>-    QRect r = QApplication::desktop()-&gt;availableGeometry(w-&gt;containingWindow());
</del><ins>+    QRect r = QApplication::desktop()-&gt;availableGeometry(w-&gt;root()-&gt;hostWindow()-&gt;platformWindow());
</ins><span class="cx">     return FloatRect(r.x(), r.y(), r.width(), r.height());
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkWebCoreplatformqtPopupMenuQtcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/platform/qt/PopupMenuQt.cpp (37253 => 37254)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/platform/qt/PopupMenuQt.cpp        2008-10-03 20:56:50 UTC (rev 37253)
+++ trunk/WebCore/platform/qt/PopupMenuQt.cpp        2008-10-03 21:16:13 UTC (rev 37254)
</span><span class="lines">@@ -89,7 +89,7 @@
</span><span class="cx"> 
</span><span class="cx"> void PopupMenu::show(const IntRect&amp; r, FrameView* v, int index)
</span><span class="cx"> {
</span><del>-    QWidget* window = v-&gt;containingWindow();
</del><ins>+    QWidget* window = v-&gt;hostWindow()-&gt;platformWindow();
</ins><span class="cx">     populate(r);
</span><span class="cx">     QRect rect = r;
</span><span class="cx">     rect.moveTopLeft(v-&gt;contentsToWindow(r.topLeft()));
</span></span></pre></div>
<a id="trunkWebCoreplatformwinPopupMenuWincpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/platform/win/PopupMenuWin.cpp (37253 => 37254)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/platform/win/PopupMenuWin.cpp        2008-10-03 20:56:50 UTC (rev 37253)
+++ trunk/WebCore/platform/win/PopupMenuWin.cpp        2008-10-03 21:16:13 UTC (rev 37254)
</span><span class="lines">@@ -106,7 +106,7 @@
</span><span class="cx">         m_popup = ::CreateWindowEx(exStyle, kPopupWindowClassName, _T(&quot;PopupMenu&quot;),
</span><span class="cx">             WS_POPUP | WS_BORDER,
</span><span class="cx">             0, 0, 0, 0,
</span><del>-            v-&gt;containingWindow(), 0, 0, 0);
</del><ins>+            v-&gt;hostWindow()-&gt;platformWindow(), 0, 0, 0);
</ins><span class="cx"> 
</span><span class="cx">         if (!m_popup)
</span><span class="cx">             return;
</span><span class="lines">@@ -132,7 +132,7 @@
</span><span class="cx"> 
</span><span class="cx">     if (shouldAnimate) {
</span><span class="cx">         RECT viewRect = {0};
</span><del>-        ::GetWindowRect(v-&gt;containingWindow(), &amp;viewRect);
</del><ins>+        ::GetWindowRect(v-&gt;hostWindow()-&gt;platformWindow(), &amp;viewRect);
</ins><span class="cx"> 
</span><span class="cx">         if (!::IsRectEmpty(&amp;viewRect)) {
</span><span class="cx">             // Popups should slide into view away from the &lt;select&gt; box
</span><span class="lines">@@ -167,7 +167,7 @@
</span><span class="cx"> 
</span><span class="cx">     // Then, translate to screen coordinates
</span><span class="cx">     POINT location(rScreenCoords.location());
</span><del>-    if (!::ClientToScreen(v-&gt;containingWindow(), &amp;location))
</del><ins>+    if (!::ClientToScreen(v-&gt;hostWindow()-&gt;platformWindow(), &amp;location))
</ins><span class="cx">         return;
</span><span class="cx"> 
</span><span class="cx">     rScreenCoords.setLocation(location);
</span><span class="lines">@@ -686,13 +686,13 @@
</span><span class="cx">                         }
</span><span class="cx">                         break;
</span><span class="cx">                     case VK_TAB:
</span><del>-                        ::SendMessage(popup-&gt;client()-&gt;clientDocument()-&gt;view()-&gt;containingWindow(), message, wParam, lParam);
</del><ins>+                        ::SendMessage(popup-&gt;client()-&gt;clientDocument()-&gt;view()-&gt;hostWindow()-&gt;platformWindow(), message, wParam, lParam);
</ins><span class="cx">                         popup-&gt;client()-&gt;hidePopup();
</span><span class="cx">                         break;
</span><span class="cx">                     default:
</span><span class="cx">                         if (isASCIIPrintable(wParam))
</span><span class="cx">                             // Send the keydown to the WebView so it can be used for type-to-select.
</span><del>-                            ::PostMessage(popup-&gt;client()-&gt;clientDocument()-&gt;view()-&gt;containingWindow(), message, wParam, lParam);
</del><ins>+                            ::PostMessage(popup-&gt;client()-&gt;clientDocument()-&gt;view()-&gt;hostWindow()-&gt;platformWindow(), message, wParam, lParam);
</ins><span class="cx">                         else
</span><span class="cx">                             lResult = 1;
</span><span class="cx">                         break;
</span></span></pre></div>
<a id="trunkWebKitgtkWebCoreSupportChromeClientGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp (37253 => 37254)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp        2008-10-03 20:56:50 UTC (rev 37253)
+++ trunk/WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp        2008-10-03 21:16:13 UTC (rev 37254)
</span><span class="lines">@@ -292,6 +292,11 @@
</span><span class="cx">     return point;
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+PlatformWidget WebChromeClient::platformWindow() const
+{
+    return m_webView ? GTK_WIDGET(m_webView) : 0;
+}
+
</ins><span class="cx"> void ChromeClient::mouseDidMoveOverElement(const HitTestResult&amp; hit, unsigned modifierFlags)
</span><span class="cx"> {
</span><span class="cx">     // check if the element is a link...
</span></span></pre></div>
<a id="trunkWebKitgtkWebCoreSupportChromeClientGtkh"></a>
<div class="modfile"><h4>Modified: trunk/WebKit/gtk/WebCoreSupport/ChromeClientGtk.h (37253 => 37254)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/gtk/WebCoreSupport/ChromeClientGtk.h        2008-10-03 20:56:50 UTC (rev 37253)
+++ trunk/WebKit/gtk/WebCoreSupport/ChromeClientGtk.h        2008-10-03 21:16:13 UTC (rev 37254)
</span><span class="lines">@@ -88,6 +88,7 @@
</span><span class="cx">         virtual void scroll(const WebCore::IntSize&amp; scrollDelta, const WebCore::IntRect&amp; rectToScroll, const WebCore::IntRect&amp; clipRect);
</span><span class="cx">         virtual WebCore::IntPoint screenToWindow(const WebCore::IntPoint&amp;) const;
</span><span class="cx">         virtual WebCore::IntRect windowToScreen(const WebCore::IntRect&amp;) const;
</span><ins>+        virtual PlatformWidget platformWindow() const;
</ins><span class="cx"> 
</span><span class="cx">         virtual void mouseDidMoveOverElement(const WebCore::HitTestResult&amp;, unsigned modifierFlags);
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkWebKitmacWebCoreSupportWebChromeClienth"></a>
<div class="modfile"><h4>Modified: trunk/WebKit/mac/WebCoreSupport/WebChromeClient.h (37253 => 37254)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/mac/WebCoreSupport/WebChromeClient.h        2008-10-03 20:56:50 UTC (rev 37253)
+++ trunk/WebKit/mac/WebCoreSupport/WebChromeClient.h        2008-10-03 21:16:13 UTC (rev 37254)
</span><span class="lines">@@ -93,6 +93,7 @@
</span><span class="cx">     virtual void scroll(const WebCore::IntSize&amp; scrollDelta, const WebCore::IntRect&amp; rectToScroll, const WebCore::IntRect&amp; clipRect);
</span><span class="cx">     virtual WebCore::IntPoint screenToWindow(const WebCore::IntPoint&amp;) const;
</span><span class="cx">     virtual WebCore::IntRect windowToScreen(const WebCore::IntRect&amp;) const;
</span><ins>+    virtual PlatformWidget platformWindow() const;
</ins><span class="cx"> 
</span><span class="cx">     virtual void setStatusbarText(const WebCore::String&amp;);
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkWebKitmacWebCoreSupportWebChromeClientmm"></a>
<div class="modfile"><h4>Modified: trunk/WebKit/mac/WebCoreSupport/WebChromeClient.mm (37253 => 37254)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/mac/WebCoreSupport/WebChromeClient.mm        2008-10-03 20:56:50 UTC (rev 37253)
+++ trunk/WebKit/mac/WebCoreSupport/WebChromeClient.mm        2008-10-03 21:16:13 UTC (rev 37254)
</span><span class="lines">@@ -421,6 +421,11 @@
</span><span class="cx"> {
</span><span class="cx">     return r;
</span><span class="cx"> }
</span><ins>+
+PlatformWidget WebChromeClient::platformWindow() const
+{
+    return 0;
+}
</ins><span class="cx"> // End host window methods.
</span><span class="cx"> 
</span><span class="cx"> void WebChromeClient::mouseDidMoveOverElement(const HitTestResult&amp; result, unsigned modifierFlags)
</span></span></pre></div>
<a id="trunkWebKitqtWebCoreSupportChromeClientQtcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebKit/qt/WebCoreSupport/ChromeClientQt.cpp (37253 => 37254)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/qt/WebCoreSupport/ChromeClientQt.cpp        2008-10-03 20:56:50 UTC (rev 37253)
+++ trunk/WebKit/qt/WebCoreSupport/ChromeClientQt.cpp        2008-10-03 21:16:13 UTC (rev 37254)
</span><span class="lines">@@ -335,6 +335,11 @@
</span><span class="cx">     return point;
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+PlatformWidget WebChromeClient::platformWindow() const
+{
+    return m_webPage-&gt;view();
+}
+
</ins><span class="cx"> void ChromeClientQt::mouseDidMoveOverElement(const HitTestResult&amp; result, unsigned modifierFlags)
</span><span class="cx"> {
</span><span class="cx">     if (result.absoluteLinkURL() != lastHoverURL
</span></span></pre></div>
<a id="trunkWebKitqtWebCoreSupportChromeClientQth"></a>
<div class="modfile"><h4>Modified: trunk/WebKit/qt/WebCoreSupport/ChromeClientQt.h (37253 => 37254)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/qt/WebCoreSupport/ChromeClientQt.h        2008-10-03 20:56:50 UTC (rev 37253)
+++ trunk/WebKit/qt/WebCoreSupport/ChromeClientQt.h        2008-10-03 21:16:13 UTC (rev 37254)
</span><span class="lines">@@ -104,7 +104,8 @@
</span><span class="cx">         virtual void scroll(const IntSize&amp; scrollDelta, const IntRect&amp; rectToScroll, const IntRect&amp; clipRect);
</span><span class="cx">         virtual IntPoint screenToWindow(const IntPoint&amp;) const;
</span><span class="cx">         virtual IntRect windowToScreen(const IntRect&amp;) const;
</span><del>-    
</del><ins>+        virtual PlatformWidget platformWindow() const;
+
</ins><span class="cx">         virtual void mouseDidMoveOverElement(const HitTestResult&amp;, unsigned modifierFlags);
</span><span class="cx"> 
</span><span class="cx">         virtual void setToolTip(const String&amp;);
</span></span></pre></div>
<a id="trunkWebKitwinWebCoreSupportWebChromeClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebKit/win/WebCoreSupport/WebChromeClient.cpp (37253 => 37254)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/win/WebCoreSupport/WebChromeClient.cpp        2008-10-03 20:56:50 UTC (rev 37253)
+++ trunk/WebKit/win/WebCoreSupport/WebChromeClient.cpp        2008-10-03 21:16:13 UTC (rev 37254)
</span><span class="lines">@@ -459,6 +459,14 @@
</span><span class="cx">     return result;
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+PlatformWidget WebChromeClient::platformWindow() const
+{
+    HWND viewWindow;
+    if (FAILED(m_webView-&gt;viewWindow(reinterpret_cast&lt;OLE_HANDLE*&gt;(&amp;viewWindow))))
+        return 0;
+    return viewWindow;
+}
+
</ins><span class="cx"> void WebChromeClient::mouseDidMoveOverElement(const HitTestResult&amp; result, unsigned modifierFlags)
</span><span class="cx"> {
</span><span class="cx">     COMPtr&lt;IWebUIDelegate&gt; uiDelegate;
</span></span></pre></div>
<a id="trunkWebKitwinWebCoreSupportWebChromeClienth"></a>
<div class="modfile"><h4>Modified: trunk/WebKit/win/WebCoreSupport/WebChromeClient.h (37253 => 37254)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/win/WebCoreSupport/WebChromeClient.h        2008-10-03 20:56:50 UTC (rev 37253)
+++ trunk/WebKit/win/WebCoreSupport/WebChromeClient.h        2008-10-03 21:16:13 UTC (rev 37254)
</span><span class="lines">@@ -96,6 +96,7 @@
</span><span class="cx">     virtual void scroll(const WebCore::IntSize&amp; scrollDelta, const WebCore::IntRect&amp; rectToScroll, const WebCore::IntRect&amp; clipRect);
</span><span class="cx">     virtual WebCore::IntPoint screenToWindow(const WebCore::IntPoint&amp; p) const;
</span><span class="cx">     virtual WebCore::IntRect windowToScreen(const WebCore::IntRect&amp; r) const;
</span><ins>+    virtual PlatformWidget platformWindow() const;
</ins><span class="cx"> 
</span><span class="cx">     virtual void addToDirtyRegion(const WebCore::IntRect&amp;);
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkWebKitwxWebKitSupportChromeClientWxcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebKit/wx/WebKitSupport/ChromeClientWx.cpp (37253 => 37254)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/wx/WebKitSupport/ChromeClientWx.cpp        2008-10-03 20:56:50 UTC (rev 37253)
+++ trunk/WebKit/wx/WebKitSupport/ChromeClientWx.cpp        2008-10-03 21:16:13 UTC (rev 37254)
</span><span class="lines">@@ -300,6 +300,11 @@
</span><span class="cx">     return point;
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+PlatformWidget WebChromeClient::platformWindow() const
+{
+    return 0;
+}
+
</ins><span class="cx"> void ChromeClientWx::scrollBackingStore(int dx, int dy, 
</span><span class="cx">                     const IntRect&amp; scrollViewRect, 
</span><span class="cx">                     const IntRect&amp; clipRect)
</span></span></pre></div>
<a id="trunkWebKitwxWebKitSupportChromeClientWxh"></a>
<div class="modfile"><h4>Modified: trunk/WebKit/wx/WebKitSupport/ChromeClientWx.h (37253 => 37254)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/wx/WebKitSupport/ChromeClientWx.h        2008-10-03 20:56:50 UTC (rev 37253)
+++ trunk/WebKit/wx/WebKitSupport/ChromeClientWx.h        2008-10-03 21:16:13 UTC (rev 37254)
</span><span class="lines">@@ -101,6 +101,7 @@
</span><span class="cx">     virtual void repaint(const IntRect&amp;, bool contentChanged, bool immediate = false);
</span><span class="cx">     virtual IntPoint screenToWindow(const IntPoint&amp;) const;
</span><span class="cx">     virtual IntRect windowToScreen(const IntRect&amp;) const;
</span><ins>+    virtual PlatformWidget platformWindow() const;
</ins><span class="cx"> 
</span><span class="cx">     virtual void mouseDidMoveOverElement(const HitTestResult&amp;, unsigned modifierFlags);
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>