Retrieve resources from media and supports query rules while serializing

Source/core/page/PageSerializer.cpp

 /*
  * Copyright (C) 2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 19 matching lines @@
 
 #include "config.h"
 #include "core/page/PageSerializer.h"
 
 #include "core/HTMLNames.h"
 #include "core/InputTypeNames.h"
 #include "core/css/CSSFontFaceRule.h"
 #include "core/css/CSSFontFaceSrcValue.h"
 #include "core/css/CSSImageValue.h"
 #include "core/css/CSSImportRule.h"
+#include "core/css/CSSRuleList.h"
 #include "core/css/CSSStyleDeclaration.h"
 #include "core/css/CSSStyleRule.h"
 #include "core/css/CSSValueList.h"
 #include "core/css/StylePropertySet.h"
 #include "core/css/StyleRule.h"
 #include "core/css/StyleSheetContents.h"
 #include "core/dom/Document.h"
 #include "core/dom/Element.h"
 #include "core/dom/Text.h"
 #include "core/editing/MarkupAccumulator.h"
@@ skipping 245 matching lines @@
 {
     StringBuilder cssText;
     for (unsigned i = 0; i < styleSheet.length(); ++i) {
         CSSRule* rule = styleSheet.item(i);
         String itemText = rule->cssText();
         if (!itemText.isEmpty()) {
             cssText.append(itemText);
             if (i < styleSheet.length() - 1)
                 cssText.appendLiteral("\n\n");
         }
-        ASSERT(styleSheet.ownerDocument());
-        Document& document = *styleSheet.ownerDocument();
+
         // Some rules have resources associated with them that we need to retrieve.
-        if (rule->type() == CSSRule::IMPORT_RULE) {
-            CSSImportRule* importRule = toCSSImportRule(rule);
-            ASSERT(styleSheet.baseURL().isValid());
-            KURL importURL = KURL(styleSheet.baseURL(), importRule->href());
-            if (m_resourceURLs.contains(importURL))
-                continue;
-            if (importRule->styleSheet())
-                serializeCSSStyleSheet(*importRule->styleSheet(), importURL);
-        } else if (rule->type() == CSSRule::FONT_FACE_RULE) {
-            retrieveResourcesForProperties(&toCSSFontFaceRule(rule)->styleRule()->properties(), document);
-        } else if (rule->type() == CSSRule::STYLE_RULE) {
-            retrieveResourcesForProperties(&toCSSStyleRule(rule)->styleRule()->properties(), document);
-        }
+        serializeCSSRule(rule);
     }
 
     if (url.isValid() && !m_resourceURLs.contains(url)) {
         // FIXME: We should check whether a charset has been specified and if none was found add one.
         WTF::TextEncoding textEncoding(styleSheet.contents()->charset());
         ASSERT(textEncoding.isValid());
         String textString = cssText.toString();
         CString text = textEncoding.normalizeAndEncode(textString, WTF::EntitiesForUnencodables);
         m_resources->append(SerializedResource(url, String("text/css"), SharedBuffer::create(text.data(), text.length())));
         m_resourceURLs.add(url);
     }
 }
 
+void PageSerializer::serializeCSSRule(CSSRule* rule)
+{
+    ASSERT(rule->parentStyleSheet()->ownerDocument());
+    Document& document = *rule->parentStyleSheet()->ownerDocument();
+
+    switch (rule->type()) {
+    case CSSRule::STYLE_RULE:
+        retrieveResourcesForProperties(&toCSSStyleRule(rule)->styleRule()->properties(), document);
+        break;
+
+    case CSSRule::IMPORT_RULE: {
+        CSSImportRule* importRule = toCSSImportRule(rule);
+        KURL sheetBaseURL = rule->parentStyleSheet()->baseURL();
+        ASSERT(sheetBaseURL.isValid());
+        KURL importURL = KURL(sheetBaseURL, importRule->href());
+        if (m_resourceURLs.contains(importURL))
+            break;
+        if (importRule->styleSheet())
+            serializeCSSStyleSheet(*importRule->styleSheet(), importURL);
+        break;
+    }
+
+    // Rules inheriting CSSGroupingRule
+    case CSSRule::MEDIA_RULE:
+    case CSSRule::SUPPORTS_RULE: {

[philipj_slow, 2015/06/25 09:07:40]

Good find with @supports

+        CSSRuleList* ruleList = rule->cssRules();
+        for (unsigned i = 0; i < ruleList->length(); ++i)
+            serializeCSSRule(ruleList->item(i));
+        break;
+    }
+
+    case CSSRule::FONT_FACE_RULE:
+        retrieveResourcesForProperties(&toCSSFontFaceRule(rule)->styleRule()->properties(), document);
+        break;
+
+    // Rules in which no external resources can be referenced
+    case CSSRule::CHARSET_RULE:
+    case CSSRule::PAGE_RULE:
+    case CSSRule::KEYFRAMES_RULE:
+    case CSSRule::KEYFRAME_RULE:
+    case CSSRule::VIEWPORT_RULE:
+        break;

[philipj_slow, 2015/06/25 09:07:40]

I guess also an ASSERT_NOT_REACH in a default branch so that we're not only
relying on the compiler warning about missing cases.

+    }
+}
+
 bool PageSerializer::shouldAddURL(const KURL& url)
 {
     return url.isValid() && !m_resourceURLs.contains(url) && !url.protocolIsData();
 }
 
 void PageSerializer::addToResources(Resource* resource, PassRefPtr<SharedBuffer> data, const KURL& url)
 {
     if (!data) {
         WTF_LOG_ERROR("No data for resource %s", url.string().utf8().data());
         return;
@@ skipping 79 matching lines @@
 
     return fakeURL;
 }
 
 PageSerializer::Delegate* PageSerializer::delegate()
 {
     return m_delegate.get();
 }
 
 } // namespace blink