Use a separate setting for CSS font inlining threshold (with a larger default),

since current for-Chrome CSS produced by fonts.g.c is quite large.

Addresses https://code.google.com/p/modpagespeed/issues/detail?id=1040

Author: morlovich

src/net/instaweb/automatic/system_tests/inliners.sh

@@ -5,19 +5,25 @@ fetch_until $URL 'grep -c <style' 3
 # restrictions on external connections
 if [ -z ${DISABLE_FONT_API_TESTS:-} ]; then
   test_filter inline_google_font_css Can inline Google Font API loader CSS
-  fetch_until $URL 'grep -c @font-face' 1
+  # Use a more recent version of Chrome UA than our default, which will get
+  # a very large (which hit our previous default size limits) CSS using woff2
+  WGETRC_OLD=$WGETRC
+  export WGETRC=$TESTTMP/wgetrc-chrome
+  cat > $WGETRC <<EOF
+user_agent =Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/40.0.2214.45 Safari/537.36
+EOF
+
+  fetch_until $URL 'grep -c @font-face' 7
 
-  # By default we use a Chrome UA, so it should get woff
   OUT=$($WGET_DUMP $URL)
-  check_from "$OUT" fgrep -qi "format('woff')"
+  check_from "$OUT" fgrep -qi "format('woff2')"
   check_not_from "$OUT" fgrep -qi "format('truetype')"
   check_not_from "$OUT" fgrep -qi "format('embedded-opentype')"
   check_not_from "$OUT" fgrep -qi ".ttf"
   check_not_from "$OUT" fgrep -qi ".eot"
 
   # Now try with IE6 user-agent. We do this with setting WGETRC due to
   # quoting madness
-  WGETRC_OLD=$WGETRC
   export WGETRC=$TESTTMP/wgetrc-ie
   cat > $WGETRC <<EOF
 user_agent = Mozilla/4.0 (compatible; MSIE 6.01; Windows NT 6.0)

src/net/instaweb/rewriter/google_font_css_inline_filter.cc

