Add an ability to call WebKit's WebFrame::loadData via NavigationController.

content/browser/web_contents/navigation_controller_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/web_contents/navigation_controller_impl.h"
 
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/string_number_conversions.h"  // Temporary
 #include "base/string_util.h"
@@ skipping 11 matching lines @@
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/common/view_messages.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/invalidate_type.h"
 #include "content/public/browser/navigation_details.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/browser/web_contents_delegate.h"
 #include "content/public/common/content_constants.h"
+#include "content/public/common/url_constants.h"
 #include "net/base/escape.h"
 #include "net/base/mime_util.h"
 #include "net/base/net_util.h"
 #include "webkit/glue/webkit_glue.h"
 
 using content::BrowserContext;
 using content::DOMStorageContext;
 using content::GlobalRequestID;
 using content::NavigationController;
 using content::NavigationEntry;
@@ skipping 574 matching lines @@
 
   NavigationEntryImpl* entry = NavigationEntryImpl::FromNavigationEntry(
       CreateNavigationEntry(
           url, referrer, transition, is_renderer_initiated, extra_headers,
           browser_context_));
   entry->SetIsOverridingUserAgent(is_overriding_user_agent);
 
   LoadEntry(entry);
 }
 
+void NavigationControllerImpl::LoadDataWithBaseURL(
+    const GURL& data_url,
+    const content::Referrer& referrer,
+    const GURL& base_url,
+    const GURL& history_url,
+    bool is_overriding_user_agent) {
+  // Make sure we don't allow non-'data:' URLs.
+  DCHECK(data_url.SchemeIs(chrome::kDataScheme));

[Charlie Reis, 2012/07/03 17:54:37]

Alternatively, just put a NOTREACHED inside the "if" below.

[mnaganov (inactive), 2012/07/04 15:25:57]

Done, thanks for the suggestion.

+  if (!data_url.SchemeIs(chrome::kDataScheme))
+    return;
+
+  needs_reload_ = false;
+
+  NavigationEntryImpl* entry = NavigationEntryImpl::FromNavigationEntry(
+      CreateNavigationEntry(
+          data_url,
+          referrer,
+          content::PAGE_TRANSITION_TYPED,
+          false,
+          std::string(),
+          browser_context_));
+  entry->SetIsOverridingUserAgent(is_overriding_user_agent);
+  entry->SetBaseURLForDataURL(base_url);
+  entry->SetVirtualURL(history_url);
+
+  LoadEntry(entry);
+}
+
 void NavigationControllerImpl::DocumentLoadedInFrame() {
   last_document_loaded_ = base::TimeTicks::Now();
 }
 
 bool NavigationControllerImpl::RendererDidNavigate(
     const ViewHostMsg_FrameNavigate_Params& params,
     content::LoadCommittedDetails* details) {
 
   // Save the previous state before we clobber it.
   if (GetLastCommittedEntry()) {
@@ skipping 818 matching lines @@
   for (int i = 0; i < max_index; i++) {
     // When cloning a tab, copy all entries except interstitial pages
     if (source.entries_[i].get()->GetPageType() !=
         content::PAGE_TYPE_INTERSTITIAL) {
       entries_.insert(entries_.begin() + insert_index++,
                       linked_ptr<NavigationEntryImpl>(
                           new NavigationEntryImpl(*source.entries_[i])));
     }
   }
 }