<!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>[185400] 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/185400">185400</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-06-09 20:34:24 -0700 (Tue, 09 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Implement dumpProgressFinishedCallback() for Win layoutTestController.
https://bugs.webkit.org/show_bug.cgi?id=66773
Patch by Hyungwook Lee <hyungwook.lee@navercorp.com> on 2015-06-09
Reviewed by Darin Adler.
Source/WebKit/win:
* WebView.cpp:
(WebView::setFrameLoadDelegatePrivate):
Tools:
* DumpRenderTree/win/FrameLoadDelegate.cpp:
* DumpRenderTree/win/FrameLoadDelegate.h:
LayoutTests:
* platform/win/TestExpectations:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformwinTestExpectations">trunk/LayoutTests/platform/win/TestExpectations</a></li>
<li><a href="#trunkSourceWebKitwinChangeLog">trunk/Source/WebKit/win/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitwinWebViewcpp">trunk/Source/WebKit/win/WebView.cpp</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsDumpRenderTreewinFrameLoadDelegatecpp">trunk/Tools/DumpRenderTree/win/FrameLoadDelegate.cpp</a></li>
<li><a href="#trunkToolsDumpRenderTreewinFrameLoadDelegateh">trunk/Tools/DumpRenderTree/win/FrameLoadDelegate.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (185399 => 185400)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-06-10 02:00:40 UTC (rev 185399)
+++ trunk/LayoutTests/ChangeLog 2015-06-10 03:34:24 UTC (rev 185400)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2015-06-09 Hyungwook Lee <hyungwook.lee@navercorp.com>
+
+ Implement dumpProgressFinishedCallback() for Win layoutTestController.
+ https://bugs.webkit.org/show_bug.cgi?id=66773
+
+ Reviewed by Darin Adler.
+
+ * platform/win/TestExpectations:
+
</ins><span class="cx"> 2015-06-09 Ryosuke Niwa <rniwa@webkit.org>
</span><span class="cx">
</span><span class="cx"> REGRESSION(r180867): Tabbing to login field on iCloud.com doesn't have highlight for text
</span></span></pre></div>
<a id="trunkLayoutTestsplatformwinTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/win/TestExpectations (185399 => 185400)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/win/TestExpectations 2015-06-10 02:00:40 UTC (rev 185399)
+++ trunk/LayoutTests/platform/win/TestExpectations 2015-06-10 03:34:24 UTC (rev 185400)
</span><span class="lines">@@ -457,9 +457,6 @@
</span><span class="cx"> # Font feature settings is not implemented.
</span><span class="cx"> css3/font-feature-settings-rendering.html [ Skip ]
</span><span class="cx">
</span><del>-# TODO Implement dumpProgressFinishedCallback
-webkit.org/b/66773 http/tests/loading/progress-finished-callback.html
-
</del><span class="cx"> # TODO HiDPI tests require test infrastructure enhancements (e.g. testRunner.setBackingScaleFactor)
</span><span class="cx"> # https://bugs.webkit.org/show_bug.cgi?id=87919
</span><span class="cx"> webkit.org/b/87919 compositing/tiled-layers-hidpi.html
</span></span></pre></div>
<a id="trunkSourceWebKitwinChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/ChangeLog (185399 => 185400)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/ChangeLog 2015-06-10 02:00:40 UTC (rev 185399)
+++ trunk/Source/WebKit/win/ChangeLog 2015-06-10 03:34:24 UTC (rev 185400)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-06-09 Hyungwook Lee <hyungwook.lee@navercorp.com>
+
+ Implement dumpProgressFinishedCallback() for Win layoutTestController.
+ https://bugs.webkit.org/show_bug.cgi?id=66773
+
+ Reviewed by Darin Adler.
+
+ * WebView.cpp:
+ (WebView::setFrameLoadDelegatePrivate):
+
</ins><span class="cx"> 2015-06-08 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Access GCController instance via GCController::singleton() instead of a free function
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebView.cpp (185399 => 185400)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebView.cpp 2015-06-10 02:00:40 UTC (rev 185399)
+++ trunk/Source/WebKit/win/WebView.cpp 2015-06-10 03:34:24 UTC (rev 185400)
</span><span class="lines">@@ -5249,7 +5249,23 @@
</span><span class="cx"> HRESULT STDMETHODCALLTYPE WebView::setFrameLoadDelegatePrivate(
</span><span class="cx"> /* [in] */ IWebFrameLoadDelegatePrivate* d)
</span><span class="cx"> {
</span><ins>+ if (m_frameLoadDelegatePrivate == d)
+ return S_OK;
+
+ static BSTR webViewProgressFinishedNotificationName = SysAllocString(WebViewProgressFinishedNotification);
+
+ IWebNotificationCenter* notifyCenter = WebNotificationCenter::defaultCenterInternal();
+
+ COMPtr<IWebNotificationObserver> wasObserver(Query, m_frameLoadDelegatePrivate);
+ if (wasObserver)
+ notifyCenter->removeObserver(wasObserver.get(), webViewProgressFinishedNotificationName, nullptr);
+
</ins><span class="cx"> m_frameLoadDelegatePrivate = d;
</span><ins>+
+ COMPtr<IWebNotificationObserver> isObserver(Query, m_frameLoadDelegatePrivate);
+ if (isObserver)
+ notifyCenter->addObserver(isObserver.get(), webViewProgressFinishedNotificationName, nullptr);
+
</ins><span class="cx"> return S_OK;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (185399 => 185400)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-06-10 02:00:40 UTC (rev 185399)
+++ trunk/Tools/ChangeLog 2015-06-10 03:34:24 UTC (rev 185400)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-06-09 Hyungwook Lee <hyungwook.lee@navercorp.com>
+
+ Implement dumpProgressFinishedCallback() for Win layoutTestController.
+ https://bugs.webkit.org/show_bug.cgi?id=66773
+
+ Reviewed by Darin Adler.
+
+ * DumpRenderTree/win/FrameLoadDelegate.cpp:
+ * DumpRenderTree/win/FrameLoadDelegate.h:
+
</ins><span class="cx"> 2015-06-09 Ryosuke Niwa <rniwa@webkit.org>
</span><span class="cx">
</span><span class="cx"> run-benchmark should either checkout JetStream 1.0.1 or support running the latest version
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreewinFrameLoadDelegatecpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/win/FrameLoadDelegate.cpp (185399 => 185400)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/win/FrameLoadDelegate.cpp 2015-06-10 02:00:40 UTC (rev 185399)
+++ trunk/Tools/DumpRenderTree/win/FrameLoadDelegate.cpp 2015-06-10 03:34:24 UTC (rev 185400)
</span><span class="lines">@@ -96,6 +96,8 @@
</span><span class="cx"> *ppvObject = static_cast<IWebFrameLoadDelegatePrivate*>(this);
</span><span class="cx"> else if (IsEqualGUID(riid, IID_IWebFrameLoadDelegatePrivate2))
</span><span class="cx"> *ppvObject = static_cast<IWebFrameLoadDelegatePrivate2*>(this);
</span><ins>+ else if (IsEqualGUID(riid, IID_IWebNotificationObserver))
+ *ppvObject = static_cast<IWebNotificationObserver*>(this);
</ins><span class="cx"> else
</span><span class="cx"> return E_NOINTERFACE;
</span><span class="cx">
</span><span class="lines">@@ -424,3 +426,24 @@
</span><span class="cx">
</span><span class="cx"> return S_OK;
</span><span class="cx"> }
</span><ins>+
+HRESULT FrameLoadDelegate::onNotify(IWebNotification* notification)
+{
+ _bstr_t notificationName;
+ HRESULT hr = notification->name(&notificationName.GetBSTR());
+ if (FAILED(hr))
+ return hr;
+
+ static _bstr_t webViewProgressFinishedNotificationName(WebViewProgressFinishedNotification);
+
+ if (!wcscmp(notificationName, webViewProgressFinishedNotificationName))
+ webViewProgressFinishedNotification();
+
+ return S_OK;
+}
+
+void FrameLoadDelegate::webViewProgressFinishedNotification()
+{
+ if (!done && gTestRunner->dumpProgressFinishedCallback())
+ printf("postProgressFinishedNotification\n");
+}
</ins></span></pre></div>
<a id="trunkToolsDumpRenderTreewinFrameLoadDelegateh"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/win/FrameLoadDelegate.h (185399 => 185400)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/win/FrameLoadDelegate.h 2015-06-10 02:00:40 UTC (rev 185399)
+++ trunk/Tools/DumpRenderTree/win/FrameLoadDelegate.h 2015-06-10 03:34:24 UTC (rev 185400)
</span><span class="lines">@@ -35,7 +35,7 @@
</span><span class="cx"> class TextInputController;
</span><span class="cx"> class GCController;
</span><span class="cx">
</span><del>-class FrameLoadDelegate : public IWebFrameLoadDelegate, public IWebFrameLoadDelegatePrivate2 {
</del><ins>+class FrameLoadDelegate : public IWebFrameLoadDelegate, public IWebFrameLoadDelegatePrivate2, public IWebNotificationObserver {
</ins><span class="cx"> public:
</span><span class="cx"> FrameLoadDelegate();
</span><span class="cx"> virtual ~FrameLoadDelegate();
</span><span class="lines">@@ -150,11 +150,15 @@
</span><span class="cx"> /* [in] */ IWebView *sender,
</span><span class="cx"> /* [in] */ IWebFrame *frame) { return E_NOTIMPL; }
</span><span class="cx">
</span><ins>+ // IWebNotificationObserver
+ virtual HRESULT STDMETHODCALLTYPE onNotify(IWebNotification*);
+
</ins><span class="cx"> private:
</span><span class="cx"> void didClearWindowObjectForFrameInIsolatedWorld(IWebFrame*, IWebScriptWorld*);
</span><span class="cx"> void didClearWindowObjectForFrameInStandardWorld(IWebFrame*);
</span><span class="cx">
</span><span class="cx"> void locationChangeDone(IWebError*, IWebFrame*);
</span><ins>+ void webViewProgressFinishedNotification();
</ins><span class="cx">
</span><span class="cx"> ULONG m_refCount;
</span><span class="cx"> std::unique_ptr<GCController> m_gcController;
</span></span></pre>
</div>
</div>
</body>
</html>