Fixing iframe jank in the local omnibox popup.

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.h"
 #include "base/strings/string_number_conversions.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 38 matching lines @@
 
 ThemeSource::~ThemeSource() {
 }
 
 std::string ThemeSource::GetSource() const {
   return chrome::kChromeUIThemePath;
 }
 
 void ThemeSource::StartDataRequest(
     const std::string& path,
-    bool is_incognito,
+    int render_process_id,
+    int render_view_id,
     const content::URLDataSource::GotDataCallback& callback) {
   // Default scale factor if not specified.
   ui::ScaleFactor scale_factor;
   std::string uncached_path;
   webui::ParsePathAndScale(GURL(GetThemePath() + path),
                            &uncached_path,
                            &scale_factor);
 
   if (uncached_path == kNewTabCSSPath ||
       uncached_path == kNewIncognitoTabCSSPath) {
     DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
-    DCHECK((uncached_path == kNewTabCSSPath && !is_incognito) ||
-           (uncached_path == kNewIncognitoTabCSSPath && is_incognito));

[palmer, 2013/04/22 19:38:37]

Are we sure it's safe to remove this DCHECK?

[Jered, 2013/04/22 23:02:58]

Yes. The owners agreed this was ok in https://codereview.chromium.org/14039004/
of which this is a patch.

 
     callback.Run(css_bytes_);
     return;
   }
 
 
   int resource_id = ResourcesUtil::GetThemeResourceId(uncached_path);
   if (resource_id != -1) {
     SendThemeBitmap(callback, resource_id, scale_factor);
     return;
@@ skipping 61 matching lines @@
 
     scoped_refptr<base::RefCountedMemory> image_data(tp->GetRawData(
         resource_id, scale_factor));
     callback.Run(image_data);
   } else {
     DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
     const ResourceBundle& rb = ResourceBundle::GetSharedInstance();
     callback.Run(rb.LoadDataResourceBytesForScale(resource_id, scale_factor));
   }
 }