Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(473)

Side by Side Diff: third_party/WebKit/WebCore/wml/WMLGoElement.cpp

Issue 21165: Revert the merge. Mac build is mysteriously broken. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 11 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 /** 1 /**
2 * Copyright (C) 2008 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/) 2 * Copyright (C) 2008 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/)
3 * 3 *
4 * This library is free software; you can redistribute it and/or 4 * This library is free software; you can redistribute it and/or
5 * modify it under the terms of the GNU Library General Public 5 * modify it under the terms of the GNU Library General Public
6 * License as published by the Free Software Foundation; either 6 * License as published by the Free Software Foundation; either
7 * version 2 of the License, or (at your option) any later version. 7 * version 2 of the License, or (at your option) any later version.
8 * 8 *
9 * This library is distributed in the hope that it will be useful, 9 * This library is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after
124 prepareGETRequest(request, url); 124 prepareGETRequest(request, url);
125 125
126 // Set HTTP cache-control header if needed 126 // Set HTTP cache-control header if needed
127 if (!cacheControl.isEmpty()) { 127 if (!cacheControl.isEmpty()) {
128 request.setHTTPHeaderField("cache-control", cacheControl); 128 request.setHTTPHeaderField("cache-control", cacheControl);
129 129
130 if (cacheControl == "no-cache") 130 if (cacheControl == "no-cache")
131 request.setCachePolicy(ReloadIgnoringCacheData); 131 request.setCachePolicy(ReloadIgnoringCacheData);
132 } 132 }
133 133
134 loader->load(request, false); 134 loader->load(request);
135 } 135 }
136 136
137 void WMLGoElement::preparePOSTRequest(ResourceRequest& request, bool inSameDeck, const String& cacheControl) 137 void WMLGoElement::preparePOSTRequest(ResourceRequest& request, bool inSameDeck, const String& cacheControl)
138 { 138 {
139 request.setHTTPMethod("POST"); 139 request.setHTTPMethod("POST");
140 140
141 if (inSameDeck && cacheControl != "no-cache") { 141 if (inSameDeck && cacheControl != "no-cache") {
142 request.setCachePolicy(ReturnCacheDataDontLoad); 142 request.setCachePolicy(ReturnCacheDataDontLoad);
143 return; 143 return;
144 } 144 }
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
205 if (m_formDataBuilder.isMultiPartForm()) 205 if (m_formDataBuilder.isMultiPartForm())
206 m_formDataBuilder.addBoundaryToMultiPartHeader(encodedData, boundary, tr ue); 206 m_formDataBuilder.addBoundaryToMultiPartHeader(encodedData, boundary, tr ue);
207 207
208 result->appendData(encodedData.data(), encodedData.size()); 208 result->appendData(encodedData.data(), encodedData.size());
209 return result; 209 return result;
210 } 210 }
211 211
212 } 212 }
213 213
214 #endif 214 #endif
OLDNEW
« no previous file with comments | « third_party/WebKit/WebCore/svg/SVGElementInstance.h ('k') | third_party/WebKit/WebCore/xml/XPathExpression.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698