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

<h3>Log Message</h3>
<pre>WebCore:

2008-10-03  David Hyatt  &lt;hyatt@apple.com&gt;

        https://bugs.webkit.org/show_bug.cgi?id=21340
        
        Remove &quot;containingWindow()/setContainingWindow()&quot; from Widget.  HostWindow covers this now.
    
        Reviewed by Dan Bernstein &amp; Darin Adler
        
        * platform/ScrollView.cpp:
        (WebCore::ScrollView::addChild):
        * platform/Widget.cpp:
        (WebCore::Widget::init):
        * platform/Widget.h:
        * platform/mac/WidgetMac.mm:
        * platform/win/PopupMenuWin.cpp:
        (WebCore::PopupMenu::show):

WebKit/gtk:

2008-10-03  David Hyatt  &lt;hyatt@apple.com&gt;

        https://bugs.webkit.org/show_bug.cgi?id=21340
        
        Remove &quot;containingWindow()/setContainingWindow()&quot; from Widget.  HostWindow covers this now.

        Reviewed by Dan Bernstein &amp; Darin Adler
        
        * WebCoreSupport/FrameLoaderClientGtk.cpp:
        (WebKit::FrameLoaderClient::transitionToCommittedForNewPage):

WebKit/win:

2008-10-03  David Hyatt  &lt;hyatt@apple.com&gt;

        https://bugs.webkit.org/show_bug.cgi?id=21340
        
        Remove &quot;containingWindow()/setContainingWindow()&quot; from Widget.  HostWindow covers this now.
        
        Reviewed by Dan Bernstein &amp; Darin Adler

        * WebCoreSupport/WebFrameLoaderClient.cpp:
        (WebFrameLoaderClient::transitionToCommittedForNewPage):
        * WebScrollBar.cpp:
        (WebScrollBar::WebScrollBar):
        (WebScrollBar::init):
        (WebScrollBar::invalidateScrollbarRect):
        * WebScrollBar.h:</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="#trunkWebCoreplatformWidgetcpp">trunk/WebCore/platform/Widget.cpp</a></li>
