| Index: third_party/WebKit/Source/web/tests/FrameSerializerTest.cpp
|
| diff --git a/third_party/WebKit/Source/web/tests/FrameSerializerTest.cpp b/third_party/WebKit/Source/web/tests/FrameSerializerTest.cpp
|
| index ed5a1335ce325f48e202737bed9fac3eb0d07d91..469a791d84fb198f4083e080eadaa4ffa46cecde 100644
|
| --- a/third_party/WebKit/Source/web/tests/FrameSerializerTest.cpp
|
| +++ b/third_party/WebKit/Source/web/tests/FrameSerializerTest.cpp
|
| @@ -105,6 +105,10 @@ class FrameSerializerTest : public testing::Test,
|
| m_rewriteURLs.add(fromURL, toURL);
|
| }
|
|
|
| + void registerSkipURL(const char* url) {
|
| + m_skipURLs.append(KURL(m_baseUrl, url));
|
| + }
|
| +
|
| void serialize(const char* url) {
|
| FrameTestHelpers::loadFrame(m_helper.webView()->mainFrame(),
|
| KURL(m_baseUrl, url).getString().utf8().data());
|
| @@ -171,11 +175,16 @@ class FrameSerializerTest : public testing::Test,
|
| return true;
|
| }
|
|
|
| + bool shouldSkipResourceWithURL(const KURL& url) {
|
| + return m_skipURLs.contains(url);
|
| + }
|
| +
|
| FrameTestHelpers::WebViewHelper m_helper;
|
| WebString m_folder;
|
| KURL m_baseUrl;
|
| Vector<SerializedResource> m_resources;
|
| HashMap<String, String> m_rewriteURLs;
|
| + Vector<String> m_skipURLs;
|
| String m_rewriteFolder;
|
| };
|
|
|
| @@ -336,11 +345,15 @@ TEST_F(FrameSerializerTest, CSS) {
|
| registerURL("ul-dot.png", "image.png", "image/png");
|
| registerURL("ol-dot.png", "image.png", "image/png");
|
|
|
| + registerURL("included_in_another_frame.css", "text/css");
|
| + registerSkipURL("included_in_another_frame.css");
|
| +
|
| serialize("css_test_page.html");
|
|
|
| EXPECT_EQ(15U, getResources().size());
|
|
|
| EXPECT_FALSE(isSerialized("do_not_serialize.png", "image/png"));
|
| + EXPECT_FALSE(isSerialized("included_in_another_frame.css", "text/css"));
|
|
|
| EXPECT_TRUE(isSerialized("css_test_page.html", "text/html"));
|
| EXPECT_TRUE(isSerialized("link_styles.css", "text/css"));
|
|
|