Gzip compress chrome://accessibility resources

content/browser/webui/web_ui_data_source_impl.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/webui/web_ui_data_source_impl.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <string>
@@ skipping 56 matching lines @@
   }
   std::string GetContentSecurityPolicyChildSrc() const override {
     if (parent_->frame_src_set_)
       return parent_->frame_src_;
     return URLDataSource::GetContentSecurityPolicyChildSrc();
   }
   bool ShouldDenyXFrameOptions() const override {
     return parent_->deny_xframe_options_;
   }
   bool IsGzipped(const std::string& path) const override {
-    if (!parent_->json_path_.empty() && path == parent_->json_path_)
-      return false;
-    return parent_->use_gzip_for_all_paths_;
+    return parent_->use_gzip_for_all_paths_ &&
+        parent_->GetResourceIdFromPath(path) != -1;

[agrieve, 2016/10/12 14:19:36]

I think this would have worked:

if (path == json_path_)
  return false;

bool is_default_path = parent_->GetResourceIdFromPath(path) ==
default_resource_;
return use_gzip_for_default_resource_ && is_default_path ||
           use_gzip_for_subresources_ && !is_default_path;

[Dan Beam, 2016/10/12 16:26:32]

this breaks when no json_path_ is set, but a .empty() check would probably fix
kDataPath would match the is_default_path and would be gzipped (even though the
contents is not), and there'd be a encoding failure / broken resource.

   }
 
  private:
   WebUIDataSourceImpl* parent_;
 };
 
 WebUIDataSourceImpl::WebUIDataSourceImpl(const std::string& source_name)
     : URLDataSourceImpl(source_name, new InternalDataSource(this)),
       source_name_(source_name),
       default_resource_(-1),
@@ skipping 143 matching lines @@
     webui::SetLoadTimeDataDefaults(locale, &defaults);
     AddLocalizedStrings(defaults);
     add_load_time_data_defaults_ = false;
   }
 
   if (!json_path_.empty() && path == json_path_) {
     SendLocalizedStringsAsJSON(callback);
     return;
   }
 
-  int resource_id = default_resource_;
-  std::map<std::string, int>::iterator result;
-  // Remove the query string for named resource lookups.
-  std::string file_path = path.substr(0, path.find_first_of('?'));
-  result = path_to_idr_map_.find(file_path);
-  if (result != path_to_idr_map_.end())
-    resource_id = result->second;
+  int resource_id = GetResourceIdFromPath(path);
   DCHECK_NE(resource_id, -1);
   scoped_refptr<base::RefCountedMemory> response(
       GetContentClient()->GetDataResourceBytes(resource_id));
 
   // TODO(dschuyler): improve filtering of which resource to run template
   // expansion upon. TODO(dbeam): make a streaming filter that works on gzipped
   // content.
   if (response.get() && GetMimeType(path) == "text/html" &&
       !source()->IsGzipped(path)) {
     std::string replaced = ui::ReplaceTemplateExpressions(
         base::StringPiece(response->front_as<char>(), response->size()),
         replacements_);
     response = base::RefCountedString::TakeString(&replaced);
   }
 
   callback.Run(response.get());
 }
 
 void WebUIDataSourceImpl::SendLocalizedStringsAsJSON(
     const URLDataSource::GotDataCallback& callback) {
   std::string template_data;
   webui::AppendJsonJS(&localized_strings_, &template_data);
   callback.Run(base::RefCountedString::TakeString(&template_data));
 }
 
+int WebUIDataSourceImpl::GetResourceIdFromPath(const std::string& path) const {
+  // Remove the query string for named resource lookups.
+  std::string file_path = path.substr(0, path.find_first_of('?'));
+  auto result = path_to_idr_map_.find(file_path);
+  return result != path_to_idr_map_.end() ? result->second : default_resource_;
+}
+
 }  // namespace content