<!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>[170025] trunk/Source</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/170025">170025</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-06-16 13:33:46 -0700 (Mon, 16 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Change ResourceRequestBase::addHTTPHeaderFields to setHTTPHeaderFields instead
https://bugs.webkit.org/show_bug.cgi?id=133925
Reviewed by Sam Weinig.
Source/WebCore:
* WebCore.exp.in:
* platform/network/ResourceRequestBase.cpp:
(WebCore::ResourceRequestBase::setHTTPHeaderFields):
(WebCore::ResourceRequestBase::addHTTPHeaderFields): Deleted.
* platform/network/ResourceRequestBase.h:
* plugins/PluginView.cpp:
(WebCore::PluginView::handlePost):
* xml/XMLHttpRequest.cpp:
(WebCore::XMLHttpRequest::createRequest):
Source/WebKit2:
* PluginProcess/PluginControllerProxy.h:
* Shared/WebCoreArgumentCoders.cpp:
(IPC::ArgumentCoder<ResourceRequest>::decode):
* WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp:
(WebKit::NPN_PostURL):
* WebProcess/Plugins/PluginView.cpp:
(WebKit::PluginView::loadURL):
* WebProcess/Plugins/PluginView.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreWebCoreexpin">trunk/Source/WebCore/WebCore.exp.in</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkResourceRequestBasecpp">trunk/Source/WebCore/platform/network/ResourceRequestBase.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkResourceRequestBaseh">trunk/Source/WebCore/platform/network/ResourceRequestBase.h</a></li>
<li><a href="#trunkSourceWebCorepluginsPluginViewcpp">trunk/Source/WebCore/plugins/PluginView.cpp</a></li>
<li><a href="#trunkSourceWebCorexmlXMLHttpRequestcpp">trunk/Source/WebCore/xml/XMLHttpRequest.cpp</a></li>
<li><a href="#trunkSourceWebKitwinWebMutableURLRequestcpp">trunk/Source/WebKit/win/WebMutableURLRequest.cpp</a></li>
<li><a href="#trunkSourceWebKitwinWebMutableURLRequesth">trunk/Source/WebKit/win/WebMutableURLRequest.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2PluginProcessPluginControllerProxyh">trunk/Source/WebKit2/PluginProcess/PluginControllerProxy.h</a></li>
<li><a href="#trunkSourceWebKit2SharedWebCoreArgumentCoderscpp">trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessPluginsNetscapeNetscapeBrowserFuncscpp">trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessPluginsPluginViewcpp">trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessPluginsPluginViewh">trunk/Source/WebKit2/WebProcess/Plugins/PluginView.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (170024 => 170025)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-06-16 19:52:21 UTC (rev 170024)
+++ trunk/Source/WebCore/ChangeLog 2014-06-16 20:33:46 UTC (rev 170025)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2014-06-15 Anders Carlsson <andersca@apple.com>
+
+ Change ResourceRequestBase::addHTTPHeaderFields to setHTTPHeaderFields instead
+ https://bugs.webkit.org/show_bug.cgi?id=133925
+
+ Reviewed by Sam Weinig.
+
+ * WebCore.exp.in:
+ * platform/network/ResourceRequestBase.cpp:
+ (WebCore::ResourceRequestBase::setHTTPHeaderFields):
+ (WebCore::ResourceRequestBase::addHTTPHeaderFields): Deleted.
+ * platform/network/ResourceRequestBase.h:
+ * plugins/PluginView.cpp:
+ (WebCore::PluginView::handlePost):
+ * xml/XMLHttpRequest.cpp:
+ (WebCore::XMLHttpRequest::createRequest):
+
</ins><span class="cx"> 2014-06-16 Jeongeun Kim <je_julie.kim@samsung.com>
</span><span class="cx">
</span><span class="cx"> Use references instead of pointers to RenderBlock in RenderObject::enclosingBox().
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCoreexpin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.exp.in (170024 => 170025)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.exp.in 2014-06-16 19:52:21 UTC (rev 170024)
+++ trunk/Source/WebCore/WebCore.exp.in 2014-06-16 20:33:46 UTC (rev 170025)
</span><span class="lines">@@ -818,7 +818,7 @@
</span><span class="cx"> __ZN7WebCore19ResourceRequestBase11setHTTPBodyEN3WTF10PassRefPtrINS_8FormDataEEE
</span><span class="cx"> __ZN7WebCore19ResourceRequestBase13setHTTPMethodERKN3WTF6StringE
</span><span class="cx"> __ZN7WebCore19ResourceRequestBase15setHTTPReferrerERKN3WTF6StringE
</span><del>-__ZN7WebCore19ResourceRequestBase19addHTTPHeaderFieldsERKNS_13HTTPHeaderMapE
</del><ins>+__ZN7WebCore19ResourceRequestBase19setHTTPHeaderFieldsENS_13HTTPHeaderMapE
</ins><span class="cx"> __ZN7WebCore19ResourceRequestBase22defaultTimeoutIntervalEv
</span><span class="cx"> __ZN7WebCore19ResourceRequestBase24s_defaultTimeoutIntervalE
</span><span class="cx"> __ZN7WebCore19ResourceRequestBase25setDefaultTimeoutIntervalEd
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkResourceRequestBasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/ResourceRequestBase.cpp (170024 => 170025)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/ResourceRequestBase.cpp 2014-06-16 19:52:21 UTC (rev 170024)
+++ trunk/Source/WebCore/platform/network/ResourceRequestBase.cpp 2014-06-16 20:33:46 UTC (rev 170025)
</span><span class="lines">@@ -463,10 +463,14 @@
</span><span class="cx"> m_platformRequestUpdated = false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ResourceRequestBase::addHTTPHeaderFields(const HTTPHeaderMap& headerFields)
</del><ins>+void ResourceRequestBase::setHTTPHeaderFields(HTTPHeaderMap headerFields)
</ins><span class="cx"> {
</span><del>- for (const auto& header : headerFields)
- addHTTPHeaderField(header.key, header.value);
</del><ins>+ updateResourceRequest();
+
+ m_httpHeaderFields = std::move(headerFields);
+
+ if (url().protocolIsInHTTPFamily())
+ m_platformRequestUpdated = false;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool equalIgnoringHeaderFields(const ResourceRequestBase& a, const ResourceRequestBase& b)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkResourceRequestBaseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/ResourceRequestBase.h (170024 => 170025)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/ResourceRequestBase.h 2014-06-16 19:52:21 UTC (rev 170024)
+++ trunk/Source/WebCore/platform/network/ResourceRequestBase.h 2014-06-16 20:33:46 UTC (rev 170025)
</span><span class="lines">@@ -80,16 +80,18 @@
</span><span class="cx"> void setHTTPMethod(const String& httpMethod);
</span><span class="cx">
</span><span class="cx"> const HTTPHeaderMap& httpHeaderFields() const;
</span><ins>+ void setHTTPHeaderFields(HTTPHeaderMap);
+
</ins><span class="cx"> String httpHeaderField(const AtomicString& name) const;
</span><span class="cx"> String httpHeaderField(HTTPHeaderName) const;
</span><span class="cx"> void setHTTPHeaderField(const AtomicString& name, const String& value);
</span><span class="cx"> void setHTTPHeaderField(HTTPHeaderName, const String& value);
</span><span class="cx"> void addHTTPHeaderField(const AtomicString& name, const String& value);
</span><del>- void addHTTPHeaderFields(const HTTPHeaderMap& headerFields);
</del><span class="cx">
</span><span class="cx"> // Instead of passing a string literal to any of these functions, just use a HTTPHeaderName instead.
</span><span class="cx"> template<size_t length> String httpHeaderField(const char (&)[length]) const = delete;
</span><span class="cx"> template<size_t length> void setHTTPHeaderField(const char (&)[length], const String&) = delete;
</span><ins>+ template<size_t length> void addHTTPHeaderField(const char (&)[length], const String&) = delete;
</ins><span class="cx">
</span><span class="cx"> void clearHTTPAuthorization();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepluginsPluginViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/plugins/PluginView.cpp (170024 => 170025)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/plugins/PluginView.cpp 2014-06-16 19:52:21 UTC (rev 170024)
+++ trunk/Source/WebCore/plugins/PluginView.cpp 2014-06-16 20:33:46 UTC (rev 170025)
</span><span class="lines">@@ -1176,7 +1176,7 @@
</span><span class="cx">
</span><span class="cx"> frameLoadRequest.resourceRequest().setHTTPMethod("POST");
</span><span class="cx"> frameLoadRequest.resourceRequest().setURL(makeURL(m_parentFrame->document()->baseURL(), url));
</span><del>- frameLoadRequest.resourceRequest().addHTTPHeaderFields(headerFields);
</del><ins>+ frameLoadRequest.resourceRequest().setHTTPHeaderFields(std::move(headerFields));
</ins><span class="cx"> frameLoadRequest.resourceRequest().setHTTPBody(FormData::create(postData, postDataLength));
</span><span class="cx"> frameLoadRequest.setFrameName(target);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorexmlXMLHttpRequestcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/xml/XMLHttpRequest.cpp (170024 => 170025)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/xml/XMLHttpRequest.cpp 2014-06-16 19:52:21 UTC (rev 170024)
+++ trunk/Source/WebCore/xml/XMLHttpRequest.cpp 2014-06-16 20:33:46 UTC (rev 170025)
</span><span class="lines">@@ -753,7 +753,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!m_requestHeaders.isEmpty())
</span><del>- request.addHTTPHeaderFields(m_requestHeaders);
</del><ins>+ request.setHTTPHeaderFields(m_requestHeaders);
</ins><span class="cx">
</span><span class="cx"> ThreadableLoaderOptions options;
</span><span class="cx"> options.sendLoadCallbacks = SendCallbacks;
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebMutableURLRequestcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebMutableURLRequest.cpp (170024 => 170025)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebMutableURLRequest.cpp 2014-06-16 19:52:21 UTC (rev 170024)
+++ trunk/Source/WebKit/win/WebMutableURLRequest.cpp 2014-06-16 20:33:46 UTC (rev 170025)
</span><span class="lines">@@ -411,11 +411,6 @@
</span><span class="cx"> return m_request.httpBody();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebMutableURLRequest::addHTTPHeaderFields(const HTTPHeaderMap& headerFields)
-{
- m_request.addHTTPHeaderFields(headerFields);
-}
-
</del><span class="cx"> const HTTPHeaderMap& WebMutableURLRequest::httpHeaderFields() const
</span><span class="cx"> {
</span><span class="cx"> return m_request.httpHeaderFields();
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebMutableURLRequesth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebMutableURLRequest.h (170024 => 170025)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebMutableURLRequest.h 2014-06-16 19:52:21 UTC (rev 170024)
+++ trunk/Source/WebKit/win/WebMutableURLRequest.h 2014-06-16 20:33:46 UTC (rev 170025)
</span><span class="lines">@@ -164,7 +164,6 @@
</span><span class="cx"> void setFormData(const PassRefPtr<WebCore::FormData> data);
</span><span class="cx"> const PassRefPtr<WebCore::FormData> formData() const;
</span><span class="cx">
</span><del>- void addHTTPHeaderFields(const WebCore::HTTPHeaderMap& headerFields);
</del><span class="cx"> const WebCore::HTTPHeaderMap& httpHeaderFields() const;
</span><span class="cx">
</span><span class="cx"> const WebCore::ResourceRequest& resourceRequest() const;
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (170024 => 170025)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-06-16 19:52:21 UTC (rev 170024)
+++ trunk/Source/WebKit2/ChangeLog 2014-06-16 20:33:46 UTC (rev 170025)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2014-06-15 Anders Carlsson <andersca@apple.com>
+
+ Change ResourceRequestBase::addHTTPHeaderFields to setHTTPHeaderFields instead
+ https://bugs.webkit.org/show_bug.cgi?id=133925
+
+ Reviewed by Sam Weinig.
+
+ * PluginProcess/PluginControllerProxy.h:
+ * Shared/WebCoreArgumentCoders.cpp:
+ (IPC::ArgumentCoder<ResourceRequest>::decode):
+ * WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp:
+ (WebKit::NPN_PostURL):
+ * WebProcess/Plugins/PluginView.cpp:
+ (WebKit::PluginView::loadURL):
+ * WebProcess/Plugins/PluginView.h:
+
</ins><span class="cx"> 2014-06-16 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Add HTTPHeaderName overloads on ResourceResponseBase
</span></span></pre></div>
<a id="trunkSourceWebKit2PluginProcessPluginControllerProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/PluginProcess/PluginControllerProxy.h (170024 => 170025)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/PluginProcess/PluginControllerProxy.h 2014-06-16 19:52:21 UTC (rev 170024)
+++ trunk/Source/WebKit2/PluginProcess/PluginControllerProxy.h 2014-06-16 20:33:46 UTC (rev 170025)
</span><span class="lines">@@ -82,19 +82,19 @@
</span><span class="cx"> void paint();
</span><span class="cx">
</span><span class="cx"> // PluginController
</span><del>- virtual bool isPluginVisible();
- virtual void invalidate(const WebCore::IntRect&);
- virtual String userAgent();
- virtual void loadURL(uint64_t requestID, const String& method, const String& urlString, const String& target, const WebCore::HTTPHeaderMap& headerFields, const Vector<uint8_t>& httpBody, bool allowPopups);
- virtual void cancelStreamLoad(uint64_t streamID);
- virtual void cancelManualStreamLoad();
- virtual NPObject* windowScriptNPObject();
- virtual NPObject* pluginElementNPObject();
- virtual bool evaluate(NPObject*, const String& scriptString, NPVariant* result, bool allowPopups);
- virtual void setStatusbarText(const String&);
- virtual bool isAcceleratedCompositingEnabled();
- virtual void pluginProcessCrashed();
- virtual void willSendEventToPlugin();
</del><ins>+ virtual bool isPluginVisible() override;
+ virtual void invalidate(const WebCore::IntRect&) override;
+ virtual String userAgent() override;
+ virtual void loadURL(uint64_t requestID, const String& method, const String& urlString, const String& target, const WebCore::HTTPHeaderMap& headerFields, const Vector<uint8_t>& httpBody, bool allowPopups) override;
+ virtual void cancelStreamLoad(uint64_t streamID) override;
+ virtual void cancelManualStreamLoad() override;
+ virtual NPObject* windowScriptNPObject() override;
+ virtual NPObject* pluginElementNPObject() override;
+ virtual bool evaluate(NPObject*, const String& scriptString, NPVariant* result, bool allowPopups) override;
+ virtual void setStatusbarText(const String&) override;
+ virtual bool isAcceleratedCompositingEnabled() override;
+ virtual void pluginProcessCrashed() override;
+ virtual void willSendEventToPlugin() override;
</ins><span class="cx"> virtual void didInitializePlugin() override;
</span><span class="cx"> virtual void didFailToInitializePlugin() override;
</span><span class="cx">
</span><span class="lines">@@ -105,17 +105,17 @@
</span><span class="cx"> virtual void openPluginPreferencePane() override;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- virtual float contentsScaleFactor();
- virtual String proxiesForURL(const String&);
- virtual String cookiesForURL(const String&);
- virtual void setCookiesForURL(const String& urlString, const String& cookieString);
- virtual bool isPrivateBrowsingEnabled();
- virtual bool getAuthenticationInfo(const WebCore::ProtectionSpace&, String& username, String& password);
- virtual void protectPluginFromDestruction();
- virtual void unprotectPluginFromDestruction();
</del><ins>+ virtual float contentsScaleFactor() override;
+ virtual String proxiesForURL(const String&) override;
+ virtual String cookiesForURL(const String&) override;
+ virtual void setCookiesForURL(const String& urlString, const String& cookieString) override;
+ virtual bool isPrivateBrowsingEnabled() override;
+ virtual bool getAuthenticationInfo(const WebCore::ProtectionSpace&, String& username, String& password) override;
+ virtual void protectPluginFromDestruction() override;
+ virtual void unprotectPluginFromDestruction() override;
</ins><span class="cx"> #if PLUGIN_ARCHITECTURE(X11)
</span><del>- virtual uint64_t createPluginContainer();
- virtual void windowedPluginGeometryDidChange(const WebCore::IntRect& frameRect, const WebCore::IntRect& clipRect, uint64_t windowID);
</del><ins>+ virtual uint64_t createPluginContainer() override;
+ virtual void windowedPluginGeometryDidChange(const WebCore::IntRect& frameRect, const WebCore::IntRect& clipRect, uint64_t windowID) override;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> // Message handlers.
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebCoreArgumentCoderscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.cpp (170024 => 170025)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.cpp 2014-06-16 19:52:21 UTC (rev 170024)
+++ trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.cpp 2014-06-16 20:33:46 UTC (rev 170025)
</span><span class="lines">@@ -699,7 +699,7 @@
</span><span class="cx"> HTTPHeaderMap headers;
</span><span class="cx"> if (!decoder.decode(headers))
</span><span class="cx"> return false;
</span><del>- request.addHTTPHeaderFields(headers);
</del><ins>+ request.setHTTPHeaderFields(std::move(headers));
</ins><span class="cx">
</span><span class="cx"> bool hasHTTPBody;
</span><span class="cx"> if (!decoder.decode(hasHTTPBody))
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessPluginsNetscapeNetscapeBrowserFuncscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp (170024 => 170025)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp 2014-06-16 19:52:21 UTC (rev 170024)
+++ trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp 2014-06-16 20:33:46 UTC (rev 170025)
</span><span class="lines">@@ -299,7 +299,7 @@
</span><span class="cx"> return error;
</span><span class="cx">
</span><span class="cx"> RefPtr<NetscapePlugin> plugin = NetscapePlugin::fromNPP(npp);
</span><del>- plugin->loadURL("POST", makeURLString(url), target, headerFields, postData, false, 0);
</del><ins>+ plugin->loadURL("POST", makeURLString(url), target, std::move(headerFields), postData, false, 0);
</ins><span class="cx"> return NPERR_NO_ERROR;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessPluginsPluginViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp (170024 => 170025)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp 2014-06-16 19:52:21 UTC (rev 170024)
+++ trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp 2014-06-16 20:33:46 UTC (rev 170025)
</span><span class="lines">@@ -1330,13 +1330,12 @@
</span><span class="cx"> return frame->loader().client().userAgent(URL());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void PluginView::loadURL(uint64_t requestID, const String& method, const String& urlString, const String& target,
- const HTTPHeaderMap& headerFields, const Vector<uint8_t>& httpBody, bool allowPopups)
</del><ins>+void PluginView::loadURL(uint64_t requestID, const String& method, const String& urlString, const String& target, const HTTPHeaderMap& headerFields, const Vector<uint8_t>& httpBody, bool allowPopups)
</ins><span class="cx"> {
</span><span class="cx"> FrameLoadRequest frameLoadRequest(m_pluginElement->document().securityOrigin());
</span><span class="cx"> frameLoadRequest.resourceRequest().setHTTPMethod(method);
</span><span class="cx"> frameLoadRequest.resourceRequest().setURL(m_pluginElement->document().completeURL(urlString));
</span><del>- frameLoadRequest.resourceRequest().addHTTPHeaderFields(headerFields);
</del><ins>+ frameLoadRequest.resourceRequest().setHTTPHeaderFields(headerFields);
</ins><span class="cx"> frameLoadRequest.resourceRequest().setHTTPBody(FormData::create(httpBody.data(), httpBody.size()));
</span><span class="cx"> frameLoadRequest.setFrameName(target);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessPluginsPluginViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Plugins/PluginView.h (170024 => 170025)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Plugins/PluginView.h 2014-06-16 19:52:21 UTC (rev 170024)
+++ trunk/Source/WebKit2/WebProcess/Plugins/PluginView.h 2014-06-16 20:33:46 UTC (rev 170025)
</span><span class="lines">@@ -147,84 +147,83 @@
</span><span class="cx">
</span><span class="cx"> // WebCore::PluginViewBase
</span><span class="cx"> #if PLATFORM(COCOA)
</span><del>- virtual PlatformLayer* platformLayer() const;
</del><ins>+ virtual PlatformLayer* platformLayer() const override;
</ins><span class="cx"> #endif
</span><del>- virtual JSC::JSObject* scriptObject(JSC::JSGlobalObject*);
- virtual void storageBlockingStateChanged();
- virtual void privateBrowsingStateChanged(bool);
- virtual bool getFormValue(String&);
- virtual bool scroll(WebCore::ScrollDirection, WebCore::ScrollGranularity);
- virtual WebCore::Scrollbar* horizontalScrollbar();
- virtual WebCore::Scrollbar* verticalScrollbar();
- virtual bool wantsWheelEvents();
</del><ins>+ virtual JSC::JSObject* scriptObject(JSC::JSGlobalObject*) override;
+ virtual void storageBlockingStateChanged() override;
+ virtual void privateBrowsingStateChanged(bool) override;
+ virtual bool getFormValue(String&) override;
+ virtual bool scroll(WebCore::ScrollDirection, WebCore::ScrollGranularity) override;
+ virtual WebCore::Scrollbar* horizontalScrollbar() override;
+ virtual WebCore::Scrollbar* verticalScrollbar() override;
+ virtual bool wantsWheelEvents() override;
</ins><span class="cx"> virtual bool shouldAlwaysAutoStart() const override;
</span><span class="cx"> virtual void beginSnapshottingRunningPlugin() override;
</span><span class="cx"> virtual bool shouldAllowNavigationFromDrags() const override;
</span><span class="cx"> virtual bool shouldNotAddLayer() const override;
</span><span class="cx">
</span><span class="cx"> // WebCore::Widget
</span><del>- virtual void setFrameRect(const WebCore::IntRect&);
- virtual void paint(WebCore::GraphicsContext*, const WebCore::IntRect&);
- virtual void invalidateRect(const WebCore::IntRect&);
- virtual void setFocus(bool);
- virtual void frameRectsChanged();
- virtual void setParent(WebCore::ScrollView*);
- virtual void handleEvent(WebCore::Event*);
- virtual void notifyWidget(WebCore::WidgetNotification);
- virtual void show();
- virtual void hide();
- virtual bool transformsAffectFrameRect();
</del><ins>+ virtual void setFrameRect(const WebCore::IntRect&) override;
+ virtual void paint(WebCore::GraphicsContext*, const WebCore::IntRect&) override;
+ virtual void invalidateRect(const WebCore::IntRect&) override;
+ virtual void setFocus(bool) override;
+ virtual void frameRectsChanged() override;
+ virtual void setParent(WebCore::ScrollView*) override;
+ virtual void handleEvent(WebCore::Event*) override;
+ virtual void notifyWidget(WebCore::WidgetNotification) override;
+ virtual void show() override;
+ virtual void hide() override;
+ virtual bool transformsAffectFrameRect() override;
</ins><span class="cx"> virtual void clipRectChanged() override;
</span><span class="cx">
</span><span class="cx"> // WebCore::MediaCanStartListener
</span><del>- virtual void mediaCanStart();
</del><ins>+ virtual void mediaCanStart() override;
</ins><span class="cx">
</span><span class="cx"> // PluginController
</span><del>- virtual bool isPluginVisible();
- virtual void invalidate(const WebCore::IntRect&);
- virtual String userAgent();
- virtual void loadURL(uint64_t requestID, const String& method, const String& urlString, const String& target,
- const WebCore::HTTPHeaderMap& headerFields, const Vector<uint8_t>& httpBody, bool allowPopups);
- virtual void cancelStreamLoad(uint64_t streamID);
- virtual void cancelManualStreamLoad();
</del><ins>+ virtual bool isPluginVisible() override;
+ virtual void invalidate(const WebCore::IntRect&) override;
+ virtual String userAgent() override;
+ virtual void loadURL(uint64_t requestID, const String& method, const String& urlString, const String& target, const WebCore::HTTPHeaderMap& headerFields, const Vector<uint8_t>& httpBody, bool allowPopups) override;
+ virtual void cancelStreamLoad(uint64_t streamID) override;
+ virtual void cancelManualStreamLoad() override;
</ins><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span><del>- virtual NPObject* windowScriptNPObject();
- virtual NPObject* pluginElementNPObject();
- virtual bool evaluate(NPObject*, const String&scriptString, NPVariant* result, bool allowPopups);
</del><ins>+ virtual NPObject* windowScriptNPObject() override;
+ virtual NPObject* pluginElementNPObject() override;
+ virtual bool evaluate(NPObject*, const String& scriptString, NPVariant* result, bool allowPopups) override;
</ins><span class="cx"> #endif
</span><del>- virtual void setStatusbarText(const String&);
- virtual bool isAcceleratedCompositingEnabled();
- virtual void pluginProcessCrashed();
- virtual void willSendEventToPlugin();
</del><ins>+ virtual void setStatusbarText(const String&) override;
+ virtual bool isAcceleratedCompositingEnabled() override;
+ virtual void pluginProcessCrashed() override;
+ virtual void willSendEventToPlugin() override;
</ins><span class="cx"> #if PLATFORM(COCOA)
</span><del>- virtual void pluginFocusOrWindowFocusChanged(bool pluginHasFocusAndWindowHasFocus);
- virtual void setComplexTextInputState(PluginComplexTextInputState);
- virtual mach_port_t compositingRenderServerPort();
</del><ins>+ virtual void pluginFocusOrWindowFocusChanged(bool pluginHasFocusAndWindowHasFocus) override;
+ virtual void setComplexTextInputState(PluginComplexTextInputState) override;
+ virtual mach_port_t compositingRenderServerPort() override;
</ins><span class="cx"> virtual void openPluginPreferencePane() override;
</span><span class="cx"> #endif
</span><del>- virtual float contentsScaleFactor();
- virtual String proxiesForURL(const String&);
- virtual String cookiesForURL(const String&);
- virtual void setCookiesForURL(const String& urlString, const String& cookieString);
- virtual bool getAuthenticationInfo(const WebCore::ProtectionSpace&, String& username, String& password);
- virtual bool isPrivateBrowsingEnabled();
- virtual bool asynchronousPluginInitializationEnabled() const;
- virtual bool asynchronousPluginInitializationEnabledForAllPlugins() const;
- virtual bool artificialPluginInitializationDelayEnabled() const;
- virtual void protectPluginFromDestruction();
- virtual void unprotectPluginFromDestruction();
</del><ins>+ virtual float contentsScaleFactor() override;
+ virtual String proxiesForURL(const String&) override;
+ virtual String cookiesForURL(const String&) override;
+ virtual void setCookiesForURL(const String& urlString, const String& cookieString) override;
+ virtual bool getAuthenticationInfo(const WebCore::ProtectionSpace&, String& username, String& password) override;
+ virtual bool isPrivateBrowsingEnabled() override;
+ virtual bool asynchronousPluginInitializationEnabled() const override;
+ virtual bool asynchronousPluginInitializationEnabledForAllPlugins() const override;
+ virtual bool artificialPluginInitializationDelayEnabled() const override;
+ virtual void protectPluginFromDestruction() override;
+ virtual void unprotectPluginFromDestruction() override;
</ins><span class="cx"> #if PLUGIN_ARCHITECTURE(X11)
</span><del>- virtual uint64_t createPluginContainer();
- virtual void windowedPluginGeometryDidChange(const WebCore::IntRect& frameRect, const WebCore::IntRect& clipRect, uint64_t windowID);
</del><ins>+ virtual uint64_t createPluginContainer() override;
+ virtual void windowedPluginGeometryDidChange(const WebCore::IntRect& frameRect, const WebCore::IntRect& clipRect, uint64_t windowID) override;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><del>- virtual void didInitializePlugin();
- virtual void didFailToInitializePlugin();
</del><ins>+ virtual void didInitializePlugin() override;
+ virtual void didFailToInitializePlugin() override;
</ins><span class="cx"> void destroyPluginAndReset();
</span><span class="cx">
</span><span class="cx"> // WebFrame::LoadListener
</span><del>- virtual void didFinishLoad(WebFrame*);
- virtual void didFailLoad(WebFrame*, bool wasCancelled);
</del><ins>+ virtual void didFinishLoad(WebFrame*) override;
+ virtual void didFailLoad(WebFrame*, bool wasCancelled) override;
</ins><span class="cx">
</span><span class="cx"> std::unique_ptr<WebEvent> createWebEvent(WebCore::MouseEvent*) const;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>