@@ -32,6 +32,8 @@ namespace net_instaweb {
 GoogleFontCssInlineFilter::GoogleFontCssInlineFilter(RewriteDriver* driver)
     : CssInlineFilter(driver) {
   set_id(RewriteOptions::kGoogleFontCssInlineId);
+  set_size_threshold_bytes(
+      driver->options()->google_font_css_inline_max_bytes());
   driver->AddResourceUrlClaimant(
       NewPermanentCallback(
           this, &GoogleFontCssInlineFilter::CheckIfFontServiceUrl));

src/net/instaweb/rewriter/google_font_css_inline_filter_test.cc

@@ -127,10 +127,11 @@ class GoogleFontCssInlineFilterSizeLimitTest
  protected:
   virtual void SetUp() {
     GoogleFontCssInlineFilterTestBase::SetUp();
-    // GoogleFontCssInlineFilter honors css_inline_max_bytes.
+    // GoogleFontCssInlineFilter uses google_font_css_inline_max_bytes.
     // Set a threshold at font_safieri, which should prevent longer
     // font_chromezilla from inlining.
-    options()->set_css_inline_max_bytes(STATIC_STRLEN("font_safieri"));
+    options()->set_google_font_css_inline_max_bytes(
+        STATIC_STRLEN("font_safieri"));
     SetUpForFontFilterTest(RewriteOptions::kInlineGoogleFontCss);
   }
 };

src/net/instaweb/rewriter/public/css_inline_filter.h

@@ -21,6 +21,7 @@
 
 #include <cstddef>
 
+#include "net/instaweb/rewriter/cached_result.pb.h"
 #include "net/instaweb/rewriter/public/common_filter.h"
 #include "net/instaweb/rewriter/public/css_tag_scanner.h"
 #include "net/instaweb/rewriter/public/resource.h"
@@ -29,13 +30,12 @@
 #include "pagespeed/kernel/base/basictypes.h"
 #include "pagespeed/kernel/base/string.h"
 #include "pagespeed/kernel/base/string_util.h"
+#include "pagespeed/kernel/html/html_element.h"
+#include "pagespeed/kernel/http/google_url.h"
 #include "pagespeed/kernel/http/semantic_type.h"
 
 namespace net_instaweb {
 
-class CachedResult;
-class GoogleUrl;
-class HtmlElement;
 class Statistics;
 class Variable;
 
@@ -75,6 +75,8 @@ class CssInlineFilter : public CommonFilter {
   // for semantics.
   virtual ResourcePtr CreateResource(const char* url, bool* is_authorized);
 
+  void set_size_threshold_bytes(size_t size) { size_threshold_bytes_ = size; }
+
  private:
   class Context;
   friend class Context;
@@ -87,7 +89,7 @@ class CssInlineFilter : public CommonFilter {
                     HtmlElement* element);
 
   const char* id_;  // filter ID code.
-  const size_t size_threshold_bytes_;
+  size_t size_threshold_bytes_;
 
   GoogleString domain_;
   CssTagScanner css_tag_scanner_;

src/net/instaweb/rewriter/public/rewrite_options.h

@@ -266,6 +266,7 @@ class RewriteOptions {
   static const char kFlushBufferLimitBytes[];
   static const char kFlushHtml[];
   static const char kFlushMoreResourcesEarlyIfTimePermits[];
+  static const char kGoogleFontCssInlineMaxBytes[];
   static const char kForbidAllDisabledFilters[];
   static const char kHideRefererUsingMeta[];
   static const char kIdleFlushTimeMs[];
@@ -620,6 +621,7 @@ class RewriteOptions {
   static const int64 kDefaultCssImageInlineMaxBytes;
   static const int64 kDefaultCssInlineMaxBytes;
   static const int64 kDefaultCssOutlineMinBytes;
+  static const int64 kDefaultGoogleFontCssInlineMaxBytes;
   static const int64 kDefaultImageInlineMaxBytes;
   static const int64 kDefaultJsInlineMaxBytes;
   static const int64 kDefaultJsOutlineMinBytes;
@@ -1347,6 +1349,12 @@ class RewriteOptions {
   void set_css_inline_max_bytes(int64 x) {
     set_option(x, &css_inline_max_bytes_);
   }
+  int64 google_font_css_inline_max_bytes() const {
+    return google_font_css_inline_max_bytes_.value();
+  }
+  void set_google_font_css_inline_max_bytes(int64 x) {
+    set_option(x, &google_font_css_inline_max_bytes_);
+  }
   int64 js_inline_max_bytes() const { return js_inline_max_bytes_.value(); }
   void set_js_inline_max_bytes(int64 x) {
     set_option(x, &js_inline_max_bytes_);
@@ -3454,6 +3462,7 @@ class RewriteOptions {
   Option<int64> css_image_inline_max_bytes_;
   Option<int64> css_inline_max_bytes_;
   Option<int64> css_outline_min_bytes_;
+  Option<int64> google_font_css_inline_max_bytes_;
 
   // Preserve URL options
   Option<bool> css_preserve_urls_;

src/net/instaweb/rewriter/rewrite_options.cc

@@ -138,6 +138,8 @@ const char RewriteOptions::kFlushMoreResourcesEarlyIfTimePermits[] =
     "FlushMoreResourcesEarlyIfTimePermits";
 const char RewriteOptions::kForbidAllDisabledFilters[] =
     "ForbidAllDisabledFilters";
+const char RewriteOptions::kGoogleFontCssInlineMaxBytes[] =
+    "GoogleFontCssInlineMaxBytes";
 const char RewriteOptions::kHideRefererUsingMeta[] = "HideRefererUsingMeta";
 const char RewriteOptions::kIdleFlushTimeMs[] = "IdleFlushTimeMs";
 const char RewriteOptions::kImageInlineMaxBytes[] = "ImageInlineMaxBytes";
@@ -412,6 +414,8 @@ const int64 RewriteOptions::kDefaultCssInlineMaxBytes = 2048;
 const int64 RewriteOptions::kDefaultCssFlattenMaxBytes = 1024000;
 const int64 RewriteOptions::kDefaultCssImageInlineMaxBytes = 0;
 const int64 RewriteOptions::kDefaultCssOutlineMinBytes = 3000;
+// 3K is bigger than Roboto loader for Chrome (2.2k)
+const int64 RewriteOptions::kDefaultGoogleFontCssInlineMaxBytes = 3 * 1024;
 const int64 RewriteOptions::kDefaultImageInlineMaxBytes = 3072;
 const int64 RewriteOptions::kDefaultJsInlineMaxBytes = 2048;
 const int64 RewriteOptions::kDefaultJsOutlineMinBytes = 3000;
@@ -1221,6 +1225,13 @@ void RewriteOptions::AddProperties() {
       kCssInlineMaxBytes,
       kQueryScope,
       "Number of bytes below which stylesheets will be inlined.", true);
+  AddBaseProperty(
+      kDefaultGoogleFontCssInlineMaxBytes,
+      &RewriteOptions::google_font_css_inline_max_bytes_, "gfci",
+      kGoogleFontCssInlineMaxBytes,
+      kQueryScope,
+      "Number of bytes below which Google Font stylesheets will be inlined.",
+      true);
   AddBaseProperty(
       kDefaultCssOutlineMinBytes,
       &RewriteOptions::css_outline_min_bytes_, "co",

src/net/instaweb/rewriter/rewrite_options_test.cc

@@ -911,6 +911,7 @@ TEST_F(RewriteOptionsTest, LookupOptionByNameTest) {
     RewriteOptions::kFlushHtml,
     RewriteOptions::kFlushMoreResourcesEarlyIfTimePermits,
     RewriteOptions::kForbidAllDisabledFilters,
+    RewriteOptions::kGoogleFontCssInlineMaxBytes,
     RewriteOptions::kHideRefererUsingMeta,
     RewriteOptions::kIdleFlushTimeMs,
     RewriteOptions::kImageInlineMaxBytes,