<li><a href="#trunkWebCoreplatformWidgeth">trunk/WebCore/platform/Widget.h</a></li>
<li><a href="#trunkWebCoreplatformmacWidgetMacmm">trunk/WebCore/platform/mac/WidgetMac.mm</a></li>
<li><a href="#trunkWebCoreplatformwinPopupMenuWincpp">trunk/WebCore/platform/win/PopupMenuWin.cpp</a></li>
<li><a href="#trunkWebKitgtkChangeLog">trunk/WebKit/gtk/ChangeLog</a></li>
<li><a href="#trunkWebKitgtkWebCoreSupportFrameLoaderClientGtkcpp">trunk/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp</a></li>
<li><a href="#trunkWebKitwinChangeLog">trunk/WebKit/win/ChangeLog</a></li>
<li><a href="#trunkWebKitwinWebCoreSupportWebFrameLoaderClientcpp">trunk/WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp</a></li>
<li><a href="#trunkWebKitwinWebScrollBarcpp">trunk/WebKit/win/WebScrollBar.cpp</a></li>
<li><a href="#trunkWebKitwinWebScrollBarh">trunk/WebKit/win/WebScrollBar.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/ChangeLog (37248 => 37249)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/ChangeLog        2008-10-03 19:06:28 UTC (rev 37248)
+++ trunk/WebCore/ChangeLog        2008-10-03 19:17:35 UTC (rev 37249)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2008-10-03  David Hyatt  &lt;hyatt@apple.com&gt;
+
+        https://bugs.webkit.org/show_bug.cgi?id=21340
+        
+        Remove &quot;containingWindow()/setContainingWindow()&quot; from Widget.  HostWindow covers this now.
+    
+        Reviewed by Dan Bernstein &amp; Darin Adler
+        
+        * platform/ScrollView.cpp:
+        (WebCore::ScrollView::addChild):
+        * platform/Widget.cpp:
+        (WebCore::Widget::init):
+        * platform/Widget.h:
+        * platform/mac/WidgetMac.mm:
+        * platform/win/PopupMenuWin.cpp:
+        (WebCore::PopupMenu::show):
+
</ins><span class="cx"> 2008-10-03  Adele Peterson  &lt;adele@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Sam Weinig.
</span></span></pre></div>
<a id="trunkWebCoreplatformScrollViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/platform/ScrollView.cpp (37248 => 37249)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/platform/ScrollView.cpp        2008-10-03 19:06:28 UTC (rev 37248)
+++ trunk/WebCore/platform/ScrollView.cpp        2008-10-03 19:17:35 UTC (rev 37249)
</span><span class="lines">@@ -64,11 +64,8 @@
</span><span class="cx">     ASSERT(child != this &amp;&amp; !child-&gt;parent());
</span><span class="cx">     child-&gt;setParent(this);
</span><span class="cx">     m_children.add(child);
</span><del>-    if (!child-&gt;platformWidget()) {
-        child-&gt;setContainingWindow(containingWindow());
-        return;
-    }
-    platformAddChild(child);
</del><ins>+    if (child-&gt;platformWidget())
+        platformAddChild(child);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void ScrollView::removeChild(Widget* child)
</span></span></pre></div>
<a id="trunkWebCoreplatformWidgetcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/platform/Widget.cpp (37248 => 37249)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/platform/Widget.cpp        2008-10-03 19:06:28 UTC (rev 37248)
+++ trunk/WebCore/platform/Widget.cpp        2008-10-03 19:17:35 UTC (rev 37249)
</span><span class="lines">@@ -38,7 +38,6 @@
</span><span class="cx">     m_parent = 0;
</span><span class="cx">     m_selfVisible = false;
</span><span class="cx">     m_parentVisible = false;
</span><del>-    m_containingWindow = 0;
</del><span class="cx">     m_widget = widget;
</span><span class="cx">     if (m_widget)
</span><span class="cx">         retainPlatformWidget();
</span></span></pre></div>
<a id="trunkWebCoreplatformWidgeth"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/platform/Widget.h (37248 => 37249)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/platform/Widget.h        2008-10-03 19:06:28 UTC (rev 37248)
+++ trunk/WebCore/platform/Widget.h        2008-10-03 19:17:35 UTC (rev 37249)
</span><span class="lines">@@ -38,7 +38,6 @@
</span><span class="cx"> class NSWindow;
</span><span class="cx"> #endif
</span><span class="cx"> typedef NSView* PlatformWidget;
</span><del>-typedef NSWindow* PlatformWindow;
</del><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="cx"> #if PLATFORM(WIN)
</span><span class="lines">@@ -66,10 +65,6 @@
</span><span class="cx"> typedef wxWindow* PlatformWidget;
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><del>-#if !PLATFORM(MAC)
-typedef PlatformWidget PlatformWindow;
-#endif
-
</del><span class="cx"> #include &quot;IntPoint.h&quot;
</span><span class="cx"> #include &quot;IntRect.h&quot;
</span><span class="cx"> #include &quot;IntSize.h&quot;
</span><span class="lines">@@ -160,10 +155,6 @@
</span><span class="cx"> 
</span><span class="cx">     virtual void handleEvent(Event*) { }
</span><span class="cx"> 
</span><del>-    // The containing window is used as the coordinate space for event handling.
-    PlatformWindow containingWindow() const;
-    void setContainingWindow(PlatformWindow window) { m_containingWindow = window; } // This method is only used by platforms that can't easily get back to their containing window.
-
</del><span class="cx">     // It is important for cross-platform code to realize that Mac has flipped coordinates.  Therefore any code
</span><span class="cx">     // that tries to convert the location of a rect using the point-based convertFromContainingWindow will end
</span><span class="cx">     // up with an inaccurate rect.  Always make sure to use the rect-based convertFromContainingWindow method
</span><span class="lines">@@ -197,7 +188,6 @@
</span><span class="cx">     bool m_parentVisible;
</span><span class="cx">     
</span><span class="cx">     IntRect m_frame; // Not used when a native widget exists.
</span><del>-    PlatformWindow m_containingWindow; // Not used when a native widget exists.
</del><span class="cx"> 
</span><span class="cx"> #if PLATFORM(MAC) || PLATFORM(GTK)
</span><span class="cx">     WidgetPrivate* m_data;
</span></span></pre></div>
<a id="trunkWebCoreplatformmacWidgetMacmm"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/platform/mac/WidgetMac.mm (37248 => 37249)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/platform/mac/WidgetMac.mm        2008-10-03 19:06:28 UTC (rev 37248)
+++ trunk/WebCore/platform/mac/WidgetMac.mm        2008-10-03 19:17:35 UTC (rev 37249)
</span><span class="lines">@@ -275,18 +275,6 @@
</span><span class="cx">     }
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-NSWindow* Widget::containingWindow() const
-{
-    if (!platformWidget())
-        return m_containingWindow;
-    
-    BEGIN_BLOCK_OBJC_EXCEPTIONS;
-    [platformWidget() window];
-    END_BLOCK_OBJC_EXCEPTIONS;
-
-    return nil; 
-}
-
</del><span class="cx"> IntPoint Widget::convertFromContainingWindow(const IntPoint&amp; point) const
</span><span class="cx"> {
</span><span class="cx">     if (!platformWidget() &amp;&amp; parent()) {
</span></span></pre></div>
<a id="trunkWebCoreplatformwinPopupMenuWincpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/platform/win/PopupMenuWin.cpp (37248 => 37249)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/platform/win/PopupMenuWin.cpp        2008-10-03 19:06:28 UTC (rev 37248)
+++ trunk/WebCore/platform/win/PopupMenuWin.cpp        2008-10-03 19:17:35 UTC (rev 37249)
</span><span class="lines">@@ -119,7 +119,6 @@
</span><span class="cx">         if (visibleItems() &lt; client()-&gt;listSize()) {
</span><span class="cx">             // We need a scroll bar
</span><span class="cx">             m_scrollbar = Scrollbar::createNativeScrollbar(this, VerticalScrollbar, SmallScrollbar);
</span><del>-            m_scrollbar-&gt;setContainingWindow(m_popup);
</del><span class="cx">         }
</span><span class="cx"> 
</span><span class="cx">     ::SetWindowPos(m_popup, HWND_TOP, m_windowRect.x(), m_windowRect.y(), m_windowRect.width(), m_windowRect.height(), 0);
</span></span></pre></div>
<a id="trunkWebKitgtkChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebKit/gtk/ChangeLog (37248 => 37249)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/gtk/ChangeLog        2008-10-03 19:06:28 UTC (rev 37248)
+++ trunk/WebKit/gtk/ChangeLog        2008-10-03 19:17:35 UTC (rev 37249)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2008-10-03  David Hyatt  &lt;hyatt@apple.com&gt;
+
+        https://bugs.webkit.org/show_bug.cgi?id=21340
+        
+        Remove &quot;containingWindow()/setContainingWindow()&quot; from Widget.  HostWindow covers this now.
+
+        Reviewed by Dan Bernstein &amp; Darin Adler
+        
+        * WebCoreSupport/FrameLoaderClientGtk.cpp:
+        (WebKit::FrameLoaderClient::transitionToCommittedForNewPage):
+
</ins><span class="cx"> 2008-10-03  Alp Toker  &lt;alp@nuanti.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Remove some left-over GTK+ includes. No change in functionality.
</span></span></pre></div>
<a id="trunkWebKitgtkWebCoreSupportFrameLoaderClientGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp (37248 => 37249)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp        2008-10-03 19:06:28 UTC (rev 37248)
+++ trunk/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp        2008-10-03 19:17:35 UTC (rev 37249)
</span><span class="lines">@@ -793,7 +793,6 @@
</span><span class="cx">     frame-&gt;setView(frameView);
</span><span class="cx">     // FrameViews are created with a ref count of 1. Release this ref since we've assigned it to frame.
</span><span class="cx">     frameView-&gt;deref();
</span><del>-    frameView-&gt;setContainingWindow(GTK_WIDGET(containingWindow));
</del><span class="cx"> 
</span><span class="cx">     if (frame-&gt;ownerRenderer())
</span><span class="cx">         frame-&gt;ownerRenderer()-&gt;setWidget(frameView);
</span></span></pre></div>
<a id="trunkWebKitwinChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebKit/win/ChangeLog (37248 => 37249)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/win/ChangeLog        2008-10-03 19:06:28 UTC (rev 37248)
+++ trunk/WebKit/win/ChangeLog        2008-10-03 19:17:35 UTC (rev 37249)
</span><span class="lines">@@ -1,5 +1,21 @@
</span><span class="cx"> 2008-10-03  David Hyatt  &lt;hyatt@apple.com&gt;
</span><span class="cx"> 
</span><ins>+        https://bugs.webkit.org/show_bug.cgi?id=21340
+        
+        Remove &quot;containingWindow()/setContainingWindow()&quot; from Widget.  HostWindow covers this now.
+        
+        Reviewed by Dan Bernstein &amp; Darin Adler
+
+        * WebCoreSupport/WebFrameLoaderClient.cpp:
+        (WebFrameLoaderClient::transitionToCommittedForNewPage):
+        * WebScrollBar.cpp:
+        (WebScrollBar::WebScrollBar):
+        (WebScrollBar::init):
+        (WebScrollBar::invalidateScrollbarRect):
+        * WebScrollBar.h:
+
+2008-10-03  David Hyatt  &lt;hyatt@apple.com&gt;
+
</ins><span class="cx">          Remove addToDirtyRegion.
</span><span class="cx">         
</span><span class="cx">          Reviewed by Oliver Hunt
</span></span></pre></div>
<a id="trunkWebKitwinWebCoreSupportWebFrameLoaderClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp (37248 => 37249)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp        2008-10-03 19:06:28 UTC (rev 37248)
+++ trunk/WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp        2008-10-03 19:17:35 UTC (rev 37249)
</span><span class="lines">@@ -511,10 +511,6 @@
</span><span class="cx"> 
</span><span class="cx">     m_webFrame-&gt;updateBackground();
</span><span class="cx"> 
</span><del>-    HWND viewWindow;
-    if (SUCCEEDED(webView-&gt;viewWindow(reinterpret_cast&lt;OLE_HANDLE*&gt;(&amp;viewWindow))))
-        frameView-&gt;setContainingWindow(viewWindow);
-
</del><span class="cx">     if (isMainFrame)
</span><span class="cx">         frameView-&gt;setParentVisible(true);
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkWebKitwinWebScrollBarcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebKit/win/WebScrollBar.cpp (37248 => 37249)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/win/WebScrollBar.cpp        2008-10-03 19:06:28 UTC (rev 37248)
+++ trunk/WebKit/win/WebScrollBar.cpp        2008-10-03 19:17:35 UTC (rev 37249)
</span><span class="lines">@@ -41,6 +41,7 @@
</span><span class="cx"> 
</span><span class="cx"> WebScrollBar::WebScrollBar()
</span><span class="cx">     : m_refCount(0)
</span><ins>+    , m_containingWindow(0)
</ins><span class="cx"> {
</span><span class="cx">     gClassCount++;
</span><span class="cx">     gClassNameCount.add(&quot;WebScrollBar&quot;);
</span><span class="lines">@@ -104,7 +105,7 @@
</span><span class="cx">     m_scrollBar = Scrollbar::createNativeScrollbar(this, webCoreOrientation, webCoreControlSize);
</span><span class="cx">     if (!m_scrollBar)
</span><span class="cx">         return E_FAIL;
</span><del>-    m_scrollBar-&gt;setContainingWindow((HWND)(ULONG64)containingWindow);
</del><ins>+    m_containingWindow = (HWND)(ULONG64)containingWindow;
</ins><span class="cx">     return S_OK;
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -262,7 +263,6 @@
</span><span class="cx"> 
</span><span class="cx"> void WebScrollBar::invalidateScrollbarRect(Scrollbar*, const IntRect&amp; rect)
</span><span class="cx"> {
</span><del>-    HWND sbContainingWindow = m_scrollBar-&gt;containingWindow();
</del><span class="cx">     RECT r = rect;
</span><del>-    ::InvalidateRect(sbContainingWindow, &amp;r, false);
</del><ins>+    ::InvalidateRect(m_containingWindow, &amp;r, false);
</ins><span class="cx"> }
</span></span></pre></div>
<a id="trunkWebKitwinWebScrollBarh"></a>
<div class="modfile"><h4>Modified: trunk/WebKit/win/WebScrollBar.h (37248 => 37249)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/win/WebScrollBar.h        2008-10-03 19:06:28 UTC (rev 37248)
+++ trunk/WebKit/win/WebScrollBar.h        2008-10-03 19:17:35 UTC (rev 37249)
</span><span class="lines">@@ -123,6 +123,7 @@
</span><span class="cx">     virtual bool isActive() const { return true; }
</span><span class="cx"> 
</span><span class="cx">     ULONG m_refCount;
</span><ins>+    HWND m_containingWindow;
</ins><span class="cx">     RefPtr&lt;WebCore::Scrollbar&gt; m_scrollBar;
</span><span class="cx">     COMPtr&lt;IWebScrollBarDelegatePrivate&gt; m_delegate;
</span><span class="cx"> };
</span></span></pre>
</div>
</div>

</body>
</html>