[page-speed] r2565 committed - Merge r2562-2564 to 1.15 tag.

[page-...@googlecode.com]

Revision: 2565
Author: bmcq...@google.com
Date: Mon Dec 2 20:47:04 2013 UTC
Log: Merge r2562-2564 to 1.15 tag.
http://code.google.com/p/page-speed/source/detail?r=2565

Modified:
/lib/tags/lib-1.15.0.0
/lib/tags/lib-1.15.0.0/src
/lib/tags/lib-1.15.0.0/src/pagespeed/formatters/formatter_util.cc
/lib/tags/lib-1.15.0.0/src/pagespeed/formatters/formatter_util_test.cc
/lib/tags/lib-1.15.0.0/src/pagespeed/proto/timeline.proto
/lib/tags/lib-1.15.0.0/src/pagespeed/rules/avoid_plugins.cc
/lib/tags/lib-1.15.0.0/src/pagespeed/rules/avoid_plugins_test.cc

=======================================
--- /lib/tags/lib-1.15.0.0/src/pagespeed/formatters/formatter_util.cc Fri
Oct 18 21:27:14 2013 UTC
+++ /lib/tags/lib-1.15.0.0/src/pagespeed/formatters/formatter_util.cc Mon
Dec 2 20:47:04 2013 UTC
@@ -44,7 +44,6 @@
};

