<!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>[52677] trunk</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/52677">52677</a></dd>
<dt>Author</dt> <dd>eric@webkit.org</dd>
<dt>Date</dt> <dd>2009-12-30 20:58:54 -0800 (Wed, 30 Dec 2009)</dd>
</dl>

<h3>Log Message</h3>
<pre>2009-12-30  Darin Fisher  &lt;darin@chromium.org&gt;

        Reviewed by David Levin.

        [Chromium] Delete ResourceRequest::securityInfo
        https://bugs.webkit.org/show_bug.cgi?id=26847

        * src/WebWorkerBase.cpp:
        (WebKit::WebWorkerBase::initializeLoader):
2009-12-30  Darin Fisher  &lt;darin@chromium.org&gt;

        Reviewed by David Levin.

        [Chromium] Delete ResourceRequest::securityInfo
        https://bugs.webkit.org/show_bug.cgi?id=26847

        * platform/network/chromium/ResourceRequest.h:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkWebCoreChangeLog">trunk/WebCore/ChangeLog</a></li>
<li><a href="#trunkWebCoreplatformnetworkchromiumResourceRequesth">trunk/WebCore/platform/network/chromium/ResourceRequest.h</a></li>
<li><a href="#trunkWebKitchromiumChangeLog">trunk/WebKit/chromium/ChangeLog</a></li>
<li><a href="#trunkWebKitchromiumsrcWebWorkerBasecpp">trunk/WebKit/chromium/src/WebWorkerBase.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/ChangeLog (52676 => 52677)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/ChangeLog        2009-12-31 00:12:15 UTC (rev 52676)
+++ trunk/WebCore/ChangeLog        2009-12-31 04:58:54 UTC (rev 52677)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2009-12-30  Darin Fisher  &lt;darin@chromium.org&gt;
+
+        Reviewed by David Levin.
+
+        [Chromium] Delete ResourceRequest::securityInfo
+        https://bugs.webkit.org/show_bug.cgi?id=26847
+
+        * platform/network/chromium/ResourceRequest.h:
+
</ins><span class="cx"> 2009-12-30  Dimitri Glazkov  &lt;dglazkov@chromium.org&gt;
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Adam Barth.
</span></span></pre></div>
<a id="trunkWebCoreplatformnetworkchromiumResourceRequesth"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/platform/network/chromium/ResourceRequest.h (52676 => 52677)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/platform/network/chromium/ResourceRequest.h        2009-12-31 00:12:15 UTC (rev 52676)
+++ trunk/WebCore/platform/network/chromium/ResourceRequest.h        2009-12-31 04:58:54 UTC (rev 52677)
</span><span class="lines">@@ -28,7 +28,6 @@
</span><span class="cx"> #ifndef ResourceRequest_h
</span><span class="cx"> #define ResourceRequest_h
</span><span class="cx"> 
</span><del>-#include &quot;CString.h&quot;
</del><span class="cx"> #include &quot;ResourceRequestBase.h&quot;
</span><span class="cx"> 
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -45,15 +44,6 @@
</span><span class="cx">         {
</span><span class="cx">         }
</span><span class="cx"> 
</span><del>-        ResourceRequest(const KURL&amp; url, const CString&amp; securityInfo) 
-            : ResourceRequestBase(url, UseProtocolCachePolicy)
-            , m_requestorID(0)
-            , m_requestorProcessID(0)
-            , m_appCacheHostID(0)
-            , m_securityInfo(securityInfo)
-        {
-        }
-
</del><span class="cx">         ResourceRequest(const KURL&amp; url) 
</span><span class="cx">             : ResourceRequestBase(url, UseProtocolCachePolicy)
</span><span class="cx">             , m_requestorID(0)
</span><span class="lines">@@ -94,15 +84,6 @@
</span><span class="cx">         int appCacheHostID() const { return m_appCacheHostID; }
</span><span class="cx">         void setAppCacheHostID(int id) { m_appCacheHostID = id; }
</span><span class="cx"> 
</span><del>-        // Opaque buffer that describes the security state (including SSL
-        // connection state) for the resource that should be reported when the
-        // resource has been loaded.  This is used to simulate secure
-        // connection for request (typically when showing error page, so the
-        // error page has the errors of the page that actually failed).  Empty
-        // string if not a secure connection.
-        CString securityInfo() const { return m_securityInfo; }
-        void setSecurityInfo(const CString&amp; value) { m_securityInfo = value; }
-
</del><span class="cx">     private:
</span><span class="cx">         friend class ResourceRequestBase;
</span><span class="cx"> 
</span><span class="lines">@@ -112,7 +93,6 @@
</span><span class="cx">         int m_requestorID;
</span><span class="cx">         int m_requestorProcessID;
</span><span class="cx">         int m_appCacheHostID;
</span><del>-        CString m_securityInfo;
</del><span class="cx">     };
</span><span class="cx"> 
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkWebKitchromiumChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebKit/chromium/ChangeLog (52676 => 52677)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/chromium/ChangeLog        2009-12-31 00:12:15 UTC (rev 52676)
+++ trunk/WebKit/chromium/ChangeLog        2009-12-31 04:58:54 UTC (rev 52677)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2009-12-30  Darin Fisher  &lt;darin@chromium.org&gt;
+
+        Reviewed by David Levin.
+
+        [Chromium] Delete ResourceRequest::securityInfo
+        https://bugs.webkit.org/show_bug.cgi?id=26847
+
+        * src/WebWorkerBase.cpp:
+        (WebKit::WebWorkerBase::initializeLoader):
+
</ins><span class="cx"> 2009-12-30  Albert J. Wong  &lt;ajwong@chromium.org&gt;
</span><span class="cx"> 
</span><span class="cx">         Not reviewed.  Trivial Chromium build fix.
</span></span></pre></div>
<a id="trunkWebKitchromiumsrcWebWorkerBasecpp"></a>
<div class="modfile"><h4>Modified: trunk/WebKit/chromium/src/WebWorkerBase.cpp (52676 => 52677)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/chromium/src/WebWorkerBase.cpp        2009-12-31 00:12:15 UTC (rev 52676)
+++ trunk/WebKit/chromium/src/WebWorkerBase.cpp        2009-12-31 04:58:54 UTC (rev 52677)
</span><span class="lines">@@ -132,8 +132,7 @@
</span><span class="cx">     int len = static_cast&lt;int&gt;(content.length());
</span><span class="cx">     RefPtr&lt;SharedBuffer&gt; buf(SharedBuffer::create(content.data(), len));
</span><span class="cx">     SubstituteData substData(buf, String(&quot;text/html&quot;), String(&quot;UTF-8&quot;), KURL());
</span><del>-    ResourceRequest request(url, CString());
-    webFrame-&gt;frame()-&gt;loader()-&gt;load(request, substData, false);
</del><ins>+    webFrame-&gt;frame()-&gt;loader()-&gt;load(ResourceRequest(url), substData, false);
</ins><span class="cx"> 
</span><span class="cx">     // This document will be used as 'loading context' for the worker.
</span><span class="cx">     m_loadingDocument = webFrame-&gt;frame()-&gt;document();
</span></span></pre>
</div>
</div>

</body>
</html>