OLD | NEW |
---|---|
1 /* | 1 /* |
2 * Copyright (C) 2012 Google Inc. All rights reserved. | 2 * Copyright (C) 2012 Google Inc. All rights reserved. |
3 * | 3 * |
4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
6 * met: | 6 * met: |
7 * | 7 * |
8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
46 registerMockedURLLoad(toKURL(fullString.c_str()), fileName, WebString::fromU TF8(""), mimeType); | 46 registerMockedURLLoad(toKURL(fullString.c_str()), fileName, WebString::fromU TF8(""), mimeType); |
47 } | 47 } |
48 | 48 |
49 void registerMockedURLLoad(const WebURL& fullURL, const WebString& fileName, con st WebString& mimeType) | 49 void registerMockedURLLoad(const WebURL& fullURL, const WebString& fileName, con st WebString& mimeType) |
50 { | 50 { |
51 registerMockedURLLoad(fullURL, fileName, WebString::fromUTF8(""), mimeType); | 51 registerMockedURLLoad(fullURL, fileName, WebString::fromUTF8(""), mimeType); |
52 } | 52 } |
53 | 53 |
54 void registerMockedURLLoad(const WebURL& fullURL, const WebString& fileName, con st WebString& relativeBaseDirectory, const WebString& mimeType) | 54 void registerMockedURLLoad(const WebURL& fullURL, const WebString& fileName, con st WebString& relativeBaseDirectory, const WebString& mimeType) |
55 { | 55 { |
56 WebURLResponse response; | 56 WebURLResponse response(fullURL); |
Mikhail
2014/08/29 12:49:18
is this change Manifest-related?
mlamouri (slow - plz ping)
2014/09/01 19:23:50
It's needed for the cors check. It was part of htt
| |
57 response.initialize(); | |
58 response.setMIMEType(mimeType); | 57 response.setMIMEType(mimeType); |
59 response.setHTTPStatusCode(200); | 58 response.setHTTPStatusCode(200); |
60 | 59 |
61 // Physical file path for the mock = <webkitRootDir> + relativeBaseDirectory + fileName. | 60 // Physical file path for the mock = <webkitRootDir> + relativeBaseDirectory + fileName. |
62 std::string filePath = std::string(Platform::current()->unitTestSupport()->w ebKitRootDir().utf8().data()); | 61 std::string filePath = std::string(Platform::current()->unitTestSupport()->w ebKitRootDir().utf8().data()); |
63 filePath.append("/Source/web/tests/data/"); | 62 filePath.append("/Source/web/tests/data/"); |
64 filePath.append(std::string(relativeBaseDirectory.utf8().data())); | 63 filePath.append(std::string(relativeBaseDirectory.utf8().data())); |
65 filePath.append(std::string(fileName.utf8().data())); | 64 filePath.append(std::string(fileName.utf8().data())); |
66 | 65 |
67 Platform::current()->unitTestSupport()->registerMockedURL(fullURL, response, WebString::fromUTF8(filePath.c_str())); | 66 Platform::current()->unitTestSupport()->registerMockedURL(fullURL, response, WebString::fromUTF8(filePath.c_str())); |
68 } | 67 } |
69 | 68 |
70 } // namespace URLTestHelpers | 69 } // namespace URLTestHelpers |
71 } // namespace blink | 70 } // namespace blink |
OLD | NEW |