Various optimizations to reduce the number of temporary allocations.

chrome/browser/ui/webui/theme_source.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 "chrome/browser/ui/webui/theme_source.h"
 
 #include "base/memory/ref_counted_memory.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/string_number_conversions.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/resources_util.h"
 #include "chrome/browser/search/instant_io_context.h"
+#include "chrome/browser/themes/browser_theme_pack.h"
 #include "chrome/browser/themes/theme_properties.h"
 #include "chrome/browser/themes/theme_service.h"
 #include "chrome/browser/themes/theme_service_factory.h"
 #include "chrome/browser/ui/webui/ntp/ntp_resource_cache.h"
 #include "chrome/browser/ui/webui/ntp/ntp_resource_cache_factory.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/browser_thread.h"
 #include "net/url_request/url_request.h"
 #include "ui/base/layout.h"
 #include "ui/base/resource/resource_bundle.h"
@@ skipping 83 matching lines @@
 
   if (uncached_path == kNewTabCSSPath ||
       uncached_path == kNewIncognitoTabCSSPath) {
     // We generated and cached this when we initialized the object.  We don't
     // have to go back to the UI thread to send the data.
     return NULL;
   }
 
   // If it's not a themeable image, we don't need to go to the UI thread.
   int resource_id = ResourcesUtil::GetThemeResourceId(uncached_path);
-  if (!ThemeProperties::IsThemeableImage(resource_id))
+  if (!BrowserThemePack::IsPersistentImageID(resource_id))
     return NULL;
 
   return content::URLDataSource::MessageLoopForRequestPath(path);
 }
 
 bool ThemeSource::ShouldReplaceExistingSource() const {
   // We currently get the css_bytes_ in the ThemeSource constructor, so we need
   // to recreate the source itself when a theme changes.
   return true;
 }
 
 bool ThemeSource::ShouldServiceRequest(const net::URLRequest* request) const {
   if (request->url().SchemeIs(chrome::kChromeSearchScheme))
     return InstantIOContext::ShouldServiceRequest(request);
   return URLDataSource::ShouldServiceRequest(request);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // ThemeSource, private:
 
 void ThemeSource::SendThemeBitmap(
     const content::URLDataSource::GotDataCallback& callback,
     int resource_id,
     float scale_factor) {
   ui::ScaleFactor resource_scale_factor =
       ui::GetSupportedScaleFactor(scale_factor);
-  if (ThemeProperties::IsThemeableImage(resource_id)) {
+  if (BrowserThemePack::IsPersistentImageID(resource_id)) {
     DCHECK_CURRENTLY_ON(BrowserThread::UI);
     ui::ThemeProvider* tp = ThemeServiceFactory::GetForProfile(profile_);
     DCHECK(tp);
 
     scoped_refptr<base::RefCountedMemory> image_data(
         tp->GetRawData(resource_id, resource_scale_factor));
     callback.Run(image_data.get());
   } else {
     DCHECK_CURRENTLY_ON(BrowserThread::IO);
     const ResourceBundle& rb = ResourceBundle::GetSharedInstance();
     callback.Run(
         rb.LoadDataResourceBytesForScale(resource_id, resource_scale_factor));
   }
 }