<!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>[172986] branches/safari-600.1-branch</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/172986">172986</a></dd>
<dt>Author</dt> <dd>dburkart@apple.com</dd>
<dt>Date</dt> <dd>2014-08-26 17:01:31 -0700 (Tue, 26 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/172977">r172977</a>. <rdar://problem/18141703></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6001branchSourceWebCoreChangeLog">branches/safari-600.1-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari6001branchSourceWebCoreplatformwinWindowMessageBroadcastercpp">branches/safari-600.1-branch/Source/WebCore/platform/win/WindowMessageBroadcaster.cpp</a></li>
<li><a href="#branchessafari6001branchSourceWebKitwinChangeLog">branches/safari-600.1-branch/Source/WebKit/win/ChangeLog</a></li>
<li><a href="#branchessafari6001branchSourceWebKitwinInterfacesIWebDocumentidl">branches/safari-600.1-branch/Source/WebKit/win/Interfaces/IWebDocument.idl</a></li>
<li><a href="#branchessafari6001branchSourceWebKitwinInterfacesIWebEmbeddedViewidl">branches/safari-600.1-branch/Source/WebKit/win/Interfaces/IWebEmbeddedView.idl</a></li>
<li><a href="#branchessafari6001branchSourceWebKitwinInterfacesIWebErrorPrivateidl">branches/safari-600.1-branch/Source/WebKit/win/Interfaces/IWebErrorPrivate.idl</a></li>
<li><a href="#branchessafari6001branchSourceWebKitwinInterfacesIWebFrameLoadDelegateidl">branches/safari-600.1-branch/Source/WebKit/win/Interfaces/IWebFrameLoadDelegate.idl</a></li>
<li><a href="#branchessafari6001branchSourceWebKitwinInterfacesIWebFramePrivateidl">branches/safari-600.1-branch/Source/WebKit/win/Interfaces/IWebFramePrivate.idl</a></li>
<li><a href="#branchessafari6001branchSourceWebKitwinInterfacesIWebHistoryItemidl">branches/safari-600.1-branch/Source/WebKit/win/Interfaces/IWebHistoryItem.idl</a></li>
<li><a href="#branchessafari6001branchSourceWebKitwinInterfacesIWebIconDatabaseidl">branches/safari-600.1-branch/Source/WebKit/win/Interfaces/IWebIconDatabase.idl</a></li>
<li><a href="#branchessafari6001branchSourceWebKitwinInterfacesIWebMutableURLRequestPrivateidl">branches/safari-600.1-branch/Source/WebKit/win/Interfaces/IWebMutableURLRequestPrivate.idl</a></li>
<li><a href="#branchessafari6001branchSourceWebKitwinInterfacesIWebUIDelegateidl">branches/safari-600.1-branch/Source/WebKit/win/Interfaces/IWebUIDelegate.idl</a></li>
<li><a href="#branchessafari6001branchSourceWebKitwinInterfacesIWebUIDelegatePrivateidl">branches/safari-600.1-branch/Source/WebKit/win/Interfaces/IWebUIDelegatePrivate.idl</a></li>
<li><a href="#branchessafari6001branchSourceWebKitwinInterfacesIWebURLResponsePrivateidl">branches/safari-600.1-branch/Source/WebKit/win/Interfaces/IWebURLResponsePrivate.idl</a></li>
<li><a href="#branchessafari6001branchSourceWebKitwinInterfacesIWebViewidl">branches/safari-600.1-branch/Source/WebKit/win/Interfaces/IWebView.idl</a></li>
<li><a href="#branchessafari6001branchSourceWebKitwinInterfacesIWebViewPrivateidl">branches/safari-600.1-branch/Source/WebKit/win/Interfaces/IWebViewPrivate.idl</a></li>
<li><a href="#branchessafari6001branchSourceWebKitwinWebCoreSupportEmbeddedWidgetcpp">branches/safari-600.1-branch/Source/WebKit/win/WebCoreSupport/EmbeddedWidget.cpp</a></li>
<li><a href="#branchessafari6001branchSourceWebKitwinWebCoreSupportWebChromeClientcpp">branches/safari-600.1-branch/Source/WebKit/win/WebCoreSupport/WebChromeClient.cpp</a></li>
<li><a href="#branchessafari6001branchSourceWebKitwinWebCoreSupportWebContextMenuClientcpp">branches/safari-600.1-branch/Source/WebKit/win/WebCoreSupport/WebContextMenuClient.cpp</a></li>
<li><a href="#branchessafari6001branchSourceWebKitwinWebCoreSupportWebFrameLoaderClientcpp">branches/safari-600.1-branch/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp</a></li>
<li><a href="#branchessafari6001branchSourceWebKitwinWebCoreSupportWebInspectorClientcpp">branches/safari-600.1-branch/Source/WebKit/win/WebCoreSupport/WebInspectorClient.cpp</a></li>
<li><a href="#branchessafari6001branchSourceWebKitwinWebCoreSupportWebInspectorClienth">branches/safari-600.1-branch/Source/WebKit/win/WebCoreSupport/WebInspectorClient.h</a></li>
<li><a href="#branchessafari6001branchSourceWebKitwinWebCoreSupportWebInspectorDelegatecpp">branches/safari-600.1-branch/Source/WebKit/win/WebCoreSupport/WebInspectorDelegate.cpp</a></li>
<li><a href="#branchessafari6001branchSourceWebKitwinWebCoreSupportWebInspectorDelegateh">branches/safari-600.1-branch/Source/WebKit/win/WebCoreSupport/WebInspectorDelegate.h</a></li>
<li><a href="#branchessafari6001branchSourceWebKitwinWebDropSourcecpp">branches/safari-600.1-branch/Source/WebKit/win/WebDropSource.cpp</a></li>
<li><a href="#branchessafari6001branchSourceWebKitwinWebErrorcpp">branches/safari-600.1-branch/Source/WebKit/win/WebError.cpp</a></li>
<li><a href="#branchessafari6001branchSourceWebKitwinWebErrorh">branches/safari-600.1-branch/Source/WebKit/win/WebError.h</a></li>
<li><a href="#branchessafari6001branchSourceWebKitwinWebFramecpp">branches/safari-600.1-branch/Source/WebKit/win/WebFrame.cpp</a></li>
<li><a href="#branchessafari6001branchSourceWebKitwinWebFrameh">branches/safari-600.1-branch/Source/WebKit/win/WebFrame.h</a></li>
<li><a href="#branchessafari6001branchSourceWebKitwinWebHistoryItemcpp">branches/safari-600.1-branch/Source/WebKit/win/WebHistoryItem.cpp</a></li>
<li><a href="#branchessafari6001branchSourceWebKitwinWebHistoryItemh">branches/safari-600.1-branch/Source/WebKit/win/WebHistoryItem.h</a></li>
<li><a href="#branchessafari6001branchSourceWebKitwinWebIconDatabasecpp">branches/safari-600.1-branch/Source/WebKit/win/WebIconDatabase.cpp</a></li>
<li><a href="#branchessafari6001branchSourceWebKitwinWebIconDatabaseh">branches/safari-600.1-branch/Source/WebKit/win/WebIconDatabase.h</a></li>
<li><a href="#branchessafari6001branchSourceWebKitwinWebMutableURLRequestcpp">branches/safari-600.1-branch/Source/WebKit/win/WebMutableURLRequest.cpp</a></li>
<li><a href="#branchessafari6001branchSourceWebKitwinWebMutableURLRequesth">branches/safari-600.1-branch/Source/WebKit/win/WebMutableURLRequest.h</a></li>
<li><a href="#branchessafari6001branchSourceWebKitwinWebNodeHighlightcpp">branches/safari-600.1-branch/Source/WebKit/win/WebNodeHighlight.cpp</a></li>
<li><a href="#branchessafari6001branchSourceWebKitwinWebURLResponsecpp">branches/safari-600.1-branch/Source/WebKit/win/WebURLResponse.cpp</a></li>
<li><a href="#branchessafari6001branchSourceWebKitwinWebURLResponseh">branches/safari-600.1-branch/Source/WebKit/win/WebURLResponse.h</a></li>
<li><a href="#branchessafari6001branchSourceWebKitwinWebViewcpp">branches/safari-600.1-branch/Source/WebKit/win/WebView.cpp</a></li>
<li><a href="#branchessafari6001branchSourceWebKitwinWebViewh">branches/safari-600.1-branch/Source/WebKit/win/WebView.h</a></li>
<li><a href="#branchessafari6001branchToolsChangeLog">branches/safari-600.1-branch/Tools/ChangeLog</a></li>
<li><a href="#branchessafari6001branchToolsDumpRenderTreewinAccessibilityControllerWincpp">branches/safari-600.1-branch/Tools/DumpRenderTree/win/AccessibilityControllerWin.cpp</a></li>
<li><a href="#branchessafari6001branchToolsDumpRenderTreewinDumpRenderTreecpp">branches/safari-600.1-branch/Tools/DumpRenderTree/win/DumpRenderTree.cpp</a></li>
<li><a href="#branchessafari6001branchToolsDumpRenderTreewinFrameLoadDelegateh">branches/safari-600.1-branch/Tools/DumpRenderTree/win/FrameLoadDelegate.h</a></li>
<li><a href="#branchessafari6001branchToolsDumpRenderTreewinTestRunnerWincpp">branches/safari-600.1-branch/Tools/DumpRenderTree/win/TestRunnerWin.cpp</a></li>
<li><a href="#branchessafari6001branchToolsDumpRenderTreewinUIDelegatecpp">branches/safari-600.1-branch/Tools/DumpRenderTree/win/UIDelegate.cpp</a></li>
<li><a href="#branchessafari6001branchToolsDumpRenderTreewinUIDelegateh">branches/safari-600.1-branch/Tools/DumpRenderTree/win/UIDelegate.h</a></li>
<li><a href="#branchessafari6001branchToolsTestWebKitAPITestsWebKitwinWebViewDestructioncpp">branches/safari-600.1-branch/Tools/TestWebKitAPI/Tests/WebKit/win/WebViewDestruction.cpp</a></li>
<li><a href="#branchessafari6001branchToolsWinLauncherPrintWebUIDelegatecpp">branches/safari-600.1-branch/Tools/WinLauncher/PrintWebUIDelegate.cpp</a></li>
<li><a href="#branchessafari6001branchToolsWinLauncherPrintWebUIDelegateh">branches/safari-600.1-branch/Tools/WinLauncher/PrintWebUIDelegate.h</a></li>
<li><a href="#branchessafari6001branchToolsWinLauncherWinLaunchercpp">branches/safari-600.1-branch/Tools/WinLauncher/WinLauncher.cpp</a></li>
<li><a href="#branchessafari6001branchToolsWinLauncherWinLauncherWebHosth">branches/safari-600.1-branch/Tools/WinLauncher/WinLauncherWebHost.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6001branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebCore/ChangeLog (172985 => 172986)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebCore/ChangeLog 2014-08-27 00:01:12 UTC (rev 172985)
+++ branches/safari-600.1-branch/Source/WebCore/ChangeLog 2014-08-27 00:01:31 UTC (rev 172986)
</span><span class="lines">@@ -1,5 +1,27 @@
</span><span class="cx"> 2014-08-26 Dana Burkart <dburkart@apple.com>
</span><span class="cx">
</span><ins>+ Merge r172977. <rdar://problem/18141703>
+
+ 2014-08-26 Brent Fulgham <bfulgham@apple.com>
+
+ [Win] WebKit IDL incorrectly passes HWND as OLE_HANDLE
+ https://bugs.webkit.org/show_bug.cgi?id=136258
+ <rdar://problem/18134138>
+
+ Reviewed by Tim Horton.
+
+ Avoid 32/64-bit truncation by preventing 64-bit HWND (and other)
+ values from passing through the 32-bit OLE_HANDLE data type.
+
+ * platform/win/WindowMessageBroadcaster.cpp:
+ (WebCore::WindowMessageBroadcaster::addListener):
+ (WebCore::WindowMessageBroadcaster::removeListener):
+ (WebCore::WindowMessageBroadcaster::destroy):
+ (WebCore::WindowMessageBroadcaster::unsubclassWindow):
+ (WebCore::WindowMessageBroadcaster::SubclassedWndProc):
+
+2014-08-26 Dana Burkart <dburkart@apple.com>
+
</ins><span class="cx"> Merge r172969. <rdar://problem/17435564>
</span><span class="cx">
</span><span class="cx"> 2014-08-26 Simon Fraser <simon.fraser@apple.com>
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebCoreplatformwinWindowMessageBroadcastercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebCore/platform/win/WindowMessageBroadcaster.cpp (172985 => 172986)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebCore/platform/win/WindowMessageBroadcaster.cpp 2014-08-27 00:01:12 UTC (rev 172985)
+++ branches/safari-600.1-branch/Source/WebCore/platform/win/WindowMessageBroadcaster.cpp 2014-08-27 00:01:31 UTC (rev 172986)
</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, 2014 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">@@ -79,6 +79,7 @@
</span><span class="cx"> #pragma warning(disable: 4244 4312)
</span><span class="cx"> m_originalWndProc = reinterpret_cast<WNDPROC>(SetWindowLongPtr(m_subclassedWindow, GWLP_WNDPROC, reinterpret_cast<LONG_PTR>(SubclassedWndProc)));
</span><span class="cx"> }
</span><ins>+ ASSERT(m_originalWndProc);
</ins><span class="cx">
</span><span class="cx"> m_listeners.add(listener);
</span><span class="cx"> }
</span><span class="lines">@@ -108,6 +109,8 @@
</span><span class="cx"> {
</span><span class="cx"> WindowMessageBroadcaster* broadcaster = instancesMap().get(hwnd);
</span><span class="cx"> ASSERT(broadcaster);
</span><ins>+ if (!broadcaster)
+ return 0;
</ins><span class="cx">
</span><span class="cx"> ListenerSet::const_iterator end = broadcaster->listeners().end();
</span><span class="cx"> for (ListenerSet::const_iterator it = broadcaster->listeners().begin(); it != end; ++it)
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebKitwinChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebKit/win/ChangeLog (172985 => 172986)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit/win/ChangeLog 2014-08-27 00:01:12 UTC (rev 172985)
+++ branches/safari-600.1-branch/Source/WebKit/win/ChangeLog 2014-08-27 00:01:31 UTC (rev 172986)
</span><span class="lines">@@ -1,3 +1,107 @@
</span><ins>+2014-08-26 Dana Burkart <dburkart@apple.com>
+
+ Merge r172977. <rdar://problem/18141703>
+
+ 2014-08-26 Brent Fulgham <bfulgham@apple.com>
+
+ [Win] WebKit IDL incorrectly passes HWND as OLE_HANDLE
+ https://bugs.webkit.org/show_bug.cgi?id=136258
+ <rdar://problem/18134138>
+
+ Reviewed by Tim Horton.
+
+ Avoid 32/64-bit truncation by preventing 64-bit HWND (and other)
+ values from passing through the 32-bit OLE_HANDLE data type.
+
+ * Interfaces/IWebDocument.idl:
+ * Interfaces/IWebEmbeddedView.idl:
+ * Interfaces/IWebErrorPrivate.idl:
+ * Interfaces/IWebFrameLoadDelegate.idl:
+ * Interfaces/IWebFramePrivate.idl:
+ * Interfaces/IWebHistoryItem.idl:
+ * Interfaces/IWebIconDatabase.idl:
+ * Interfaces/IWebMutableURLRequestPrivate.idl:
+ * Interfaces/IWebUIDelegate.idl:
+ * Interfaces/IWebUIDelegatePrivate.idl:
+ * Interfaces/IWebURLResponsePrivate.idl:
+ * Interfaces/IWebView.idl:
+ * Interfaces/IWebViewPrivate.idl:
+ * WebCoreSupport/EmbeddedWidget.cpp:
+ (EmbeddedWidget::createWindow):
+ * WebCoreSupport/WebChromeClient.cpp:
+ (WebChromeClient::rootViewToScreen):
+ (WebChromeClient::screenToRootView):
+ (WebChromeClient::platformPageClient):
+ (WebChromeClient::runOpenPanel):
+ (WebChromeClient::setCursor):
+ * WebCoreSupport/WebContextMenuClient.cpp:
+ (WebContextMenuClient::customizeMenu):
+ * WebCoreSupport/WebFrameLoaderClient.cpp:
+ (WebFrameLoaderClient::createPlugin):
+ * WebCoreSupport/WebInspectorClient.cpp:
+ (WebInspectorClient::openInspectorFrontend):
+ (WebInspectorClient::highlight):
+ (WebInspectorFrontendClient::setAttachedWindowHeight):
+ (WebInspectorFrontendClient::closeWindowWithoutNotifications):
+ (WebInspectorFrontendClient::showWindowWithoutNotifications):
+ * WebCoreSupport/WebInspectorClient.h:
+ * WebCoreSupport/WebInspectorDelegate.cpp:
+ * WebCoreSupport/WebInspectorDelegate.h:
+ (WebInspectorDelegate::webViewFirstResponder):
+ (WebInspectorDelegate::makeFirstResponder):
+ (WebInspectorDelegate::contextMenuItemsForElement):
+ (WebInspectorDelegate::trackCustomPopupMenu):
+ (WebInspectorDelegate::addCustomMenuDrawingData):
+ (WebInspectorDelegate::cleanUpCustomMenuDrawingData):
+ (WebInspectorDelegate::drawHeaderInRect):
+ (WebInspectorDelegate::drawFooterInRect):
+ * WebDropSource.cpp:
+ (generateMouseEvent):
+ (WebDropSource::GiveFeedback):
+ * WebError.cpp:
+ (WebError::sslPeerCertificate):
+ * WebError.h:
+ * WebFrame.cpp:
+ (WebFrame::paintDocumentRectToContext):
+ (WebFrame::paintScrollViewRectToContextAtPoint):
+ (WebFrame::createSubframeWithOwnerElement):
+ (WebFrame::initWithWebView):
+ (WebFrame::drawHeader):
+ (WebFrame::drawFooter):
+ * WebFrame.h:
+ * WebHistoryItem.cpp:
+ (WebHistoryItem::icon):
+ * WebHistoryItem.h:
+ * WebIconDatabase.cpp:
+ (WebIconDatabase::iconForURL):
+ (WebIconDatabase::defaultIconWithSize):
+ * WebIconDatabase.h:
+ * WebMutableURLRequest.cpp:
+ (WebMutableURLRequest::setClientCertificate):
+ * WebMutableURLRequest.h:
+ * WebNodeHighlight.cpp:
+ (WebNodeHighlight::WebNodeHighlight):
+ * WebURLResponse.cpp:
+ (WebURLResponse::sslPeerCertificate):
+ * WebURLResponse.h:
+ * WebView.cpp:
+ (WebView::paintIntoBackingStore):
+ (WebView::handleContextMenuEvent):
+ (WebView::onInitMenuPopup):
+ (WebView::onUninitMenuPopup):
+ (WebView::WebViewWndProc):
+ (WebView::dispatchDidReceiveIconFromWebFrame):
+ (WebView::setHostWindow):
+ (WebView::hostWindow):
+ (WebView::generateSelectionImage):
+ (WebView::mainFrameIcon):
+ (WebView::viewWindow):
+ (WebView::paintDocumentRectToContext):
+ (WebView::paintScrollViewRectToContextAtPoint):
+ (WebView::backingStore):
+ (WebView::fullScreenClientSetParentWindow):
+ * WebView.h:
+
</ins><span class="cx"> 2014-07-23 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r171403
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebKitwinInterfacesIWebDocumentidl"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebKit/win/Interfaces/IWebDocument.idl (172985 => 172986)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit/win/Interfaces/IWebDocument.idl 2014-08-27 00:01:12 UTC (rev 172985)
+++ branches/safari-600.1-branch/Source/WebKit/win/Interfaces/IWebDocument.idl 2014-08-27 00:01:31 UTC (rev 172986)
</span><span class="lines">@@ -86,7 +86,7 @@
</span><span class="cx"> @abstract Called before the host window is set on the parent web view.
</span><span class="cx"> - (void)viewWillMoveToHostWindow:(NSWindow *)hostWindow;
</span><span class="cx"> */
</span><del>- HRESULT viewWillMoveToHostWindow([in] OLE_HANDLE hwnd);
</del><ins>+ HRESULT viewWillMoveToHostWindow([in] HWND hwnd);
</ins><span class="cx">
</span><span class="cx"> /*!
</span><span class="cx"> @method viewDidMoveToHostWindow
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebKitwinInterfacesIWebEmbeddedViewidl"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebKit/win/Interfaces/IWebEmbeddedView.idl (172985 => 172986)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit/win/Interfaces/IWebEmbeddedView.idl 2014-08-27 00:01:12 UTC (rev 172985)
+++ branches/safari-600.1-branch/Source/WebKit/win/Interfaces/IWebEmbeddedView.idl 2014-08-27 00:01:31 UTC (rev 172986)
</span><span class="lines">@@ -37,7 +37,7 @@
</span><span class="cx"> ]
</span><span class="cx"> interface IWebEmbeddedView : IUnknown
</span><span class="cx"> {
</span><del>- HRESULT createViewWindow([in] OLE_HANDLE parentWindow, [in] LPSIZE pluginSize, [out, retval] OLE_HANDLE* window);
</del><ins>+ HRESULT createViewWindow([in] HWND parentWindow, [in] LPSIZE pluginSize, [out, retval] HWND* window);
</ins><span class="cx">
</span><span class="cx"> HRESULT didReceiveResponse([in] IWebURLResponse* response);
</span><span class="cx"> HRESULT didReceiveData([in] IStream* data);
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebKitwinInterfacesIWebErrorPrivateidl"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebKit/win/Interfaces/IWebErrorPrivate.idl (172985 => 172986)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit/win/Interfaces/IWebErrorPrivate.idl 2014-08-27 00:01:12 UTC (rev 172985)
+++ branches/safari-600.1-branch/Source/WebKit/win/Interfaces/IWebErrorPrivate.idl 2014-08-27 00:01:31 UTC (rev 172986)
</span><span class="lines">@@ -43,5 +43,5 @@
</span><span class="cx">
</span><span class="cx"> interface IWebErrorPrivate : IUnknown
</span><span class="cx"> {
</span><del>- HRESULT sslPeerCertificate([out, retval] OLE_HANDLE* result);
</del><ins>+ HRESULT sslPeerCertificate([out, retval] ULONG_PTR* result);
</ins><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebKitwinInterfacesIWebFrameLoadDelegateidl"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebKit/win/Interfaces/IWebFrameLoadDelegate.idl (172985 => 172986)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit/win/Interfaces/IWebFrameLoadDelegate.idl 2014-08-27 00:01:12 UTC (rev 172985)
+++ branches/safari-600.1-branch/Source/WebKit/win/Interfaces/IWebFrameLoadDelegate.idl 2014-08-27 00:01:31 UTC (rev 172986)
</span><span class="lines">@@ -121,7 +121,7 @@
</span><span class="cx"> @param frame The frame for which a page icon has been received
</span><span class="cx"> - (void)webView:(WebView *)sender didReceiveIcon:(NSImage *)image forFrame:(WebFrame *)frame;
</span><span class="cx"> */
</span><del>- HRESULT didReceiveIcon([in] IWebView* webView, [in] OLE_HANDLE hBitmap, [in] IWebFrame* frame);
</del><ins>+ HRESULT didReceiveIcon([in] IWebView* webView, [in] HBITMAP hBitmap, [in] IWebFrame* frame);
</ins><span class="cx">
</span><span class="cx"> /*!
</span><span class="cx"> @method webView:didFinishLoadForFrame:
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebKitwinInterfacesIWebFramePrivateidl"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebKit/win/Interfaces/IWebFramePrivate.idl (172985 => 172986)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit/win/Interfaces/IWebFramePrivate.idl 2014-08-27 00:01:12 UTC (rev 172985)
+++ branches/safari-600.1-branch/Source/WebKit/win/Interfaces/IWebFramePrivate.idl 2014-08-27 00:01:31 UTC (rev 172986)
</span><span class="lines">@@ -80,7 +80,7 @@
</span><span class="cx">
</span><span class="cx"> HRESULT unused3();
</span><span class="cx">
</span><del>- HRESULT paintDocumentRectToContext([in] RECT rect, [in] OLE_HANDLE deviceContext);
</del><ins>+ HRESULT paintDocumentRectToContext([in] RECT rect, [in] HDC deviceContext);
</ins><span class="cx">
</span><span class="cx"> HRESULT elementDoesAutoComplete([in] IDOMElement* element, [out, retval] BOOL* result);
</span><span class="cx">
</span><span class="lines">@@ -106,7 +106,7 @@
</span><span class="cx">
</span><span class="cx"> HRESULT layerTreeAsText([out, retval] BSTR* result);
</span><span class="cx">
</span><del>- HRESULT paintScrollViewRectToContextAtPoint([in] RECT rect, [in] POINT pt, [in] OLE_HANDLE deviceContext);
</del><ins>+ HRESULT paintScrollViewRectToContextAtPoint([in] RECT rect, [in] POINT pt, [in] HDC deviceContext);
</ins><span class="cx">
</span><span class="cx"> HRESULT renderTreeAsExternalRepresentation([in] BOOL forPrinting, [out, retval] BSTR* result);
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebKitwinInterfacesIWebHistoryItemidl"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebKit/win/Interfaces/IWebHistoryItem.idl (172985 => 172986)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit/win/Interfaces/IWebHistoryItem.idl 2014-08-27 00:01:12 UTC (rev 172985)
+++ branches/safari-600.1-branch/Source/WebKit/win/Interfaces/IWebHistoryItem.idl 2014-08-27 00:01:31 UTC (rev 172986)
</span><span class="lines">@@ -121,5 +121,5 @@
</span><span class="cx"> @result The icon associated with this item's URL.
</span><span class="cx"> - (NSImage *)icon;
</span><span class="cx"> */
</span><del>- HRESULT icon([out, retval] OLE_HANDLE* hBitmap);
</del><ins>+ HRESULT icon([out, retval] HBITMAP* hBitmap);
</ins><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebKitwinInterfacesIWebIconDatabaseidl"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebKit/win/Interfaces/IWebIconDatabase.idl (172985 => 172986)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit/win/Interfaces/IWebIconDatabase.idl 2014-08-27 00:01:12 UTC (rev 172985)
+++ branches/safari-600.1-branch/Source/WebKit/win/Interfaces/IWebIconDatabase.idl 2014-08-27 00:01:31 UTC (rev 172986)
</span><span class="lines">@@ -91,14 +91,14 @@
</span><span class="cx"> @param URL
</span><span class="cx"> - (NSString *)iconURLForURL:(NSString *)URL;
</span><span class="cx"> */
</span><del>- HRESULT iconForURL([in] BSTR url, [in] LPSIZE size, [in] BOOL cache, [out, retval] OLE_HANDLE* hBitmap);
</del><ins>+ HRESULT iconForURL([in] BSTR url, [in] LPSIZE size, [in] BOOL cache, [out, retval] HBITMAP* hBitmap);
</ins><span class="cx">
</span><span class="cx"> /*!
</span><span class="cx"> @method defaultIconWithSize:
</span><span class="cx"> @param size
</span><span class="cx"> - (NSImage *)defaultIconWithSize:(NSSize)size;
</span><span class="cx"> */
</span><del>- HRESULT defaultIconWithSize([in] LPSIZE size, [out, retval] OLE_HANDLE* hBitmap);
</del><ins>+ HRESULT defaultIconWithSize([in] LPSIZE size, [out, retval] HBITMAP* hBitmap);
</ins><span class="cx">
</span><span class="cx"> /*!
</span><span class="cx"> @method retainIconForURL:
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebKitwinInterfacesIWebMutableURLRequestPrivateidl"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebKit/win/Interfaces/IWebMutableURLRequestPrivate.idl (172985 => 172986)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit/win/Interfaces/IWebMutableURLRequestPrivate.idl 2014-08-27 00:01:12 UTC (rev 172985)
+++ branches/safari-600.1-branch/Source/WebKit/win/Interfaces/IWebMutableURLRequestPrivate.idl 2014-08-27 00:01:31 UTC (rev 172986)
</span><span class="lines">@@ -47,7 +47,7 @@
</span><span class="cx"> ]
</span><span class="cx"> interface IWebMutableURLRequestPrivate : IUnknown
</span><span class="cx"> {
</span><del>- HRESULT setClientCertificate([in] OLE_HANDLE cert);
</del><ins>+ HRESULT setClientCertificate([in] ULONG_PTR cert);
</ins><span class="cx">
</span><span class="cx"> [local] CFURLRequestRef cfRequest();
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebKitwinInterfacesIWebUIDelegateidl"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebKit/win/Interfaces/IWebUIDelegate.idl (172985 => 172986)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit/win/Interfaces/IWebUIDelegate.idl 2014-08-27 00:01:12 UTC (rev 172985)
+++ branches/safari-600.1-branch/Source/WebKit/win/Interfaces/IWebUIDelegate.idl 2014-08-27 00:01:31 UTC (rev 172986)
</span><span class="lines">@@ -253,7 +253,7 @@
</span><span class="cx"> real first responder if some control not in the window has focus.
</span><span class="cx"> - (NSResponder *)webViewFirstResponder:(WebView *)sender;
</span><span class="cx"> */
</span><del>- HRESULT webViewFirstResponder([in] IWebView* sender, [out, retval] OLE_HANDLE* responderHWnd);
</del><ins>+ HRESULT webViewFirstResponder([in] IWebView* sender, [out, retval] HWND* responderHWnd);
</ins><span class="cx">
</span><span class="cx"> /*!
</span><span class="cx"> @method webView:makeFirstResponder:
</span><span class="lines">@@ -267,7 +267,7 @@
</span><span class="cx"> elsewhere, or possibly ignore this call.
</span><span class="cx"> - (void)webView:(WebView *)sender makeFirstResponder:(NSResponder *)responder;
</span><span class="cx"> */
</span><del>- HRESULT makeFirstResponder([in] IWebView* sender, [in] OLE_HANDLE responderHWnd);
</del><ins>+ HRESULT makeFirstResponder([in] IWebView* sender, [in] HWND responderHWnd);
</ins><span class="cx">
</span><span class="cx"> /*!
</span><span class="cx"> @method webView:setStatusText:
</span><span class="lines">@@ -481,7 +481,7 @@
</span><span class="cx"> @result An array of NSMenuItems to include in the contextual menu.
</span><span class="cx"> - (NSArray *)webView:(WebView *)sender contextMenuItemsForElement:(NSDictionary *)element defaultMenuItems:(NSArray *)defaultMenuItems;
</span><span class="cx"> */
</span><del>- HRESULT contextMenuItemsForElement([in] IWebView* sender, [in] IPropertyBag* element, [in] OLE_HANDLE defaultItemsHMenu, [out, retval] OLE_HANDLE* resultHMenu);
</del><ins>+ HRESULT contextMenuItemsForElement([in] IWebView* sender, [in] IPropertyBag* element, [in] HMENU defaultItemsHMenu, [out, retval] HMENU* resultHMenu);
</ins><span class="cx">
</span><span class="cx"> /*!
</span><span class="cx"> @method webView:validateUserInterfaceItem:defaultValidation:
</span><span class="lines">@@ -581,7 +581,7 @@
</span><span class="cx"> @param menu The menu that we want to pop up.
</span><span class="cx"> @param point The point associated with the context menu event in the coordinates of the WebView
</span><span class="cx"> */
</span><del>- HRESULT trackCustomPopupMenu([in] IWebView* sender, [in] OLE_HANDLE hMenu, [in] LPPOINT point);
</del><ins>+ HRESULT trackCustomPopupMenu([in] IWebView* sender, [in] HMENU hMenu, [in] LPPOINT point);
</ins><span class="cx">
</span><span class="cx"> /*
</span><span class="cx"> @method webView:measureCustomMenuItem
</span><span class="lines">@@ -606,7 +606,7 @@
</span><span class="cx"> @param menu The cutsom menu to clean up.
</span><span class="cx"> @discussion This method is called for submenus as well.
</span><span class="cx"> */
</span><del>- HRESULT addCustomMenuDrawingData([in] IWebView* sender, [in] OLE_HANDLE hMenu);
</del><ins>+ HRESULT addCustomMenuDrawingData([in] IWebView* sender, [in] HMENU hMenu);
</ins><span class="cx">
</span><span class="cx"> /*
</span><span class="cx"> @method webView:cleanUpCustomMenuDrawingData
</span><span class="lines">@@ -614,7 +614,7 @@
</span><span class="cx"> @param sender The WebView sending the delegate method.
</span><span class="cx"> @param menu The cutsom menu to clean up.
</span><span class="cx"> */
</span><del>- HRESULT cleanUpCustomMenuDrawingData([in] IWebView* sender, [in] OLE_HANDLE hMenu);
</del><ins>+ HRESULT cleanUpCustomMenuDrawingData([in] IWebView* sender, [in] HMENU hMenu);
</ins><span class="cx">
</span><span class="cx"> /*!
</span><span class="cx"> @method webView:canTakeFocus:
</span><span class="lines">@@ -732,7 +732,7 @@
</span><span class="cx">
</span><span class="cx"> - (void)webView:(WebView *)sender drawHeaderInRect:(NSRect)rect;
</span><span class="cx"> */
</span><del>- HRESULT drawHeaderInRect([in] IWebView* webView, [in] RECT* rect, [in] OLE_HANDLE drawingContext);
</del><ins>+ HRESULT drawHeaderInRect([in] IWebView* webView, [in] RECT* rect, [in] ULONG_PTR drawingContext);
</ins><span class="cx">
</span><span class="cx"> /*!
</span><span class="cx"> @method webView:drawFooterInRect:
</span><span class="lines">@@ -742,7 +742,7 @@
</span><span class="cx">
</span><span class="cx"> - (void)webView:(WebView *)sender drawFooterInRect:(NSRect)rect;
</span><span class="cx"> */
</span><del>- HRESULT drawFooterInRect([in] IWebView* webView, [in] RECT* rect, [in] OLE_HANDLE drawingContext, [in] UINT pageIndex, [in] UINT pageCount);
</del><ins>+ HRESULT drawFooterInRect([in] IWebView* webView, [in] RECT* rect, [in] ULONG_PTR drawingContext, [in] UINT pageIndex, [in] UINT pageCount);
</ins><span class="cx">
</span><span class="cx"> HRESULT webViewPrintingMarginRect([in] IWebView* webView, [out, retval] RECT* rect);
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebKitwinInterfacesIWebUIDelegatePrivateidl"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebKit/win/Interfaces/IWebUIDelegatePrivate.idl (172985 => 172986)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit/win/Interfaces/IWebUIDelegatePrivate.idl 2014-08-27 00:01:12 UTC (rev 172985)
+++ branches/safari-600.1-branch/Source/WebKit/win/Interfaces/IWebUIDelegatePrivate.idl 2014-08-27 00:01:31 UTC (rev 172986)
</span><span class="lines">@@ -56,7 +56,7 @@
</span><span class="cx"> HRESULT webViewAddMessageToConsole([in] IWebView* sender, [in] BSTR message, [in] int lineNumber, [in] BSTR url, [in] BOOL isError);
</span><span class="cx"> HRESULT webViewShouldInterruptJavaScript([in] IWebView* sender, [out, retval] BOOL* result);
</span><span class="cx"> HRESULT webViewReceivedFocus([in] IWebView* sender);
</span><del>- HRESULT webViewLostFocus([in] IWebView* sender, [in] OLE_HANDLE loseFocusToHWnd);
</del><ins>+ HRESULT webViewLostFocus([in] IWebView* sender, [in] HWND loseFocusToHWnd);
</ins><span class="cx"> HRESULT doDragDrop([in] IWebView* sender, [in] IDataObject* dataObject, [in] IDropSource* dropSource, [in] DWORD okEffect, [out, retval] DWORD* performedEffect);
</span><span class="cx"> HRESULT webViewGetDlgCode([in] IWebView* sender, [in] UINT keyCode, [out, retval] LONG_PTR* code);
</span><span class="cx"> HRESULT webViewPainted([in] IWebView* sender);
</span><span class="lines">@@ -64,7 +64,7 @@
</span><span class="cx"> HRESULT embeddedViewWithArguments([in] IWebView* sender, [in] IWebFrame* frame, [in] IPropertyBag* arguments, [out, retval] IWebEmbeddedView** view);
</span><span class="cx"> HRESULT unused3();
</span><span class="cx"> HRESULT webViewClosing([in] IWebView* sender);
</span><del>- HRESULT webViewSetCursor([in] IWebView* sender, [in] OLE_HANDLE cursor);
</del><ins>+ HRESULT webViewSetCursor([in] IWebView* sender, [in] HCURSOR cursor);
</ins><span class="cx"> HRESULT webViewDidInvalidate([in] IWebView* sender);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -95,7 +95,7 @@
</span><span class="cx"> // strings above.
</span><span class="cx"> HRESULT createWebViewWithRequest([in] IWebView* sender, [in] IWebURLRequest* request, [in] IPropertyBag* windowFeatures, [out, retval] IWebView** newWebView);
</span><span class="cx">
</span><del>- HRESULT drawBackground([in] IWebView* sender, [in] OLE_HANDLE hdc, [in] const RECT* dirtyRect);
</del><ins>+ HRESULT drawBackground([in] IWebView* sender, [in] HDC hdc, [in] const RECT* dirtyRect);
</ins><span class="cx">
</span><span class="cx"> HRESULT decidePolicyForGeolocationRequest([in] IWebView* sender, [in] IWebFrame* frame, [in] IWebSecurityOrigin* origin, [in] IWebGeolocationPolicyListener* listener);
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebKitwinInterfacesIWebURLResponsePrivateidl"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebKit/win/Interfaces/IWebURLResponsePrivate.idl (172985 => 172986)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit/win/Interfaces/IWebURLResponsePrivate.idl 2014-08-27 00:01:12 UTC (rev 172985)
+++ branches/safari-600.1-branch/Source/WebKit/win/Interfaces/IWebURLResponsePrivate.idl 2014-08-27 00:01:31 UTC (rev 172986)
</span><span class="lines">@@ -40,5 +40,5 @@
</span><span class="cx">
</span><span class="cx"> interface IWebURLResponsePrivate : IUnknown
</span><span class="cx"> {
</span><del>- HRESULT sslPeerCertificate([out, retval] OLE_HANDLE* result);
</del><ins>+ HRESULT sslPeerCertificate([out, retval] ULONG_PTR* result);
</ins><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebKitwinInterfacesIWebViewidl"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebKit/win/Interfaces/IWebView.idl (172985 => 172986)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit/win/Interfaces/IWebView.idl 2014-08-27 00:01:12 UTC (rev 172985)
+++ branches/safari-600.1-branch/Source/WebKit/win/Interfaces/IWebView.idl 2014-08-27 00:01:31 UTC (rev 172986)
</span><span class="lines">@@ -545,14 +545,14 @@
</span><span class="cx"> not in an actual window.
</span><span class="cx"> - (void)setHostWindow:(NSWindow *)hostWindow;
</span><span class="cx"> */
</span><del>- HRESULT setHostWindow([in] OLE_HANDLE window);
</del><ins>+ HRESULT setHostWindow([in] HWND window);
</ins><span class="cx">
</span><span class="cx"> /*!
</span><span class="cx"> @method hostWindow
</span><span class="cx"> @result The host window for the web view.
</span><span class="cx"> - (NSWindow *)hostWindow;
</span><span class="cx"> */
</span><del>- HRESULT hostWindow([out, retval] OLE_HANDLE* window);
</del><ins>+ HRESULT hostWindow([out, retval] HWND* window);
</ins><span class="cx">
</span><span class="cx"> /*!
</span><span class="cx"> @method searchFor:direction:caseSensitive:
</span><span class="lines">@@ -735,7 +735,7 @@
</span><span class="cx"> @result Returns the main frame's icon if any, otherwise nil.
</span><span class="cx"> - (NSImage *)mainFrameIcon;
</span><span class="cx"> */
</span><del>- HRESULT mainFrameIcon([out, retval] OLE_HANDLE* hBitmap);
</del><ins>+ HRESULT mainFrameIcon([out, retval] HBITMAP* hBitmap);
</ins><span class="cx">
</span><span class="cx"> /*!
</span><span class="cx"> @method registerURLSchemeAsLocal
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebKitwinInterfacesIWebViewPrivateidl"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebKit/win/Interfaces/IWebViewPrivate.idl (172985 => 172986)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit/win/Interfaces/IWebViewPrivate.idl 2014-08-27 00:01:12 UTC (rev 172985)
+++ branches/safari-600.1-branch/Source/WebKit/win/Interfaces/IWebViewPrivate.idl 2014-08-27 00:01:31 UTC (rev 172986)
</span><span class="lines">@@ -72,7 +72,7 @@
</span><span class="cx"> */
</span><span class="cx"> HRESULT inViewSourceMode([out, retval] BOOL* flag);
</span><span class="cx">
</span><del>- HRESULT viewWindow([out, retval] OLE_HANDLE* window);
</del><ins>+ HRESULT viewWindow([out, retval] HWND* window);
</ins><span class="cx">
</span><span class="cx"> // May well become public
</span><span class="cx"> //- (void)_setFormDelegate:(id<WebFormDelegate>)delegate;
</span><span class="lines">@@ -96,7 +96,7 @@
</span><span class="cx"> HRESULT unmarkAllTextMatches();
</span><span class="cx"> HRESULT rectsForTextMatches([out]IEnumTextMatches** pmatches);
</span><span class="cx"> HRESULT selectionRect([in, out] RECT* rc);
</span><del>- HRESULT generateSelectionImage(BOOL forceWhiteText, [out, retval] OLE_HANDLE* hBitmap);
</del><ins>+ HRESULT generateSelectionImage(BOOL forceWhiteText, [out, retval] HBITMAP* hBitmap);
</ins><span class="cx">
</span><span class="cx"> HRESULT canHandleRequest([in] IWebURLRequest* request, [out, retval] BOOL* result);
</span><span class="cx">
</span><span class="lines">@@ -137,7 +137,7 @@
</span><span class="cx">
</span><span class="cx"> HRESULT windowAncestryDidChange();
</span><span class="cx">
</span><del>- HRESULT paintDocumentRectToContext([in] RECT rect, [in] OLE_HANDLE dc);
</del><ins>+ HRESULT paintDocumentRectToContext([in] RECT rect, [in] HDC dc);
</ins><span class="cx">
</span><span class="cx"> HRESULT setDefersCallbacks([in] BOOL defersCallbacks);
</span><span class="cx"> HRESULT defersCallbacks([out, retval] BOOL* defersCallbacks);
</span><span class="lines">@@ -147,7 +147,7 @@
</span><span class="cx"> HRESULT setCustomHTMLTokenizerTimeDelay([in] double timeDelay);
</span><span class="cx"> HRESULT setCustomHTMLTokenizerChunkSize([in] int chunkSize);
</span><span class="cx">
</span><del>- HRESULT backingStore([out, retval] OLE_HANDLE* hBitmap);
</del><ins>+ HRESULT backingStore([out, retval] HBITMAP* hBitmap);
</ins><span class="cx">
</span><span class="cx"> HRESULT setTransparent([in] BOOL transparent);
</span><span class="cx"> HRESULT transparent([out, retval] BOOL* transparent);
</span><span class="lines">@@ -233,7 +233,7 @@
</span><span class="cx">
</span><span class="cx"> HRESULT nextDisplayIsSynchronous();
</span><span class="cx">
</span><del>- HRESULT paintScrollViewRectToContextAtPoint([in] RECT rect, [in] POINT pt, [in] OLE_HANDLE dc);
</del><ins>+ HRESULT paintScrollViewRectToContextAtPoint([in] RECT rect, [in] POINT pt, [in] HDC dc);
</ins><span class="cx">
</span><span class="cx"> [local] HRESULT reportException([in] JSContextRef context, [in] JSValueRef exception);
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebKitwinWebCoreSupportEmbeddedWidgetcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebKit/win/WebCoreSupport/EmbeddedWidget.cpp (172985 => 172986)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit/win/WebCoreSupport/EmbeddedWidget.cpp 2014-08-27 00:01:12 UTC (rev 172985)
+++ branches/safari-600.1-branch/Source/WebKit/win/WebCoreSupport/EmbeddedWidget.cpp 2014-08-27 00:01:31 UTC (rev 172986)
</span><span class="lines">@@ -56,16 +56,15 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(!m_window);
</span><span class="cx">
</span><del>- OLE_HANDLE window;
-
</del><ins>+ HWND window;
</ins><span class="cx"> SIZE pluginSize(size);
</span><span class="cx">
</span><del>- HRESULT hr = m_view->createViewWindow(reinterpret_cast<OLE_HANDLE>(parentWindow), &pluginSize, &window);
</del><ins>+ HRESULT hr = m_view->createViewWindow(parentWindow, &pluginSize, &window);
</ins><span class="cx">
</span><span class="cx"> if (FAILED(hr) || !window)
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- m_window = reinterpret_cast<HWND>(window);
</del><ins>+ m_window = window;
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebKitwinWebCoreSupportWebChromeClientcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebKit/win/WebCoreSupport/WebChromeClient.cpp (172985 => 172986)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit/win/WebCoreSupport/WebChromeClient.cpp 2014-08-27 00:01:12 UTC (rev 172985)
+++ branches/safari-600.1-branch/Source/WebKit/win/WebCoreSupport/WebChromeClient.cpp 2014-08-27 00:01:31 UTC (rev 172986)
</span><span class="lines">@@ -489,7 +489,7 @@
</span><span class="cx"> IntRect WebChromeClient::rootViewToScreen(const IntRect& rect) const
</span><span class="cx"> {
</span><span class="cx"> HWND viewWindow;
</span><del>- if (FAILED(m_webView->viewWindow(reinterpret_cast<OLE_HANDLE*>(&viewWindow))))
</del><ins>+ if (FAILED(m_webView->viewWindow(&viewWindow)))
</ins><span class="cx"> return rect;
</span><span class="cx">
</span><span class="cx"> // Find the top left corner of the Widget's containing window in screen coords,
</span><span class="lines">@@ -507,7 +507,7 @@
</span><span class="cx"> POINT result = point;
</span><span class="cx">
</span><span class="cx"> HWND viewWindow;
</span><del>- if (FAILED(m_webView->viewWindow(reinterpret_cast<OLE_HANDLE*>(&viewWindow))))
</del><ins>+ if (FAILED(m_webView->viewWindow(&viewWindow)))
</ins><span class="cx"> return point;
</span><span class="cx">
</span><span class="cx"> ::ScreenToClient(viewWindow, &result);
</span><span class="lines">@@ -518,7 +518,7 @@
</span><span class="cx"> PlatformPageClient WebChromeClient::platformPageClient() const
</span><span class="cx"> {
</span><span class="cx"> HWND viewWindow;
</span><del>- if (FAILED(m_webView->viewWindow(reinterpret_cast<OLE_HANDLE*>(&viewWindow))))
</del><ins>+ if (FAILED(m_webView->viewWindow(&viewWindow)))
</ins><span class="cx"> return 0;
</span><span class="cx"> return viewWindow;
</span><span class="cx"> }
</span><span class="lines">@@ -654,7 +654,7 @@
</span><span class="cx"> RefPtr<FileChooser> fileChooser = prpFileChooser;
</span><span class="cx">
</span><span class="cx"> HWND viewWindow;
</span><del>- if (FAILED(m_webView->viewWindow(reinterpret_cast<OLE_HANDLE*>(&viewWindow))))
</del><ins>+ if (FAILED(m_webView->viewWindow(&viewWindow)))
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> bool multiFile = fileChooser->settings().allowsMultipleFiles;
</span><span class="lines">@@ -726,7 +726,7 @@
</span><span class="cx"> if (COMPtr<IWebUIDelegate> delegate = uiDelegate()) {
</span><span class="cx"> COMPtr<IWebUIDelegatePrivate> delegatePrivate(Query, delegate);
</span><span class="cx"> if (delegatePrivate) {
</span><del>- if (SUCCEEDED(delegatePrivate->webViewSetCursor(m_webView, reinterpret_cast<OLE_HANDLE>(platformCursor))))
</del><ins>+ if (SUCCEEDED(delegatePrivate->webViewSetCursor(m_webView, platformCursor)))
</ins><span class="cx"> shouldSetCursor = false;
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebKitwinWebCoreSupportWebContextMenuClientcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebKit/win/WebCoreSupport/WebContextMenuClient.cpp (172985 => 172986)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit/win/WebCoreSupport/WebContextMenuClient.cpp 2014-08-27 00:01:12 UTC (rev 172985)
+++ branches/safari-600.1-branch/Source/WebKit/win/WebCoreSupport/WebContextMenuClient.cpp 2014-08-27 00:01:31 UTC (rev 172986)
</span><span class="lines">@@ -63,17 +63,17 @@
</span><span class="cx">
</span><span class="cx"> ASSERT(uiDelegate);
</span><span class="cx">
</span><del>- OLE_HANDLE nativeMenu = reinterpret_cast<OLE_HANDLE>(menu->platformContextMenu());
</del><ins>+ HMENU nativeMenu = menu->platformContextMenu();
</ins><span class="cx"> COMPtr<WebElementPropertyBag> propertyBag;
</span><span class="cx"> propertyBag.adoptRef(WebElementPropertyBag::createInstance(m_webView->page()->contextMenuController().hitTestResult()));
</span><span class="cx"> // FIXME: We need to decide whether to do the default before calling this delegate method
</span><span class="cx"> if (FAILED(uiDelegate->contextMenuItemsForElement(m_webView, propertyBag.get(), nativeMenu, &nativeMenu))) {
</span><del>- ::DestroyMenu(reinterpret_cast<HMENU>(nativeMenu));
</del><ins>+ ::DestroyMenu(nativeMenu);
</ins><span class="cx"> return menu.release();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- OwnPtr<ContextMenu> customizedMenu = adoptPtr(new ContextMenu(reinterpret_cast<HMENU>(nativeMenu)));
- ::DestroyMenu(reinterpret_cast<HMENU>(nativeMenu));
</del><ins>+ OwnPtr<ContextMenu> customizedMenu = adoptPtr(new ContextMenu(nativeMenu));
+ ::DestroyMenu(nativeMenu);
</ins><span class="cx">
</span><span class="cx"> return customizedMenu.release();
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebKitwinWebCoreSupportWebFrameLoaderClientcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp (172985 => 172986)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp 2014-08-27 00:01:12 UTC (rev 172985)
+++ branches/safari-600.1-branch/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp 2014-08-27 00:01:31 UTC (rev 172986)
</span><span class="lines">@@ -1167,11 +1167,11 @@
</span><span class="cx"> COMPtr<IWebEmbeddedView> view;
</span><span class="cx"> HRESULT result = uiPrivate->embeddedViewWithArguments(webView, m_webFrame, argumentsBag.get(), &view);
</span><span class="cx"> if (SUCCEEDED(result)) {
</span><del>- OLE_HANDLE parentWindow;
</del><ins>+ HWND parentWindow;
</ins><span class="cx"> HRESULT hr = webView->viewWindow(&parentWindow);
</span><span class="cx"> ASSERT(SUCCEEDED(hr));
</span><span class="cx">
</span><del>- return EmbeddedWidget::create(view.get(), element, reinterpret_cast<HWND>(parentWindow), pluginSize);
</del><ins>+ return EmbeddedWidget::create(view.get(), element, parentWindow, pluginSize);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebKitwinWebCoreSupportWebInspectorClientcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebKit/win/WebCoreSupport/WebInspectorClient.cpp (172985 => 172986)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit/win/WebCoreSupport/WebInspectorClient.cpp 2014-08-27 00:01:12 UTC (rev 172985)
+++ branches/safari-600.1-branch/Source/WebKit/win/WebCoreSupport/WebInspectorClient.cpp 2014-08-27 00:01:31 UTC (rev 172986)
</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, 2014 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">@@ -97,7 +97,7 @@
</span><span class="cx">
</span><span class="cx"> COMPtr<WebView> frontendWebView(AdoptCOM, WebView::createInstance());
</span><span class="cx">
</span><del>- if (FAILED(frontendWebView->setHostWindow((OLE_HANDLE)(ULONG64)frontendHwnd)))
</del><ins>+ if (FAILED(frontendWebView->setHostWindow(frontendHwnd)))
</ins><span class="cx"> return 0;
</span><span class="cx">
</span><span class="cx"> RECT rect;
</span><span class="lines">@@ -154,7 +154,7 @@
</span><span class="cx"> frontendWebView->setProhibitsMainFrameScrolling(TRUE);
</span><span class="cx">
</span><span class="cx"> HWND frontendWebViewHwnd;
</span><del>- if (FAILED(frontendWebView->viewWindow(reinterpret_cast<OLE_HANDLE*>(&frontendWebViewHwnd))))
</del><ins>+ if (FAILED(frontendWebView->viewWindow(&frontendWebViewHwnd)))
</ins><span class="cx"> return 0;
</span><span class="cx">
</span><span class="cx"> COMPtr<WebMutableURLRequest> request(AdoptCOM, WebMutableURLRequest::createInstance());
</span><span class="lines">@@ -171,10 +171,10 @@
</span><span class="cx"> return 0;
</span><span class="cx">
</span><span class="cx"> m_frontendPage = core(frontendWebView.get());
</span><del>- auto frontendClient = std::make_unique<WebInspectorFrontendClient>(m_inspectedWebView, reinterpret_cast<HWND>(m_inspectedWebViewHandle), frontendHwnd, frontendWebView, frontendWebViewHwnd, this, createFrontendSettings());
</del><ins>+ auto frontendClient = std::make_unique<WebInspectorFrontendClient>(m_inspectedWebView, m_inspectedWebViewHandle, frontendHwnd, frontendWebView, frontendWebViewHwnd, this, createFrontendSettings());
</ins><span class="cx"> m_frontendClient = frontendClient.get();
</span><span class="cx"> m_frontendPage->inspectorController().setInspectorFrontendClient(WTF::move(frontendClient));
</span><del>- m_frontendHandle = reinterpret_cast<OLE_HANDLE>(frontendHwnd);
</del><ins>+ m_frontendHandle = frontendHwnd;
</ins><span class="cx"> return this;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -201,8 +201,8 @@
</span><span class="cx"> else
</span><span class="cx"> m_highlight->setShowsWhileWebViewIsVisible(true);
</span><span class="cx">
</span><del>- if (creatingHighlight && IsWindowVisible((HWND)m_frontendHandle))
- m_highlight->placeBehindWindow(reinterpret_cast<HWND>(m_frontendHandle));
</del><ins>+ if (creatingHighlight && IsWindowVisible(m_frontendHandle))
+ m_highlight->placeBehindWindow(m_frontendHandle);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebInspectorClient::hideHighlight()
</span><span class="lines">@@ -313,12 +313,12 @@
</span><span class="cx"> if (!m_attached)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- OLE_HANDLE hostWindow;
</del><ins>+ HWND hostWindow;
</ins><span class="cx"> if (!SUCCEEDED(m_inspectedWebView->hostWindow(&hostWindow)))
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> RECT hostWindowRect;
</span><del>- GetClientRect(reinterpret_cast<HWND>(hostWindow), &hostWindowRect);
</del><ins>+ GetClientRect(hostWindow, &hostWindowRect);
</ins><span class="cx">
</span><span class="cx"> RECT inspectedRect;
</span><span class="cx"> GetClientRect(m_inspectedWebViewHwnd, &inspectedRect);
</span><span class="lines">@@ -371,12 +371,12 @@
</span><span class="cx">
</span><span class="cx"> m_attached = false;
</span><span class="cx">
</span><del>- m_frontendWebView->setHostWindow(reinterpret_cast<OLE_HANDLE>(m_frontendHwnd));
</del><ins>+ m_frontendWebView->setHostWindow(m_frontendHwnd);
</ins><span class="cx">
</span><span class="cx"> // Make sure everything has the right size/position.
</span><del>- OLE_HANDLE hostWindow;
</del><ins>+ HWND hostWindow;
</ins><span class="cx"> if (SUCCEEDED(m_inspectedWebView->hostWindow(&hostWindow)))
</span><del>- SendMessage(reinterpret_cast<HWND>(hostWindow), WM_SIZE, 0, 0);
</del><ins>+ SendMessage(hostWindow, WM_SIZE, 0, 0);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebInspectorFrontendClient::showWindowWithoutNotifications()
</span><span class="lines">@@ -401,7 +401,7 @@
</span><span class="cx">
</span><span class="cx"> if (!shouldAttach) {
</span><span class="cx"> // Put the Inspector's WebView inside our window and show it.
</span><del>- m_frontendWebView->setHostWindow(reinterpret_cast<OLE_HANDLE>(m_frontendHwnd));
</del><ins>+ m_frontendWebView->setHostWindow(m_frontendHwnd);
</ins><span class="cx"> SendMessage(m_frontendHwnd, WM_SIZE, 0, 0);
</span><span class="cx"> updateWindowTitle();
</span><span class="cx">
</span><span class="lines">@@ -413,10 +413,10 @@
</span><span class="cx"> WindowMessageBroadcaster::addListener(m_inspectedWebViewHwnd, this);
</span><span class="cx">
</span><span class="cx"> HWND hostWindow;
</span><del>- if (FAILED(m_inspectedWebView->hostWindow(reinterpret_cast<OLE_HANDLE*>(&hostWindow))))
</del><ins>+ if (FAILED(m_inspectedWebView->hostWindow(&hostWindow)))
</ins><span class="cx"> return;
</span><span class="cx">
</span><del>- m_frontendWebView->setHostWindow(reinterpret_cast<OLE_HANDLE>(hostWindow));
</del><ins>+ m_frontendWebView->setHostWindow(hostWindow);
</ins><span class="cx">
</span><span class="cx"> // Then hide our own window.
</span><span class="cx"> ShowWindow(m_frontendHwnd, SW_HIDE);
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebKitwinWebCoreSupportWebInspectorClienth"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebKit/win/WebCoreSupport/WebInspectorClient.h (172985 => 172986)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit/win/WebCoreSupport/WebInspectorClient.h 2014-08-27 00:01:12 UTC (rev 172985)
+++ branches/safari-600.1-branch/Source/WebKit/win/WebCoreSupport/WebInspectorClient.h 2014-08-27 00:01:31 UTC (rev 172986)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2006, 2007 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2006, 2007, 2014 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">@@ -86,8 +86,8 @@
</span><span class="cx"> WebView* m_inspectedWebView;
</span><span class="cx"> WebCore::Page* m_frontendPage;
</span><span class="cx"> WebInspectorFrontendClient* m_frontendClient;
</span><del>- OLE_HANDLE m_inspectedWebViewHandle;
- OLE_HANDLE m_frontendHandle;
</del><ins>+ HWND m_inspectedWebViewHandle;
+ HWND m_frontendHandle;
</ins><span class="cx">
</span><span class="cx"> OwnPtr<WebNodeHighlight> m_highlight;
</span><span class="cx"> };
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebKitwinWebCoreSupportWebInspectorDelegatecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebKit/win/WebCoreSupport/WebInspectorDelegate.cpp (172985 => 172986)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit/win/WebCoreSupport/WebInspectorDelegate.cpp 2014-08-27 00:01:12 UTC (rev 172985)
+++ branches/safari-600.1-branch/Source/WebKit/win/WebCoreSupport/WebInspectorDelegate.cpp 2014-08-27 00:01:31 UTC (rev 172986)
</span><span class="lines">@@ -1,5 +1,6 @@
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2008 Matt Lilek <webkit@mattlilek.com>
</span><ins>+ * Copyright (C) 2014 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="branchessafari6001branchSourceWebKitwinWebCoreSupportWebInspectorDelegateh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebKit/win/WebCoreSupport/WebInspectorDelegate.h (172985 => 172986)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit/win/WebCoreSupport/WebInspectorDelegate.h 2014-08-27 00:01:12 UTC (rev 172985)
+++ branches/safari-600.1-branch/Source/WebKit/win/WebCoreSupport/WebInspectorDelegate.h 2014-08-27 00:01:31 UTC (rev 172986)
</span><span class="lines">@@ -1,5 +1,6 @@
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2008 Matt Lilek <webkit@mattlilek.com>
</span><ins>+ * Copyright (C) 2014 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">@@ -64,13 +65,9 @@
</span><span class="cx"> virtual HRESULT STDMETHODCALLTYPE webViewUnfocus(
</span><span class="cx"> /* [in] */ IWebView*) { return E_NOTIMPL; }
</span><span class="cx">
</span><del>- virtual HRESULT STDMETHODCALLTYPE webViewFirstResponder(
- /* [in] */ IWebView*,
- /* [retval][out] */ OLE_HANDLE*) { return E_NOTIMPL; }
</del><ins>+ virtual HRESULT STDMETHODCALLTYPE webViewFirstResponder(IWebView*, HWND*) { return E_NOTIMPL; }
</ins><span class="cx">
</span><del>- virtual HRESULT STDMETHODCALLTYPE makeFirstResponder(
- /* [in] */ IWebView*,
- /* [in] */ OLE_HANDLE) { return E_NOTIMPL; }
</del><ins>+ virtual HRESULT STDMETHODCALLTYPE makeFirstResponder(IWebView*, HWND) { return E_NOTIMPL; }
</ins><span class="cx">
</span><span class="cx"> virtual HRESULT STDMETHODCALLTYPE setStatusText(
</span><span class="cx"> /* [in] */ IWebView*,
</span><span class="lines">@@ -150,11 +147,7 @@
</span><span class="cx"> /* [in] */ IPropertyBag*,
</span><span class="cx"> /* [in] */ UINT /*modifierFlags*/) { return E_NOTIMPL; }
</span><span class="cx">
</span><del>- virtual HRESULT STDMETHODCALLTYPE contextMenuItemsForElement(
- /* [in] */ IWebView*,
- /* [in] */ IPropertyBag*,
- /* [in] */ OLE_HANDLE,
- /* [retval][out] */ OLE_HANDLE*) { return E_NOTIMPL; }
</del><ins>+ virtual HRESULT STDMETHODCALLTYPE contextMenuItemsForElement(IWebView*, IPropertyBag*, HMENU, HMENU*) { return E_NOTIMPL; }
</ins><span class="cx">
</span><span class="cx"> virtual HRESULT STDMETHODCALLTYPE validateUserInterfaceItem(
</span><span class="cx"> /* [in] */ IWebView*,
</span><span class="lines">@@ -192,10 +185,7 @@
</span><span class="cx"> virtual HRESULT STDMETHODCALLTYPE hasCustomMenuImplementation(
</span><span class="cx"> /* [retval][out] */ BOOL*) { return E_NOTIMPL; }
</span><span class="cx">
</span><del>- virtual HRESULT STDMETHODCALLTYPE trackCustomPopupMenu(
- /* [in] */ IWebView*,
- /* [in] */ OLE_HANDLE,
- /* [in] */ LPPOINT) { return E_NOTIMPL; }
</del><ins>+ virtual HRESULT STDMETHODCALLTYPE trackCustomPopupMenu(/* [in] */ IWebView*, /* [in] */ HMENU, /* [in] */ LPPOINT) { return E_NOTIMPL; }
</ins><span class="cx">
</span><span class="cx"> virtual HRESULT STDMETHODCALLTYPE measureCustomMenuItem(
</span><span class="cx"> /* [in] */ IWebView*,
</span><span class="lines">@@ -205,13 +195,9 @@
</span><span class="cx"> /* [in] */ IWebView*,
</span><span class="cx"> /* [in] */ void* /*drawItem*/) { return E_NOTIMPL; }
</span><span class="cx">
</span><del>- virtual HRESULT STDMETHODCALLTYPE addCustomMenuDrawingData(
- /* [in] */ IWebView*,
- /* [in] */ OLE_HANDLE) { return E_NOTIMPL; }
</del><ins>+ virtual HRESULT STDMETHODCALLTYPE addCustomMenuDrawingData(/* [in] */ IWebView*, /* [in] */ HMENU) { return E_NOTIMPL; }
</ins><span class="cx">
</span><del>- virtual HRESULT STDMETHODCALLTYPE cleanUpCustomMenuDrawingData(
- /* [in] */ IWebView*,
- /* [in] */ OLE_HANDLE) { return E_NOTIMPL; }
</del><ins>+ virtual HRESULT STDMETHODCALLTYPE cleanUpCustomMenuDrawingData(/* [in] */ IWebView*, /* [in] */ HMENU) { return E_NOTIMPL; }
</ins><span class="cx">
</span><span class="cx"> virtual HRESULT STDMETHODCALLTYPE canTakeFocus(
</span><span class="cx"> /* [in] */ IWebView*,
</span><span class="lines">@@ -259,17 +245,9 @@
</span><span class="cx"> /* [in] */ IWebView *webView,
</span><span class="cx"> /* [retval][out] */ float *result) { return E_NOTIMPL; }
</span><span class="cx">
</span><del>- virtual HRESULT STDMETHODCALLTYPE drawHeaderInRect(
- /* [in] */ IWebView *webView,
- /* [in] */ RECT *rect,
- /* [in] */ OLE_HANDLE drawingContext) { return E_NOTIMPL; }
</del><ins>+ virtual HRESULT STDMETHODCALLTYPE drawHeaderInRect(IWebView*, RECT*, ULONG_PTR) { return E_NOTIMPL; }
</ins><span class="cx">
</span><del>- virtual HRESULT STDMETHODCALLTYPE drawFooterInRect(
- /* [in] */ IWebView *webView,
- /* [in] */ RECT *rect,
- /* [in] */ OLE_HANDLE drawingContext,
- /* [in] */ UINT pageIndex,
- /* [in] */ UINT pageCount) { return E_NOTIMPL; }
</del><ins>+ virtual HRESULT STDMETHODCALLTYPE drawFooterInRect(IWebView*, RECT*, ULONG_PTR, UINT, UINT) { return E_NOTIMPL; }
</ins><span class="cx">
</span><span class="cx"> virtual HRESULT STDMETHODCALLTYPE webViewPrintingMarginRect(
</span><span class="cx"> /* [in] */ IWebView *webView,
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebKitwinWebDropSourcecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebKit/win/WebDropSource.cpp (172985 => 172986)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit/win/WebDropSource.cpp 2014-08-27 00:01:12 UTC (rev 172985)
+++ branches/safari-600.1-branch/Source/WebKit/win/WebDropSource.cpp 2014-08-27 00:01:31 UTC (rev 172986)
</span><span class="lines">@@ -98,9 +98,9 @@
</span><span class="cx"> POINTL pt;
</span><span class="cx"> ::GetCursorPos((LPPOINT)&pt);
</span><span class="cx"> POINTL localpt = pt;
</span><del>- OLE_HANDLE viewWindow;
</del><ins>+ HWND viewWindow;
</ins><span class="cx"> if (SUCCEEDED(webView->viewWindow(&viewWindow)))
</span><del>- ::ScreenToClient(reinterpret_cast<HWND>(viewWindow), reinterpret_cast<LPPOINT>(&localpt));
</del><ins>+ ::ScreenToClient(viewWindow, reinterpret_cast<LPPOINT>(&localpt));
</ins><span class="cx"> return PlatformMouseEvent(IntPoint(localpt.x, localpt.y), IntPoint(pt.x, pt.y),
</span><span class="cx"> isDrag ? LeftButton : NoButton, PlatformEvent::MouseMoved, 0, false, false, false, false, currentTime());
</span><span class="cx"> }
</span><span class="lines">@@ -131,7 +131,7 @@
</span><span class="cx"> return DRAGDROP_S_USEDEFAULTCURSORS;
</span><span class="cx">
</span><span class="cx"> HWND viewWindow;
</span><del>- if (FAILED(m_webView->viewWindow(reinterpret_cast<OLE_HANDLE*>(&viewWindow))))
</del><ins>+ if (FAILED(m_webView->viewWindow(&viewWindow)))
</ins><span class="cx"> return DRAGDROP_S_USEDEFAULTCURSORS;
</span><span class="cx">
</span><span class="cx"> RECT webViewRect;
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebKitwinWebErrorcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebKit/win/WebError.cpp (172985 => 172986)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit/win/WebError.cpp 2014-08-27 00:01:12 UTC (rev 172985)
+++ branches/safari-600.1-branch/Source/WebKit/win/WebError.cpp 2014-08-27 00:01:31 UTC (rev 172986)
</span><span class="lines">@@ -208,8 +208,7 @@
</span><span class="cx"> return S_OK;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-HRESULT STDMETHODCALLTYPE WebError::sslPeerCertificate(
- /* [retval][out] */ OLE_HANDLE* result)
</del><ins>+HRESULT WebError::sslPeerCertificate(/* [retval][out] */ ULONG_PTR* result)
</ins><span class="cx"> {
</span><span class="cx"> if (!result)
</span><span class="cx"> return E_POINTER;
</span><span class="lines">@@ -228,7 +227,7 @@
</span><span class="cx"> void* data = wkGetSSLPeerCertificateDataBytePtr(m_cfErrorUserInfoDict.get());
</span><span class="cx"> if (!data)
</span><span class="cx"> return E_FAIL;
</span><del>- *result = (OLE_HANDLE)(ULONG64)data;
</del><ins>+ *result = reinterpret_cast<ULONG_PTR>(data);
</ins><span class="cx"> #endif
</span><span class="cx"> return *result ? S_OK : E_FAIL;
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebKitwinWebErrorh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebKit/win/WebError.h (172985 => 172986)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit/win/WebError.h 2014-08-27 00:01:12 UTC (rev 172985)
+++ branches/safari-600.1-branch/Source/WebKit/win/WebError.h 2014-08-27 00:01:31 UTC (rev 172986)
</span><span class="lines">@@ -82,8 +82,7 @@
</span><span class="cx"> /* [retval][out] */ BOOL *result);
</span><span class="cx">
</span><span class="cx"> // IWebErrorPrivate
</span><del>- virtual HRESULT STDMETHODCALLTYPE sslPeerCertificate(
- /* [retval][out] */ OLE_HANDLE *result);
</del><ins>+ virtual HRESULT STDMETHODCALLTYPE sslPeerCertificate(/* [retval][out] */ ULONG_PTR* result);
</ins><span class="cx">
</span><span class="cx"> const WebCore::ResourceError& resourceError() const;
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebKitwinWebFramecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebKit/win/WebFrame.cpp (172985 => 172986)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit/win/WebFrame.cpp 2014-08-27 00:01:12 UTC (rev 172985)
+++ branches/safari-600.1-branch/Source/WebKit/win/WebFrame.cpp 2014-08-27 00:01:31 UTC (rev 172986)
</span><span class="lines">@@ -314,9 +314,7 @@
</span><span class="cx"> return S_OK;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-HRESULT STDMETHODCALLTYPE WebFrame::paintDocumentRectToContext(
- /* [in] */ RECT rect,
- /* [in] */ OLE_HANDLE deviceContext)
</del><ins>+HRESULT WebFrame::paintDocumentRectToContext(RECT rect, HDC deviceContext)
</ins><span class="cx"> {
</span><span class="cx"> Frame* coreFrame = core(this);
</span><span class="cx"> if (!coreFrame)
</span><span class="lines">@@ -329,8 +327,7 @@
</span><span class="cx"> // We can't paint with a layout still pending.
</span><span class="cx"> view->updateLayoutAndStyleIfNeededRecursive();
</span><span class="cx">
</span><del>- HDC dc = reinterpret_cast<HDC>(static_cast<ULONG64>(deviceContext));
- GraphicsContext gc(dc);
</del><ins>+ GraphicsContext gc(deviceContext);
</ins><span class="cx"> gc.setShouldIncludeChildWindows(true);
</span><span class="cx"> gc.save();
</span><span class="cx"> LONG width = rect.right - rect.left;
</span><span class="lines">@@ -346,10 +343,7 @@
</span><span class="cx"> return S_OK;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-HRESULT STDMETHODCALLTYPE WebFrame::paintScrollViewRectToContextAtPoint(
- /* [in] */ RECT rect,
- /* [in] */ POINT pt,
- /* [in] */ OLE_HANDLE deviceContext)
</del><ins>+HRESULT WebFrame::paintScrollViewRectToContextAtPoint(RECT rect, POINT pt, HDC deviceContext)
</ins><span class="cx"> {
</span><span class="cx"> Frame* coreFrame = core(this);
</span><span class="cx"> if (!coreFrame)
</span><span class="lines">@@ -362,8 +356,7 @@
</span><span class="cx"> // We can't paint with a layout still pending.
</span><span class="cx"> view->updateLayoutAndStyleIfNeededRecursive();
</span><span class="cx">
</span><del>- HDC dc = reinterpret_cast<HDC>(static_cast<ULONG64>(deviceContext));
- GraphicsContext gc(dc);
</del><ins>+ GraphicsContext gc(deviceContext);
</ins><span class="cx"> gc.setShouldIncludeChildWindows(true);
</span><span class="cx"> gc.save();
</span><span class="cx"> IntRect dirtyRect(rect);
</span><span class="lines">@@ -1053,7 +1046,7 @@
</span><span class="cx"> webView->QueryInterface(&d->webView);
</span><span class="cx"> d->webView->Release(); // don't hold the extra ref
</span><span class="cx">
</span><del>- OLE_HANDLE viewWindow;
</del><ins>+ HWND viewWindow;
</ins><span class="cx"> d->webView->viewWindow(&viewWindow);
</span><span class="cx">
</span><span class="cx"> this->AddRef(); // We release this ref in frameLoaderDestroyed()
</span><span class="lines">@@ -1067,7 +1060,7 @@
</span><span class="cx"> webView->QueryInterface(&d->webView);
</span><span class="cx"> d->webView->Release(); // don't hold the extra ref
</span><span class="cx">
</span><del>- OLE_HANDLE viewWindow;
</del><ins>+ HWND viewWindow;
</ins><span class="cx"> d->webView->viewWindow(&viewWindow);
</span><span class="cx">
</span><span class="cx"> this->AddRef(); // We release this ref in frameLoaderDestroyed()
</span><span class="lines">@@ -1584,7 +1577,7 @@
</span><span class="cx"> int x = pageRect.x();
</span><span class="cx"> int y = 0;
</span><span class="cx"> RECT headerRect = {x, y, x+pageRect.width(), y+static_cast<int>(headerHeight)};
</span><del>- ui->drawHeaderInRect(d->webView, &headerRect, static_cast<OLE_HANDLE>(reinterpret_cast<LONG64>(pctx)));
</del><ins>+ ui->drawHeaderInRect(d->webView, &headerRect, reinterpret_cast<ULONG_PTR>(pctx));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebFrame::drawFooter(PlatformGraphicsContext* pctx, IWebUIDelegate* ui, const IntRect& pageRect, UINT page, UINT pageCount, float headerHeight, float footerHeight)
</span><span class="lines">@@ -1592,7 +1585,7 @@
</span><span class="cx"> int x = pageRect.x();
</span><span class="cx"> int y = max((int)headerHeight+pageRect.height(), m_pageHeight-static_cast<int>(footerHeight));
</span><span class="cx"> RECT footerRect = {x, y, x+pageRect.width(), y+static_cast<int>(footerHeight)};
</span><del>- ui->drawFooterInRect(d->webView, &footerRect, static_cast<OLE_HANDLE>(reinterpret_cast<LONG64>(pctx)), page+1, pageCount);
</del><ins>+ ui->drawFooterInRect(d->webView, &footerRect, reinterpret_cast<ULONG_PTR>(pctx), page + 1, pageCount);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebFrame::spoolPage(PlatformGraphicsContext* pctx, GraphicsContext* spoolCtx, HDC printDC, IWebUIDelegate* ui, float headerHeight, float footerHeight, UINT page, UINT pageCount)
</span><span class="lines">@@ -1663,7 +1656,7 @@
</span><span class="cx"> int y = 0;
</span><span class="cx"> RECT headerRect = {x, y, x + pageRect.width(), y + static_cast<int>(headerHeight)};
</span><span class="cx">
</span><del>- ui->drawHeaderInRect(d->webView, &headerRect, static_cast<OLE_HANDLE>(reinterpret_cast<LONG64>(hdc)));
</del><ins>+ ui->drawHeaderInRect(d->webView, &headerRect, reinterpret_cast<ULONG_PTR>(hdc));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebFrame::drawFooter(PlatformGraphicsContext* pctx, IWebUIDelegate* ui, const IntRect& pageRect, UINT page, UINT pageCount, float headerHeight, float footerHeight)
</span><span class="lines">@@ -1674,7 +1667,7 @@
</span><span class="cx"> int y = max(static_cast<int>(headerHeight) + pageRect.height(), m_pageHeight -static_cast<int>(footerHeight));
</span><span class="cx"> RECT footerRect = {x, y, x + pageRect.width(), y + static_cast<int>(footerHeight)};
</span><span class="cx">
</span><del>- ui->drawFooterInRect(d->webView, &footerRect, static_cast<OLE_HANDLE>(reinterpret_cast<LONG64>(hdc)), page+1, pageCount);
</del><ins>+ ui->drawFooterInRect(d->webView, &footerRect, reinterpret_cast<ULONG_PTR>(hdc), page+1, pageCount);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static XFORM buildXFORMFromCairo(HDC targetDC, cairo_t* previewContext)
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebKitwinWebFrameh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebKit/win/WebFrame.h (172985 => 172986)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit/win/WebFrame.h 2014-08-27 00:01:12 UTC (rev 172985)
+++ branches/safari-600.1-branch/Source/WebKit/win/WebFrame.h 2014-08-27 00:01:31 UTC (rev 172986)
</span><span class="lines">@@ -236,14 +236,9 @@
</span><span class="cx">
</span><span class="cx"> virtual HRESULT STDMETHODCALLTYPE reloadFromOrigin();
</span><span class="cx">
</span><del>- virtual HRESULT STDMETHODCALLTYPE paintDocumentRectToContext(
- /* [in] */ RECT rect,
- /* [in] */ OLE_HANDLE deviceContext);
</del><ins>+ virtual HRESULT STDMETHODCALLTYPE paintDocumentRectToContext(/* [in] */ RECT rect, /* [in] */ HDC deviceContext);
</ins><span class="cx">
</span><del>- virtual HRESULT STDMETHODCALLTYPE paintScrollViewRectToContextAtPoint(
- /* [in] */ RECT rect,
- /* [in] */ POINT pt,
- /* [in] */ OLE_HANDLE deviceContext);
</del><ins>+ virtual HRESULT STDMETHODCALLTYPE paintScrollViewRectToContextAtPoint(/* [in] */ RECT rect, /* [in] */ POINT pt, /* [in] */ HDC deviceContext);
</ins><span class="cx">
</span><span class="cx"> virtual HRESULT STDMETHODCALLTYPE elementDoesAutoComplete(
</span><span class="cx"> /* [in] */ IDOMElement* element,
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebKitwinWebHistoryItemcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebKit/win/WebHistoryItem.cpp (172985 => 172986)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit/win/WebHistoryItem.cpp 2014-08-27 00:01:12 UTC (rev 172985)
+++ branches/safari-600.1-branch/Source/WebKit/win/WebHistoryItem.cpp 2014-08-27 00:01:31 UTC (rev 172986)
</span><span class="lines">@@ -487,8 +487,7 @@
</span><span class="cx"> return S_OK;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-HRESULT STDMETHODCALLTYPE WebHistoryItem::icon(
- /* [out, retval] */ OLE_HANDLE* /*hBitmap*/)
</del><ins>+HRESULT STDMETHODCALLTYPE WebHistoryItem::icon(/* [out, retval] */ HBITMAP* /*hBitmap*/)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> return E_NOTIMPL;
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebKitwinWebHistoryItemh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebKit/win/WebHistoryItem.h (172985 => 172986)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit/win/WebHistoryItem.h 2014-08-27 00:01:12 UTC (rev 172985)
+++ branches/safari-600.1-branch/Source/WebKit/win/WebHistoryItem.h 2014-08-27 00:01:31 UTC (rev 172986)
</span><span class="lines">@@ -78,8 +78,7 @@
</span><span class="cx"> virtual HRESULT STDMETHODCALLTYPE alternateTitle(
</span><span class="cx"> /* [retval][out] */ BSTR* title);
</span><span class="cx">
</span><del>- virtual HRESULT STDMETHODCALLTYPE icon(
- /* [out, retval] */ OLE_HANDLE *hBitmap);
</del><ins>+ virtual HRESULT STDMETHODCALLTYPE icon(/* [out, retval] */ HBITMAP* hBitmap);
</ins><span class="cx">
</span><span class="cx"> // IWebHistoryItemPrivate
</span><span class="cx"> virtual HRESULT STDMETHODCALLTYPE initFromDictionaryRepresentation(void* dictionary);
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebKitwinWebIconDatabasecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebKit/win/WebIconDatabase.cpp (172985 => 172986)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit/win/WebIconDatabase.cpp 2014-08-27 00:01:12 UTC (rev 172985)
+++ branches/safari-600.1-branch/Source/WebKit/win/WebIconDatabase.cpp 2014-08-27 00:01:31 UTC (rev 172986)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2006, 2007, 2008, 2009, 2013 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2006, 2007, 2008, 2009, 2013-2014 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">@@ -161,11 +161,7 @@
</span><span class="cx"> return S_OK;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-HRESULT WebIconDatabase::iconForURL(
- /* [in] */ BSTR url,
- /* [optional][in] */ LPSIZE size,
- /* [optional][in] */ BOOL /*cache*/,
- /* [retval][out] */ OLE_HANDLE* bitmap)
</del><ins>+HRESULT WebIconDatabase::iconForURL(BSTR url, LPSIZE size, BOOL /*cache*/, HBITMAP* bitmap)
</ins><span class="cx"> {
</span><span class="cx"> if (!size)
</span><span class="cx"> return E_POINTER;
</span><span class="lines">@@ -178,8 +174,8 @@
</span><span class="cx">
</span><span class="cx"> // Make sure we check for the case of an "empty image"
</span><span class="cx"> if (icon && icon->width()) {
</span><del>- *bitmap = (OLE_HANDLE)(ULONG64)getOrCreateSharedBitmap(intSize);
- if (!icon->getHBITMAPOfSize((HBITMAP)(ULONG64)*bitmap, &intSize)) {
</del><ins>+ *bitmap = getOrCreateSharedBitmap(intSize);
+ if (!icon->getHBITMAPOfSize(*bitmap, &intSize)) {
</ins><span class="cx"> LOG_ERROR("Failed to draw Image to HBITMAP");
</span><span class="cx"> *bitmap = 0;
</span><span class="cx"> return E_FAIL;
</span><span class="lines">@@ -190,16 +186,14 @@
</span><span class="cx"> return defaultIconWithSize(size, bitmap);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-HRESULT STDMETHODCALLTYPE WebIconDatabase::defaultIconWithSize(
- /* [in] */ LPSIZE size,
- /* [retval][out] */ OLE_HANDLE* result)
</del><ins>+HRESULT WebIconDatabase::defaultIconWithSize(LPSIZE size, HBITMAP* result)
</ins><span class="cx"> {
</span><span class="cx"> if (!size)
</span><span class="cx"> return E_POINTER;
</span><span class="cx">
</span><span class="cx"> IntSize intSize(*size);
</span><span class="cx">
</span><del>- *result = (OLE_HANDLE)(ULONG64)getOrCreateDefaultIconBitmap(intSize);
</del><ins>+ *result = getOrCreateDefaultIconBitmap(intSize);
</ins><span class="cx"> return S_OK;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebKitwinWebIconDatabaseh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebKit/win/WebIconDatabase.h (172985 => 172986)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit/win/WebIconDatabase.h 2014-08-27 00:01:12 UTC (rev 172985)
+++ branches/safari-600.1-branch/Source/WebKit/win/WebIconDatabase.h 2014-08-27 00:01:31 UTC (rev 172986)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2006, 2007, 2008, 2009, 2013 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2006, 2007, 2008, 2009, 2013-2014 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">@@ -65,16 +65,10 @@
</span><span class="cx"> virtual HRESULT STDMETHODCALLTYPE sharedIconDatabase(
</span><span class="cx"> /* [retval][out] */ IWebIconDatabase **result);
</span><span class="cx">
</span><del>- virtual HRESULT STDMETHODCALLTYPE iconForURL(
- /* [in] */ BSTR url,
- /* [optional][in] */ LPSIZE size,
- /* [optional][in] */ BOOL cache,
- /* [retval][out] */ OLE_HANDLE *image);
</del><ins>+ virtual HRESULT STDMETHODCALLTYPE iconForURL(BSTR url, LPSIZE, BOOL cache, HBITMAP* image);
+
+ virtual HRESULT STDMETHODCALLTYPE defaultIconWithSize(/* [in] */ LPSIZE size, /* [retval][out] */ HBITMAP* result);
</ins><span class="cx">
</span><del>- virtual HRESULT STDMETHODCALLTYPE defaultIconWithSize(
- /* [in] */ LPSIZE size,
- /* [retval][out] */ OLE_HANDLE *result);
-
</del><span class="cx"> virtual HRESULT STDMETHODCALLTYPE retainIconForURL(
</span><span class="cx"> /* [in] */ BSTR url);
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebKitwinWebMutableURLRequestcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebKit/win/WebMutableURLRequest.cpp (172985 => 172986)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit/win/WebMutableURLRequest.cpp 2014-08-27 00:01:12 UTC (rev 172985)
+++ branches/safari-600.1-branch/Source/WebKit/win/WebMutableURLRequest.cpp 2014-08-27 00:01:31 UTC (rev 172986)
</span><span class="lines">@@ -366,13 +366,12 @@
</span><span class="cx"> return S_OK;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-HRESULT STDMETHODCALLTYPE WebMutableURLRequest::setClientCertificate(
- /* [in] */ OLE_HANDLE cert)
</del><ins>+HRESULT STDMETHODCALLTYPE WebMutableURLRequest::setClientCertificate(/* [in] */ ULONG_PTR cert)
</ins><span class="cx"> {
</span><span class="cx"> if (!cert)
</span><span class="cx"> return E_POINTER;
</span><span class="cx">
</span><del>- PCCERT_CONTEXT certContext = reinterpret_cast<PCCERT_CONTEXT>((ULONG64)cert);
</del><ins>+ PCCERT_CONTEXT certContext = reinterpret_cast<PCCERT_CONTEXT>(cert);
</ins><span class="cx"> RetainPtr<CFDataRef> certData = WebCore::copyCertificateToData(certContext);
</span><span class="cx"> ResourceHandle::setClientCertificate(m_request.url().host(), certData.get());
</span><span class="cx"> return S_OK;
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebKitwinWebMutableURLRequesth"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebKit/win/WebMutableURLRequest.h (172985 => 172986)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit/win/WebMutableURLRequest.h 2014-08-27 00:01:12 UTC (rev 172985)
+++ branches/safari-600.1-branch/Source/WebKit/win/WebMutableURLRequest.h 2014-08-27 00:01:31 UTC (rev 172986)
</span><span class="lines">@@ -155,8 +155,7 @@
</span><span class="cx">
</span><span class="cx"> // IWebMutableURLRequestPrivate
</span><span class="cx">
</span><del>- virtual HRESULT STDMETHODCALLTYPE setClientCertificate(
- /* [in] */ OLE_HANDLE cert);
</del><ins>+ virtual HRESULT STDMETHODCALLTYPE setClientCertificate(ULONG_PTR);
</ins><span class="cx">
</span><span class="cx"> virtual /* [local] */ CFURLRequestRef STDMETHODCALLTYPE cfRequest();
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebKitwinWebNodeHighlightcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebKit/win/WebNodeHighlight.cpp (172985 => 172986)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit/win/WebNodeHighlight.cpp 2014-08-27 00:01:12 UTC (rev 172985)
+++ branches/safari-600.1-branch/Source/WebKit/win/WebNodeHighlight.cpp 2014-08-27 00:01:31 UTC (rev 172986)
</span><span class="lines">@@ -57,7 +57,7 @@
</span><span class="cx"> , m_showsWhileWebViewIsVisible(false)
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(INSPECTOR)
</span><del>- m_inspectedWebView->viewWindow(reinterpret_cast<OLE_HANDLE*>(&m_inspectedWebViewWindow));
</del><ins>+ m_inspectedWebView->viewWindow(&m_inspectedWebViewWindow);
</ins><span class="cx"> #endif // ENABLE(INSPECTOR)
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebKitwinWebURLResponsecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebKit/win/WebURLResponse.cpp (172985 => 172986)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit/win/WebURLResponse.cpp 2014-08-27 00:01:12 UTC (rev 172985)
+++ branches/safari-600.1-branch/Source/WebKit/win/WebURLResponse.cpp 2014-08-27 00:01:31 UTC (rev 172986)
</span><span class="lines">@@ -400,8 +400,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-HRESULT STDMETHODCALLTYPE WebURLResponse::sslPeerCertificate(
- /* [retval][out] */ OLE_HANDLE* result)
</del><ins>+HRESULT WebURLResponse::sslPeerCertificate(/* [retval][out] */ ULONG_PTR* result)
</ins><span class="cx"> {
</span><span class="cx"> if (!result)
</span><span class="cx"> return E_POINTER;
</span><span class="lines">@@ -414,7 +413,7 @@
</span><span class="cx"> void* data = wkGetSSLPeerCertificateDataBytePtr(dict);
</span><span class="cx"> if (!data)
</span><span class="cx"> return E_FAIL;
</span><del>- *result = (OLE_HANDLE)(ULONG64)data;
</del><ins>+ *result = reinterpret_cast<ULONG_PTR>(data);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> return *result ? S_OK : E_FAIL;
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebKitwinWebURLResponseh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebKit/win/WebURLResponse.h (172985 => 172986)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit/win/WebURLResponse.h 2014-08-27 00:01:12 UTC (rev 172985)
+++ branches/safari-600.1-branch/Source/WebKit/win/WebURLResponse.h 2014-08-27 00:01:31 UTC (rev 172986)
</span><span class="lines">@@ -81,8 +81,7 @@
</span><span class="cx"> /* [retval][out] */ BOOL *attachment);
</span><span class="cx">
</span><span class="cx"> // IWebURLResponsePrivate
</span><del>- virtual HRESULT STDMETHODCALLTYPE sslPeerCertificate(
- /* [retval][out] */ OLE_HANDLE *result);
</del><ins>+ virtual HRESULT STDMETHODCALLTYPE sslPeerCertificate(/* [retval][out] */ ULONG_PTR* result);
</ins><span class="cx">
</span><span class="cx"> const WebCore::ResourceResponse& resourceResponse() const;
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebKitwinWebViewcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebKit/win/WebView.cpp (172985 => 172986)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit/win/WebView.cpp 2014-08-27 00:01:12 UTC (rev 172985)
+++ branches/safari-600.1-branch/Source/WebKit/win/WebView.cpp 2014-08-27 00:01:31 UTC (rev 172986)
</span><span class="lines">@@ -1184,7 +1184,7 @@
</span><span class="cx">
</span><span class="cx"> COMPtr<IWebUIDelegatePrivate2> uiPrivate(Query, m_uiDelegate);
</span><span class="cx"> if (uiPrivate)
</span><del>- uiPrivate->drawBackground(this, reinterpret_cast<OLE_HANDLE>(bitmapDC), &rect);
</del><ins>+ uiPrivate->drawBackground(this, bitmapDC, &rect);
</ins><span class="cx">
</span><span class="cx"> if (frameView && frameView->frame().contentRenderer()) {
</span><span class="cx"> gc.clip(dirtyRect);
</span><span class="lines">@@ -1392,7 +1392,7 @@
</span><span class="cx"> m_uiDelegate->hasCustomMenuImplementation(&hasCustomMenus);
</span><span class="cx">
</span><span class="cx"> if (hasCustomMenus)
</span><del>- m_uiDelegate->trackCustomPopupMenu((IWebView*)this, (OLE_HANDLE)(ULONG64)coreMenu->platformContextMenu(), &point);
</del><ins>+ m_uiDelegate->trackCustomPopupMenu((IWebView*)this, coreMenu->platformContextMenu(), &point);
</ins><span class="cx"> else {
</span><span class="cx"> // Surprisingly, TPM_RIGHTBUTTON means that items are selectable with either the right OR left mouse button
</span><span class="cx"> UINT flags = TPM_RIGHTBUTTON | TPM_TOPALIGN | TPM_VERPOSANIMATION | TPM_HORIZONTAL
</span><span class="lines">@@ -1445,7 +1445,7 @@
</span><span class="cx"> if (!hasCustomMenus)
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- m_uiDelegate->addCustomMenuDrawingData((IWebView*)this, (OLE_HANDLE)(ULONG64)menu);
</del><ins>+ m_uiDelegate->addCustomMenuDrawingData((IWebView*)this, menu);
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1463,7 +1463,7 @@
</span><span class="cx"> if (!hasCustomMenus)
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- m_uiDelegate->cleanUpCustomMenuDrawingData((IWebView*)this, (OLE_HANDLE)(ULONG64)menu);
</del><ins>+ m_uiDelegate->cleanUpCustomMenuDrawingData((IWebView*)this, menu);
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2312,7 +2312,7 @@
</span><span class="cx"> HWND newFocusWnd = reinterpret_cast<HWND>(wParam);
</span><span class="cx"> if (SUCCEEDED(webView->uiDelegate(&uiDelegate)) && uiDelegate
</span><span class="cx"> && SUCCEEDED(uiDelegate->QueryInterface(IID_IWebUIDelegatePrivate, (void**) &uiDelegatePrivate)) && uiDelegatePrivate)
</span><del>- uiDelegatePrivate->webViewLostFocus(webView, (OLE_HANDLE)(ULONG64)newFocusWnd);
</del><ins>+ uiDelegatePrivate->webViewLostFocus(webView, newFocusWnd);
</ins><span class="cx">
</span><span class="cx"> FocusController& focusController = webView->page()->focusController();
</span><span class="cx"> Frame& frame = focusController.focusedOrMainFrame();
</span><span class="lines">@@ -2920,7 +2920,7 @@
</span><span class="cx"> icon->getHBITMAPOfSize(hBitmap, &sz);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- HRESULT hr = m_frameLoadDelegate->didReceiveIcon(this, (OLE_HANDLE)hBitmap, frame);
</del><ins>+ HRESULT hr = m_frameLoadDelegate->didReceiveIcon(this, hBitmap, frame);
</ins><span class="cx"> if (hr == E_NOTIMPL)
</span><span class="cx"> DeleteObject(hBitmap);
</span><span class="cx"> }
</span><span class="lines">@@ -3445,10 +3445,8 @@
</span><span class="cx"> KillTimer(m_viewWindow, DeleteBackingStoreTimer);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-HRESULT STDMETHODCALLTYPE WebView::setHostWindow(
- /* [in] */ OLE_HANDLE oleWindow)
</del><ins>+HRESULT WebView::setHostWindow(/* [in] */ HWND window)
</ins><span class="cx"> {
</span><del>- HWND window = (HWND)(ULONG64)oleWindow;
</del><span class="cx"> if (m_viewWindow) {
</span><span class="cx"> if (window)
</span><span class="cx"> SetParent(m_viewWindow, window);
</span><span class="lines">@@ -3468,10 +3466,9 @@
</span><span class="cx"> return S_OK;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-HRESULT STDMETHODCALLTYPE WebView::hostWindow(
- /* [retval][out] */ OLE_HANDLE* window)
</del><ins>+HRESULT WebView::hostWindow(/* [retval][out] */ HWND* window)
</ins><span class="cx"> {
</span><del>- *window = (OLE_HANDLE)(ULONG64)m_hostWindow;
</del><ins>+ *window = m_hostWindow;
</ins><span class="cx"> return S_OK;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -3594,14 +3591,14 @@
</span><span class="cx"> return createMatchEnumerator(&allRects, pmatches);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-HRESULT STDMETHODCALLTYPE WebView::generateSelectionImage(BOOL forceWhiteText, OLE_HANDLE* hBitmap)
</del><ins>+HRESULT STDMETHODCALLTYPE WebView::generateSelectionImage(BOOL forceWhiteText, HBITMAP* hBitmap)
</ins><span class="cx"> {
</span><span class="cx"> *hBitmap = 0;
</span><span class="cx">
</span><span class="cx"> WebCore::Frame& frame = m_page->focusController().focusedOrMainFrame();
</span><span class="cx">
</span><span class="cx"> auto bitmap = imageFromSelection(&frame, forceWhiteText ? TRUE : FALSE);
</span><del>- *hBitmap = static_cast<OLE_HANDLE>(reinterpret_cast<ULONG64>(bitmap.leak()));
</del><ins>+ *hBitmap = bitmap.leak();
</ins><span class="cx">
</span><span class="cx"> return S_OK;
</span><span class="cx"> }
</span><span class="lines">@@ -3856,8 +3853,7 @@
</span><span class="cx"> return E_NOTIMPL;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-HRESULT STDMETHODCALLTYPE WebView::mainFrameIcon(
- /* [retval][out] */ OLE_HANDLE* /*hBitmap*/)
</del><ins>+HRESULT WebView::mainFrameIcon(/* [retval][out] */ HBITMAP* /*hBitmap*/)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> return E_NOTIMPL;
</span><span class="lines">@@ -5128,10 +5124,9 @@
</span><span class="cx"> return E_NOTIMPL;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-HRESULT STDMETHODCALLTYPE WebView::viewWindow(
- /* [retval][out] */ OLE_HANDLE *window)
</del><ins>+HRESULT WebView::viewWindow(/* [retval][out] */ HWND* window)
</ins><span class="cx"> {
</span><del>- *window = (OLE_HANDLE)(ULONG64)m_viewWindow;
</del><ins>+ *window = m_viewWindow;
</ins><span class="cx"> return S_OK;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -5907,9 +5902,7 @@
</span><span class="cx"> return S_OK;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-HRESULT STDMETHODCALLTYPE WebView::paintDocumentRectToContext(
- /* [in] */ RECT rect,
- /* [in] */ OLE_HANDLE deviceContext)
</del><ins>+HRESULT WebView::paintDocumentRectToContext(RECT rect, HDC deviceContext)
</ins><span class="cx"> {
</span><span class="cx"> if (!deviceContext)
</span><span class="cx"> return E_POINTER;
</span><span class="lines">@@ -5920,10 +5913,7 @@
</span><span class="cx"> return m_mainFrame->paintDocumentRectToContext(rect, deviceContext);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-HRESULT STDMETHODCALLTYPE WebView::paintScrollViewRectToContextAtPoint(
- /* [in] */ RECT rect,
- /* [in] */ POINT pt,
- /* [in] */ OLE_HANDLE deviceContext)
</del><ins>+HRESULT WebView::paintScrollViewRectToContextAtPoint(RECT rect, POINT pt, HDC deviceContext)
</ins><span class="cx"> {
</span><span class="cx"> if (!deviceContext)
</span><span class="cx"> return E_POINTER;
</span><span class="lines">@@ -5992,14 +5982,13 @@
</span><span class="cx"> return E_FAIL;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-HRESULT STDMETHODCALLTYPE WebView::backingStore(
- /* [out, retval] */ OLE_HANDLE* hBitmap)
</del><ins>+HRESULT WebView::backingStore(/* [out, retval] */ HBITMAP* hBitmap)
</ins><span class="cx"> {
</span><span class="cx"> if (!hBitmap)
</span><span class="cx"> return E_POINTER;
</span><span class="cx"> if (!m_backingStoreBitmap)
</span><span class="cx"> return E_FAIL;
</span><del>- *hBitmap = reinterpret_cast<OLE_HANDLE>(m_backingStoreBitmap->get());
</del><ins>+ *hBitmap = m_backingStoreBitmap->get();
</ins><span class="cx"> return S_OK;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -6927,7 +6916,7 @@
</span><span class="cx">
</span><span class="cx"> void WebView::fullScreenClientSetParentWindow(HWND hostWindow)
</span><span class="cx"> {
</span><del>- setHostWindow(reinterpret_cast<OLE_HANDLE>(hostWindow));
</del><ins>+ setHostWindow(hostWindow);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebView::fullScreenClientWillEnterFullScreen()
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebKitwinWebViewh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebKit/win/WebView.h (172985 => 172986)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit/win/WebView.h 2014-08-27 00:01:12 UTC (rev 172985)
+++ branches/safari-600.1-branch/Source/WebKit/win/WebView.h 2014-08-27 00:01:31 UTC (rev 172986)
</span><span class="lines">@@ -245,11 +245,9 @@
</span><span class="cx"> virtual HRESULT STDMETHODCALLTYPE preferencesIdentifier(
</span><span class="cx"> /* [retval][out] */ BSTR *anIdentifier);
</span><span class="cx">
</span><del>- virtual HRESULT STDMETHODCALLTYPE setHostWindow(
- /* [in] */ OLE_HANDLE window);
</del><ins>+ virtual HRESULT STDMETHODCALLTYPE setHostWindow(HWND);
</ins><span class="cx">
</span><del>- virtual HRESULT STDMETHODCALLTYPE hostWindow(
- /* [retval][out] */ OLE_HANDLE *window);
</del><ins>+ virtual HRESULT STDMETHODCALLTYPE hostWindow(HWND*);
</ins><span class="cx">
</span><span class="cx"> virtual HRESULT STDMETHODCALLTYPE searchFor(
</span><span class="cx"> /* [in] */ BSTR str,
</span><span class="lines">@@ -326,8 +324,7 @@
</span><span class="cx"> virtual HRESULT STDMETHODCALLTYPE mainFrameTitle(
</span><span class="cx"> /* [retval][out] */ BSTR *title);
</span><span class="cx">
</span><del>- virtual HRESULT STDMETHODCALLTYPE mainFrameIcon(
- /* [retval][out] */ OLE_HANDLE *hBitmap);
</del><ins>+ virtual HRESULT STDMETHODCALLTYPE mainFrameIcon(/* [retval][out] */ HBITMAP* hBitmap);
</ins><span class="cx">
</span><span class="cx"> virtual HRESULT STDMETHODCALLTYPE registerURLSchemeAsLocal(
</span><span class="cx"> /* [in] */ BSTR scheme);
</span><span class="lines">@@ -623,8 +620,7 @@
</span><span class="cx"> virtual HRESULT STDMETHODCALLTYPE inViewSourceMode(
</span><span class="cx"> /* [retval][out] */ BOOL* flag);
</span><span class="cx">
</span><del>- virtual HRESULT STDMETHODCALLTYPE viewWindow(
- /* [retval][out] */ OLE_HANDLE *window);
</del><ins>+ virtual HRESULT STDMETHODCALLTYPE viewWindow(/* [retval][out] */ HWND* window);
</ins><span class="cx">
</span><span class="cx"> virtual HRESULT STDMETHODCALLTYPE setFormDelegate(
</span><span class="cx"> /* [in] */ IWebFormDelegate *formDelegate);
</span><span class="lines">@@ -661,8 +657,7 @@
</span><span class="cx"> virtual HRESULT STDMETHODCALLTYPE rectsForTextMatches(
</span><span class="cx"> IEnumTextMatches** pmatches);
</span><span class="cx">
</span><del>- virtual HRESULT STDMETHODCALLTYPE generateSelectionImage(
- BOOL forceWhiteText, OLE_HANDLE* hBitmap);
</del><ins>+ virtual HRESULT STDMETHODCALLTYPE generateSelectionImage(BOOL forceWhiteText, HBITMAP* hBitmap);
</ins><span class="cx">
</span><span class="cx"> virtual HRESULT STDMETHODCALLTYPE selectionRect(
</span><span class="cx"> RECT* rc);
</span><span class="lines">@@ -718,14 +713,9 @@
</span><span class="cx">
</span><span class="cx"> virtual HRESULT STDMETHODCALLTYPE windowAncestryDidChange();
</span><span class="cx">
</span><del>- virtual HRESULT STDMETHODCALLTYPE paintDocumentRectToContext(
- /* [in] */ RECT rect,
- /* [in] */ OLE_HANDLE dc);
</del><ins>+ virtual HRESULT STDMETHODCALLTYPE paintDocumentRectToContext(RECT, HDC);
</ins><span class="cx">
</span><del>- virtual HRESULT STDMETHODCALLTYPE paintScrollViewRectToContextAtPoint(
- /* [in] */ RECT rect,
- /* [in] */ POINT pt,
- /* [in] */ OLE_HANDLE dc);
</del><ins>+ virtual HRESULT STDMETHODCALLTYPE paintScrollViewRectToContextAtPoint(RECT, POINT, HDC);
</ins><span class="cx">
</span><span class="cx"> virtual HRESULT STDMETHODCALLTYPE reportException(
</span><span class="cx"> /* [in] */ JSContextRef context,
</span><span class="lines">@@ -742,8 +732,7 @@
</span><span class="cx"> virtual HRESULT STDMETHODCALLTYPE setCustomHTMLTokenizerChunkSize(
</span><span class="cx"> /* [in] */ int chunkSize);
</span><span class="cx">
</span><del>- virtual HRESULT STDMETHODCALLTYPE backingStore(
- /* [out, retval] */ OLE_HANDLE* hBitmap);
</del><ins>+ virtual HRESULT STDMETHODCALLTYPE backingStore(/* [out, retval] */ HBITMAP* hBitmap);
</ins><span class="cx">
</span><span class="cx"> virtual HRESULT STDMETHODCALLTYPE setTransparent(
</span><span class="cx"> /* [in] */ BOOL transparent);
</span></span></pre></div>
<a id="branchessafari6001branchToolsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Tools/ChangeLog (172985 => 172986)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Tools/ChangeLog 2014-08-27 00:01:12 UTC (rev 172985)
+++ branches/safari-600.1-branch/Tools/ChangeLog 2014-08-27 00:01:31 UTC (rev 172986)
</span><span class="lines">@@ -1,3 +1,60 @@
</span><ins>+2014-08-26 Dana Burkart <dburkart@apple.com>
+
+ Merge r172977. <rdar://problem/18141703>
+
+ 2014-08-26 Brent Fulgham <bfulgham@apple.com>
+
+ [Win] WebKit IDL incorrectly passes HWND as OLE_HANDLE
+ https://bugs.webkit.org/show_bug.cgi?id=136258
+ <rdar://problem/18134138>
+
+ Reviewed by Tim Horton.
+
+ Avoid 32/64-bit truncation by preventing 64-bit HWND (and other)
+ values from passing through the 32-bit OLE_HANDLE data type.
+
+ * DumpRenderTree/win/AccessibilityControllerWin.cpp:
+ (AccessibilityController::rootElement):
+ * DumpRenderTree/win/DumpRenderTree.cpp:
+ (resetWebViewToConsistentStateBeforeTesting):
+ (runTest):
+ (createWebViewAndOffscreenWindow):
+ * DumpRenderTree/win/FrameLoadDelegate.h:
+ (FrameLoadDelegate::didReceiveIcon):
+ * DumpRenderTree/win/TestRunnerWin.cpp:
+ (TestRunner::setWindowIsKey):
+ * DumpRenderTree/win/UIDelegate.cpp:
+ (UIDelegate::trackCustomPopupMenu):
+ (UIDelegate::drawHeaderInRect):
+ (UIDelegate::drawFooterInRect):
+ (UIDelegate::webViewClose):
+ (UIDelegate::webViewFocus):
+ (UIDelegate::webViewSetCursor):
+ (UIDelegate::drawBackground):
+ * DumpRenderTree/win/UIDelegate.h:
+ (UIDelegate::webViewFirstResponder):
+ (UIDelegate::makeFirstResponder):
+ (UIDelegate::contextMenuItemsForElement):
+ (UIDelegate::addCustomMenuDrawingData):
+ (UIDelegate::cleanUpCustomMenuDrawingData):
+ (UIDelegate::webViewLostFocus):
+ * TestWebKitAPI/Tests/WebKit/win/WebViewDestruction.cpp:
+ (TestWebKitAPI::WebViewDestructionWithHostWindow::SetUp):
+ * WinLauncher/PrintWebUIDelegate.cpp:
+ (PrintWebUIDelegate::drawHeaderInRect):
+ (PrintWebUIDelegate::drawFooterInRect):
+ * WinLauncher/PrintWebUIDelegate.h:
+ (PrintWebUIDelegate::webViewFirstResponder):
+ (PrintWebUIDelegate::makeFirstResponder):
+ (PrintWebUIDelegate::contextMenuItemsForElement):
+ (PrintWebUIDelegate::trackCustomPopupMenu):
+ (PrintWebUIDelegate::addCustomMenuDrawingData):
+ (PrintWebUIDelegate::cleanUpCustomMenuDrawingData):
+ * WinLauncher/WinLauncher.cpp:
+ (WinLauncher::prepareViews):
+ * WinLauncher/WinLauncherWebHost.h:
+ (WinLauncherWebHost::didReceiveIcon):
+
</ins><span class="cx"> 2014-08-18 Dana Burkart <dburkart@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r172680
</span></span></pre></div>
<a id="branchessafari6001branchToolsDumpRenderTreewinAccessibilityControllerWincpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Tools/DumpRenderTree/win/AccessibilityControllerWin.cpp (172985 => 172986)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Tools/DumpRenderTree/win/AccessibilityControllerWin.cpp 2014-08-27 00:01:12 UTC (rev 172985)
+++ branches/safari-600.1-branch/Tools/DumpRenderTree/win/AccessibilityControllerWin.cpp 2014-08-27 00:01:31 UTC (rev 172986)
</span><span class="lines">@@ -164,14 +164,14 @@
</span><span class="cx"> if (!viewPrivate)
</span><span class="cx"> return 0;
</span><span class="cx">
</span><del>- OLE_HANDLE webViewWindow;
</del><ins>+ HWND webViewWindow;
</ins><span class="cx"> if (FAILED(viewPrivate->viewWindow(&webViewWindow)))
</span><span class="cx"> return 0;
</span><span class="cx">
</span><span class="cx"> // Get the root accessible object by querying for the accessible object for the
</span><span class="cx"> // WebView's window.
</span><span class="cx"> COMPtr<IAccessible> rootAccessible;
</span><del>- if (FAILED(AccessibleObjectFromWindow(reinterpret_cast<HWND>(webViewWindow), static_cast<DWORD>(OBJID_CLIENT), __uuidof(IAccessible), reinterpret_cast<void**>(&rootAccessible))))
</del><ins>+ if (FAILED(AccessibleObjectFromWindow(webViewWindow, static_cast<DWORD>(OBJID_CLIENT), __uuidof(IAccessible), reinterpret_cast<void**>(&rootAccessible))))
</ins><span class="cx"> return 0;
</span><span class="cx">
</span><span class="cx"> return rootAccessible;
</span></span></pre></div>
<a id="branchessafari6001branchToolsDumpRenderTreewinDumpRenderTreecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Tools/DumpRenderTree/win/DumpRenderTree.cpp (172985 => 172986)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Tools/DumpRenderTree/win/DumpRenderTree.cpp 2014-08-27 00:01:12 UTC (rev 172985)
+++ branches/safari-600.1-branch/Tools/DumpRenderTree/win/DumpRenderTree.cpp 2014-08-27 00:01:31 UTC (rev 172986)
</span><span class="lines">@@ -878,7 +878,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> HWND viewWindow;
</span><del>- if (SUCCEEDED(webViewPrivate->viewWindow(reinterpret_cast<OLE_HANDLE*>(&viewWindow))) && viewWindow)
</del><ins>+ if (SUCCEEDED(webViewPrivate->viewWindow(&viewWindow)) && viewWindow)
</ins><span class="cx"> SetFocus(viewWindow);
</span><span class="cx">
</span><span class="cx"> webViewPrivate->clearMainFrameName();
</span><span class="lines">@@ -1065,7 +1065,7 @@
</span><span class="cx"> WorkQueue::shared()->setFrozen(false);
</span><span class="cx">
</span><span class="cx"> HWND hostWindow;
</span><del>- webView->hostWindow(reinterpret_cast<OLE_HANDLE*>(&hostWindow));
</del><ins>+ webView->hostWindow(&hostWindow);
</ins><span class="cx">
</span><span class="cx"> COMPtr<IWebMutableURLRequest> request;
</span><span class="cx"> HRESULT hr = WebKitCreateInstance(CLSID_WebMutableURLRequest, 0, IID_IWebMutableURLRequest, (void**)&request);
</span><span class="lines">@@ -1151,7 +1151,7 @@
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (FAILED(webView->setHostWindow((OLE_HANDLE)(ULONG64)hostWindow)))
</del><ins>+ if (FAILED(webView->setHostWindow(hostWindow)))
</ins><span class="cx"> return 0;
</span><span class="cx">
</span><span class="cx"> RECT clientRect;
</span><span class="lines">@@ -1174,7 +1174,7 @@
</span><span class="cx"> return 0;
</span><span class="cx">
</span><span class="cx"> HWND viewWindow;
</span><del>- if (FAILED(viewPrivate->viewWindow(reinterpret_cast<OLE_HANDLE*>(&viewWindow))))
</del><ins>+ if (FAILED(viewPrivate->viewWindow(&viewWindow)))
</ins><span class="cx"> return 0;
</span><span class="cx"> if (webViewWindow)
</span><span class="cx"> *webViewWindow = viewWindow;
</span></span></pre></div>
<a id="branchessafari6001branchToolsDumpRenderTreewinFrameLoadDelegateh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Tools/DumpRenderTree/win/FrameLoadDelegate.h (172985 => 172986)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Tools/DumpRenderTree/win/FrameLoadDelegate.h 2014-08-27 00:01:12 UTC (rev 172985)
+++ branches/safari-600.1-branch/Tools/DumpRenderTree/win/FrameLoadDelegate.h 2014-08-27 00:01:31 UTC (rev 172986)
</span><span class="lines">@@ -78,10 +78,7 @@
</span><span class="cx"> /* [in] */ IWebView *webView,
</span><span class="cx"> /* [in] */ IWebFrame *frame);
</span><span class="cx">
</span><del>- virtual HRESULT STDMETHODCALLTYPE didReceiveIcon(
- /* [in] */ IWebView *webView,
- /* [in] */ OLE_HANDLE image,
- /* [in] */ IWebFrame *frame) { return E_NOTIMPL; }
</del><ins>+ virtual HRESULT STDMETHODCALLTYPE didReceiveIcon(/* [in] */ IWebView*, /* [in] */ HBITMAP, /* [in] */ IWebFrame*) { return E_NOTIMPL; }
</ins><span class="cx">
</span><span class="cx"> virtual HRESULT STDMETHODCALLTYPE didFinishLoadForFrame(
</span><span class="cx"> /* [in] */ IWebView *webView,
</span></span></pre></div>
<a id="branchessafari6001branchToolsDumpRenderTreewinTestRunnerWincpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Tools/DumpRenderTree/win/TestRunnerWin.cpp (172985 => 172986)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Tools/DumpRenderTree/win/TestRunnerWin.cpp 2014-08-27 00:01:12 UTC (rev 172985)
+++ branches/safari-600.1-branch/Tools/DumpRenderTree/win/TestRunnerWin.cpp 2014-08-27 00:01:31 UTC (rev 172986)
</span><span class="lines">@@ -708,11 +708,11 @@
</span><span class="cx"> if (FAILED(webView->QueryInterface(&viewPrivate)))
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- OLE_HANDLE webViewWindow;
</del><ins>+ HWND webViewWindow;
</ins><span class="cx"> if (FAILED(viewPrivate->viewWindow(&webViewWindow)))
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- ::SendMessage(reinterpret_cast<HWND>(webViewWindow), flag ? WM_SETFOCUS : WM_KILLFOCUS, (WPARAM)::GetDesktopWindow(), 0);
</del><ins>+ ::SendMessage(webViewWindow, flag ? WM_SETFOCUS : WM_KILLFOCUS, (WPARAM)::GetDesktopWindow(), 0);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static const CFTimeInterval waitToDumpWatchdogInterval = 30.0;
</span></span></pre></div>
<a id="branchessafari6001branchToolsDumpRenderTreewinUIDelegatecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Tools/DumpRenderTree/win/UIDelegate.cpp (172985 => 172986)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Tools/DumpRenderTree/win/UIDelegate.cpp 2014-08-27 00:01:12 UTC (rev 172985)
+++ branches/safari-600.1-branch/Tools/DumpRenderTree/win/UIDelegate.cpp 2014-08-27 00:01:31 UTC (rev 172986)
</span><span class="lines">@@ -206,7 +206,7 @@
</span><span class="cx"> return S_OK;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-HRESULT UIDelegate::trackCustomPopupMenu(IWebView* /*sender*/, OLE_HANDLE /*menu*/, LPPOINT /*point*/)
</del><ins>+HRESULT UIDelegate::trackCustomPopupMenu(IWebView* /*sender*/, HMENU /*menu*/, LPPOINT /*point*/)
</ins><span class="cx"> {
</span><span class="cx"> // Do nothing
</span><span class="cx"> return S_OK;
</span><span class="lines">@@ -291,12 +291,12 @@
</span><span class="cx"> return E_NOTIMPL;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-HRESULT UIDelegate::drawHeaderInRect(IWebView* /*webView*/, RECT* /*rect*/, OLE_HANDLE /*drawingContext*/)
</del><ins>+HRESULT UIDelegate::drawHeaderInRect(IWebView* /*webView*/, RECT* /*rect*/, ULONG_PTR /*drawingContext*/)
</ins><span class="cx"> {
</span><span class="cx"> return E_NOTIMPL;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-HRESULT UIDelegate::drawFooterInRect(IWebView* /*webView*/, RECT* /*rect*/, OLE_HANDLE /*drawingContext*/, UINT /*pageIndex*/, UINT /*pageCount*/)
</del><ins>+HRESULT UIDelegate::drawFooterInRect(IWebView* /*webView*/, RECT* /*rect*/, ULONG_PTR /*drawingContext*/, UINT /*pageIndex*/, UINT /*pageCount*/)
</ins><span class="cx"> {
</span><span class="cx"> return E_NOTIMPL;
</span><span class="cx"> }
</span><span class="lines">@@ -452,7 +452,7 @@
</span><span class="cx"> HRESULT UIDelegate::webViewClose(IWebView* sender)
</span><span class="cx"> {
</span><span class="cx"> HWND hostWindow;
</span><del>- sender->hostWindow(reinterpret_cast<OLE_HANDLE*>(&hostWindow));
</del><ins>+ sender->hostWindow(&hostWindow);
</ins><span class="cx"> DestroyWindow(hostWindow);
</span><span class="cx"> return S_OK;
</span><span class="cx"> }
</span><span class="lines">@@ -460,7 +460,7 @@
</span><span class="cx"> HRESULT UIDelegate::webViewFocus(IWebView* sender)
</span><span class="cx"> {
</span><span class="cx"> HWND hostWindow;
</span><del>- sender->hostWindow(reinterpret_cast<OLE_HANDLE*>(&hostWindow));
</del><ins>+ sender->hostWindow(&hostWindow);
</ins><span class="cx"> SetForegroundWindow(hostWindow);
</span><span class="cx"> return S_OK;
</span><span class="cx"> }
</span><span class="lines">@@ -540,7 +540,7 @@
</span><span class="cx"> return E_NOTIMPL;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-HRESULT UIDelegate::webViewSetCursor(IWebView* /*sender*/, OLE_HANDLE /*cursor*/)
</del><ins>+HRESULT UIDelegate::webViewSetCursor(IWebView* /*sender*/, HCURSOR /*cursor*/)
</ins><span class="cx"> {
</span><span class="cx"> return E_NOTIMPL;
</span><span class="cx"> }
</span><span class="lines">@@ -568,7 +568,7 @@
</span><span class="cx"> return E_NOTIMPL;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-HRESULT UIDelegate::drawBackground(IWebView* /*sender*/, OLE_HANDLE hdc, const RECT* dirtyRect)
</del><ins>+HRESULT UIDelegate::drawBackground(IWebView* /*sender*/, HDC /*hdc*/, const RECT* /*dirtyRect*/)
</ins><span class="cx"> {
</span><span class="cx"> return E_NOTIMPL;
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari6001branchToolsDumpRenderTreewinUIDelegateh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Tools/DumpRenderTree/win/UIDelegate.h (172985 => 172986)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Tools/DumpRenderTree/win/UIDelegate.h 2014-08-27 00:01:12 UTC (rev 172985)
+++ branches/safari-600.1-branch/Tools/DumpRenderTree/win/UIDelegate.h 2014-08-27 00:01:31 UTC (rev 172986)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2005, 2006, 2007 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2005, 2006, 2007, 2014 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">@@ -66,13 +66,9 @@
</span><span class="cx"> virtual HRESULT STDMETHODCALLTYPE webViewUnfocus(
</span><span class="cx"> /* [in] */ IWebView *sender);
</span><span class="cx">
</span><del>- virtual HRESULT STDMETHODCALLTYPE webViewFirstResponder(
- /* [in] */ IWebView *sender,
- /* [retval][out] */ OLE_HANDLE *responder) { return E_NOTIMPL; }
</del><ins>+ virtual HRESULT STDMETHODCALLTYPE webViewFirstResponder(IWebView*, HWND*) { return E_NOTIMPL; }
</ins><span class="cx">
</span><del>- virtual HRESULT STDMETHODCALLTYPE makeFirstResponder(
- /* [in] */ IWebView *sender,
- /* [in] */ OLE_HANDLE responder) { return E_NOTIMPL; }
</del><ins>+ virtual HRESULT STDMETHODCALLTYPE makeFirstResponder(IWebView*, HWND) { return E_NOTIMPL; }
</ins><span class="cx">
</span><span class="cx"> virtual HRESULT STDMETHODCALLTYPE setStatusText(
</span><span class="cx"> /* [in] */ IWebView *sender,
</span><span class="lines">@@ -152,11 +148,7 @@
</span><span class="cx"> /* [in] */ IPropertyBag *elementInformation,
</span><span class="cx"> /* [in] */ UINT modifierFlags) { return E_NOTIMPL; }
</span><span class="cx">
</span><del>- virtual HRESULT STDMETHODCALLTYPE contextMenuItemsForElement(
- /* [in] */ IWebView *sender,
- /* [in] */ IPropertyBag *element,
- /* [in] */ OLE_HANDLE defaultItems,
- /* [retval][out] */ OLE_HANDLE *resultMenu) { return E_NOTIMPL; }
</del><ins>+ virtual HRESULT STDMETHODCALLTYPE contextMenuItemsForElement(IWebView*, IPropertyBag*, HMENU, HMENU*) { return E_NOTIMPL; }
</ins><span class="cx">
</span><span class="cx"> virtual HRESULT STDMETHODCALLTYPE validateUserInterfaceItem(
</span><span class="cx"> /* [in] */ IWebView *webView,
</span><span class="lines">@@ -199,10 +191,7 @@
</span><span class="cx"> virtual HRESULT STDMETHODCALLTYPE hasCustomMenuImplementation(
</span><span class="cx"> /* [retval][out] */ BOOL *hasCustomMenus);
</span><span class="cx">
</span><del>- virtual HRESULT STDMETHODCALLTYPE trackCustomPopupMenu(
- /* [in] */ IWebView *sender,
- /* [in] */ OLE_HANDLE menu,
- /* [in] */ LPPOINT point);
</del><ins>+ virtual HRESULT STDMETHODCALLTYPE trackCustomPopupMenu(/* [in] */ IWebView* sender, /* [in] */ HMENU, /* [in] */ LPPOINT);
</ins><span class="cx">
</span><span class="cx"> virtual HRESULT STDMETHODCALLTYPE measureCustomMenuItem(
</span><span class="cx"> /* [in] */ IWebView *sender,
</span><span class="lines">@@ -212,13 +201,9 @@
</span><span class="cx"> /* [in] */ IWebView *sender,
</span><span class="cx"> /* [in] */ void *drawItem) { return E_NOTIMPL; }
</span><span class="cx">
</span><del>- virtual HRESULT STDMETHODCALLTYPE addCustomMenuDrawingData(
- /* [in] */ IWebView *sender,
- /* [in] */ OLE_HANDLE menu) { return E_NOTIMPL; }
</del><ins>+ virtual HRESULT STDMETHODCALLTYPE addCustomMenuDrawingData(IWebView*, HMENU) { return E_NOTIMPL; }
</ins><span class="cx">
</span><del>- virtual HRESULT STDMETHODCALLTYPE cleanUpCustomMenuDrawingData(
- /* [in] */ IWebView *sender,
- /* [in] */ OLE_HANDLE menu) { return E_NOTIMPL; }
</del><ins>+ virtual HRESULT STDMETHODCALLTYPE cleanUpCustomMenuDrawingData(IWebView*, HMENU) { return E_NOTIMPL; }
</ins><span class="cx">
</span><span class="cx"> virtual HRESULT STDMETHODCALLTYPE canTakeFocus(
</span><span class="cx"> /* [in] */ IWebView *sender,
</span><span class="lines">@@ -266,17 +251,9 @@
</span><span class="cx"> /* [in] */ IWebView *webView,
</span><span class="cx"> /* [retval][out] */ float *result);
</span><span class="cx">
</span><del>- virtual HRESULT STDMETHODCALLTYPE drawHeaderInRect(
- /* [in] */ IWebView *webView,
- /* [in] */ RECT *rect,
- /* [in] */ OLE_HANDLE drawingContext);
</del><ins>+ virtual HRESULT STDMETHODCALLTYPE drawHeaderInRect(IWebView*, RECT*, ULONG_PTR drawingContext);
</ins><span class="cx">
</span><del>- virtual HRESULT STDMETHODCALLTYPE drawFooterInRect(
- /* [in] */ IWebView *webView,
- /* [in] */ RECT *rect,
- /* [in] */ OLE_HANDLE drawingContext,
- /* [in] */ UINT pageIndex,
- /* [in] */ UINT pageCount);
</del><ins>+ virtual HRESULT STDMETHODCALLTYPE drawFooterInRect(IWebView*, RECT*, ULONG_PTR drawingContext, UINT pageIndex, UINT pageCount);
</ins><span class="cx">
</span><span class="cx"> virtual HRESULT STDMETHODCALLTYPE webViewPrintingMarginRect(
</span><span class="cx"> /* [in] */ IWebView *webView,
</span><span class="lines">@@ -327,7 +304,7 @@
</span><span class="cx">
</span><span class="cx"> virtual HRESULT STDMETHODCALLTYPE createWebViewWithRequest(IWebView* sender, IWebURLRequest* request, IPropertyBag* windowFeatures, IWebView** newWebView);
</span><span class="cx">
</span><del>- virtual HRESULT STDMETHODCALLTYPE drawBackground(IWebView* sender, OLE_HANDLE hdc, const RECT* dirtyRect);
</del><ins>+ virtual HRESULT STDMETHODCALLTYPE drawBackground(IWebView* sender, HDC, const RECT* dirtyRect);
</ins><span class="cx">
</span><span class="cx"> virtual HRESULT STDMETHODCALLTYPE decidePolicyForGeolocationRequest(IWebView* sender, IWebFrame* frame, IWebSecurityOrigin* origin, IWebGeolocationPolicyListener* listener);
</span><span class="cx">
</span><span class="lines">@@ -359,9 +336,7 @@
</span><span class="cx"> virtual HRESULT STDMETHODCALLTYPE webViewReceivedFocus(
</span><span class="cx"> /* [in] */ IWebView *sender) { return E_NOTIMPL; }
</span><span class="cx">
</span><del>- virtual HRESULT STDMETHODCALLTYPE webViewLostFocus(
- /* [in] */ IWebView *sender,
- /* [in] */ OLE_HANDLE loseFocusTo) { return E_NOTIMPL; }
</del><ins>+ virtual HRESULT STDMETHODCALLTYPE webViewLostFocus(IWebView*, HWND) { return E_NOTIMPL; }
</ins><span class="cx">
</span><span class="cx"> virtual HRESULT STDMETHODCALLTYPE doDragDrop(
</span><span class="cx"> /* [in] */ IWebView *sender,
</span><span class="lines">@@ -393,9 +368,7 @@
</span><span class="cx"> virtual HRESULT STDMETHODCALLTYPE webViewClosing(
</span><span class="cx"> /* [in] */ IWebView *sender);
</span><span class="cx">
</span><del>- virtual HRESULT STDMETHODCALLTYPE webViewSetCursor(
- /* [in] */ IWebView *sender,
- /* [in] */ OLE_HANDLE cursor);
</del><ins>+ virtual HRESULT STDMETHODCALLTYPE webViewSetCursor(IWebView* sender, HCURSOR);
</ins><span class="cx">
</span><span class="cx"> virtual HRESULT STDMETHODCALLTYPE webViewDidInvalidate(
</span><span class="cx"> /* [in] */ IWebView *sender);
</span></span></pre></div>
<a id="branchessafari6001branchToolsTestWebKitAPITestsWebKitwinWebViewDestructioncpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Tools/TestWebKitAPI/Tests/WebKit/win/WebViewDestruction.cpp (172985 => 172986)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Tools/TestWebKitAPI/Tests/WebKit/win/WebViewDestruction.cpp 2014-08-27 00:01:12 UTC (rev 172985)
+++ branches/safari-600.1-branch/Tools/TestWebKitAPI/Tests/WebKit/win/WebViewDestruction.cpp 2014-08-27 00:01:31 UTC (rev 172986)
</span><span class="lines">@@ -80,12 +80,12 @@
</span><span class="cx"> WebViewDestruction::SetUp();
</span><span class="cx">
</span><span class="cx"> EXPECT_TRUE(m_window.initialize());
</span><del>- EXPECT_HRESULT_SUCCEEDED(m_webView->setHostWindow(reinterpret_cast<OLE_HANDLE>(m_window.window())));
</del><ins>+ EXPECT_HRESULT_SUCCEEDED(m_webView->setHostWindow(m_window.window()));
</ins><span class="cx"> EXPECT_HRESULT_SUCCEEDED(m_webView->initWithFrame(m_window.clientRect(), 0, 0));
</span><span class="cx">
</span><span class="cx"> COMPtr<IWebViewPrivate> viewPrivate(Query, m_webView);
</span><span class="cx"> ASSERT_NOT_NULL(viewPrivate);
</span><del>- EXPECT_HRESULT_SUCCEEDED(viewPrivate->viewWindow(reinterpret_cast<OLE_HANDLE*>(&m_viewWindow)));
</del><ins>+ EXPECT_HRESULT_SUCCEEDED(viewPrivate->viewWindow(&m_viewWindow));
</ins><span class="cx"> EXPECT_TRUE(::IsWindow(m_viewWindow));
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari6001branchToolsWinLauncherPrintWebUIDelegatecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Tools/WinLauncher/PrintWebUIDelegate.cpp (172985 => 172986)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Tools/WinLauncher/PrintWebUIDelegate.cpp 2014-08-27 00:01:12 UTC (rev 172985)
+++ branches/safari-600.1-branch/Tools/WinLauncher/PrintWebUIDelegate.cpp 2014-08-27 00:01:31 UTC (rev 172986)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2009, 2013 Apple Inc. All Rights Reserved.
</del><ins>+ * Copyright (C) 2009, 2013-2014 Apple Inc. All Rights Reserved.
</ins><span class="cx"> * Copyright (C) 2009 Brent Fulgham. All Rights Reserved.
</span><span class="cx"> * Copyright (C) 2013 Alex Christensen. All Rights Reserved.
</span><span class="cx"> *
</span><span class="lines">@@ -12,7 +12,6 @@
</span><span class="cx"> * notice, this list of conditions and the following disclaimer in the
</span><span class="cx"> * documentation and/or other materials provided with the distribution.
</span><span class="cx"> *
</span><del>- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
</del><span class="cx"> * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
</span><span class="cx"> * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
</span><span class="cx"> * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
</span><span class="lines">@@ -164,10 +163,7 @@
</span><span class="cx"> return S_OK;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-HRESULT PrintWebUIDelegate::drawHeaderInRect(
- /* [in] */ IWebView* webView,
- /* [in] */ RECT* rect,
- /* [in] */ OLE_HANDLE drawingContext)
</del><ins>+HRESULT PrintWebUIDelegate::drawHeaderInRect(IWebView* webView, RECT* rect, ULONG_PTR drawingContext)
</ins><span class="cx"> {
</span><span class="cx"> if (!webView || !rect)
</span><span class="cx"> return E_POINTER;
</span><span class="lines">@@ -196,12 +192,7 @@
</span><span class="cx"> return S_OK;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-HRESULT PrintWebUIDelegate::drawFooterInRect(
- /* [in] */ IWebView* webView,
- /* [in] */ RECT* rect,
- /* [in] */ OLE_HANDLE drawingContext,
- /* [in] */ UINT pageIndex,
- /* [in] */ UINT pageCount)
</del><ins>+HRESULT PrintWebUIDelegate::drawFooterInRect(IWebView* webView, RECT* rect, ULONG_PTR drawingContext, UINT pageIndex, UINT pageCount)
</ins><span class="cx"> {
</span><span class="cx"> if (!webView || !rect)
</span><span class="cx"> return E_POINTER;
</span></span></pre></div>
<a id="branchessafari6001branchToolsWinLauncherPrintWebUIDelegateh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Tools/WinLauncher/PrintWebUIDelegate.h (172985 => 172986)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Tools/WinLauncher/PrintWebUIDelegate.h 2014-08-27 00:01:12 UTC (rev 172985)
+++ branches/safari-600.1-branch/Tools/WinLauncher/PrintWebUIDelegate.h 2014-08-27 00:01:31 UTC (rev 172986)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2009 Apple Inc. All Rights Reserved.
</del><ins>+ * Copyright (C) 2009, 2014 Apple Inc. All Rights Reserved.
</ins><span class="cx"> * Copyright (C) 2009 Brent Fulgham. 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">@@ -43,8 +43,8 @@
</span><span class="cx"> virtual HRESULT STDMETHODCALLTYPE webViewClose(IWebView*) { return E_NOTIMPL; }
</span><span class="cx"> virtual HRESULT STDMETHODCALLTYPE webViewFocus(IWebView*) { return E_NOTIMPL; }
</span><span class="cx"> virtual HRESULT STDMETHODCALLTYPE webViewUnfocus(IWebView*) { return E_NOTIMPL; }
</span><del>- virtual HRESULT STDMETHODCALLTYPE webViewFirstResponder(IWebView*, OLE_HANDLE*) { return E_NOTIMPL; }
- virtual HRESULT STDMETHODCALLTYPE makeFirstResponder(IWebView*, OLE_HANDLE) { return E_NOTIMPL; }
</del><ins>+ virtual HRESULT STDMETHODCALLTYPE webViewFirstResponder(IWebView*, HWND*) { return E_NOTIMPL; }
+ virtual HRESULT STDMETHODCALLTYPE makeFirstResponder(IWebView*, HWND) { return E_NOTIMPL; }
</ins><span class="cx"> virtual HRESULT STDMETHODCALLTYPE setStatusText(IWebView*, BSTR) { return E_NOTIMPL; }
</span><span class="cx"> virtual HRESULT STDMETHODCALLTYPE webViewStatusText(IWebView*, BSTR*) { return E_NOTIMPL; }
</span><span class="cx"> virtual HRESULT STDMETHODCALLTYPE webViewAreToolbarsVisible(IWebView*, BOOL*) { return E_NOTIMPL; }
</span><span class="lines">@@ -63,7 +63,7 @@
</span><span class="cx"> virtual HRESULT STDMETHODCALLTYPE runBeforeUnloadConfirmPanelWithMessage(IWebView*, BSTR, IWebFrame*, BOOL*) { return E_NOTIMPL; }
</span><span class="cx"> virtual HRESULT STDMETHODCALLTYPE runOpenPanelForFileButtonWithResultListener(IWebView*, IWebOpenPanelResultListener*) { return E_NOTIMPL; }
</span><span class="cx"> virtual HRESULT STDMETHODCALLTYPE mouseDidMoveOverElement(IWebView*, IPropertyBag*, UINT) { return E_NOTIMPL; }
</span><del>- virtual HRESULT STDMETHODCALLTYPE contextMenuItemsForElement(IWebView*, IPropertyBag*, OLE_HANDLE, OLE_HANDLE*) { return E_NOTIMPL; }
</del><ins>+ virtual HRESULT STDMETHODCALLTYPE contextMenuItemsForElement(IWebView*, IPropertyBag*, HMENU, HMENU*) { return E_NOTIMPL; }
</ins><span class="cx"> virtual HRESULT STDMETHODCALLTYPE validateUserInterfaceItem(IWebView*, UINT, BOOL, BOOL*) { return E_NOTIMPL; }
</span><span class="cx"> virtual HRESULT STDMETHODCALLTYPE shouldPerformAction(IWebView*, UINT, UINT) { return E_NOTIMPL; }
</span><span class="cx"> virtual HRESULT STDMETHODCALLTYPE dragDestinationActionMaskForDraggingInfo(IWebView*, IDataObject*, WebDragDestinationAction*) { return E_NOTIMPL; }
</span><span class="lines">@@ -72,11 +72,11 @@
</span><span class="cx"> virtual HRESULT STDMETHODCALLTYPE willPerformDragSourceAction(IWebView*, WebDragSourceAction, LPPOINT, IDataObject*, IDataObject**) { return E_NOTIMPL; }
</span><span class="cx"> virtual HRESULT STDMETHODCALLTYPE contextMenuItemSelected(IWebView*, void*, IPropertyBag*) { return E_NOTIMPL; }
</span><span class="cx"> virtual HRESULT STDMETHODCALLTYPE hasCustomMenuImplementation(BOOL*) { return E_NOTIMPL; }
</span><del>- virtual HRESULT STDMETHODCALLTYPE trackCustomPopupMenu(IWebView*, OLE_HANDLE, LPPOINT) { return E_NOTIMPL; }
</del><ins>+ virtual HRESULT STDMETHODCALLTYPE trackCustomPopupMenu(IWebView*, HMENU, LPPOINT) { return E_NOTIMPL; }
</ins><span class="cx"> virtual HRESULT STDMETHODCALLTYPE measureCustomMenuItem(IWebView*, void*) { return E_NOTIMPL; }
</span><span class="cx"> virtual HRESULT STDMETHODCALLTYPE drawCustomMenuItem(IWebView*, void*) { return E_NOTIMPL; }
</span><del>- virtual HRESULT STDMETHODCALLTYPE addCustomMenuDrawingData(IWebView*, OLE_HANDLE) { return E_NOTIMPL; }
- virtual HRESULT STDMETHODCALLTYPE cleanUpCustomMenuDrawingData(IWebView*, OLE_HANDLE) { return E_NOTIMPL; }
</del><ins>+ virtual HRESULT STDMETHODCALLTYPE addCustomMenuDrawingData(IWebView*, HMENU) { return E_NOTIMPL; }
+ virtual HRESULT STDMETHODCALLTYPE cleanUpCustomMenuDrawingData(IWebView*, HMENU) { return E_NOTIMPL; }
</ins><span class="cx"> virtual HRESULT STDMETHODCALLTYPE canTakeFocus(IWebView*, BOOL, BOOL*) { return E_NOTIMPL; }
</span><span class="cx"> virtual HRESULT STDMETHODCALLTYPE takeFocus(IWebView*, BOOL) { return E_NOTIMPL; }
</span><span class="cx"> virtual HRESULT STDMETHODCALLTYPE registerUndoWithTarget(IWebUndoTarget*, BSTR, IUnknown*) { return E_NOTIMPL; }
</span><span class="lines">@@ -90,8 +90,8 @@
</span><span class="cx"> virtual HRESULT STDMETHODCALLTYPE ftpDirectoryTemplatePath(IWebView*, BSTR*) { return E_NOTIMPL; }
</span><span class="cx"> virtual HRESULT STDMETHODCALLTYPE webViewHeaderHeight(IWebView*, float*);
</span><span class="cx"> virtual HRESULT STDMETHODCALLTYPE webViewFooterHeight(IWebView*, float*);
</span><del>- virtual HRESULT STDMETHODCALLTYPE drawHeaderInRect(IWebView*, RECT*, OLE_HANDLE);
- virtual HRESULT STDMETHODCALLTYPE drawFooterInRect(IWebView*, RECT*, OLE_HANDLE, UINT, UINT);
</del><ins>+ virtual HRESULT STDMETHODCALLTYPE drawHeaderInRect(IWebView*, RECT*, ULONG_PTR);
+ virtual HRESULT STDMETHODCALLTYPE drawFooterInRect(IWebView*, RECT*, ULONG_PTR, UINT, UINT);
</ins><span class="cx"> virtual HRESULT STDMETHODCALLTYPE webViewPrintingMarginRect(IWebView*, RECT*);
</span><span class="cx"> virtual HRESULT STDMETHODCALLTYPE canRunModal(IWebView*, BOOL*) { return E_NOTIMPL; }
</span><span class="cx"> virtual HRESULT STDMETHODCALLTYPE createModalDialog(IWebView*, IWebURLRequest*, IWebView**) { return E_NOTIMPL; }
</span></span></pre></div>
<a id="branchessafari6001branchToolsWinLauncherWinLaunchercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Tools/WinLauncher/WinLauncher.cpp (172985 => 172986)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Tools/WinLauncher/WinLauncher.cpp 2014-08-27 00:01:12 UTC (rev 172985)
+++ branches/safari-600.1-branch/Tools/WinLauncher/WinLauncher.cpp 2014-08-27 00:01:31 UTC (rev 172986)
</span><span class="lines">@@ -86,7 +86,7 @@
</span><span class="cx"> if (!m_webView)
</span><span class="cx"> return E_FAIL;
</span><span class="cx">
</span><del>- HRESULT hr = m_webView->setHostWindow(reinterpret_cast<OLE_HANDLE>(mainWnd));
</del><ins>+ HRESULT hr = m_webView->setHostWindow(mainWnd);
</ins><span class="cx"> if (FAILED(hr))
</span><span class="cx"> return hr;
</span><span class="cx">
</span><span class="lines">@@ -111,7 +111,7 @@
</span><span class="cx"> if (FAILED(hr))
</span><span class="cx"> return hr;
</span><span class="cx">
</span><del>- hr = m_webViewPrivate->viewWindow(reinterpret_cast<OLE_HANDLE*>(&viewHwnd));
</del><ins>+ hr = m_webViewPrivate->viewWindow(&viewHwnd);
</ins><span class="cx">
</span><span class="cx"> return hr;
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari6001branchToolsWinLauncherWinLauncherWebHosth"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Tools/WinLauncher/WinLauncherWebHost.h (172985 => 172986)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Tools/WinLauncher/WinLauncherWebHost.h 2014-08-27 00:01:12 UTC (rev 172985)
+++ branches/safari-600.1-branch/Tools/WinLauncher/WinLauncherWebHost.h 2014-08-27 00:01:31 UTC (rev 172986)
</span><span class="lines">@@ -54,7 +54,7 @@
</span><span class="cx">
</span><span class="cx"> virtual HRESULT STDMETHODCALLTYPE didReceiveTitle(IWebView*, BSTR title, IWebFrame*) { return S_OK; }
</span><span class="cx"> virtual HRESULT STDMETHODCALLTYPE didChangeIcons(IWebView*, IWebFrame*) { return S_OK; }
</span><del>- virtual HRESULT STDMETHODCALLTYPE didReceiveIcon(IWebView*, OLE_HANDLE hBitmap, IWebFrame*) { return S_OK; }
</del><ins>+ virtual HRESULT STDMETHODCALLTYPE didReceiveIcon(IWebView*, HBITMAP, IWebFrame*) { return S_OK; }
</ins><span class="cx"> virtual HRESULT STDMETHODCALLTYPE didFinishLoadForFrame(IWebView*, IWebFrame*);
</span><span class="cx"> virtual HRESULT STDMETHODCALLTYPE didFailLoadWithError(IWebView*, IWebError*, IWebFrame*) { return S_OK; }
</span><span class="cx"> virtual HRESULT STDMETHODCALLTYPE didChangeLocationWithinPageForFrame(IWebView*, IWebFrame*) { return S_OK; }
</span></span></pre>
</div>
</div>
</body>
</html>