| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2013 Google Inc. All rights reserved. | 2 * Copyright (C) 2013 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 | 5 * modification, are permitted provided that the following conditions |
| 6 * are met: | 6 * are met: |
| 7 * | 7 * |
| 8 * 1. Redistributions of source code must retain the above copyright | 8 * 1. 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 * 2. Redistributions in binary form must reproduce the above copyright | 10 * 2. Redistributions in binary form must reproduce the above copyright |
| (...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 73 virtual void TearDown() | 73 virtual void TearDown() |
| 74 { | 74 { |
| 75 Platform::current()->unitTestSupport()->unregisterAllMockedURLs(); | 75 Platform::current()->unitTestSupport()->unregisterAllMockedURLs(); |
| 76 m_webViewImpl->close(); | 76 m_webViewImpl->close(); |
| 77 m_mainFrame->close(); | 77 m_mainFrame->close(); |
| 78 } | 78 } |
| 79 | 79 |
| 80 void navigateTo(const std::string& url) | 80 void navigateTo(const std::string& url) |
| 81 { | 81 { |
| 82 FrameTestHelpers::loadFrame(m_webViewImpl->mainFrame(), url); | 82 FrameTestHelpers::loadFrame(m_webViewImpl->mainFrame(), url); |
| 83 Platform::current()->unitTestSupport()->serveAsynchronousMockedRequests(
); |
| 83 } | 84 } |
| 84 | 85 |
| 85 void registerMockedHttpURLLoad(const std::string& fileName) | 86 void registerMockedHttpURLLoad(const std::string& fileName) |
| 86 { | 87 { |
| 87 URLTestHelpers::registerMockedURLFromBaseURL(WebString::fromUTF8(m_baseU
RL.c_str()), WebString::fromUTF8(fileName.c_str())); | 88 URLTestHelpers::registerMockedURLFromBaseURL(WebString::fromUTF8(m_baseU
RL.c_str()), WebString::fromUTF8(fileName.c_str())); |
| 88 } | 89 } |
| 89 | 90 |
| 90 protected: | 91 protected: |
| 91 std::string m_baseURL; | 92 std::string m_baseURL; |
| 92 MockWebFrameClient m_mockWebFrameClient; | 93 MockWebFrameClient m_mockWebFrameClient; |
| (...skipping 16 matching lines...) Expand all Loading... |
| 109 | 110 |
| 110 layerElement = document->getElementById("layer-solid-color"); | 111 layerElement = document->getElementById("layer-solid-color"); |
| 111 renderer = toRenderLayerModelObject(layerElement->renderer()); | 112 renderer = toRenderLayerModelObject(layerElement->renderer()); |
| 112 // CompositedLayerMapping::graphicsLayer's background color is unset if Soli
dColorLayer is created. | 113 // CompositedLayerMapping::graphicsLayer's background color is unset if Soli
dColorLayer is created. |
| 113 EXPECT_EQ(Color(), renderer->layer()->compositedLayerMapping()->mainGraphics
Layer()->backgroundColor()); | 114 EXPECT_EQ(Color(), renderer->layer()->compositedLayerMapping()->mainGraphics
Layer()->backgroundColor()); |
| 114 } | 115 } |
| 115 | 116 |
| 116 } | 117 } |
| 117 | 118 |
| 118 } // namespace WebCore | 119 } // namespace WebCore |
| OLD | NEW |