[headless] Embed pak file into binary.

ui/base/resource/resource_bundle.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 "ui/base/resource/resource_bundle.h"
 
 #include <stdint.h>
 
 #include <limits>
 #include <utility>
@@ skipping 189 matching lines @@
 
 // static
 void ResourceBundle::InitSharedInstanceWithPakPath(const base::FilePath& path) {
   InitSharedInstance(NULL);
   g_shared_instance_->LoadTestResources(path, path);
 
   g_shared_instance_->InitDefaultFontList();
 }
 
 // static
+void ResourceBundle::InitSharedInstanceWithPakBuffer(base::StringPiece buffer) {
+  InitSharedInstance(NULL);
+  g_shared_instance_->LoadTestResourcesFromBuffer(buffer, buffer);
+
+  g_shared_instance_->InitDefaultFontList();
+}
+
+// static
 void ResourceBundle::CleanupSharedInstance() {
   if (g_shared_instance_) {
     delete g_shared_instance_;
     g_shared_instance_ = NULL;
   }
 }
 
 // static
 bool ResourceBundle::HasSharedInstance() {
   return g_shared_instance_ != NULL;
@@ skipping 125 matching lines @@
     AddDataPack(data_pack.release());
 
   data_pack.reset(new DataPack(ui::SCALE_FACTOR_NONE));
   if (!locale_path.empty() && data_pack->LoadFromPath(locale_path)) {
     locale_resources_data_.reset(data_pack.release());
   } else {
     locale_resources_data_.reset(new DataPack(ui::SCALE_FACTOR_NONE));
   }
 }
 
+void ResourceBundle::LoadTestResourcesFromBuffer(
+    base::StringPiece data,
+    base::StringPiece locale_data) {
+  is_test_resources_ = true;

[sadrul, 2016/05/17 15:07:50]

Add a comment why this is a test-resource?

[altimin, 2016/05/17 15:40:08]

Actually, I can use your advice here. Content shell uses
ResourceBundle::InitSharedInstanceWithPakPath, which calls
ResourceBuffer::LoadTestResources, which sets is_test_resources_ = true.

Since headless shell resembles content shell, we've used
InitSharedInstanceWithPakPath initially, and now switching to
InitSharedInstanceWithPakBuffer and LoadTestResourcesFromBuffer. 

If you have ideas how to make it better, I'd be glad to hear them.

[sadrul, 2016/05/19 18:28:26]

It looks like |is_test_resources_| is used to determine whether it's OK to fall
back to lower-res images. I feel like it would make sense to have an explicit
API on ResourceBundle to set that, instead of inferring this info based on what
function call was made to initialize the RB. But that's not an issue with this
CL.

If headless is OK with allowing fall-back to lower-res images, then this can be
set here. Please add a comment explaining that.

[altimin, 2016/05/19 19:23:30]

Done.

+  DCHECK(!ui::GetSupportedScaleFactors().empty());
+  const ScaleFactor scale_factor(ui::GetSupportedScaleFactors()[0]);
+  // Use the given resource pak for both common and localized resources.
+  std::unique_ptr<DataPack> data_pack(new DataPack(scale_factor));
+  if (data_pack->LoadFromBuffer(data))
+    AddDataPack(data_pack.release());
+
+  data_pack.reset(new DataPack(ui::SCALE_FACTOR_NONE));
+  if (data_pack->LoadFromBuffer(locale_data)) {
+    locale_resources_data_.reset(data_pack.release());
+  } else {
+    locale_resources_data_.reset(new DataPack(ui::SCALE_FACTOR_NONE));
+  }
+}
+
 void ResourceBundle::UnloadLocaleResources() {
   locale_resources_data_.reset();
 }
 
 void ResourceBundle::OverrideLocalePakForTest(const base::FilePath& pak_path) {
   overridden_pak_path_ = pak_path;
 }
 
 void ResourceBundle::OverrideLocaleStringResource(
     int message_id,
@@ skipping 531 matching lines @@
 // static
 bool ResourceBundle::DecodePNG(const unsigned char* buf,
                                size_t size,
                                SkBitmap* bitmap,
                                bool* fell_back_to_1x) {
   *fell_back_to_1x = PNGContainsFallbackMarker(buf, size);
   return gfx::PNGCodec::Decode(buf, size, bitmap);
 }
 
 }  // namespace ui