artox/incubator-pagespeed-ngx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

NULL StringPiece is deprecated

Browse Source
This commit is contained in:
Steve Hill
2016-11-10 13:50:33 -05:00
parent 8b8658bd72
commit 573071ae3a
19 changed files with 75 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
net/instaweb/rewriter/add_instrumentation_filter.cc
+4 -2
View File
@@ -120,7 +120,8 @@ void AddInstrumentationFilter::EndElementImpl(HtmlElement* element) {
GoogleString js = GetScriptJs(kUnloadTag);
HtmlElement* script = driver()->NewElement(element, HtmlName::kScript);
if (!driver()->defer_instrumentation_script()) {
driver()->AddAttribute(script, HtmlName::kDataPagespeedNoDefer, NULL);
driver()->AddAttribute(script, HtmlName::kDataPagespeedNoDefer,
StringPiece());
}
driver()->InsertNodeBeforeCurrent(script);
AddJsToElement(js, script);
@@ -139,7 +140,8 @@ void AddInstrumentationFilter::EndDocument() {
GoogleString js = GetScriptJs(kLoadTag);
HtmlElement* script = driver()->NewElement(NULL, HtmlName::kScript);
if (!driver()->defer_instrumentation_script()) {
driver()->AddAttribute(script, HtmlName::kDataPagespeedNoDefer, NULL);
driver()->AddAttribute(script, HtmlName::kDataPagespeedNoDefer,
StringPiece());
}
InsertNodeAtBodyEnd(script);
AddJsToElement(js, script);
net/instaweb/rewriter/critical_css_beacon_filter.cc
+2 -1
View File
@@ -207,7 +207,8 @@ void CriticalCssBeaconFilter::SummariesDone() {
AppendSelectorsInitJs(&script, selectors);
}
HtmlElement* script_element = driver()->NewElement(NULL, HtmlName::kScript);
driver()->AddAttribute(script_element, HtmlName::kDataPagespeedNoDefer, NULL);
driver()->AddAttribute(script_element, HtmlName::kDataPagespeedNoDefer,
StringPiece());
InsertNodeAtBodyEnd(script_element);
AddJsToElement(script, script_element);
net/instaweb/rewriter/critical_images_beacon_filter.cc
+2 -1
View File
@@ -140,7 +140,8 @@ void CriticalImagesBeaconFilter::MaybeAddBeaconJavascript(
resize_rendered_image_dimensions_enabled, ",'",
beacon_metadata_.nonce, "');");
HtmlElement* script = driver()->NewElement(NULL, HtmlName::kScript);
driver()->AddAttribute(script, HtmlName::kDataPagespeedNoDefer, NULL);
driver()->AddAttribute(script, HtmlName::kDataPagespeedNoDefer,
StringPiece());
// Always add the beacon js before the current node, because the current node
// might be an img node that needs the beacon js for its
// checkImageForCriticality onload handler.
net/instaweb/rewriter/critical_selector_filter.cc
+2 -1
View File
@@ -367,7 +367,8 @@ void CriticalSelectorFilter::RenderDone() {
}
HtmlElement* script = driver()->NewElement(NULL, HtmlName::kScript);
driver()->AddAttribute(script, HtmlName::kDataPagespeedNoDefer, NULL);
driver()->AddAttribute(script, HtmlName::kDataPagespeedNoDefer,
StringPiece());
InsertNodeAtBodyEnd(script);
GoogleString js =
driver()->server_context()->static_asset_manager()->GetAsset(
net/instaweb/rewriter/critical_selector_finder_test.cc
+3 -3
View File
@@ -515,7 +515,7 @@ TEST_F(UnverifiedSelectorsTest, NonCandidatesAreStored) {
selectors.insert(".noncandidate");
selectors.insert("#noncandidate");
finder_->WriteCriticalSelectorsToPropertyCache(
selectors, NULL /* no nonce */, rewrite_driver());
selectors, StringPiece() /* no nonce */, rewrite_driver());
EXPECT_STREQ("#noncandidate,.a,.noncandidate", CriticalSelectorsString());
}
@@ -525,14 +525,14 @@ TEST_F(UnverifiedSelectorsTest, MultipleResultsReplace) {
StringSet selectors;
selectors.insert(".noncandidate");
finder_->WriteCriticalSelectorsToPropertyCache(
selectors, NULL /* no nonce */, rewrite_driver());
selectors, StringPiece() /* no nonce */, rewrite_driver());
EXPECT_STREQ(".noncandidate", CriticalSelectorsString());
selectors.clear();
selectors.insert(".another");
Beacon();
finder_->WriteCriticalSelectorsToPropertyCache(
selectors, NULL /* no nonce */, rewrite_driver());
selectors, StringPiece() /* no nonce */, rewrite_driver());
EXPECT_STREQ(".another", CriticalSelectorsString());
}
net/instaweb/rewriter/css_combine_filter_test.cc
+2 -4
View File
@@ -564,10 +564,8 @@ TEST_F(CssCombineFilterCustomOptions, CssCombineAcrossProxyDomains) {
// Proxy http://kProxyMapDomain/ onto http://kTestDomain/proxied/
DomainLawyer* lawyer = options()->WriteableDomainLawyer();
GoogleString proxy_target = StrCat(kTestDomain, "proxied/");
ASSERT_TRUE(lawyer->AddProxyDomainMapping(proxy_target,
kProxyMapDomain,
NULL,
&message_handler_));
ASSERT_TRUE(lawyer->AddProxyDomainMapping(proxy_target, kProxyMapDomain,
StringPiece(), &message_handler_));
CssCombineFilterTest::SetUp();
SetHtmlMimetype();
net/instaweb/rewriter/dedup_inlined_images_filter.cc
+4 -2
View File
@@ -146,7 +146,8 @@ void DedupInlinedImagesFilter::EndElementImpl(HtmlElement* element) {
driver()->InsertElementAfterElement(element, script);
AddJsToElement(snippet, script);
driver()->AddAttribute(script, HtmlName::kId, script_id);
driver()->AddAttribute(script, HtmlName::kDataPagespeedNoDefer, NULL);
driver()->AddAttribute(script, HtmlName::kDataPagespeedNoDefer,
StringPiece());
element->DeleteAttribute(HtmlName::kSrc);
}
}
@@ -181,7 +182,8 @@ void DedupInlinedImagesFilter::InsertOurScriptElement(HtmlElement* before) {
HtmlName::kScript);
driver()->InsertElementBeforeElement(before, script_element);
AddJsToElement(initialized_js, script_element);
driver()->AddAttribute(script_element, HtmlName::kDataPagespeedNoDefer, NULL);
driver()->AddAttribute(script_element, HtmlName::kDataPagespeedNoDefer,
StringPiece());
script_inserted_ = true;
}
net/instaweb/rewriter/delay_images_filter.cc
+8 -6
View File
@@ -98,7 +98,8 @@ void DelayImagesFilter::MaybeAddImageOnloadJsSnippet(HtmlElement* element) {
}
added_image_onload_js_ = true;
HtmlElement* script = driver()->NewElement(NULL, HtmlName::kScript);
driver()->AddAttribute(script, HtmlName::kDataPagespeedNoDefer, NULL);
driver()->AddAttribute(script, HtmlName::kDataPagespeedNoDefer,
StringPiece());
// Always add the image-onload js before the current node, because the
// current node might be an img node that needs the image-onload js for
// setting its onload handler.
@@ -214,8 +215,8 @@ void DelayImagesFilter::InsertLowResImagesAndJs(HtmlElement* element,
kDelayImagesSuffix);
HtmlElement* script_element =
driver()->NewElement(element, HtmlName::kScript);
driver()->AddAttribute(
script_element, HtmlName::kDataPagespeedNoDefer, NULL);
driver()->AddAttribute(script_element, HtmlName::kDataPagespeedNoDefer,
StringPiece());
if (insert_after_element) {
DCHECK(element->keyword() == HtmlName::kImg ||
element->keyword() == HtmlName::kInput);
@@ -242,8 +243,8 @@ void DelayImagesFilter::InsertLowResImagesAndJs(HtmlElement* element,
"\npagespeed.delayImagesInline.replaceWithLowRes();\n");
HtmlElement* low_res_element =
driver()->NewElement(current_element, HtmlName::kScript);
driver()->AddAttribute(
low_res_element, HtmlName::kDataPagespeedNoDefer, NULL);
driver()->AddAttribute(low_res_element, HtmlName::kDataPagespeedNoDefer,
StringPiece());
if (insert_after_element) {
driver()->InsertNodeAfterNode(current_element, low_res_element);
current_element = low_res_element;
@@ -268,7 +269,8 @@ void DelayImagesFilter::InsertHighResJs(HtmlElement* body_element) {
"\npagespeed.delayImages.replaceWithHighRes();\n");
}
HtmlElement* script = driver()->NewElement(body_element, HtmlName::kScript);
driver()->AddAttribute(script, HtmlName::kDataPagespeedNoDefer, NULL);
driver()->AddAttribute(script, HtmlName::kDataPagespeedNoDefer,
StringPiece());
driver()->AppendChild(body_element, script);
AddJsToElement(js, script);
}
net/instaweb/rewriter/deterministic_js_filter.cc
+2 -1
View File
@@ -49,7 +49,8 @@ void DeterministicJsFilter::StartElementImpl(HtmlElement* element) {
static_asset_manager->GetAsset(
StaticAssetEnum::DETERMINISTIC_JS, driver()->options());
AddJsToElement(deterministic_js, script);
driver()->AddAttribute(script, HtmlName::kDataPagespeedNoDefer, NULL);
driver()->AddAttribute(script, HtmlName::kDataPagespeedNoDefer,
StringPiece());
}
}
net/instaweb/rewriter/domain_lawyer_test.cc
+2 -2
View File
@@ -1004,8 +1004,8 @@ TEST_F(DomainLawyerTest, ProxyExternalResourceToCDN) {
TEST_F(DomainLawyerTest, ProxyExternalResourceFromHttps) {
GoogleUrl context_gurl("http://origin.com/index.html");
ASSERT_TRUE(domain_lawyer_.AddProxyDomainMapping(
"http://origin.com/external", "https://external.com/static", NULL,
&message_handler_));
"http://origin.com/external", "https://external.com/static",
StringPiece(), &message_handler_));
// Map proxy_this.png to a subdirectory in origin.com.
GoogleUrl resolved_request;
net/instaweb/rewriter/google_analytics_filter.cc
+1 -1
View File
@@ -394,7 +394,7 @@ bool GoogleAnalyticsFilter::MatchUnhandledCalls(
void GoogleAnalyticsFilter::FindRewritableScripts() {
if (html_parse_->IsRewritable(script_element_)) {
StringPiece src = script_element_->AttributeValue(HtmlName::kSrc);
if (src != NULL && !src.empty()) {
if (!src.empty()) {
if (src.ends_with(kGaJsUrlSuffix)) {
html_parse_->InfoHere("Found ga.js load: script src");
is_load_found_ = true;
net/instaweb/rewriter/js_disable_filter.cc
+2 -1
View File
@@ -83,7 +83,8 @@ void JsDisableFilter::InsertJsDeferExperimentalScript() {
driver()->NewElement(NULL, HtmlName::kScript);
driver()->AddAttribute(script_node, HtmlName::kType, "text/javascript");
driver()->AddAttribute(script_node, HtmlName::kDataPagespeedNoDefer, NULL);
driver()->AddAttribute(script_node, HtmlName::kDataPagespeedNoDefer,
StringPiece());
HtmlNode* script_code =
driver()->NewCharactersNode(script_node, kEnableJsExperimental);
InsertNodeAtBodyEnd(script_node);
net/instaweb/rewriter/lazyload_images_filter.cc
+4 -2
View File
@@ -338,7 +338,8 @@ void LazyloadImagesFilter::InsertLazyloadJsCode(HtmlElement* element) {
GoogleString lazyload_js = GetLazyloadJsSnippet(
driver()->options(), static_asset_manager);
AddJsToElement(lazyload_js, script);
driver()->AddAttribute(script, HtmlName::kDataPagespeedNoDefer, NULL);
driver()->AddAttribute(script, HtmlName::kDataPagespeedNoDefer,
StringPiece());
}
main_script_inserted_ = true;
}
@@ -348,7 +349,8 @@ void LazyloadImagesFilter::InsertOverrideAttributesScript(
if (num_images_lazily_loaded_ > 0) {
HtmlElement* script = driver()->NewElement(element, HtmlName::kScript);
driver()->AddAttribute(script, HtmlName::kType, "text/javascript");
driver()->AddAttribute(script, HtmlName::kDataPagespeedNoDefer, NULL);
driver()->AddAttribute(script, HtmlName::kDataPagespeedNoDefer,
StringPiece());
HtmlNode* script_code = driver()->NewCharactersNode(
script, kOverrideAttributeFunctions);
if (is_before_script) {
net/instaweb/rewriter/local_storage_cache_filter.cc
+4 -4
View File
@@ -144,8 +144,8 @@ void LocalStorageCacheFilter::EndElementImpl(HtmlElement* element) {
}
HtmlElement* script_element =
driver()->NewElement(element->parent(), HtmlName::kScript);
driver()->AddAttribute(
script_element, HtmlName::kDataPagespeedNoDefer, NULL);
driver()->AddAttribute(script_element, HtmlName::kDataPagespeedNoDefer,
StringPiece());
if (driver()->ReplaceNode(element, script_element)) {
driver()->AppendChild(script_element,
driver()->NewCharactersNode(element, snippet));
@@ -167,8 +167,8 @@ void LocalStorageCacheFilter::InsertOurScriptElement(HtmlElement* before) {
HtmlName::kScript);
driver()->InsertNodeBeforeNode(before, script_element);
AddJsToElement(initialized_js, script_element);
driver()->AddAttribute(
script_element, HtmlName::kDataPagespeedNoDefer, NULL);
driver()->AddAttribute(script_element, HtmlName::kDataPagespeedNoDefer,
StringPiece());
script_inserted_ = true;
}
net/instaweb/rewriter/make_show_ads_async_filter.cc
+1 -1
View File
@@ -193,7 +193,7 @@ void MakeShowAdsAsyncFilter::ReplaceShowAdsWithAdsByGoogleElement(
HtmlElement* script_element = driver()->NewElement(
container_element, HtmlName::kScript);
script_element->set_style(HtmlElement::EXPLICIT_CLOSE);
driver()->AddAttribute(script_element, HtmlName::kAsync, NULL);
driver()->AddAttribute(script_element, HtmlName::kAsync, StringPiece());
driver()->AddAttribute(script_element,
HtmlName::kSrc,
ads_util::kAdsByGoogleJavascriptSrc);
net/instaweb/rewriter/rewrite_options.cc
+1 -1
View File
@@ -977,7 +977,7 @@ int RewriteOptions::NumFilterIds() {
bool RewriteOptions::ParseRewriteLevel(
const StringPiece& in, RewriteLevel* out) {
bool ret = false;
if (in != NULL) {
if (!in.empty()) {
if (StringCaseEqual(in, "CoreFilters")) {
*out = kCoreFilters;
ret = true;
net/instaweb/rewriter/rewrite_options_test.cc
+3 -3
View File
@@ -407,7 +407,7 @@ TEST_F(RewriteOptionsTest, ParseRewriteLevel) {
EXPECT_TRUE(RewriteOptions::ParseRewriteLevel("MobilizeFilters", &level));
EXPECT_EQ(RewriteOptions::kMobilizeFilters, level);
EXPECT_FALSE(RewriteOptions::ParseRewriteLevel(NULL, &level));
EXPECT_FALSE(RewriteOptions::ParseRewriteLevel(StringPiece(), &level));
EXPECT_FALSE(RewriteOptions::ParseRewriteLevel("", &level));
EXPECT_FALSE(RewriteOptions::ParseRewriteLevel("Garbage", &level));
}
@@ -2571,7 +2571,7 @@ TEST_F(RewriteOptionsTest, FilterLookupMethods) {
EXPECT_EQ(RewriteOptions::kEndOfFilters,
RewriteOptions::LookupFilterById(""));
EXPECT_EQ(RewriteOptions::kEndOfFilters,
RewriteOptions::LookupFilterById(NULL));
RewriteOptions::LookupFilterById(StringPiece()));
EXPECT_EQ(RewriteOptions::kAnalyticsID,
RewriteOptions::LookupOptionNameById("ig"));
@@ -2580,7 +2580,7 @@ TEST_F(RewriteOptionsTest, FilterLookupMethods) {
EXPECT_TRUE(RewriteOptions::LookupOptionNameById(" ").empty());
EXPECT_TRUE(RewriteOptions::LookupOptionNameById("junk").empty());
EXPECT_TRUE(RewriteOptions::LookupOptionNameById("").empty());
EXPECT_TRUE(RewriteOptions::LookupOptionNameById(NULL).empty());
EXPECT_TRUE(RewriteOptions::LookupOptionNameById(StringPiece()).empty());
}
TEST_F(RewriteOptionsTest, ParseBeaconUrl) {
net/instaweb/rewriter/rewrite_query.cc
+1 -1
View File
@@ -354,7 +354,7 @@ RewriteQuery::Status RewriteQuery::Scan(
return status;
}
} else {
temp_query_params.AddEscaped(query_params_.name(i), NULL);
temp_query_params.AddEscaped(query_params_.name(i), StringPiece());
}
}
if (status == kSuccess) {
net/instaweb/rewriter/rewrite_query_test.cc
+27 -31
View File
@@ -70,7 +70,7 @@ class RewriteQueryTest : public RewriteTestBase {
CHECK_EQ(2, attr_value.size());
request_headers.Add(attr_value[0], attr_value[1]);
}
return ParseAndScan(request_url, in_query, NULL, &request_headers,
return ParseAndScan(request_url, in_query, StringPiece(), &request_headers,
NULL, out_query, out_req_string, &out_resp_string);
}
@@ -191,7 +191,7 @@ class RewriteQueryTest : public RewriteTestBase {
expected_quality_preference);
const RewriteOptions* options = ParseAndScan(
kHtmlUrl, in_query, NULL, request_headers, &response_headers,
kHtmlUrl, in_query, StringPiece(), request_headers, &response_headers,
&out_query, &out_req_string, &out_resp_string);
if (!expected_parsing_result) {
EXPECT_TRUE(options == NULL);
@@ -259,8 +259,8 @@ TEST_F(RewriteQueryTest, OffResponseHeader) {
response_headers.Add("ModPagespeed", "off");
const RewriteOptions* options = ParseAndScan(
kHtmlUrl, in_query, NULL, &request_headers, &response_headers, &out_query,
&out_req_string, &out_resp_string);
kHtmlUrl, in_query, StringPiece(), &request_headers, &response_headers,
&out_query, &out_req_string, &out_resp_string);
ASSERT_TRUE(options != NULL);
EXPECT_FALSE(options->enabled());
}
@@ -284,8 +284,8 @@ TEST_F(RewriteQueryTest, OffResponseHeaderPageSpeed) {
response_headers.Add("PageSpeed", "off");
const RewriteOptions* options = ParseAndScan(
kHtmlUrl, in_query, NULL, &request_headers, &response_headers, &out_query,
&out_req_string, &out_resp_string);
kHtmlUrl, in_query, StringPiece(), &request_headers, &response_headers,
&out_query, &out_req_string, &out_resp_string);
ASSERT_TRUE(options != NULL);
EXPECT_FALSE(options->enabled());
}
@@ -401,8 +401,8 @@ TEST_F(RewriteQueryTest, SetFiltersResponseHeaders) {
response_headers.Add("ModPagespeedFilters", "remove_quotes");
const RewriteOptions* options = ParseAndScan(
kHtmlUrl, in_query, NULL, &request_headers, &response_headers, &out_query,
&out_req_string, &out_resp_string);
kHtmlUrl, in_query, StringPiece(), &request_headers, &response_headers,
&out_query, &out_req_string, &out_resp_string);
ASSERT_TRUE(options != NULL);
EXPECT_TRUE(options->enabled());
EXPECT_TRUE(options->Enabled(RewriteOptions::kRemoveQuotes));
@@ -655,13 +655,12 @@ TEST_F(RewriteQueryTest, OutputQueryandHeadersPostRequest) {
request_headers.Add("xyz", "6");
request_headers.set_message_body("pqr");
ParseAndScan(kHtmlUrl, "ModPagespeedCssInlineMaxBytes=3"
ParseAndScan(kHtmlUrl,
"ModPagespeedCssInlineMaxBytes=3"
"&abc=1"
"&def",
NULL,
&request_headers,
NULL,
&output_query, &output_req_headers, &output_resp_headers);
StringPiece(), &request_headers, NULL, &output_query,
&output_req_headers, &output_resp_headers);
EXPECT_EQ(output_query, "abc=1&def");
EXPECT_EQ(output_req_headers, "POST HTTP/1.0\r\nxyz: 6\r\n\r\n");
EXPECT_EQ(request_headers.message_body(), "pqr");
@@ -675,13 +674,12 @@ TEST_F(RewriteQueryTest, OutputQueryandHeadersPostRequestPageSpeed) {
request_headers.Add("xyz", "6");
request_headers.set_message_body("pqr");
ParseAndScan(kHtmlUrl, "PageSpeedCssInlineMaxBytes=3"
ParseAndScan(kHtmlUrl,
"PageSpeedCssInlineMaxBytes=3"
"&abc=1"
"&def",
NULL,
&request_headers,
NULL,
&output_query, &output_req_headers, &output_resp_headers);
StringPiece(), &request_headers, NULL, &output_query,
&output_req_headers, &output_resp_headers);
EXPECT_EQ(output_query, "abc=1&def");
EXPECT_EQ(output_req_headers, "POST HTTP/1.0\r\nxyz: 6\r\n\r\n");
EXPECT_EQ(request_headers.message_body(), "pqr");
@@ -1067,9 +1065,8 @@ TEST_F(RewriteQueryTest, CacheControlNoTransform) {
GoogleString in_query, out_query, out_req_string, out_resp_string;
const RewriteOptions* options = ParseAndScan(
kHtmlUrl, in_query, NULL, &request_headers,
&response_headers, &out_query,
&out_req_string, &out_resp_string);
kHtmlUrl, in_query, StringPiece(), &request_headers, &response_headers,
&out_query, &out_req_string, &out_resp_string);
ASSERT_TRUE(options != NULL);
EXPECT_FALSE(options->enabled());
EXPECT_TRUE(request_headers.Lookup1(HttpAttributes::kCacheControl) != NULL);
@@ -1083,10 +1080,11 @@ TEST_F(RewriteQueryTest, DisableScriptsWithXHR) {
ResponseHeaders response_headers;
GoogleString in_query, out_query, out_req_string, out_resp_string;
scoped_ptr<RewriteOptions> options(ParseAndScan(
kHtmlUrl, in_query, NULL, &request_headers,
&response_headers, &out_query,
&out_req_string, &out_resp_string)->Clone());
scoped_ptr<RewriteOptions> options(
ParseAndScan(kHtmlUrl, in_query, StringPiece(), &request_headers,
&response_headers, &out_query, &out_req_string,
&out_resp_string)
->Clone());
// Convert disabled -> forbidden for easier testing.
options->set_forbid_all_disabled_filters(true);
@@ -1108,9 +1106,8 @@ TEST_F(RewriteQueryTest, CacheControlPrivateNoTransformResponse) {
GoogleString in_query, out_query, out_req_string, out_resp_string;
const RewriteOptions* options = ParseAndScan(
kHtmlUrl, in_query, NULL, &request_headers,
&response_headers, &out_query,
&out_req_string, &out_resp_string);
kHtmlUrl, in_query, StringPiece(), &request_headers, &response_headers,
&out_query, &out_req_string, &out_resp_string);
ASSERT_TRUE(options != NULL);
EXPECT_FALSE(options->enabled());
@@ -1129,9 +1126,8 @@ TEST_F(RewriteQueryTest, NoCustomOptionsWithCacheControlPrivate) {
GoogleString in_query, out_query, out_req_string, out_resp_string;
const RewriteOptions* options = ParseAndScan(
kHtmlUrl, in_query, NULL, &request_headers,
&response_headers, &out_query,
&out_req_string, &out_resp_string);
kHtmlUrl, in_query, StringPiece(), &request_headers, &response_headers,
&out_query, &out_req_string, &out_resp_string);
EXPECT_TRUE(options == NULL);
}