<!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, #msg p { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul { 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>[28445] trunk/WebKit/win</title>
</head>
<body>

<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/28445">28445</a></dd>
<dt>Author</dt> <dd>aroben@apple.com</dd>
<dt>Date</dt> <dd>2007-12-05 11:38:02 -0800 (Wed, 05 Dec 2007)</dd>
</dl>

<h3>Log Message</h3>
<pre>         Expose WebView::setProhibitsMainFrameScrolling through IWebViewPrivate

         Reviewed by Steve.

         * Interfaces/IWebViewPrivate.idl: Added declaration.
         * WebInspectorClient.cpp:
         (WebInspectorClient::createPage): Updated for change to
         setProhibitsMainFrameScrolling signature.
         * WebView.cpp:
         (WebView::setProhibitsMainFrameScrolling): Updated and robustified.
         * WebView.h:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkWebKitwinChangeLog">trunk/WebKit/win/ChangeLog</a></li>
<li><a href="#trunkWebKitwinInterfacesIWebViewPrivateidl">trunk/WebKit/win/Interfaces/IWebViewPrivate.idl</a></li>
<li><a href="#trunkWebKitwinWebInspectorClientcpp">trunk/WebKit/win/WebInspectorClient.cpp</a></li>
<li><a href="#trunkWebKitwinWebViewcpp">trunk/WebKit/win/WebView.cpp</a></li>
<li><a href="#trunkWebKitwinWebViewh">trunk/WebKit/win/WebView.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkWebKitwinChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebKit/win/ChangeLog (28444 => 28445)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/win/ChangeLog        2007-12-05 19:36:56 UTC (rev 28444)
+++ trunk/WebKit/win/ChangeLog        2007-12-05 19:38:02 UTC (rev 28445)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2007-12-05  Adam Roben  &lt;aroben@apple.com&gt;
+
+        Expose WebView::setProhibitsMainFrameScrolling through IWebViewPrivate
+
+        Reviewed by Steve.
+
+        * Interfaces/IWebViewPrivate.idl: Added declaration.
+        * WebInspectorClient.cpp:
+        (WebInspectorClient::createPage): Updated for change to
+        setProhibitsMainFrameScrolling signature.
+        * WebView.cpp:
+        (WebView::setProhibitsMainFrameScrolling): Updated and robustified.
+        * WebView.h:
+
</ins><span class="cx"> 2007-12-05  Dan Bernstein  &lt;mitz@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Darin Adler.
</span></span></pre></div>
<a id="trunkWebKitwinInterfacesIWebViewPrivateidl"></a>
<div class="modfile"><h4>Modified: trunk/WebKit/win/Interfaces/IWebViewPrivate.idl (28444 => 28445)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/win/Interfaces/IWebViewPrivate.idl        2007-12-05 19:36:56 UTC (rev 28444)
+++ trunk/WebKit/win/Interfaces/IWebViewPrivate.idl        2007-12-05 19:38:02 UTC (rev 28445)
</span><span class="lines">@@ -122,4 +122,6 @@
</span><span class="cx">     HRESULT inspector([out, retval] IWebInspector**);
</span><span class="cx"> 
</span><span class="cx">     HRESULT clearUndoRedoOperations();
</span><ins>+
+    HRESULT setProhibitsMainFrameScrolling([in] BOOL prohibits);
</ins><span class="cx"> }
</span></span></pre></div>
<a id="trunkWebKitwinWebInspectorClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebKit/win/WebInspectorClient.cpp (28444 => 28445)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/win/WebInspectorClient.cpp        2007-12-05 19:36:56 UTC (rev 28444)
+++ trunk/WebKit/win/WebInspectorClient.cpp        2007-12-05 19:38:02 UTC (rev 28445)
</span><span class="lines">@@ -111,7 +111,7 @@
</span><span class="cx">     if (FAILED(m_webView-&gt;initWithFrame(rect, 0, 0)))
</span><span class="cx">         return 0;
</span><span class="cx"> 
</span><del>-    m_webView-&gt;setProhibitsMainFrameScrolling();
</del><ins>+    m_webView-&gt;setProhibitsMainFrameScrolling(TRUE);
</ins><span class="cx"> 
</span><span class="cx">     if (FAILED(m_webView-&gt;viewWindow(reinterpret_cast&lt;OLE_HANDLE*&gt;(&amp;m_webViewHwnd))))
</span><span class="cx">         return 0;
</span></span></pre></div>
<a id="trunkWebKitwinWebViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebKit/win/WebView.cpp (28444 => 28445)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/win/WebView.cpp        2007-12-05 19:36:56 UTC (rev 28444)
+++ trunk/WebKit/win/WebView.cpp        2007-12-05 19:38:02 UTC (rev 28445)
</span><span class="lines">@@ -4150,9 +4150,13 @@
</span><span class="cx">     return ::RevokeDragDrop(m_viewWindow);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void WebView::setProhibitsMainFrameScrolling(bool b)
</del><ins>+HRESULT WebView::setProhibitsMainFrameScrolling(BOOL b)
</ins><span class="cx"> {
</span><ins>+    if (!m_page)
+        return E_FAIL;
+
</ins><span class="cx">     m_page-&gt;mainFrame()-&gt;setProhibitsScrolling(b);
</span><ins>+    return S_OK;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> class IMMDict {
</span></span></pre></div>
<a id="trunkWebKitwinWebViewh"></a>
<div class="modfile"><h4>Modified: trunk/WebKit/win/WebView.h (28444 => 28445)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/win/WebView.h        2007-12-05 19:36:56 UTC (rev 28444)
+++ trunk/WebKit/win/WebView.h        2007-12-05 19:38:02 UTC (rev 28445)
</span><span class="lines">@@ -620,6 +620,8 @@
</span><span class="cx"> 
</span><span class="cx">     virtual HRESULT STDMETHODCALLTYPE clearUndoRedoOperations( void);
</span><span class="cx"> 
</span><ins>+    virtual HRESULT STDMETHODCALLTYPE setProhibitsMainFrameScrolling(BOOL);
+
</ins><span class="cx">     // WebView
</span><span class="cx">     WebCore::Page* page();
</span><span class="cx">     bool handleMouseEvent(UINT, WPARAM, LPARAM);
</span><span class="lines">@@ -649,7 +651,6 @@
</span><span class="cx">     void closeWindowSoon();
</span><span class="cx">     void close();
</span><span class="cx">     bool didClose() const { return m_didClose; }
</span><del>-    void setProhibitsMainFrameScrolling(bool = true);
</del><span class="cx"> 
</span><span class="cx">     bool onIMEStartComposition();
</span><span class="cx">     bool onIMEComposition(LPARAM);
</span></span></pre>
</div>
</div>

</body>
</html>