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

Side by Side Diff: chrome/common/render_messages.h

Issue 27168: IPC messages and changes to ResourceLoaderBridge to support resource loading for media (Closed)
Patch Set: add mac/linux build and fixed unit test failures Created 11 years, 9 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
« no previous file with comments | « chrome/chrome.gyp ('k') | chrome/common/render_messages_internal.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 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 #ifndef CHROME_COMMON_RENDER_MESSAGES_H_ 5 #ifndef CHROME_COMMON_RENDER_MESSAGES_H_
6 #define CHROME_COMMON_RENDER_MESSAGES_H_ 6 #define CHROME_COMMON_RENDER_MESSAGES_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 #include <map> 10 #include <map>
(...skipping 359 matching lines...) Expand 10 before | Expand all | Expand 10 after
370 break; 370 break;
371 case ResourceType::SUB_FRAME: 371 case ResourceType::SUB_FRAME:
372 type = L"SUB_FRAME"; 372 type = L"SUB_FRAME";
373 break; 373 break;
374 case ResourceType::SUB_RESOURCE: 374 case ResourceType::SUB_RESOURCE:
375 type = L"SUB_RESOURCE"; 375 type = L"SUB_RESOURCE";
376 break; 376 break;
377 case ResourceType::OBJECT: 377 case ResourceType::OBJECT:
378 type = L"OBJECT"; 378 type = L"OBJECT";
379 break; 379 break;
380 case ResourceType::MEDIA:
381 type = L"MEDIA";
382 break;
380 default: 383 default:
381 type = L"UNKNOWN"; 384 type = L"UNKNOWN";
382 break; 385 break;
383 } 386 }
384 387
385 LogParam(type, l); 388 LogParam(type, l);
386 } 389 }
387 }; 390 };
388 391
389 template <> 392 template <>
(...skipping 937 matching lines...) Expand 10 before | Expand all | Expand 10 after
1327 } 1330 }
1328 }; 1331 };
1329 1332
1330 template <> 1333 template <>
1331 struct ParamTraits<ResourceResponseHead> { 1334 struct ParamTraits<ResourceResponseHead> {
1332 typedef ResourceResponseHead param_type; 1335 typedef ResourceResponseHead param_type;
1333 static void Write(Message* m, const param_type& p) { 1336 static void Write(Message* m, const param_type& p) {
1334 ParamTraits<webkit_glue::ResourceLoaderBridge::ResponseInfo>::Write(m, p); 1337 ParamTraits<webkit_glue::ResourceLoaderBridge::ResponseInfo>::Write(m, p);
1335 WriteParam(m, p.status); 1338 WriteParam(m, p.status);
1336 WriteParam(m, p.filter_policy); 1339 WriteParam(m, p.filter_policy);
1340 WriteParam(m, p.response_data_file);
1337 } 1341 }
1338 static bool Read(const Message* m, void** iter, param_type* r) { 1342 static bool Read(const Message* m, void** iter, param_type* r) {
1339 return 1343 return
1340 ParamTraits<webkit_glue::ResourceLoaderBridge::ResponseInfo>::Read(m, 1344 ParamTraits<webkit_glue::ResourceLoaderBridge::ResponseInfo>::Read(m,
1341 iter, 1345 iter,
1342 r) && 1346 r) &&
1343 ReadParam(m, iter, &r->status) && 1347 ReadParam(m, iter, &r->status) &&
1344 ReadParam(m, iter, &r->filter_policy); 1348 ReadParam(m, iter, &r->filter_policy) &&
1349 ReadParam(m, iter, &r->response_data_file);
1345 } 1350 }
1346 static void Log(const param_type& p, std::wstring* l) { 1351 static void Log(const param_type& p, std::wstring* l) {
1347 // log more? 1352 // log more?
1348 ParamTraits<webkit_glue::ResourceLoaderBridge::ResponseInfo>::Log(p, l); 1353 ParamTraits<webkit_glue::ResourceLoaderBridge::ResponseInfo>::Log(p, l);
1349 } 1354 }
1350 }; 1355 };
1351 1356
1352 template <> 1357 template <>
1353 struct ParamTraits<SyncLoadResult> { 1358 struct ParamTraits<SyncLoadResult> {
1354 typedef SyncLoadResult param_type; 1359 typedef SyncLoadResult param_type;
(...skipping 394 matching lines...) Expand 10 before | Expand all | Expand 10 after
1749 }; 1754 };
1750 1755
1751 1756
1752 } // namespace IPC 1757 } // namespace IPC
1753 1758
1754 1759
1755 #define MESSAGES_INTERNAL_FILE "chrome/common/render_messages_internal.h" 1760 #define MESSAGES_INTERNAL_FILE "chrome/common/render_messages_internal.h"
1756 #include "chrome/common/ipc_message_macros.h" 1761 #include "chrome/common/ipc_message_macros.h"
1757 1762
1758 #endif // CHROME_COMMON_RENDER_MESSAGES_H_ 1763 #endif // CHROME_COMMON_RENDER_MESSAGES_H_
OLDNEW
« no previous file with comments | « chrome/chrome.gyp ('k') | chrome/common/render_messages_internal.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698