<!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>[170125] trunk/Source/WebKit/win</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/170125">170125</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-06-18 15:57:29 -0700 (Wed, 18 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove IWebFramePrivate::loadType
https://bugs.webkit.org/show_bug.cgi?id=134044
Reviewed by Tim Horton.
* Interfaces/IWebFramePrivate.idl:
* WebFrame.cpp:
(WebFrame::loadType): Deleted.
(WebFrame::unused2): Deleted.
* WebFrame.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitwinChangeLog">trunk/Source/WebKit/win/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitwinInterfacesIWebFramePrivateidl">trunk/Source/WebKit/win/Interfaces/IWebFramePrivate.idl</a></li>
<li><a href="#trunkSourceWebKitwinWebFramecpp">trunk/Source/WebKit/win/WebFrame.cpp</a></li>
<li><a href="#trunkSourceWebKitwinWebFrameh">trunk/Source/WebKit/win/WebFrame.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKitwinChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/ChangeLog (170124 => 170125)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/ChangeLog 2014-06-18 22:32:52 UTC (rev 170124)
+++ trunk/Source/WebKit/win/ChangeLog 2014-06-18 22:57:29 UTC (rev 170125)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2014-06-18 Anders Carlsson <andersca@apple.com>
+
+ Remove IWebFramePrivate::loadType
+ https://bugs.webkit.org/show_bug.cgi?id=134044
+
+ Reviewed by Tim Horton.
+
+ * Interfaces/IWebFramePrivate.idl:
+ * WebFrame.cpp:
+ (WebFrame::loadType): Deleted.
+ (WebFrame::unused2): Deleted.
+ * WebFrame.h:
+
</ins><span class="cx"> 2014-06-12 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> [Win] Avoid crashes in code that converted CFDictionaries to HashMap
</span></span></pre></div>
<a id="trunkSourceWebKitwinInterfacesIWebFramePrivateidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/Interfaces/IWebFramePrivate.idl (170124 => 170125)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/Interfaces/IWebFramePrivate.idl 2014-06-18 22:32:52 UTC (rev 170124)
+++ trunk/Source/WebKit/win/Interfaces/IWebFramePrivate.idl 2014-06-18 22:57:29 UTC (rev 170125)
</span><span class="lines">@@ -54,13 +54,13 @@
</span><span class="cx">
</span><span class="cx"> interface IWebFramePrivate : IUnknown
</span><span class="cx"> {
</span><del>- HRESULT unused1([out, retval] BSTR*);
</del><ins>+ HRESULT unused1();
</ins><span class="cx"> HRESULT scrollOffset([out, retval] SIZE* offset);
</span><span class="cx">
</span><span class="cx"> // FIXME: This shouldn't be needed once IWebDocumentView is implemented.
</span><span class="cx"> HRESULT layout();
</span><span class="cx"> HRESULT firstLayoutDone([out, retval] BOOL* result);
</span><del>- HRESULT loadType([out, retval] WebFrameLoadType* type);
</del><ins>+ HRESULT unused2();
</ins><span class="cx">
</span><span class="cx"> HRESULT setInPrintingMode([in] BOOL value, [in] HDC printDC);
</span><span class="cx"> HRESULT getPrintedPageCount([in] HDC printDC, [out, retval] UINT* pageCount);
</span><span class="lines">@@ -78,7 +78,7 @@
</span><span class="cx">
</span><span class="cx"> HRESULT pendingFrameUnloadEventCount([out, retval] UINT* result);
</span><span class="cx">
</span><del>- HRESULT unused2();
</del><ins>+ HRESULT unused3();
</ins><span class="cx">
</span><span class="cx"> HRESULT paintDocumentRectToContext([in] RECT rect, [in] OLE_HANDLE deviceContext);
</span><span class="cx">
</span><span class="lines">@@ -96,7 +96,7 @@
</span><span class="cx">
</span><span class="cx"> [local] JSGlobalContextRef globalContextForScriptWorld([in] IWebScriptWorld*);
</span><span class="cx">
</span><del>- HRESULT unused3([in] BSTR, [out, retval] BSTR*);
</del><ins>+ HRESULT unused4();
</ins><span class="cx">
</span><span class="cx"> HRESULT visibleContentRect([out, retval] RECT*);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebFramecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebFrame.cpp (170124 => 170125)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebFrame.cpp 2014-06-18 22:32:52 UTC (rev 170124)
+++ trunk/Source/WebKit/win/WebFrame.cpp 2014-06-18 22:57:29 UTC (rev 170125)
</span><span class="lines">@@ -950,24 +950,6 @@
</span><span class="cx"> return S_OK;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-HRESULT STDMETHODCALLTYPE WebFrame::loadType(
- /* [retval][out] */ WebFrameLoadType* type)
-{
- if (!type) {
- ASSERT_NOT_REACHED();
- return E_POINTER;
- }
-
- *type = (WebFrameLoadType)0;
-
- Frame* coreFrame = core(this);
- if (!coreFrame)
- return E_FAIL;
-
- *type = (WebFrameLoadType)coreFrame->loader().loadType();
- return S_OK;
-}
-
</del><span class="cx"> HRESULT STDMETHODCALLTYPE WebFrame::pendingFrameUnloadEventCount(
</span><span class="cx"> /* [retval][out] */ UINT* result)
</span><span class="cx"> {
</span><span class="lines">@@ -986,11 +968,6 @@
</span><span class="cx"> return S_OK;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-HRESULT STDMETHODCALLTYPE WebFrame::unused2()
-{
- return E_NOTIMPL;
-}
-
</del><span class="cx"> HRESULT STDMETHODCALLTYPE WebFrame::hasSpellingMarker(
</span><span class="cx"> /* [in] */ UINT from,
</span><span class="cx"> /* [in] */ UINT length,
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebFrameh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebFrame.h (170124 => 170125)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebFrame.h 2014-06-18 22:32:52 UTC (rev 170124)
+++ trunk/Source/WebKit/win/WebFrame.h 2014-06-18 22:57:29 UTC (rev 170125)
</span><span class="lines">@@ -157,7 +157,7 @@
</span><span class="cx"> virtual /* [local] */ JSGlobalContextRef STDMETHODCALLTYPE globalContext();
</span><span class="cx">
</span><span class="cx"> // IWebFramePrivate
</span><del>- virtual HRESULT STDMETHODCALLTYPE unused1(BSTR*) { return E_NOTIMPL; }
</del><ins>+ virtual HRESULT STDMETHODCALLTYPE unused1() { return E_NOTIMPL; }
</ins><span class="cx"> virtual HRESULT STDMETHODCALLTYPE renderTreeAsExternalRepresentation(BOOL forPrinting, BSTR *result);
</span><span class="cx">
</span><span class="cx"> virtual HRESULT STDMETHODCALLTYPE pageNumberForElementById(
</span><span class="lines">@@ -179,13 +179,12 @@
</span><span class="cx"> virtual HRESULT STDMETHODCALLTYPE firstLayoutDone(
</span><span class="cx"> /* [retval][out] */ BOOL* result);
</span><span class="cx">
</span><del>- virtual HRESULT STDMETHODCALLTYPE loadType(
- /* [retval][out] */ WebFrameLoadType* type);
</del><ins>+ virtual HRESULT STDMETHODCALLTYPE unused2() { return E_NOTIMPL; }
</ins><span class="cx">
</span><span class="cx"> virtual HRESULT STDMETHODCALLTYPE pendingFrameUnloadEventCount(
</span><span class="cx"> /* [retval][out] */ UINT* result);
</span><span class="cx">
</span><del>- virtual HRESULT STDMETHODCALLTYPE unused2();
</del><ins>+ virtual HRESULT STDMETHODCALLTYPE unused3();
</ins><span class="cx">
</span><span class="cx"> virtual HRESULT STDMETHODCALLTYPE setInPrintingMode(
</span><span class="cx"> /* [in] */ BOOL value,
</span><span class="lines">@@ -277,7 +276,7 @@
</span><span class="cx">
</span><span class="cx"> virtual HRESULT STDMETHODCALLTYPE setTextDirection(BSTR);
</span><span class="cx">
</span><del>- virtual HRESULT STDMETHODCALLTYPE unused3(BSTR, BSTR*) { return E_NOTIMPL; }
</del><ins>+ virtual HRESULT STDMETHODCALLTYPE unused4() { return E_NOTIMPL; }
</ins><span class="cx">
</span><span class="cx"> virtual HRESULT STDMETHODCALLTYPE resumeAnimations();
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>