Hello playmobil,
I'd like you to do a code review. Please execute
g4 diff -c 13075882
or point your web browser to
http://mondrian/13075882
to review the following code:
Change 13075882 by nigel...@nigeltao-srcmacgears1 on 2009/10/09 15:59:59
*pending*
Make Safari respect the explicit Content-Type passsed to
resourceStore.captureBlob.
PRESUBMIT=passed
R=playmobil
[email protected]
DELTA=11 (4 added, 4 deleted, 3 changed)
OCL=13075882
Affected files ...
...
//depot/googleclient/gears/opensource/gears/localserver/safari/localserver_db_proxy.mm#8
edit
...
//depot/googleclient/gears/opensource/gears/test/testcases/localserver_tests.js#13
edit
11 delta lines: 4 added, 4 deleted, 3 changed
Also consider running:
g4 lint -c 13075882
which verifies that the changelist doesn't introduce new style violations.
If you can't do the review, please let me know as soon as possible. During
your review, please ensure that all new code has corresponding unit tests and
that existing unit tests are updated appropriately. Visit
http://www/eng/code_review.html for more information.
This is a semiautomated message from "g4 mail". Complaints or suggestions?
Mail [email protected].
Change 13075882 by nigel...@nigeltao-srcmacgears1 on 2009/10/09 15:59:59
*pending*
Make Safari respect the explicit Content-Type passsed to
resourceStore.captureBlob.
OCL=13075882
Affected files ...
...
//depot/googleclient/gears/opensource/gears/localserver/safari/localserver_db_proxy.mm#8
edit
...
//depot/googleclient/gears/opensource/gears/test/testcases/localserver_tests.js#13
edit
====
//depot/googleclient/gears/opensource/gears/localserver/safari/localserver_db_proxy.mm#8
-
/Users/nigeltao/devel/srcmacgears1/googleclient/gears/opensource/gears/localserver/safari/localserver_db_proxy.mm
====
# action=edit type=text
---
googleclient/gears/opensource/gears/localserver/safari/localserver_db_proxy.mm
2009-10-09 15:33:11.000000000 +1100
+++
googleclient/gears/opensource/gears/localserver/safari/localserver_db_proxy.mm
2009-10-09 15:52:15.000000000 +1100
@@ -112,10 +112,14 @@
std::string16 header16;
if (payload.GetHeader(HttpConstants::kXGearsSafariCapturedMimeType,
- &header16))
+ &header16)) {
*mimeType = [NSString stringWithString16:header16.c_str()];
- else
+ } else if (payload.GetHeader(HttpConstants::kContentTypeHeader,
+ &header16)) {
+ *mimeType = [NSString stringWithString16:header16.c_str()];
+ } else {
*mimeType = nil;
+ }
*statusCode = payload.status_code;
NSMutableDictionary *ret_headers = nil;
====
//depot/googleclient/gears/opensource/gears/test/testcases/localserver_tests.js#13
-
/Users/nigeltao/devel/srcmacgears1/googleclient/gears/opensource/gears/test/testcases/localserver_tests.js
====
# action=edit type=text
--- googleclient/gears/opensource/gears/test/testcases/localserver_tests.js
2009-10-09 15:53:55.000000000 +1100
+++ googleclient/gears/opensource/gears/test/testcases/localserver_tests.js
2009-10-09 15:53:45.000000000 +1100
@@ -358,11 +358,7 @@
httpGetAsRequest(captureUrl, function(request2) {
assertBlobProbablyEqual(responseBlob, request2.responseBlob);
- if (!isSafari) {
- // When http://code.google.com/p/gears/issues/detail?id=782 is fixed,
- // this test should be peformed for safari too.
- assertEqual(contentType, request2.getResponseHeader('Content-Type'));
- }
+ assertEqual(contentType, request2.getResponseHeader('Content-Type'));
completeAsync();
});
});