const UnitDescriptor kDistances[] = {
- { 1000, "um" },
{ 1000, "mm" },
{ 1000, "m" },
{ -1, "km" },
@@ -119,7 +118,9 @@
if (micrometers <= 0) {
return "0mm";
}
- double distance = micrometers;
+
+ // The smallest unit used for output is a millimeter, not a micrometer.
+ double distance = micrometers / 1000.0;
const char* display_name = "";
for (size_t i = 0; i < kDistancesSize && distance > 0; ++i) {
const UnitDescriptor *desc = kDistances + i;
@@ -130,9 +131,25 @@
distance /= desc->quantity;
}

- // If the value is between 0 and 10, and the first decimal place is
- // non-zero, then show a single digit decimal value. Otherwise,
+ // Attempt to show a minimum of two significant figures, with a minimum
+ // result of 0.01 and truncating trailing zeroes. If the value is between
+ // 0 and 1, and the hundredth place is non-zero, then show a two digit
+ // decimal value. Otherwise, if the value is between 0 and 10 and the
tenth
+ // place is non-zero, then show a single digit decimal value. Otherwise,
// round to the nearest whole number.
+ if (distance < 1) {
+ if (distance <= 0.01) {
+ // Make sure that the formatted version of any non-zero distance is
+ // non-zero by rounding up very small numbers.
+ return StringPrintf("0.01%s", display_name);
+ }
+ const int hundredths = static_cast<int>(round(distance * 100)) % 10;
+ if (hundredths > 0) {
+ // Round to nearest hundredth.
+ double rounded_distance = round(distance * 100) / 100;
+ return StringPrintf("%.2f%s", rounded_distance, display_name);
+ }
+ }
if (distance < 10) {
const int tenths = static_cast<int>(round(distance * 10)) % 10;
if (tenths > 0) {
=======================================
--- /lib/tags/lib-1.15.0.0/src/pagespeed/formatters/formatter_util_test.cc
Fri Oct 18 21:27:14 2013 UTC
+++ /lib/tags/lib-1.15.0.0/src/pagespeed/formatters/formatter_util_test.cc
Mon Dec 2 20:47:04 2013 UTC
@@ -54,8 +54,11 @@
TEST(FormatterUtilTest, Distance) {
EXPECT_EQ("0mm", pagespeed::formatters::FormatDistance(-10));
EXPECT_EQ("0mm", pagespeed::formatters::FormatDistance(0));
- EXPECT_EQ("123um", pagespeed::formatters::FormatDistance(123));
- EXPECT_EQ("999um", pagespeed::formatters::FormatDistance(999));
+ EXPECT_EQ("0.01mm", pagespeed::formatters::FormatDistance(1));
+ EXPECT_EQ("0.1mm", pagespeed::formatters::FormatDistance(100));
+ EXPECT_EQ("0.12mm", pagespeed::formatters::FormatDistance(123));
+ EXPECT_EQ("0.13mm", pagespeed::formatters::FormatDistance(126));
+ EXPECT_EQ("1mm", pagespeed::formatters::FormatDistance(999));
EXPECT_EQ("1mm", pagespeed::formatters::FormatDistance(1000));
EXPECT_EQ("4.6mm", pagespeed::formatters::FormatDistance(4567));
EXPECT_EQ("3.9mm", pagespeed::formatters::FormatDistance(3949));
=======================================
--- /lib/tags/lib-1.15.0.0/src/pagespeed/proto/timeline.proto Fri Jul 26
15:36:47 2013 UTC
+++ /lib/tags/lib-1.15.0.0/src/pagespeed/proto/timeline.proto Mon Dec 2
20:47:04 2013 UTC
@@ -167,6 +167,12 @@

// Marks
optional bool is_main_frame = 33;
+
+ // DecodeImage
+ optional string image_type = 34;
+
+ // ResizeImage
+ optional bool cached = 35;
}

// The type field is required, but we mark it 'optional' because
otherwise
=======================================
--- /lib/tags/lib-1.15.0.0/src/pagespeed/rules/avoid_plugins.cc Fri Nov 15
19:41:40 2013 UTC
+++ /lib/tags/lib-1.15.0.0/src/pagespeed/rules/avoid_plugins.cc Mon Dec 2
20:47:04 2013 UTC
@@ -44,6 +44,7 @@
using pagespeed::AvoidPluginsDetails_PluginType_FLASH;
using pagespeed::AvoidPluginsDetails_PluginType_SILVERLIGHT;
using pagespeed::AvoidPluginsDetails_PluginType_JAVA;
+using pagespeed::string_util::StringCaseEndsWith;
using pagespeed::string_util::StringCaseStartsWith;

namespace {
@@ -68,6 +69,7 @@
// a plugin.
static const char* kAllowedMimeTypes[] = {
"image/",
+ "audio/",
"video/",
"text/",
// Allow preloaded javascript hacks:
@@ -98,6 +100,16 @@
{AvoidPluginsDetails_PluginType_JAVA, ".jar"}
};

+// Whitelist of file extensions most browsers can directly interpret
without
+// a plugin. Must include the ".".
+static const char* kAllowedFileExtensions[] = {
+ ".mp3",
+ ".mp4",
+ ".ogg",
+ ".wav",
+ ".webm"
+};
+
// Human-readable names for known plugin types. As these are product names,
// they should not be localized.
static const PluginID kPluginHumanNames[] = {
@@ -212,6 +224,29 @@
}
return AvoidPluginsDetails_PluginType_UNKNOWN;
}
+
+// If true, this MIME type can likely be interpreted directly by browsers
and
+// should not be recorded as a plugin.
+bool DetermineAllowedFromMime(const std::string& mime_type) {
+ for (size_t i = 0; i < arraysize(kAllowedMimeTypes); ++i) {
+ if (StringCaseStartsWith(mime_type, kAllowedMimeTypes[i])) {
+ return true;
+ }
+ }
+ return false;
+}
+
+// If true, this file's extension can likely be interpreted directly by
+// browsers and should not be recorded as a plugin. The provided url
should not
+// contain any query params or fragments.
+bool DetermineAllowedFromExtension(const std::string& url) {
+ for (size_t i = 0; i < arraysize(kAllowedFileExtensions); ++i) {
+ if (StringCaseEndsWith(url, kAllowedFileExtensions[i])) {
+ return true;
+ }
+ }
+ return false;
+}

class PluginElementVisitor : public pagespeed::DomElementVisitor {
public:
@@ -246,8 +281,9 @@
bool ProcessAppletTag(const pagespeed::DomElement& node,
AvoidPluginsDetails_PluginType* out_type,
std::string* out_url);
- AvoidPluginsDetails_PluginType DetermineTypeFromUrl(const std::string
url,
- std::string*
out_mime);
+ void DetermineTypeFromUrl(const std::string url, bool* out_allowed,
+ AvoidPluginsDetails_PluginType* out_type,
+ std::string* out_mime);
bool DetermineJavaUrlFromAttributes(const pagespeed::DomElement& node,
std::string* out_url);
bool DetermineJavaUrl(const std::string& archive,
@@ -350,15 +386,6 @@
AvoidPluginsDetails_PluginType type,
const std::string& mime,
const std::string& url) {
- if (type == AvoidPluginsDetails_PluginType_UNKNOWN) {
- for (size_t i = 0; i < arraysize(kAllowedMimeTypes); ++i) {
- if (StringCaseStartsWith(mime, kAllowedMimeTypes[i])) {
- LOG(INFO) << "Ignoring allowed plugin type " << mime;
- return;
- }
- }
- }
-
pagespeed::Result* result = provider_->NewResult();
result->add_resource_urls(url);

@@ -524,6 +551,12 @@
// Put more amusingly: at this point, the type is known to be
// PluginType_UNKNOWN, where as before it was an unknown unknown.
found_type = true;
+
+ if (*out_type == AvoidPluginsDetails_PluginType_UNKNOWN) {
+ if (DetermineAllowedFromMime(*out_mime)) {
+ return false;
+ }
+ }
}

bool found_src = false;
@@ -578,7 +611,11 @@
// the URL relative to the document.
*out_url = document_->ResolveUri(src);
if (!found_type) {
- *out_type = DetermineTypeFromUrl(*out_url, out_mime);
+ bool allowed_type;
+ DetermineTypeFromUrl(*out_url, &allowed_type, out_type, out_mime);
+ if (allowed_type) {
+ return false;
+ }
}
}

@@ -602,6 +639,12 @@
if (node.GetAttributeByName("type", out_mime) && !out_mime->empty()) {
*out_type = DetermineTypeFromMime(*out_mime);
found_type = true;
+
+ if (*out_type == AvoidPluginsDetails_PluginType_UNKNOWN) {
+ if (DetermineAllowedFromMime(*out_mime)) {
+ return false;
+ }
+ }
}

bool found_src = false;
@@ -626,7 +669,11 @@
if (found_src) {
*out_url = document_->ResolveUri(src);
if (!found_type) {
- *out_type = DetermineTypeFromUrl(*out_url, out_mime);
+ bool allowed_type;
+ DetermineTypeFromUrl(*out_url, &allowed_type, out_type, out_mime);
+ if (allowed_type) {
+ return false;
+ }
}
}
return true;
@@ -647,10 +694,14 @@
// Determine the plugin type given a URL. If the resource is in the
// PagespeedInput, uses the Content-Type header and sets out_mime.
Otherwise,
// guesses from the file extension and does not change out_mime.
-AvoidPluginsDetails_PluginType PluginElementVisitor::DetermineTypeFromUrl(
- const std::string url, std::string* out_mime) {
+void PluginElementVisitor::DetermineTypeFromUrl(
+ const std::string url, bool* out_allowed,
+ AvoidPluginsDetails_PluginType* out_type, std::string* out_mime) {
+ *out_allowed = false;
+
if (url.empty()) {
- return AvoidPluginsDetails_PluginType_UNKNOWN;
+ *out_type = AvoidPluginsDetails_PluginType_UNKNOWN;
+ return;
}

// See if we fetched the resource and have its MIME type.
@@ -667,7 +718,11 @@
std::string content_type = resource->GetResponseHeader("Content-Type");
if (!content_type.empty()) {
*out_mime = content_type;
- return DetermineTypeFromMime(content_type);
+ *out_type = DetermineTypeFromMime(content_type);
+ if (*out_type == AvoidPluginsDetails_PluginType_UNKNOWN) {
+ *out_allowed = DetermineAllowedFromMime(content_type);
+ }
+ return;
}
}

@@ -680,13 +735,17 @@
const PluginID& plugin_id = kPluginFileExtensions[i];
if (pagespeed::string_util::StringCaseEndsWith(
url_no_query, plugin_id.id)) {
- return plugin_id.type;
+ *out_type = plugin_id.type;
+ return;
}
}
+
+ // If it's not a known plugin, maybe it should be allowed.
+ *out_allowed = DetermineAllowedFromExtension(url_no_query);
}

// If that didn't work, give up.
- return AvoidPluginsDetails_PluginType_UNKNOWN;
+ *out_type = AvoidPluginsDetails_PluginType_UNKNOWN;
}

// Determine the source URL of a Java plugin from attributes on the tag.
=======================================
--- /lib/tags/lib-1.15.0.0/src/pagespeed/rules/avoid_plugins_test.cc Fri
Nov 15 19:41:40 2013 UTC
+++ /lib/tags/lib-1.15.0.0/src/pagespeed/rules/avoid_plugins_test.cc Mon
Dec 2 20:47:04 2013 UTC
@@ -534,7 +534,11 @@
{
FakeDomElement* embed = FakeDomElement::New(body(), "embed");
embed->AddAttribute("type", "video/mp4");
- embed->AddAttribute("src", "should_ignore_this_video.mp4");
+ embed->AddAttribute("src", "should_ignore_this_video");
+ }
+ {
+ FakeDomElement* embed = FakeDomElement::New(body(), "embed");
+ embed->AddAttribute("src", "should_ignore_this_audio.mp3");
}

// Blocks should be sorted by the order the first instance was
encountered on