OLD | NEW |
1 // Copyright (c) 2006-2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2009 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "base/gfx/rect.h" | 5 #include "base/gfx/rect.h" |
6 #include "base/logging.h" | 6 #include "base/logging.h" |
7 #include "base/message_loop.h" | 7 #include "base/message_loop.h" |
8 #include "base/string_util.h" | 8 #include "base/string_util.h" |
| 9 #include "base/utf_string_conversions.h" |
9 #include "net/base/escape.h" | 10 #include "net/base/escape.h" |
10 #include "skia/ext/platform_canvas.h" | 11 #include "skia/ext/platform_canvas.h" |
11 #include "webkit/api/public/WebConsoleMessage.h" | 12 #include "webkit/api/public/WebConsoleMessage.h" |
12 #include "webkit/api/public/WebCString.h" | 13 #include "webkit/api/public/WebCString.h" |
13 #include "webkit/api/public/WebCursorInfo.h" | 14 #include "webkit/api/public/WebCursorInfo.h" |
14 #include "webkit/api/public/WebData.h" | 15 #include "webkit/api/public/WebData.h" |
15 #include "webkit/api/public/WebFrame.h" | 16 #include "webkit/api/public/WebFrame.h" |
16 #include "webkit/api/public/WebHTTPBody.h" | 17 #include "webkit/api/public/WebHTTPBody.h" |
17 #include "webkit/api/public/WebHTTPHeaderVisitor.h" | 18 #include "webkit/api/public/WebHTTPHeaderVisitor.h" |
18 #include "webkit/api/public/WebInputEvent.h" | 19 #include "webkit/api/public/WebInputEvent.h" |
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
143 | 144 |
144 std::string GetAllHeaders(const WebURLResponse& response) { | 145 std::string GetAllHeaders(const WebURLResponse& response) { |
145 // TODO(darin): It is possible for httpStatusText to be empty and still have | 146 // TODO(darin): It is possible for httpStatusText to be empty and still have |
146 // an interesting response, so this check seems wrong. | 147 // an interesting response, so this check seems wrong. |
147 std::string result; | 148 std::string result; |
148 const WebString& status = response.httpStatusText(); | 149 const WebString& status = response.httpStatusText(); |
149 if (status.isEmpty()) | 150 if (status.isEmpty()) |
150 return result; | 151 return result; |
151 | 152 |
152 // TODO(darin): Shouldn't we also report HTTP version numbers? | 153 // TODO(darin): Shouldn't we also report HTTP version numbers? |
153 result.append("HTTP "); | 154 result = StringPrintf("HTTP %d ", response.httpStatusCode()); |
154 result.append(WideToUTF8(FormatNumber(response.httpStatusCode()))); | |
155 result.append(" "); | |
156 result.append(status.utf8()); | 155 result.append(status.utf8()); |
157 result.append("\n"); | 156 result.append("\n"); |
158 | 157 |
159 HeaderFlattener flattener(&result); | 158 HeaderFlattener flattener(&result); |
160 response.visitHTTPHeaderFields(&flattener); | 159 response.visitHTTPHeaderFields(&flattener); |
161 | 160 |
162 return result; | 161 return result; |
163 } | 162 } |
164 | 163 |
165 struct ResponseInfo { | 164 struct ResponseInfo { |
(...skipping 888 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1054 client_index = clients_.erase(client_index); | 1053 client_index = clients_.erase(client_index); |
1055 } | 1054 } |
1056 | 1055 |
1057 // This needs to be called now and not in the destructor since the | 1056 // This needs to be called now and not in the destructor since the |
1058 // webframe_ might not be valid anymore. | 1057 // webframe_ might not be valid anymore. |
1059 webframe_ = NULL; | 1058 webframe_ = NULL; |
1060 method_factory_.RevokeAll(); | 1059 method_factory_.RevokeAll(); |
1061 } | 1060 } |
1062 | 1061 |
1063 } // namespace webkit_glue | 1062 } // namespace webkit_glue |
OLD | NEW |