<!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>[186962] tags/Safari-601.1.36.2</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/186962">186962</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2015-07-17 12:23:43 -0700 (Fri, 17 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/186881">r186881</a>. rdar://problem/21822278</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#tagsSafari6011362SourceWebKitwinChangeLog">tags/Safari-601.1.36.2/Source/WebKit/win/ChangeLog</a></li>
<li><a href="#tagsSafari6011362SourceWebKitwinDefaultPolicyDelegatecpp">tags/Safari-601.1.36.2/Source/WebKit/win/DefaultPolicyDelegate.cpp</a></li>
<li><a href="#tagsSafari6011362SourceWebKitwinInterfacesIWebEditingDelegateidl">tags/Safari-601.1.36.2/Source/WebKit/win/Interfaces/IWebEditingDelegate.idl</a></li>
<li><a href="#tagsSafari6011362SourceWebKitwinInterfacesIWebFrameidl">tags/Safari-601.1.36.2/Source/WebKit/win/Interfaces/IWebFrame.idl</a></li>
<li><a href="#tagsSafari6011362SourceWebKitwinInterfacesIWebPreferencesPrivateidl">tags/Safari-601.1.36.2/Source/WebKit/win/Interfaces/IWebPreferencesPrivate.idl</a></li>
<li><a href="#tagsSafari6011362SourceWebKitwinInterfacesIWebSecurityOriginidl">tags/Safari-601.1.36.2/Source/WebKit/win/Interfaces/IWebSecurityOrigin.idl</a></li>
<li><a href="#tagsSafari6011362SourceWebKitwinInterfacesIWebUIDelegatePrivateidl">tags/Safari-601.1.36.2/Source/WebKit/win/Interfaces/IWebUIDelegatePrivate.idl</a></li>
<li><a href="#tagsSafari6011362SourceWebKitwinInterfacesIWebViewPrivateidl">tags/Safari-601.1.36.2/Source/WebKit/win/Interfaces/IWebViewPrivate.idl</a></li>
<li><a href="#tagsSafari6011362SourceWebKitwinInterfacesWebKitidl">tags/Safari-601.1.36.2/Source/WebKit/win/Interfaces/WebKit.idl</a></li>
<li><a href="#tagsSafari6011362SourceWebKitwinWebCoreSupportWebEditorClientcpp">tags/Safari-601.1.36.2/Source/WebKit/win/WebCoreSupport/WebEditorClient.cpp</a></li>
<li><a href="#tagsSafari6011362SourceWebKitwinWebFramecpp">tags/Safari-601.1.36.2/Source/WebKit/win/WebFrame.cpp</a></li>
<li><a href="#tagsSafari6011362SourceWebKitwinWebFrameh">tags/Safari-601.1.36.2/Source/WebKit/win/WebFrame.h</a></li>
<li><a href="#tagsSafari6011362SourceWebKitwinWebPreferencescpp">tags/Safari-601.1.36.2/Source/WebKit/win/WebPreferences.cpp</a></li>
<li><a href="#tagsSafari6011362SourceWebKitwinWebPreferencesh">tags/Safari-601.1.36.2/Source/WebKit/win/WebPreferences.h</a></li>
<li><a href="#tagsSafari6011362SourceWebKitwinWebSecurityOrigincpp">tags/Safari-601.1.36.2/Source/WebKit/win/WebSecurityOrigin.cpp</a></li>
<li><a href="#tagsSafari6011362SourceWebKitwinWebSecurityOriginh">tags/Safari-601.1.36.2/Source/WebKit/win/WebSecurityOrigin.h</a></li>
<li><a href="#tagsSafari6011362SourceWebKitwinWebViewcpp">tags/Safari-601.1.36.2/Source/WebKit/win/WebView.cpp</a></li>
<li><a href="#tagsSafari6011362SourceWebKitwinWebViewh">tags/Safari-601.1.36.2/Source/WebKit/win/WebView.h</a></li>
<li><a href="#tagsSafari6011362ToolsChangeLog">tags/Safari-601.1.36.2/Tools/ChangeLog</a></li>
<li><a href="#tagsSafari6011362ToolsDumpRenderTreewinAccessibilityControllerWincpp">tags/Safari-601.1.36.2/Tools/DumpRenderTree/win/AccessibilityControllerWin.cpp</a></li>
<li><a href="#tagsSafari6011362ToolsDumpRenderTreewinDumpRenderTreecpp">tags/Safari-601.1.36.2/Tools/DumpRenderTree/win/DumpRenderTree.cpp</a></li>
<li><a href="#tagsSafari6011362ToolsDumpRenderTreewinEditingDelegatecpp">tags/Safari-601.1.36.2/Tools/DumpRenderTree/win/EditingDelegate.cpp</a></li>
<li><a href="#tagsSafari6011362ToolsDumpRenderTreewinEditingDelegateh">tags/Safari-601.1.36.2/Tools/DumpRenderTree/win/EditingDelegate.h</a></li>
<li><a href="#tagsSafari6011362ToolsDumpRenderTreewinEventSendercpp">tags/Safari-601.1.36.2/Tools/DumpRenderTree/win/EventSender.cpp</a></li>
<li><a href="#tagsSafari6011362ToolsDumpRenderTreewinFrameLoadDelegatecpp">tags/Safari-601.1.36.2/Tools/DumpRenderTree/win/FrameLoadDelegate.cpp</a></li>
<li><a href="#tagsSafari6011362ToolsDumpRenderTreewinTestRunnerWincpp">tags/Safari-601.1.36.2/Tools/DumpRenderTree/win/TestRunnerWin.cpp</a></li>
<li><a href="#tagsSafari6011362ToolsDumpRenderTreewinTextInputControllerWincpp">tags/Safari-601.1.36.2/Tools/DumpRenderTree/win/TextInputControllerWin.cpp</a></li>
<li><a href="#tagsSafari6011362ToolsTestWebKitAPITestsWebKitwinWebViewDestructioncpp">tags/Safari-601.1.36.2/Tools/TestWebKitAPI/Tests/WebKit/win/WebViewDestruction.cpp</a></li>
<li><a href="#tagsSafari6011362ToolsWinLauncherPageLoadTestClientcpp">tags/Safari-601.1.36.2/Tools/WinLauncher/PageLoadTestClient.cpp</a></li>
<li><a href="#tagsSafari6011362ToolsWinLauncherWinLaunchercpp">tags/Safari-601.1.36.2/Tools/WinLauncher/WinLauncher.cpp</a></li>
<li><a href="#tagsSafari6011362ToolsWinLauncherWinLauncherh">tags/Safari-601.1.36.2/Tools/WinLauncher/WinLauncher.h</a></li>
<li><a href="#tagsSafari6011362ToolsWinLauncherWinLauncherWebHostcpp">tags/Safari-601.1.36.2/Tools/WinLauncher/WinLauncherWebHost.cpp</a></li>
<li><a href="#tagsSafari6011362ToolsWinLauncherWinLauncherWebHosth">tags/Safari-601.1.36.2/Tools/WinLauncher/WinLauncherWebHost.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="tagsSafari6011362SourceWebKitwinChangeLog"></a>
<div class="modfile"><h4>Modified: tags/Safari-601.1.36.2/Source/WebKit/win/ChangeLog (186961 => 186962)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-601.1.36.2/Source/WebKit/win/ChangeLog 2015-07-17 19:00:45 UTC (rev 186961)
+++ tags/Safari-601.1.36.2/Source/WebKit/win/ChangeLog 2015-07-17 19:23:43 UTC (rev 186962)
</span><span class="lines">@@ -1,3 +1,65 @@
</span><ins>+2015-07-17 Babak Shafiei <bshafiei@apple.com>
+
+ Merge r186881.
+
+ 2015-07-15 Brent Fulgham <bfulgham@apple.com>
+
+ [Win] Maintain consistent COM Interfaces
+ https://bugs.webkit.org/show_bug.cgi?id=146983
+ <rdar://problem/21822278>
+
+ Reviewed by Dean Jackson.
+
+ Keep WebKit's COM interface compatible with software
+ linked against earlier WebKit releases:
+ 1. Update IDL to present the same interface as earlier
+ releases of WebKit.
+ 2. Add new interface objects (i.g., IWebFrame2) extending
+ earlier interfaces when adding new methods.
+ 3. Update our internal software to use the correct interface
+ objects.
+
+ * DefaultPolicyDelegate.cpp:
+ (DefaultPolicyDelegate::decidePolicyForNavigationAction):
+ * Interfaces/IWebEditingDelegate.idl:
+ * Interfaces/IWebFrame.idl:
+ * Interfaces/IWebPreferencesPrivate.idl:
+ * Interfaces/IWebSecurityOrigin.idl:
+ * Interfaces/IWebUIDelegatePrivate.idl:
+ * Interfaces/IWebViewPrivate.idl:
+ * Interfaces/WebKit.idl:
+ * WebCoreSupport/WebEditorClient.cpp:
+ (WebEditorClient::shouldInsertNode):
+ * WebFrame.cpp:
+ (WebFrame::updateBackground):
+ (WebFrame::isMainFrame):
+ * WebFrame.h:
+ * WebPreferences.cpp:
+ (WebPreferences::initializeDefaultSettings):
+ (WebPreferences::QueryInterface):
+ (WebPreferences::setMockScrollbarsEnabled):
+ (WebPreferences::screenFontSubstitutionEnabled):
+ (WebPreferences::setScreenFontSubstitutionEnabled):
+ (WebPreferences::hyperlinkAuditingEnabled):
+ (WebPreferences::unused4):
+ (WebPreferences::shouldPaintNativeControls):
+ (WebPreferences::setShouldPaintNativeControls):
+ (WebPreferences::setDeveloperExtrasEnabled):
+ (WebPreferences::authorAndUserStylesEnabled):
+ (WebPreferences::inApplicationChromeMode):
+ * WebPreferences.h:
+ * WebSecurityOrigin.cpp:
+ (WebSecurityOrigin::QueryInterface):
+ (WebSecurityOrigin::setQuota):
+ (WebSecurityOrigin::initWithURL):
+ * WebSecurityOrigin.h:
+ * WebView.cpp:
+ (WebView::QueryInterface):
+ (WebView::notifyPreferencesChanged):
+ (WebView::selectedRangeForTesting):
+ (WebView::setLoadResourcesSerially):
+ * WebView.h:
+
</ins><span class="cx"> 2015-06-13 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> [WK2] API::Navigation objects are leaked on history navigation to HistoryItems in PageCache
</span></span></pre></div>
<a id="tagsSafari6011362SourceWebKitwinDefaultPolicyDelegatecpp"></a>
<div class="modfile"><h4>Modified: tags/Safari-601.1.36.2/Source/WebKit/win/DefaultPolicyDelegate.cpp (186961 => 186962)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-601.1.36.2/Source/WebKit/win/DefaultPolicyDelegate.cpp 2015-07-17 19:00:45 UTC (rev 186961)
+++ tags/Safari-601.1.36.2/Source/WebKit/win/DefaultPolicyDelegate.cpp 2015-07-17 19:23:43 UTC (rev 186962)
</span><span class="lines">@@ -107,7 +107,7 @@
</span><span class="cx"> var.ChangeType(VT_I4, nullptr);
</span><span class="cx"> navType = V_I4(&var);
</span><span class="cx"> }
</span><del>- COMPtr<IWebViewPrivate> wvPrivate(Query, webView);
</del><ins>+ COMPtr<IWebViewPrivate2> wvPrivate(Query, webView);
</ins><span class="cx"> if (wvPrivate) {
</span><span class="cx"> BOOL canHandleRequest = FALSE;
</span><span class="cx"> if (SUCCEEDED(wvPrivate->canHandleRequest(request, &canHandleRequest)) && canHandleRequest)
</span></span></pre></div>
<a id="tagsSafari6011362SourceWebKitwinInterfacesIWebEditingDelegateidl"></a>
<div class="modfile"><h4>Modified: tags/Safari-601.1.36.2/Source/WebKit/win/Interfaces/IWebEditingDelegate.idl (186961 => 186962)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-601.1.36.2/Source/WebKit/win/Interfaces/IWebEditingDelegate.idl 2015-07-17 19:00:45 UTC (rev 186961)
+++ tags/Safari-601.1.36.2/Source/WebKit/win/Interfaces/IWebEditingDelegate.idl 2015-07-17 19:23:43 UTC (rev 186962)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2006, 2007, 2008 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2006, 2007, 2008, 2015 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -113,7 +113,7 @@
</span><span class="cx"> /*
</span><span class="cx"> - (BOOL)webView:(WebView *)webView shouldInsertNode:(DOMNode *)node replacingDOMRange:(DOMRange *)range givenAction:(WebViewInsertAction)action;
</span><span class="cx"> */
</span><del>- HRESULT shouldInsertNode([in] IWebView* webView, [in] IDOMNode* node, [in] IDOMRange* range, [in] WebViewInsertAction action, [out, retval] BOOL* result);
</del><ins>+ HRESULT shouldInsertNode([in] IWebView* webView, [in] IDOMNode* node, [in] IDOMRange* range, [in] WebViewInsertAction action);
</ins><span class="cx">
</span><span class="cx"> /*
</span><span class="cx"> - (BOOL)webView:(WebView *)webView shouldInsertText:(NSString *)text replacingDOMRange:(DOMRange *)range givenAction:(WebViewInsertAction)action;
</span><span class="lines">@@ -188,3 +188,14 @@
</span><span class="cx"> HRESULT preflightChosenSpellServer();
</span><span class="cx"> HRESULT updateGrammar();
</span><span class="cx"> }
</span><ins>+
+[
+ uuid(9973D190-3346-4CAA-AB76-F070CAB0B59B)
+]
+interface IWebEditingDelegate2 : IWebEditingDelegate
+{
+ /*
+ - (BOOL)webView:(WebView *)webView shouldInsertNode:(DOMNode *)node replacingDOMRange:(DOMRange *)range givenAction:(WebViewInsertAction)action;
+ */
+ HRESULT shouldInsertNode([in] IWebView* webView, [in] IDOMNode* node, [in] IDOMRange* range, [in] WebViewInsertAction action, [out, retval] BOOL* result);
+}
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="tagsSafari6011362SourceWebKitwinInterfacesIWebFrameidl"></a>
<div class="modfile"><h4>Modified: tags/Safari-601.1.36.2/Source/WebKit/win/Interfaces/IWebFrame.idl (186961 => 186962)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-601.1.36.2/Source/WebKit/win/Interfaces/IWebFrame.idl 2015-07-17 19:00:45 UTC (rev 186961)
+++ tags/Safari-601.1.36.2/Source/WebKit/win/Interfaces/IWebFrame.idl 2015-07-17 19:23:43 UTC (rev 186962)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2006, 2007, 2008, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2006, 2007, 2008, 2014-2015 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -268,7 +268,11 @@
</span><span class="cx"> - (DOMWindow *)DOMWindow;
</span><span class="cx"> */
</span><span class="cx"> HRESULT DOMWindow([out, retval] IDOMWindow** window);
</span><ins>+}
</ins><span class="cx">
</span><ins>+[ uuid(5418D783-A3BA-48F3-BAC1-535EE264035A) ]
+interface IWebFrame2 : IWebFrame
+{
</ins><span class="cx"> /*!
</span><span class="cx"> @method isMainFrame
</span><span class="cx"> @description Returns TRUE if the frame is the main frame.
</span></span></pre></div>
<a id="tagsSafari6011362SourceWebKitwinInterfacesIWebPreferencesPrivateidl"></a>
<div class="modfile"><h4>Modified: tags/Safari-601.1.36.2/Source/WebKit/win/Interfaces/IWebPreferencesPrivate.idl (186961 => 186962)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-601.1.36.2/Source/WebKit/win/Interfaces/IWebPreferencesPrivate.idl 2015-07-17 19:00:45 UTC (rev 186961)
+++ tags/Safari-601.1.36.2/Source/WebKit/win/Interfaces/IWebPreferencesPrivate.idl 2015-07-17 19:23:43 UTC (rev 186962)
</span><span class="lines">@@ -64,6 +64,11 @@
</span><span class="cx"> HRESULT localStorageDatabasePath([out, retval] BSTR* location);
</span><span class="cx"> HRESULT setLocalStorageDatabasePath([in] BSTR location);
</span><span class="cx">
</span><ins>+ // These two methods are no-ops, and only retained to keep
+ // the Interface consistent. DO NOT USE THEM.
+ HRESULT setShouldPaintNativeControls([in] BOOL shouldPaint);
+ HRESULT shouldPaintNativeControls([out, retval] BOOL* enabled);
+
</ins><span class="cx"> HRESULT setDatabasesEnabled([in] BOOL enabled);
</span><span class="cx"> HRESULT databasesEnabled([out, retval] BOOL *enabled);
</span><span class="cx">
</span><span class="lines">@@ -116,9 +121,6 @@
</span><span class="cx"> HRESULT javaScriptCanAccessClipboard([out, retval] BOOL *enabled);
</span><span class="cx"> HRESULT setJavaScriptCanAccessClipboard([in] BOOL enabled);
</span><span class="cx">
</span><del>- HRESULT javaScriptRuntimeFlags([out, retval] unsigned* flags);
- HRESULT setJavaScriptRuntimeFlags([in] unsigned flags);
-
</del><span class="cx"> HRESULT isDNSPrefetchingEnabled([out, retval] BOOL *enabled);
</span><span class="cx"> HRESULT setDNSPrefetchingEnabled([in] BOOL enabled);
</span><span class="cx">
</span><span class="lines">@@ -152,6 +154,18 @@
</span><span class="cx"> HRESULT mockScrollbarsEnabled([out, retval] BOOL* enabled);
</span><span class="cx"> HRESULT setMockScrollbarsEnabled([in] BOOL enabled);
</span><span class="cx">
</span><ins>+ // These two methods are no-ops, and only retained to keep
+ // the Interface consistent. DO NOT USE THEM.
+ HRESULT screenFontSubstitutionEnabled([out, retval] BOOL* enabled);
+ HRESULT setScreenFontSubstitutionEnabled([in] BOOL enabled);
+
</ins><span class="cx"> HRESULT isInheritURIQueryComponentEnabled([out, retval] BOOL* enabled);
</span><span class="cx"> HRESULT setEnableInheritURIQueryComponent([in] BOOL enabled);
</span><span class="cx"> }
</span><ins>+
+[ uuid(0E1DDB80-6B38-4ABC-A252-B58A83EB6D8C) ]
+interface IWebPreferencesPrivate2 : IWebPreferencesPrivate
+{
+ HRESULT javaScriptRuntimeFlags([out, retval] unsigned* flags);
+ HRESULT setJavaScriptRuntimeFlags([in] unsigned flags);
+}
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="tagsSafari6011362SourceWebKitwinInterfacesIWebSecurityOriginidl"></a>
<div class="modfile"><h4>Modified: tags/Safari-601.1.36.2/Source/WebKit/win/Interfaces/IWebSecurityOrigin.idl (186961 => 186962)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-601.1.36.2/Source/WebKit/win/Interfaces/IWebSecurityOrigin.idl 2015-07-17 19:00:45 UTC (rev 186961)
+++ tags/Safari-601.1.36.2/Source/WebKit/win/Interfaces/IWebSecurityOrigin.idl 2015-07-17 19:23:43 UTC (rev 186962)
</span><span class="lines">@@ -47,6 +47,10 @@
</span><span class="cx">
</span><span class="cx"> HRESULT quota([out, retval] unsigned long long* result);
</span><span class="cx"> HRESULT setQuota([in] unsigned long long quota);
</span><ins>+}
</ins><span class="cx">
</span><ins>+[ uuid(54F73208-4E1D-4BED-BE25-4E076C0AAAD8) ]
+interface IWebSecurityOrigin2 : IWebSecurityOrigin
+{
</ins><span class="cx"> HRESULT initWithURL([in] BSTR);
</span><span class="cx"> }
</span></span></pre></div>
<a id="tagsSafari6011362SourceWebKitwinInterfacesIWebUIDelegatePrivateidl"></a>
<div class="modfile"><h4>Modified: tags/Safari-601.1.36.2/Source/WebKit/win/Interfaces/IWebUIDelegatePrivate.idl (186961 => 186962)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-601.1.36.2/Source/WebKit/win/Interfaces/IWebUIDelegatePrivate.idl 2015-07-17 19:00:45 UTC (rev 186961)
+++ tags/Safari-601.1.36.2/Source/WebKit/win/Interfaces/IWebUIDelegatePrivate.idl 2015-07-17 19:23:43 UTC (rev 186962)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2015 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span></span></pre></div>
<a id="tagsSafari6011362SourceWebKitwinInterfacesIWebViewPrivateidl"></a>
<div class="modfile"><h4>Modified: tags/Safari-601.1.36.2/Source/WebKit/win/Interfaces/IWebViewPrivate.idl (186961 => 186962)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-601.1.36.2/Source/WebKit/win/Interfaces/IWebViewPrivate.idl 2015-07-17 19:00:45 UTC (rev 186961)
+++ tags/Safari-601.1.36.2/Source/WebKit/win/Interfaces/IWebViewPrivate.idl 2015-07-17 19:23:43 UTC (rev 186962)
</span><span class="lines">@@ -290,9 +290,13 @@
</span><span class="cx"> HRESULT firstRectForCharacterRangeForTesting([in] UINT location, [in] UINT length, [out, retval] RECT* resultRect);
</span><span class="cx">
</span><span class="cx"> HRESULT selectedRangeForTesting([out] UINT* location, [out] UINT* length);
</span><ins>+}
</ins><span class="cx">
</span><ins>+[ uuid(671FB259-ABEF-48FC-88FB-EC4CF304E866) ]
+interface IWebViewPrivate2 : IWebViewPrivate
+{
</ins><span class="cx"> // SPI for DumpRenderTree
</span><span class="cx"> HRESULT setLoadResourcesSerially([in] BOOL serialize);
</span><span class="cx">
</span><span class="cx"> HRESULT scaleWebView([in] double scale, [in] POINT origin);
</span><del>-}
</del><ins>+}
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="tagsSafari6011362SourceWebKitwinInterfacesWebKitidl"></a>
<div class="modfile"><h4>Modified: tags/Safari-601.1.36.2/Source/WebKit/win/Interfaces/WebKit.idl (186961 => 186962)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-601.1.36.2/Source/WebKit/win/Interfaces/WebKit.idl 2015-07-17 19:00:45 UTC (rev 186961)
+++ tags/Safari-601.1.36.2/Source/WebKit/win/Interfaces/WebKit.idl 2015-07-17 19:23:43 UTC (rev 186962)
</span><span class="lines">@@ -169,7 +169,7 @@
</span><span class="cx"> interface IWebViewUndoableEditing;
</span><span class="cx"> interface IWebViewEditingActions;
</span><span class="cx"> interface IWebNotificationObserver;
</span><del>- interface IWebViewPrivate;
</del><ins>+ interface IWebViewPrivate2;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> [uuid(66827ec1-3aef-4241-bac5-f776b44f030f)]
</span></span></pre></div>
<a id="tagsSafari6011362SourceWebKitwinWebCoreSupportWebEditorClientcpp"></a>
<div class="modfile"><h4>Modified: tags/Safari-601.1.36.2/Source/WebKit/win/WebCoreSupport/WebEditorClient.cpp (186961 => 186962)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-601.1.36.2/Source/WebKit/win/WebCoreSupport/WebEditorClient.cpp 2015-07-17 19:00:45 UTC (rev 186961)
+++ tags/Safari-601.1.36.2/Source/WebKit/win/WebCoreSupport/WebEditorClient.cpp 2015-07-17 19:23:43 UTC (rev 186962)
</span><span class="lines">@@ -299,8 +299,11 @@
</span><span class="cx"> return true;
</span><span class="cx">
</span><span class="cx"> BOOL shouldInsert = FALSE;
</span><del>- if (FAILED(editingDelegate->shouldInsertNode(m_webView, insertDOMNode.get(), insertingDOMRange.get(), static_cast<WebViewInsertAction>(givenAction), &shouldInsert)))
- return true;
</del><ins>+ COMPtr<IWebEditingDelegate2> editingDelegate2(Query, editingDelegate);
+ if (editingDelegate2) {
+ if (FAILED(editingDelegate2->shouldInsertNode(m_webView, insertDOMNode.get(), insertingDOMRange.get(), static_cast<WebViewInsertAction>(givenAction), &shouldInsert)))
+ return true;
+ }
</ins><span class="cx">
</span><span class="cx"> return shouldInsert;
</span><span class="cx"> }
</span></span></pre></div>
<a id="tagsSafari6011362SourceWebKitwinWebFramecpp"></a>
<div class="modfile"><h4>Modified: tags/Safari-601.1.36.2/Source/WebKit/win/WebFrame.cpp (186961 => 186962)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-601.1.36.2/Source/WebKit/win/WebFrame.cpp 2015-07-17 19:00:45 UTC (rev 186961)
+++ tags/Safari-601.1.36.2/Source/WebKit/win/WebFrame.cpp 2015-07-17 19:23:43 UTC (rev 186962)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2006-2009, 2011, 2013-2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2006-2009, 2011, 2013-2015 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) Research In Motion Limited 2009. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -2097,6 +2097,7 @@
</span><span class="cx"> coreFrame->view()->updateBackgroundRecursively(backgroundColor, webView()->transparent());
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+// IWebFrame2
</ins><span class="cx"> HRESULT WebFrame::isMainFrame(BOOL* value)
</span><span class="cx"> {
</span><span class="cx"> if (!value)
</span></span></pre></div>
<a id="tagsSafari6011362SourceWebKitwinWebFrameh"></a>
<div class="modfile"><h4>Modified: tags/Safari-601.1.36.2/Source/WebKit/win/WebFrame.h (186961 => 186962)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-601.1.36.2/Source/WebKit/win/WebFrame.h 2015-07-17 19:00:45 UTC (rev 186961)
+++ tags/Safari-601.1.36.2/Source/WebKit/win/WebFrame.h 2015-07-17 19:23:43 UTC (rev 186962)
</span><span class="lines">@@ -75,7 +75,7 @@
</span><span class="cx"> WebFrame* kit(WebCore::Frame*);
</span><span class="cx"> WebCore::Frame* core(WebFrame*);
</span><span class="cx">
</span><del>-class DECLSPEC_UUID("{A3676398-4485-4a9d-87DC-CB5A40E6351D}") WebFrame : public IWebFrame, IWebFramePrivate, IWebDocumentText
</del><ins>+class DECLSPEC_UUID("{A3676398-4485-4a9d-87DC-CB5A40E6351D}") WebFrame : public IWebFrame2, IWebFramePrivate, IWebDocumentText
</ins><span class="cx"> {
</span><span class="cx"> public:
</span><span class="cx"> static WebFrame* createInstance();
</span></span></pre></div>
<a id="tagsSafari6011362SourceWebKitwinWebPreferencescpp"></a>
<div class="modfile"><h4>Modified: tags/Safari-601.1.36.2/Source/WebKit/win/WebPreferences.cpp (186961 => 186962)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-601.1.36.2/Source/WebKit/win/WebPreferences.cpp 2015-07-17 19:00:45 UTC (rev 186961)
+++ tags/Safari-601.1.36.2/Source/WebKit/win/WebPreferences.cpp 2015-07-17 19:23:43 UTC (rev 186962)
</span><span class="lines">@@ -194,13 +194,13 @@
</span><span class="cx">
</span><span class="cx"> CFMutableDictionaryRef defaults = CFDictionaryCreateMutable(0, 0, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks);
</span><span class="cx">
</span><del>- CFDictionaryAddValue(defaults, CFSTR(WebKitStandardFontPreferenceKey), CFSTR("Times New Roman"));
</del><ins>+ CFDictionaryAddValue(defaults, CFSTR(WebKitStandardFontPreferenceKey), CFSTR("Segoe UI"));
</ins><span class="cx"> CFDictionaryAddValue(defaults, CFSTR(WebKitFixedFontPreferenceKey), CFSTR("Courier New"));
</span><span class="cx"> CFDictionaryAddValue(defaults, CFSTR(WebKitSerifFontPreferenceKey), CFSTR("Times New Roman"));
</span><span class="cx"> CFDictionaryAddValue(defaults, CFSTR(WebKitSansSerifFontPreferenceKey), CFSTR("Arial"));
</span><span class="cx"> CFDictionaryAddValue(defaults, CFSTR(WebKitCursiveFontPreferenceKey), CFSTR("Comic Sans MS"));
</span><span class="cx"> CFDictionaryAddValue(defaults, CFSTR(WebKitFantasyFontPreferenceKey), CFSTR("Comic Sans MS"));
</span><del>- CFDictionaryAddValue(defaults, CFSTR(WebKitPictographFontPreferenceKey), CFSTR("Times New Roman"));
</del><ins>+ CFDictionaryAddValue(defaults, CFSTR(WebKitPictographFontPreferenceKey), CFSTR("Segoe UI Symbol"));
</ins><span class="cx"> CFDictionaryAddValue(defaults, CFSTR(WebKitMinimumFontSizePreferenceKey), CFSTR("0"));
</span><span class="cx"> CFDictionaryAddValue(defaults, CFSTR(WebKitMinimumLogicalFontSizePreferenceKey), CFSTR("9"));
</span><span class="cx"> CFDictionaryAddValue(defaults, CFSTR(WebKitDefaultFontSizePreferenceKey), CFSTR("16"));
</span><span class="lines">@@ -530,6 +530,8 @@
</span><span class="cx"> *ppvObject = static_cast<IWebPreferences*>(this);
</span><span class="cx"> else if (IsEqualGUID(riid, IID_IWebPreferencesPrivate))
</span><span class="cx"> *ppvObject = static_cast<IWebPreferencesPrivate*>(this);
</span><ins>+ else if (IsEqualGUID(riid, IID_IWebPreferencesPrivate2))
+ *ppvObject = static_cast<IWebPreferencesPrivate2*>(this);
</ins><span class="cx"> else if (IsEqualGUID(riid, CLSID_WebPreferences))
</span><span class="cx"> *ppvObject = this;
</span><span class="cx"> else
</span><span class="lines">@@ -1293,6 +1295,18 @@
</span><span class="cx"> return S_OK;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+// These two methods are no-ops, and only retained to keep
+// the Interface consistent. DO NOT USE THEM.
+HRESULT WebPreferences::screenFontSubstitutionEnabled(BOOL*)
+{
+ return S_OK;
+}
+
+HRESULT WebPreferences::setScreenFontSubstitutionEnabled(BOOL)
+{
+ return S_OK;
+}
+
</ins><span class="cx"> HRESULT STDMETHODCALLTYPE WebPreferences::hyperlinkAuditingEnabled(
</span><span class="cx"> /* [in] */ BOOL* enabled)
</span><span class="cx"> {
</span><span class="lines">@@ -1412,6 +1426,18 @@
</span><span class="cx"> return E_FAIL;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+// These two methods are no-ops, and only retained to keep
+// the Interface consistent. DO NOT USE THEM.
+HRESULT WebPreferences::shouldPaintNativeControls(BOOL*)
+{
+ return S_OK;
+}
+
+HRESULT WebPreferences::setShouldPaintNativeControls(BOOL)
+{
+ return S_OK;
+}
+
</ins><span class="cx"> HRESULT WebPreferences::setDeveloperExtrasEnabled(BOOL enabled)
</span><span class="cx"> {
</span><span class="cx"> setBoolValue(WebKitDeveloperExtrasEnabledPreferenceKey, enabled);
</span><span class="lines">@@ -1462,6 +1488,8 @@
</span><span class="cx"> return S_OK;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+// These two methods are no-ops, and only retained to keep
+// the Interface consistent. DO NOT USE THEM.
</ins><span class="cx"> HRESULT WebPreferences::inApplicationChromeMode(BOOL*)
</span><span class="cx"> {
</span><span class="cx"> return S_OK;
</span></span></pre></div>
<a id="tagsSafari6011362SourceWebKitwinWebPreferencesh"></a>
<div class="modfile"><h4>Modified: tags/Safari-601.1.36.2/Source/WebKit/win/WebPreferences.h (186961 => 186962)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-601.1.36.2/Source/WebKit/win/WebPreferences.h 2015-07-17 19:00:45 UTC (rev 186961)
+++ tags/Safari-601.1.36.2/Source/WebKit/win/WebPreferences.h 2015-07-17 19:23:43 UTC (rev 186962)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2006, 2007, 2008, 2009, 2015 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx"> #include <WebCore/BString.h>
</span><span class="cx"> #include <wtf/RetainPtr.h>
</span><span class="cx">
</span><del>-class WebPreferences : public IWebPreferences, public IWebPreferencesPrivate {
</del><ins>+class WebPreferences : public IWebPreferences, public IWebPreferencesPrivate2 {
</ins><span class="cx"> public:
</span><span class="cx"> static WebPreferences* createInstance();
</span><span class="cx"> protected:
</span><span class="lines">@@ -151,12 +151,6 @@
</span><span class="cx"> virtual HRESULT STDMETHODCALLTYPE setJavaScriptEnabled(
</span><span class="cx"> /* [in] */ BOOL enabled);
</span><span class="cx">
</span><del>- virtual HRESULT STDMETHODCALLTYPE javaScriptRuntimeFlags(
- /* [retval][out] */ unsigned*);
-
- virtual HRESULT STDMETHODCALLTYPE setJavaScriptRuntimeFlags(
- /* [in] */ unsigned);
-
</del><span class="cx"> virtual HRESULT STDMETHODCALLTYPE javaScriptCanOpenWindowsAutomatically(
</span><span class="cx"> /* [retval][out] */ BOOL* enabled);
</span><span class="cx">
</span><span class="lines">@@ -377,6 +371,11 @@
</span><span class="cx"> virtual HRESULT STDMETHODCALLTYPE setExperimentalNotificationsEnabled(
</span><span class="cx"> /* [in] */ BOOL enabled);
</span><span class="cx">
</span><ins>+ // These two methods are no-ops, and only retained to keep
+ // the Interface consistent. DO NOT USE THEM.
+ virtual HRESULT STDMETHODCALLTYPE setShouldPaintNativeControls(BOOL);
+ virtual HRESULT STDMETHODCALLTYPE shouldPaintNativeControls(BOOL*);
+
</ins><span class="cx"> virtual HRESULT STDMETHODCALLTYPE setZoomsTextOnly(
</span><span class="cx"> /* [retval][out] */ BOOL zoomsTextOnly);
</span><span class="cx">
</span><span class="lines">@@ -480,9 +479,18 @@
</span><span class="cx"> virtual HRESULT STDMETHODCALLTYPE mockScrollbarsEnabled(BOOL*);
</span><span class="cx"> virtual HRESULT STDMETHODCALLTYPE setMockScrollbarsEnabled(BOOL);
</span><span class="cx">
</span><ins>+ // These two methods are no-ops, and only retained to keep
+ // the Interface consistent. DO NOT USE THEM.
+ virtual HRESULT STDMETHODCALLTYPE screenFontSubstitutionEnabled(BOOL*);
+ virtual HRESULT STDMETHODCALLTYPE setScreenFontSubstitutionEnabled(BOOL);
+
</ins><span class="cx"> virtual HRESULT STDMETHODCALLTYPE isInheritURIQueryComponentEnabled(BOOL*);
</span><span class="cx"> virtual HRESULT STDMETHODCALLTYPE setEnableInheritURIQueryComponent(BOOL);
</span><span class="cx">
</span><ins>+ // IWebPreferencesPrivate2
+ virtual HRESULT STDMETHODCALLTYPE javaScriptRuntimeFlags(unsigned*);
+ virtual HRESULT STDMETHODCALLTYPE setJavaScriptRuntimeFlags(unsigned);
+
</ins><span class="cx"> // WebPreferences
</span><span class="cx">
</span><span class="cx"> // This method accesses a different preference key than developerExtrasEnabled.
</span></span></pre></div>
<a id="tagsSafari6011362SourceWebKitwinWebSecurityOrigincpp"></a>
<div class="modfile"><h4>Modified: tags/Safari-601.1.36.2/Source/WebKit/win/WebSecurityOrigin.cpp (186961 => 186962)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-601.1.36.2/Source/WebKit/win/WebSecurityOrigin.cpp 2015-07-17 19:00:45 UTC (rev 186961)
+++ tags/Safari-601.1.36.2/Source/WebKit/win/WebSecurityOrigin.cpp 2015-07-17 19:23:43 UTC (rev 186962)
</span><span class="lines">@@ -63,9 +63,11 @@
</span><span class="cx"> {
</span><span class="cx"> *ppvObject = 0;
</span><span class="cx"> if (IsEqualGUID(riid, IID_IUnknown))
</span><del>- *ppvObject = static_cast<IWebSecurityOrigin*>(this);
</del><ins>+ *ppvObject = static_cast<IWebSecurityOrigin2*>(this);
</ins><span class="cx"> else if (IsEqualGUID(riid, IID_IWebSecurityOrigin))
</span><span class="cx"> *ppvObject = static_cast<IWebSecurityOrigin*>(this);
</span><ins>+ else if (IsEqualGUID(riid, IID_IWebSecurityOrigin2))
+ *ppvObject = static_cast<IWebSecurityOrigin2*>(this);
</ins><span class="cx"> else if (IsEqualGUID(riid, __uuidof(this)))
</span><span class="cx"> *ppvObject = this;
</span><span class="cx"> else
</span><span class="lines">@@ -147,6 +149,8 @@
</span><span class="cx"> return S_OK;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+// IWebSecurityOrigin2 --------------------------------------------------------------
+
</ins><span class="cx"> HRESULT WebSecurityOrigin::initWithURL(/* [in] */ BSTR urlBstr)
</span><span class="cx"> {
</span><span class="cx"> m_securityOrigin = WebCore::SecurityOrigin::create(MarshallingHelpers::BSTRToKURL(urlBstr));
</span></span></pre></div>
<a id="tagsSafari6011362SourceWebKitwinWebSecurityOriginh"></a>
<div class="modfile"><h4>Modified: tags/Safari-601.1.36.2/Source/WebKit/win/WebSecurityOrigin.h (186961 => 186962)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-601.1.36.2/Source/WebKit/win/WebSecurityOrigin.h 2015-07-17 19:00:45 UTC (rev 186961)
+++ tags/Safari-601.1.36.2/Source/WebKit/win/WebSecurityOrigin.h 2015-07-17 19:23:43 UTC (rev 186962)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2007 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2007, 2015 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx"> #include "WebKit.h"
</span><span class="cx"> #include <WebCore/SecurityOrigin.h>
</span><span class="cx">
</span><del>-class DECLSPEC_UUID("6EB8D98F-2723-4472-88D3-5936F9D6E631") WebSecurityOrigin : public IWebSecurityOrigin {
</del><ins>+class DECLSPEC_UUID("6EB8D98F-2723-4472-88D3-5936F9D6E631") WebSecurityOrigin : public IWebSecurityOrigin2 {
</ins><span class="cx"> public:
</span><span class="cx"> // WebSecurityOrigin
</span><span class="cx"> static WebSecurityOrigin* createInstance(WebCore::SecurityOrigin* origin);
</span><span class="lines">@@ -67,6 +67,7 @@
</span><span class="cx"> virtual HRESULT STDMETHODCALLTYPE setQuota(
</span><span class="cx"> /* [in] */ unsigned long long quota);
</span><span class="cx">
</span><ins>+ // IWebSecurityOrigin2
</ins><span class="cx"> virtual HRESULT STDMETHODCALLTYPE initWithURL(/*[in]*/ BSTR);
</span><span class="cx">
</span><span class="cx"> private:
</span></span></pre></div>
<a id="tagsSafari6011362SourceWebKitwinWebViewcpp"></a>
<div class="modfile"><h4>Modified: tags/Safari-601.1.36.2/Source/WebKit/win/WebView.cpp (186961 => 186962)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-601.1.36.2/Source/WebKit/win/WebView.cpp 2015-07-17 19:00:45 UTC (rev 186961)
+++ tags/Safari-601.1.36.2/Source/WebKit/win/WebView.cpp 2015-07-17 19:23:43 UTC (rev 186962)
</span><span class="lines">@@ -2577,6 +2577,8 @@
</span><span class="cx"> *ppvObject = static_cast<IWebView*>(this);
</span><span class="cx"> else if (IsEqualGUID(riid, IID_IWebViewPrivate))
</span><span class="cx"> *ppvObject = static_cast<IWebViewPrivate*>(this);
</span><ins>+ else if (IsEqualGUID(riid, IID_IWebViewPrivate2))
+ *ppvObject = static_cast<IWebViewPrivate2*>(this);
</ins><span class="cx"> else if (IsEqualGUID(riid, IID_IWebIBActions))
</span><span class="cx"> *ppvObject = static_cast<IWebIBActions*>(this);
</span><span class="cx"> else if (IsEqualGUID(riid, IID_IWebViewCSS))
</span><span class="lines">@@ -4834,7 +4836,7 @@
</span><span class="cx"> settings.setShouldDisplayTextDescriptions(enabled);
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- COMPtr<IWebPreferencesPrivate> prefsPrivate(Query, preferences);
</del><ins>+ COMPtr<IWebPreferencesPrivate2> prefsPrivate(Query, preferences);
</ins><span class="cx"> if (prefsPrivate) {
</span><span class="cx"> hr = prefsPrivate->localStorageDatabasePath(&str);
</span><span class="cx"> if (FAILED(hr))
</span><span class="lines">@@ -7110,6 +7112,7 @@
</span><span class="cx"> return S_OK;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+// IWebViewPrivate2
</ins><span class="cx"> HRESULT WebView::setLoadResourcesSerially(BOOL serialize)
</span><span class="cx"> {
</span><span class="cx"> WebPlatformStrategies::initialize();
</span></span></pre></div>
<a id="tagsSafari6011362SourceWebKitwinWebViewh"></a>
<div class="modfile"><h4>Modified: tags/Safari-601.1.36.2/Source/WebKit/win/WebView.h (186961 => 186962)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-601.1.36.2/Source/WebKit/win/WebView.h 2015-07-17 19:00:45 UTC (rev 186961)
+++ tags/Safari-601.1.36.2/Source/WebKit/win/WebView.h 2015-07-17 19:23:43 UTC (rev 186962)
</span><span class="lines">@@ -78,7 +78,7 @@
</span><span class="cx">
</span><span class="cx"> class WebView
</span><span class="cx"> : public IWebView
</span><del>- , public IWebViewPrivate
</del><ins>+ , public IWebViewPrivate2
</ins><span class="cx"> , public IWebIBActions
</span><span class="cx"> , public IWebViewCSS
</span><span class="cx"> , public IWebViewEditing
</span><span class="lines">@@ -608,7 +608,6 @@
</span><span class="cx"> /* [in] */ IWebNotification *notification);
</span><span class="cx">
</span><span class="cx"> // IWebViewPrivate
</span><del>-
</del><span class="cx"> virtual HRESULT STDMETHODCALLTYPE MIMETypeForExtension(
</span><span class="cx"> /* [in] */ BSTR extension,
</span><span class="cx"> /* [retval][out] */ BSTR *mimeType);
</span><span class="lines">@@ -840,6 +839,10 @@
</span><span class="cx"> virtual HRESULT STDMETHODCALLTYPE setUsesLayeredWindow(BOOL);
</span><span class="cx"> virtual HRESULT STDMETHODCALLTYPE usesLayeredWindow(BOOL*);
</span><span class="cx">
</span><ins>+ // IWebViewPrivate2
+ HRESULT STDMETHODCALLTYPE setLoadResourcesSerially(BOOL);
+ HRESULT STDMETHODCALLTYPE scaleWebView(double scale, POINT origin);
+
</ins><span class="cx"> // WebView
</span><span class="cx"> bool shouldUseEmbeddedView(const WTF::String& mimeType) const;
</span><span class="cx">
</span><span class="lines">@@ -1019,9 +1022,6 @@
</span><span class="cx"> bool m_shouldInvertColors;
</span><span class="cx"> void setShouldInvertColors(bool);
</span><span class="cx">
</span><del>- HRESULT STDMETHODCALLTYPE setLoadResourcesSerially(BOOL);
- HRESULT STDMETHODCALLTYPE scaleWebView(double scale, POINT origin);
-
</del><span class="cx"> protected:
</span><span class="cx"> static bool registerWebViewWindowClass();
</span><span class="cx"> static LRESULT CALLBACK WebViewWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam);
</span></span></pre></div>
<a id="tagsSafari6011362ToolsChangeLog"></a>
<div class="modfile"><h4>Modified: tags/Safari-601.1.36.2/Tools/ChangeLog (186961 => 186962)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-601.1.36.2/Tools/ChangeLog 2015-07-17 19:00:45 UTC (rev 186961)
+++ tags/Safari-601.1.36.2/Tools/ChangeLog 2015-07-17 19:23:43 UTC (rev 186962)
</span><span class="lines">@@ -1,3 +1,80 @@
</span><ins>+2015-07-17 Babak Shafiei <bshafiei@apple.com>
+
+ Merge r186881.
+
+ 2015-07-15 Brent Fulgham <bfulgham@apple.com>
+
+ [Win] Maintain consistent COM Interfaces
+ https://bugs.webkit.org/show_bug.cgi?id=146983
+ <rdar://problem/21822278>
+
+ Reviewed by Dean Jackson.
+
+ Update DumpRenderTree and WinLauncher to use the properly
+ versioned COM interface objects.
+
+ * DumpRenderTree/win/AccessibilityControllerWin.cpp:
+ (AccessibilityController::rootElement):
+ * DumpRenderTree/win/DumpRenderTree.cpp:
+ (resetWebPreferencesToConsistentValues):
+ (resetWebViewToConsistentStateBeforeTesting):
+ (runTest):
+ (createWebViewAndOffscreenWindow):
+ * DumpRenderTree/win/EditingDelegate.cpp:
+ (EditingDelegate::QueryInterface):
+ (EditingDelegate::shouldEndEditingInDOMRange):
+ (EditingDelegate::shouldInsertNode):
+ * DumpRenderTree/win/EditingDelegate.h:
+ * DumpRenderTree/win/EventSender.cpp:
+ (scalePageByCallback):
+ * DumpRenderTree/win/FrameLoadDelegate.cpp:
+ (FrameLoadDelegate::didCommitLoadForFrame):
+ * DumpRenderTree/win/TestRunnerWin.cpp:
+ (TestRunner::callShouldCloseOnWebView):
+ (TestRunner::applicationCacheDiskUsageForOrigin):
+ (TestRunner::clearApplicationCacheForOrigin):
+ (TestRunner::setDefersLoading):
+ (TestRunner::setDomainRelaxationForbiddenForURLScheme):
+ (TestRunner::setTabKeyCyclesThroughElements):
+ (TestRunner::setValueForUser):
+ (TestRunner::dispatchPendingLoadRequests):
+ (TestRunner::setWindowIsKey):
+ (TestRunner::execCommand):
+ (TestRunner::addOriginAccessWhitelistEntry):
+ (TestRunner::removeOriginAccessWhitelistEntry):
+ (TestRunner::addUserScript):
+ (TestRunner::addUserStyleSheet):
+ (TestRunner::showWebInspector):
+ (TestRunner::closeWebInspector):
+ (TestRunner::evaluateInWebInspector):
+ (TestRunner::setSerializeHTTPLoads):
+ * DumpRenderTree/win/TextInputControllerWin.cpp:
+ (TextInputController::setMarkedText):
+ (TextInputController::hasMarkedText):
+ (TextInputController::unmarkText):
+ (TextInputController::markedRange):
+ (TextInputController::insertText):
+ (TextInputController::firstRectForCharacterRange):
+ (TextInputController::selectedRange):
+ * DumpRenderTree/win/UIDelegate.h:
+ (UIDelegate::unused2):
+ (UIDelegate::unused3):
+ (UIDelegate::webViewScrolled):
+ (UIDelegate::webViewShouldInterruptJavaScript):
+ (UIDelegate::webViewReceivedFocus):
+ (UIDelegate::unused4): Deleted.
+ * TestWebKitAPI/Tests/WebKit/win/WebViewDestruction.cpp:
+ (TestWebKitAPI::WebViewDestructionWithHostWindow::SetUp):
+ * WinLauncher/PageLoadTestClient.cpp:
+ (PageLoadTestClient::didStartProvisionalLoad):
+ * WinLauncher/WinLauncher.cpp:
+ (WinLauncher::init):
+ * WinLauncher/WinLauncher.h:
+ * WinLauncher/WinLauncherWebHost.cpp:
+ (WinLauncherWebHost::didFinishLoadForFrame):
+ (WinLauncherWebHost::didFirstLayoutInFrame):
+ * WinLauncher/WinLauncherWebHost.h:
+
</ins><span class="cx"> 2015-06-15 Chris Fleizach <cfleizach@apple.com>
</span><span class="cx">
</span><span class="cx"> AX: iOS accessibility tests are not running because we need WKTR support
</span></span></pre></div>
<a id="tagsSafari6011362ToolsDumpRenderTreewinAccessibilityControllerWincpp"></a>
<div class="modfile"><h4>Modified: tags/Safari-601.1.36.2/Tools/DumpRenderTree/win/AccessibilityControllerWin.cpp (186961 => 186962)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-601.1.36.2/Tools/DumpRenderTree/win/AccessibilityControllerWin.cpp 2015-07-17 19:00:45 UTC (rev 186961)
+++ tags/Safari-601.1.36.2/Tools/DumpRenderTree/win/AccessibilityControllerWin.cpp 2015-07-17 19:23:43 UTC (rev 186962)
</span><span class="lines">@@ -152,7 +152,7 @@
</span><span class="cx"> if (FAILED(frame->webView(&view)))
</span><span class="cx"> return 0;
</span><span class="cx">
</span><del>- COMPtr<IWebViewPrivate> viewPrivate(Query, view);
</del><ins>+ COMPtr<IWebViewPrivate2> viewPrivate(Query, view);
</ins><span class="cx"> if (!viewPrivate)
</span><span class="cx"> return 0;
</span><span class="cx">
</span></span></pre></div>
<a id="tagsSafari6011362ToolsDumpRenderTreewinDumpRenderTreecpp"></a>
<div class="modfile"><h4>Modified: tags/Safari-601.1.36.2/Tools/DumpRenderTree/win/DumpRenderTree.cpp (186961 => 186962)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-601.1.36.2/Tools/DumpRenderTree/win/DumpRenderTree.cpp 2015-07-17 19:00:45 UTC (rev 186961)
+++ tags/Safari-601.1.36.2/Tools/DumpRenderTree/win/DumpRenderTree.cpp 2015-07-17 19:23:43 UTC (rev 186962)
</span><span class="lines">@@ -782,7 +782,7 @@
</span><span class="cx"> static _bstr_t sansSerifFamily(TEXT("Arial"));
</span><span class="cx"> static _bstr_t cursiveFamily(TEXT("Comic Sans MS")); // Not actually cursive, but it's what IE and Firefox use.
</span><span class="cx"> static _bstr_t fantasyFamily(TEXT("Times New Roman"));
</span><del>- static _bstr_t pictographFamily(TEXT("Times New Roman"));
</del><ins>+ static _bstr_t pictographFamily(TEXT("Segoe UI Symbol"));
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> prefsPrivate->setAllowUniversalAccessFromFileURLs(TRUE);
</span><span class="lines">@@ -818,7 +818,9 @@
</span><span class="cx"> prefsPrivate->setJavaScriptCanAccessClipboard(TRUE);
</span><span class="cx"> prefsPrivate->setOfflineWebApplicationCacheEnabled(TRUE);
</span><span class="cx"> prefsPrivate->setDeveloperExtrasEnabled(FALSE);
</span><del>- prefsPrivate->setJavaScriptRuntimeFlags(WebKitJavaScriptRuntimeFlagsAllEnabled);
</del><ins>+ COMPtr<IWebPreferencesPrivate2> prefsPrivate2(Query, preferences);
+ if (prefsPrivate2)
+ prefsPrivate2->setJavaScriptRuntimeFlags(WebKitJavaScriptRuntimeFlagsAllEnabled);
</ins><span class="cx"> // Set JS experiments enabled: YES
</span><span class="cx"> preferences->setLoadsImagesAutomatically(TRUE);
</span><span class="cx"> prefsPrivate->setLoadsSiteIconsIgnoringImageLoadingPreference(FALSE);
</span><span class="lines">@@ -886,7 +888,7 @@
</span><span class="cx"> webIBActions->resetPageZoom(0);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- COMPtr<IWebViewPrivate> webViewPrivate(Query, webView);
</del><ins>+ COMPtr<IWebViewPrivate2> webViewPrivate(Query, webView);
</ins><span class="cx"> if (webViewPrivate)
</span><span class="cx"> webViewPrivate->setTabKeyCyclesThroughElements(TRUE);
</span><span class="cx">
</span><span class="lines">@@ -1082,7 +1084,7 @@
</span><span class="cx">
</span><span class="cx"> COMPtr<IWebView> webView;
</span><span class="cx"> if (SUCCEEDED(frame->webView(&webView))) {
</span><del>- COMPtr<IWebViewPrivate> viewPrivate;
</del><ins>+ COMPtr<IWebViewPrivate2> viewPrivate;
</ins><span class="cx"> if (SUCCEEDED(webView->QueryInterface(&viewPrivate))) {
</span><span class="cx"> if (shouldLogHistoryDelegates(pathOrURL.c_str())) {
</span><span class="cx"> ::gTestRunner->setDumpHistoryDelegateCallbacks(true);
</span><span class="lines">@@ -1224,7 +1226,7 @@
</span><span class="cx"> if (FAILED(webView->initWithFrame(clientRect, 0, groupName)))
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><del>- COMPtr<IWebViewPrivate> viewPrivate;
</del><ins>+ COMPtr<IWebViewPrivate2> viewPrivate;
</ins><span class="cx"> if (FAILED(webView->QueryInterface(&viewPrivate)))
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span></span></pre></div>
<a id="tagsSafari6011362ToolsDumpRenderTreewinEditingDelegatecpp"></a>
<div class="modfile"><h4>Modified: tags/Safari-601.1.36.2/Tools/DumpRenderTree/win/EditingDelegate.cpp (186961 => 186962)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-601.1.36.2/Tools/DumpRenderTree/win/EditingDelegate.cpp 2015-07-17 19:00:45 UTC (rev 186961)
+++ tags/Safari-601.1.36.2/Tools/DumpRenderTree/win/EditingDelegate.cpp 2015-07-17 19:23:43 UTC (rev 186962)
</span><span class="lines">@@ -52,9 +52,11 @@
</span><span class="cx"> {
</span><span class="cx"> *ppvObject = 0;
</span><span class="cx"> if (IsEqualGUID(riid, IID_IUnknown))
</span><del>- *ppvObject = static_cast<IWebEditingDelegate*>(this);
</del><ins>+ *ppvObject = static_cast<IWebEditingDelegate2*>(this);
</ins><span class="cx"> else if (IsEqualGUID(riid, IID_IWebEditingDelegate))
</span><span class="cx"> *ppvObject = static_cast<IWebEditingDelegate*>(this);
</span><ins>+ else if (IsEqualGUID(riid, IID_IWebEditingDelegate2))
+ *ppvObject = static_cast<IWebEditingDelegate2*>(this);
</ins><span class="cx"> else if (IsEqualGUID(riid, IID_IWebNotificationObserver))
</span><span class="cx"> *ppvObject = static_cast<IWebNotificationObserver*>(this);
</span><span class="cx"> else
</span><span class="lines">@@ -150,6 +152,14 @@
</span><span class="cx"> return S_OK;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+// IWebEditingDelegate
+HRESULT EditingDelegate::shouldInsertNode(IWebView* webView, IDOMNode* node, IDOMRange* range, WebViewInsertAction action)
+{
+ BOOL ignore;
+ return shouldInsertNode(webView, node, range, action, &ignore);
+}
+
+// IWebEditingDelegate2
</ins><span class="cx"> HRESULT EditingDelegate::shouldInsertNode(IWebView* /*webView*/, IDOMNode* node, IDOMRange* range, WebViewInsertAction action, BOOL* result)
</span><span class="cx"> {
</span><span class="cx"> static const char* insertActionString[] = {
</span></span></pre></div>
<a id="tagsSafari6011362ToolsDumpRenderTreewinEditingDelegateh"></a>
<div class="modfile"><h4>Modified: tags/Safari-601.1.36.2/Tools/DumpRenderTree/win/EditingDelegate.h (186961 => 186962)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-601.1.36.2/Tools/DumpRenderTree/win/EditingDelegate.h 2015-07-17 19:00:45 UTC (rev 186961)
+++ tags/Safari-601.1.36.2/Tools/DumpRenderTree/win/EditingDelegate.h 2015-07-17 19:23:43 UTC (rev 186962)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx">
</span><span class="cx"> #include <WebKit/WebKit.h>
</span><span class="cx">
</span><del>-class __declspec(uuid("265DCD4B-79C3-44a2-84BC-511C3EDABD6F")) EditingDelegate : public IWebEditingDelegate, public IWebNotificationObserver {
</del><ins>+class __declspec(uuid("265DCD4B-79C3-44a2-84BC-511C3EDABD6F")) EditingDelegate : public IWebEditingDelegate2, public IWebNotificationObserver {
</ins><span class="cx"> public:
</span><span class="cx"> EditingDelegate();
</span><span class="cx">
</span><span class="lines">@@ -53,7 +53,7 @@
</span><span class="cx"> /* [in] */ IDOMRange *range,
</span><span class="cx"> /* [retval][out] */ BOOL *result);
</span><span class="cx">
</span><del>- virtual HRESULT STDMETHODCALLTYPE shouldInsertNode(IWebView*, IDOMNode*, IDOMRange*, WebViewInsertAction, BOOL* result);
</del><ins>+ virtual HRESULT STDMETHODCALLTYPE shouldInsertNode(IWebView*, IDOMNode*, IDOMRange*, WebViewInsertAction);
</ins><span class="cx">
</span><span class="cx"> virtual HRESULT STDMETHODCALLTYPE shouldInsertText(
</span><span class="cx"> /* [in] */ IWebView *webView,
</span><span class="lines">@@ -167,6 +167,9 @@
</span><span class="cx"> // IWebNotificationObserver
</span><span class="cx"> virtual HRESULT STDMETHODCALLTYPE onNotify(IWebNotification* notification);
</span><span class="cx">
</span><ins>+ // IWebEditingDelegate2
+ virtual HRESULT STDMETHODCALLTYPE shouldInsertNode(IWebView*, IDOMNode*, IDOMRange*, WebViewInsertAction, BOOL* result);
+
</ins><span class="cx"> private:
</span><span class="cx"> bool m_acceptsEditing;
</span><span class="cx"> ULONG m_refCount;
</span></span></pre></div>
<a id="tagsSafari6011362ToolsDumpRenderTreewinEventSendercpp"></a>
<div class="modfile"><h4>Modified: tags/Safari-601.1.36.2/Tools/DumpRenderTree/win/EventSender.cpp (186961 => 186962)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-601.1.36.2/Tools/DumpRenderTree/win/EventSender.cpp 2015-07-17 19:00:45 UTC (rev 186961)
+++ tags/Safari-601.1.36.2/Tools/DumpRenderTree/win/EventSender.cpp 2015-07-17 19:23:43 UTC (rev 186962)
</span><span class="lines">@@ -760,7 +760,7 @@
</span><span class="cx"> if (FAILED(frame->webView(&webView)))
</span><span class="cx"> return JSValueMakeUndefined(context);
</span><span class="cx">
</span><del>- COMPtr<IWebViewPrivate> webViewPrivate;
</del><ins>+ COMPtr<IWebViewPrivate2> webViewPrivate;
</ins><span class="cx"> if (FAILED(webView->QueryInterface(&webViewPrivate)))
</span><span class="cx"> return JSValueMakeUndefined(context);
</span><span class="cx">
</span></span></pre></div>
<a id="tagsSafari6011362ToolsDumpRenderTreewinFrameLoadDelegatecpp"></a>
<div class="modfile"><h4>Modified: tags/Safari-601.1.36.2/Tools/DumpRenderTree/win/FrameLoadDelegate.cpp (186961 => 186962)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-601.1.36.2/Tools/DumpRenderTree/win/FrameLoadDelegate.cpp 2015-07-17 19:00:45 UTC (rev 186961)
+++ tags/Safari-601.1.36.2/Tools/DumpRenderTree/win/FrameLoadDelegate.cpp 2015-07-17 19:23:43 UTC (rev 186962)
</span><span class="lines">@@ -163,7 +163,7 @@
</span><span class="cx"> if (!done && gTestRunner->dumpFrameLoadCallbacks())
</span><span class="cx"> printf("%s - didCommitLoadForFrame\n", descriptionSuitableForTestResult(frame).c_str());
</span><span class="cx">
</span><del>- COMPtr<IWebViewPrivate> webViewPrivate;
</del><ins>+ COMPtr<IWebViewPrivate2> webViewPrivate;
</ins><span class="cx"> HRESULT hr = webView->QueryInterface(&webViewPrivate);
</span><span class="cx"> if (FAILED(hr))
</span><span class="cx"> return hr;
</span></span></pre></div>
<a id="tagsSafari6011362ToolsDumpRenderTreewinTestRunnerWincpp"></a>
<div class="modfile"><h4>Modified: tags/Safari-601.1.36.2/Tools/DumpRenderTree/win/TestRunnerWin.cpp (186961 => 186962)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-601.1.36.2/Tools/DumpRenderTree/win/TestRunnerWin.cpp 2015-07-17 19:00:45 UTC (rev 186961)
+++ tags/Safari-601.1.36.2/Tools/DumpRenderTree/win/TestRunnerWin.cpp 2015-07-17 19:23:43 UTC (rev 186962)
</span><span class="lines">@@ -86,7 +86,7 @@
</span><span class="cx"> if (FAILED(frame->webView(&webView)))
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- COMPtr<IWebViewPrivate> viewPrivate;
</del><ins>+ COMPtr<IWebViewPrivate2> viewPrivate;
</ins><span class="cx"> if (FAILED(webView->QueryInterface(&viewPrivate)))
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="lines">@@ -106,8 +106,8 @@
</span><span class="cx">
</span><span class="cx"> long long TestRunner::applicationCacheDiskUsageForOrigin(JSStringRef url)
</span><span class="cx"> {
</span><del>- COMPtr<IWebSecurityOrigin> origin;
- if (FAILED(WebKitCreateInstance(CLSID_WebSecurityOrigin, 0, IID_IWebSecurityOrigin, reinterpret_cast<void**>(&origin))))
</del><ins>+ COMPtr<IWebSecurityOrigin2> origin;
+ if (FAILED(WebKitCreateInstance(CLSID_WebSecurityOrigin, 0, IID_IWebSecurityOrigin2, reinterpret_cast<void**>(&origin))))
</ins><span class="cx"> return 0;
</span><span class="cx">
</span><span class="cx"> COMPtr<IWebApplicationCache> applicationCache;
</span><span class="lines">@@ -126,8 +126,8 @@
</span><span class="cx">
</span><span class="cx"> void TestRunner::clearApplicationCacheForOrigin(JSStringRef origin)
</span><span class="cx"> {
</span><del>- COMPtr<IWebSecurityOrigin> securityOrigin;
- if (FAILED(WebKitCreateInstance(CLSID_WebSecurityOrigin, 0, IID_IWebSecurityOrigin, reinterpret_cast<void**>(&securityOrigin))))
</del><ins>+ COMPtr<IWebSecurityOrigin2> securityOrigin;
+ if (FAILED(WebKitCreateInstance(CLSID_WebSecurityOrigin, 0, IID_IWebSecurityOrigin2, reinterpret_cast<void**>(&securityOrigin))))
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> _bstr_t originBstr(JSStringCopyBSTR(origin), false);
</span><span class="lines">@@ -418,7 +418,7 @@
</span><span class="cx"> if (FAILED(frame->webView(&webView)))
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- COMPtr<IWebViewPrivate> viewPrivate;
</del><ins>+ COMPtr<IWebViewPrivate2> viewPrivate;
</ins><span class="cx"> if (FAILED(webView->QueryInterface(&viewPrivate)))
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -427,7 +427,7 @@
</span><span class="cx">
</span><span class="cx"> void TestRunner::setDomainRelaxationForbiddenForURLScheme(bool forbidden, JSStringRef scheme)
</span><span class="cx"> {
</span><del>- COMPtr<IWebViewPrivate> webView;
</del><ins>+ COMPtr<IWebViewPrivate2> webView;
</ins><span class="cx"> if (FAILED(WebKitCreateInstance(__uuidof(WebView), 0, __uuidof(webView), reinterpret_cast<void**>(&webView))))
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -607,7 +607,7 @@
</span><span class="cx"> if (FAILED(frame->webView(&webView)))
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- COMPtr<IWebViewPrivate> viewPrivate;
</del><ins>+ COMPtr<IWebViewPrivate2> viewPrivate;
</ins><span class="cx"> if (FAILED(webView->QueryInterface(&viewPrivate)))
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -788,7 +788,7 @@
</span><span class="cx"> if (FAILED(frame->webView(&webView)))
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- COMPtr<IWebViewPrivate> webViewPrivate(Query, webView);
</del><ins>+ COMPtr<IWebViewPrivate2> webViewPrivate(Query, webView);
</ins><span class="cx"> if (!webViewPrivate)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -869,7 +869,7 @@
</span><span class="cx"> if (FAILED(frame->webView(&webView)))
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- COMPtr<IWebViewPrivate> viewPrivate;
</del><ins>+ COMPtr<IWebViewPrivate2> viewPrivate;
</ins><span class="cx"> if (FAILED(webView->QueryInterface(&viewPrivate)))
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -905,7 +905,7 @@
</span><span class="cx"> if (FAILED(frame->webView(&webView)))
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- COMPtr<IWebViewPrivate> viewPrivate;
</del><ins>+ COMPtr<IWebViewPrivate2> viewPrivate;
</ins><span class="cx"> if (FAILED(webView->QueryInterface(&viewPrivate)))
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -959,7 +959,7 @@
</span><span class="cx">
</span><span class="cx"> void TestRunner::addOriginAccessWhitelistEntry(JSStringRef sourceOrigin, JSStringRef destinationProtocol, JSStringRef destinationHost, bool allowDestinationSubdomains)
</span><span class="cx"> {
</span><del>- COMPtr<IWebViewPrivate> webView;
</del><ins>+ COMPtr<IWebViewPrivate2> webView;
</ins><span class="cx"> if (FAILED(WebKitCreateInstance(__uuidof(WebView), 0, __uuidof(webView), reinterpret_cast<void**>(&webView))))
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -968,7 +968,7 @@
</span><span class="cx">
</span><span class="cx"> void TestRunner::removeOriginAccessWhitelistEntry(JSStringRef sourceOrigin, JSStringRef destinationProtocol, JSStringRef destinationHost, bool allowDestinationSubdomains)
</span><span class="cx"> {
</span><del>- COMPtr<IWebViewPrivate> webView;
</del><ins>+ COMPtr<IWebViewPrivate2> webView;
</ins><span class="cx"> if (FAILED(WebKitCreateInstance(__uuidof(WebView), 0, __uuidof(webView), reinterpret_cast<void**>(&webView))))
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -982,7 +982,7 @@
</span><span class="cx">
</span><span class="cx"> void TestRunner::addUserScript(JSStringRef source, bool runAtStart, bool allFrames)
</span><span class="cx"> {
</span><del>- COMPtr<IWebViewPrivate> webView;
</del><ins>+ COMPtr<IWebViewPrivate2> webView;
</ins><span class="cx"> if (FAILED(WebKitCreateInstance(__uuidof(WebView), 0, __uuidof(webView), reinterpret_cast<void**>(&webView))))
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -995,7 +995,7 @@
</span><span class="cx">
</span><span class="cx"> void TestRunner::addUserStyleSheet(JSStringRef source, bool allFrames)
</span><span class="cx"> {
</span><del>- COMPtr<IWebViewPrivate> webView;
</del><ins>+ COMPtr<IWebViewPrivate2> webView;
</ins><span class="cx"> if (FAILED(WebKitCreateInstance(__uuidof(WebView), 0, __uuidof(webView), reinterpret_cast<void**>(&webView))))
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -1029,7 +1029,7 @@
</span><span class="cx"> if (FAILED(frame->webView(&webView)))
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- COMPtr<IWebViewPrivate> viewPrivate(Query, webView);
</del><ins>+ COMPtr<IWebViewPrivate2> viewPrivate(Query, webView);
</ins><span class="cx"> if (!viewPrivate)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -1044,7 +1044,7 @@
</span><span class="cx"> if (FAILED(frame->webView(&webView)))
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- COMPtr<IWebViewPrivate> viewPrivate(Query, webView);
</del><ins>+ COMPtr<IWebViewPrivate2> viewPrivate(Query, webView);
</ins><span class="cx"> if (!viewPrivate)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -1061,7 +1061,7 @@
</span><span class="cx"> if (FAILED(frame->webView(&webView)))
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- COMPtr<IWebViewPrivate> viewPrivate(Query, webView);
</del><ins>+ COMPtr<IWebViewPrivate2> viewPrivate(Query, webView);
</ins><span class="cx"> if (!viewPrivate)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -1175,7 +1175,7 @@
</span><span class="cx"> if (FAILED(frame->webView(&webView)))
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- COMPtr<IWebViewPrivate> viewPrivate;
</del><ins>+ COMPtr<IWebViewPrivate2> viewPrivate;
</ins><span class="cx"> if (FAILED(webView->QueryInterface(&viewPrivate)))
</span><span class="cx"> return;
</span><span class="cx">
</span></span></pre></div>
<a id="tagsSafari6011362ToolsDumpRenderTreewinTextInputControllerWincpp"></a>
<div class="modfile"><h4>Modified: tags/Safari-601.1.36.2/Tools/DumpRenderTree/win/TextInputControllerWin.cpp (186961 => 186962)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-601.1.36.2/Tools/DumpRenderTree/win/TextInputControllerWin.cpp 2015-07-17 19:00:45 UTC (rev 186961)
+++ tags/Safari-601.1.36.2/Tools/DumpRenderTree/win/TextInputControllerWin.cpp 2015-07-17 19:23:43 UTC (rev 186962)
</span><span class="lines">@@ -44,7 +44,7 @@
</span><span class="cx"> if (FAILED(frame->webView(&webView)))
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- COMPtr<IWebViewPrivate> viewPrivate;
</del><ins>+ COMPtr<IWebViewPrivate2> viewPrivate;
</ins><span class="cx"> if (FAILED(webView->QueryInterface(&viewPrivate)))
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -59,7 +59,7 @@
</span><span class="cx"> if (FAILED(frame->webView(&webView)))
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- COMPtr<IWebViewPrivate> viewPrivate;
</del><ins>+ COMPtr<IWebViewPrivate2> viewPrivate;
</ins><span class="cx"> if (FAILED(webView->QueryInterface(&viewPrivate)))
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="lines">@@ -74,7 +74,7 @@
</span><span class="cx"> if (FAILED(frame->webView(&webView)))
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- COMPtr<IWebViewPrivate> viewPrivate;
</del><ins>+ COMPtr<IWebViewPrivate2> viewPrivate;
</ins><span class="cx"> if (FAILED(webView->QueryInterface(&viewPrivate)))
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -91,7 +91,7 @@
</span><span class="cx"> if (FAILED(frame->webView(&webView)))
</span><span class="cx"> return result;
</span><span class="cx">
</span><del>- COMPtr<IWebViewPrivate> viewPrivate;
</del><ins>+ COMPtr<IWebViewPrivate2> viewPrivate;
</ins><span class="cx"> if (FAILED(webView->QueryInterface(&viewPrivate)))
</span><span class="cx"> return result;
</span><span class="cx">
</span><span class="lines">@@ -112,7 +112,7 @@
</span><span class="cx"> if (FAILED(frame->webView(&webView)))
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- COMPtr<IWebViewPrivate> viewPrivate;
</del><ins>+ COMPtr<IWebViewPrivate2> viewPrivate;
</ins><span class="cx"> if (FAILED(webView->QueryInterface(&viewPrivate)))
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -130,7 +130,7 @@
</span><span class="cx"> if (FAILED(frame->webView(&webView)))
</span><span class="cx"> return result;
</span><span class="cx">
</span><del>- COMPtr<IWebViewPrivate> viewPrivate;
</del><ins>+ COMPtr<IWebViewPrivate2> viewPrivate;
</ins><span class="cx"> if (FAILED(webView->QueryInterface(&viewPrivate)))
</span><span class="cx"> return result;
</span><span class="cx">
</span><span class="lines">@@ -155,7 +155,7 @@
</span><span class="cx"> if (FAILED(frame->webView(&webView)))
</span><span class="cx"> return result;
</span><span class="cx">
</span><del>- COMPtr<IWebViewPrivate> viewPrivate;
</del><ins>+ COMPtr<IWebViewPrivate2> viewPrivate;
</ins><span class="cx"> if (FAILED(webView->QueryInterface(&viewPrivate)))
</span><span class="cx"> return result;
</span><span class="cx">
</span></span></pre></div>
<a id="tagsSafari6011362ToolsTestWebKitAPITestsWebKitwinWebViewDestructioncpp"></a>
<div class="modfile"><h4>Modified: tags/Safari-601.1.36.2/Tools/TestWebKitAPI/Tests/WebKit/win/WebViewDestruction.cpp (186961 => 186962)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-601.1.36.2/Tools/TestWebKitAPI/Tests/WebKit/win/WebViewDestruction.cpp 2015-07-17 19:00:45 UTC (rev 186961)
+++ tags/Safari-601.1.36.2/Tools/TestWebKitAPI/Tests/WebKit/win/WebViewDestruction.cpp 2015-07-17 19:23:43 UTC (rev 186962)
</span><span class="lines">@@ -82,7 +82,7 @@
</span><span class="cx"> EXPECT_HRESULT_SUCCEEDED(m_webView->setHostWindow(m_window.window()));
</span><span class="cx"> EXPECT_HRESULT_SUCCEEDED(m_webView->initWithFrame(m_window.clientRect(), 0, 0));
</span><span class="cx">
</span><del>- COMPtr<IWebViewPrivate> viewPrivate(Query, m_webView);
</del><ins>+ COMPtr<IWebViewPrivate2> viewPrivate(Query, m_webView);
</ins><span class="cx"> ASSERT_NOT_NULL(viewPrivate);
</span><span class="cx"> EXPECT_HRESULT_SUCCEEDED(viewPrivate->viewWindow(&m_viewWindow));
</span><span class="cx"> EXPECT_TRUE(::IsWindow(m_viewWindow));
</span></span></pre></div>
<a id="tagsSafari6011362ToolsWinLauncherPageLoadTestClientcpp"></a>
<div class="modfile"><h4>Modified: tags/Safari-601.1.36.2/Tools/WinLauncher/PageLoadTestClient.cpp (186961 => 186962)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-601.1.36.2/Tools/WinLauncher/PageLoadTestClient.cpp 2015-07-17 19:00:45 UTC (rev 186961)
+++ tags/Safari-601.1.36.2/Tools/WinLauncher/PageLoadTestClient.cpp 2015-07-17 19:23:43 UTC (rev 186962)
</span><span class="lines">@@ -60,10 +60,14 @@
</span><span class="cx">
</span><span class="cx"> void PageLoadTestClient::didStartProvisionalLoad(IWebFrame& frame)
</span><span class="cx"> {
</span><del>- BOOL mainFrame;
- if (FAILED(frame.isMainFrame(&mainFrame)))
</del><ins>+ _com_ptr_t<_com_IIID<IWebFrame2, &__uuidof(IWebFrame2)>> frame2;
+ if (FAILED(frame.QueryInterface(&frame2.GetInterfacePtr())))
</ins><span class="cx"> return;
</span><span class="cx">
</span><ins>+ BOOL mainFrame = FALSE;
+ if (frame2 && FAILED(frame2->isMainFrame(&mainFrame)))
+ return;
+
</ins><span class="cx"> if (mainFrame) {
</span><span class="cx"> clearPageLoadState();
</span><span class="cx"> pageLoadStartedAtTime(CFAbsoluteTimeGetCurrent());
</span></span></pre></div>
<a id="tagsSafari6011362ToolsWinLauncherWinLaunchercpp"></a>
<div class="modfile"><h4>Modified: tags/Safari-601.1.36.2/Tools/WinLauncher/WinLauncher.cpp (186961 => 186962)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-601.1.36.2/Tools/WinLauncher/WinLauncher.cpp 2015-07-17 19:00:45 UTC (rev 186961)
+++ tags/Safari-601.1.36.2/Tools/WinLauncher/WinLauncher.cpp 2015-07-17 19:23:43 UTC (rev 186962)
</span><span class="lines">@@ -65,7 +65,7 @@
</span><span class="cx"> if (FAILED(hr))
</span><span class="cx"> return hr;
</span><span class="cx">
</span><del>- hr = m_webView->QueryInterface(IID_IWebViewPrivate, reinterpret_cast<void**>(&m_webViewPrivate.GetInterfacePtr()));
</del><ins>+ hr = m_webView->QueryInterface(IID_IWebViewPrivate2, reinterpret_cast<void**>(&m_webViewPrivate.GetInterfacePtr()));
</ins><span class="cx"> if (FAILED(hr))
</span><span class="cx"> return hr;
</span><span class="cx">
</span></span></pre></div>
<a id="tagsSafari6011362ToolsWinLauncherWinLauncherh"></a>
<div class="modfile"><h4>Modified: tags/Safari-601.1.36.2/Tools/WinLauncher/WinLauncher.h (186961 => 186962)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-601.1.36.2/Tools/WinLauncher/WinLauncher.h 2015-07-17 19:00:45 UTC (rev 186961)
+++ tags/Safari-601.1.36.2/Tools/WinLauncher/WinLauncher.h 2015-07-17 19:23:43 UTC (rev 186962)
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx">
</span><span class="cx"> typedef _com_ptr_t<_com_IIID<IWebFrame, &__uuidof(IWebFrame)>> IWebFramePtr;
</span><span class="cx"> typedef _com_ptr_t<_com_IIID<IWebView, &__uuidof(IWebView)>> IWebViewPtr;
</span><del>-typedef _com_ptr_t<_com_IIID<IWebViewPrivate, &__uuidof(IWebViewPrivate)>> IWebViewPrivatePtr;
</del><ins>+typedef _com_ptr_t<_com_IIID<IWebViewPrivate2, &__uuidof(IWebViewPrivate2)>> IWebViewPrivatePtr;
</ins><span class="cx"> typedef _com_ptr_t<_com_IIID<IWebFrameLoadDelegate, &__uuidof(IWebFrameLoadDelegate)>> IWebFrameLoadDelegatePtr;
</span><span class="cx"> typedef _com_ptr_t<_com_IIID<IWebHistory, &__uuidof(IWebHistory)>> IWebHistoryPtr;
</span><span class="cx"> typedef _com_ptr_t<_com_IIID<IWebHistoryItem, &__uuidof(IWebHistoryItem)>> IWebHistoryItemPtr;
</span></span></pre></div>
<a id="tagsSafari6011362ToolsWinLauncherWinLauncherWebHostcpp"></a>
<div class="modfile"><h4>Modified: tags/Safari-601.1.36.2/Tools/WinLauncher/WinLauncherWebHost.cpp (186961 => 186962)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-601.1.36.2/Tools/WinLauncher/WinLauncherWebHost.cpp 2015-07-17 19:00:45 UTC (rev 186961)
+++ tags/Safari-601.1.36.2/Tools/WinLauncher/WinLauncherWebHost.cpp 2015-07-17 19:23:43 UTC (rev 186962)
</span><span class="lines">@@ -142,16 +142,20 @@
</span><span class="cx"> typedef _com_ptr_t<_com_IIID<IDOMDocument, &__uuidof(IDOMDocument)>> IDOMDocumentPtr;
</span><span class="cx"> typedef _com_ptr_t<_com_IIID<IDOMElement, &__uuidof(IDOMElement)>> IDOMElementPtr;
</span><span class="cx"> typedef _com_ptr_t<_com_IIID<IDOMEventTarget, &__uuidof(IDOMEventTarget)>> IDOMEventTargetPtr;
</span><ins>+typedef _com_ptr_t<_com_IIID<IWebFrame2, &__uuidof(IWebFrame2)>> IWebFrame2Ptr;
</ins><span class="cx">
</span><span class="cx"> HRESULT WinLauncherWebHost::didFinishLoadForFrame(IWebView* webView, IWebFrame* frame)
</span><span class="cx"> {
</span><span class="cx"> if (!frame || !webView)
</span><span class="cx"> return E_POINTER;
</span><span class="cx">
</span><del>- BOOL mainFrame;
- if (SUCCEEDED(frame->isMainFrame(&mainFrame))) {
- if (mainFrame)
- m_client->pageLoadTestClient().didFinishLoad();
</del><ins>+ IWebFrame2Ptr frame2;
+ if (SUCCEEDED(frame->QueryInterface(&frame2.GetInterfacePtr()))) {
+ BOOL mainFrame = FALSE;
+ if (frame2 && SUCCEEDED(frame2->isMainFrame(&mainFrame))) {
+ if (mainFrame)
+ m_client->pageLoadTestClient().didFinishLoad();
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> IDOMDocumentPtr doc;
</span><span class="lines">@@ -221,8 +225,15 @@
</span><span class="cx">
</span><span class="cx"> HRESULT WinLauncherWebHost::didFirstLayoutInFrame(IWebView*, IWebFrame* frame)
</span><span class="cx"> {
</span><ins>+ if (!frame)
+ return E_POINTER;
+
+ IWebFrame2Ptr frame2;
+ if (FAILED(frame->QueryInterface(&frame2.GetInterfacePtr())))
+ return S_OK;
+
</ins><span class="cx"> BOOL mainFrame;
</span><del>- if (SUCCEEDED(frame->isMainFrame(&mainFrame))) {
</del><ins>+ if (frame2 && SUCCEEDED(frame2->isMainFrame(&mainFrame))) {
</ins><span class="cx"> if (mainFrame)
</span><span class="cx"> m_client->pageLoadTestClient().didFirstLayoutForMainFrame();
</span><span class="cx"> }
</span></span></pre></div>
<a id="tagsSafari6011362ToolsWinLauncherWinLauncherWebHosth"></a>
<div class="modfile"><h4>Modified: tags/Safari-601.1.36.2/Tools/WinLauncher/WinLauncherWebHost.h (186961 => 186962)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-601.1.36.2/Tools/WinLauncher/WinLauncherWebHost.h 2015-07-17 19:00:45 UTC (rev 186961)
+++ tags/Safari-601.1.36.2/Tools/WinLauncher/WinLauncherWebHost.h 2015-07-17 19:23:43 UTC (rev 186962)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2006, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2006, 2014-2015 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span></span></pre>
</div>
</div>
</body>
</html>