From bd92c3aee82e619df3526b4d971b706ab070167c Mon Sep 17 00:00:00 2001
From: "jorlow@chromium.org"
 <jorlow@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Wed, 13 Jan 2010 05:02:34 +0000
Subject: Hack so that the upstream change from using
 WebKitClient::createSessionStorageNamespace to using
 WebViewClient::createSessionStorageNamespace doesn't break us while the rest
 of the SessionStorage change lands.

TEST=none
BUG=none

Review URL: http://codereview.chromium.org/546017

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@36097 0039d316-1c4b-4281-b951-d872f2087c98
---
 chrome/renderer/render_view.cc | 9 +++++++++
 chrome/renderer/render_view.h  | 2 ++
 2 files changed, 11 insertions(+)

(limited to 'chrome')

diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc
index 6371372..497f52f 100644
--- a/chrome/renderer/render_view.cc
+++ b/chrome/renderer/render_view.cc
@@ -50,6 +50,7 @@
 #include "chrome/renderer/plugin_channel_host.h"
 #include "chrome/renderer/print_web_view_helper.h"
 #include "chrome/renderer/render_process.h"
+#include "chrome/renderer/renderer_webstoragenamespace_impl.h"
 #include "chrome/renderer/spellchecker/spellcheck.h"
 #include "chrome/renderer/user_script_slave.h"
 #include "chrome/renderer/visitedlink_slave.h"
@@ -86,6 +87,7 @@
 #include "third_party/WebKit/WebKit/chromium/public/WebSearchableFormData.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebSecurityOrigin.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebSize.h"
+#include "third_party/WebKit/WebKit/chromium/public/WebStorageNamespace.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebString.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebURL.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebURLError.h"
@@ -159,6 +161,7 @@ using WebKit::WebSecurityOrigin;
 using WebKit::WebSettings;
 using WebKit::WebSharedWorker;
 using WebKit::WebSize;
+using WebKit::WebStorageNamespace;
 using WebKit::WebString;
 using WebKit::WebTextAffinity;
 using WebKit::WebTextDirection;
@@ -1399,6 +1402,12 @@ WebWidget* RenderView::createPopupMenu(const WebPopupMenuInfo& info) {
   return widget->webwidget();
 }
 
+WebStorageNamespace* RenderView::createSessionStorageNamespace() {
+  if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kSingleProcess))
+    return WebStorageNamespace::createSessionStorageNamespace();
+  return new RendererWebStorageNamespaceImpl(DOM_STORAGE_SESSION);
+}
+
 void RenderView::didAddMessageToConsole(
     const WebConsoleMessage& message, const WebString& source_name,
     unsigned source_line) {
diff --git a/chrome/renderer/render_view.h b/chrome/renderer/render_view.h
index 1174b3a..f390af6 100644
--- a/chrome/renderer/render_view.h
+++ b/chrome/renderer/render_view.h
@@ -91,6 +91,7 @@ class WebDataSource;
 class WebDragData;
 class WebMediaPlayer;
 class WebMediaPlayerClient;
+class WebStorageNamespace;
 class WebURLRequest;
 struct WebFindOptions;
 }
@@ -187,6 +188,7 @@ class RenderView : public RenderWidget,
   virtual WebKit::WebWidget* createPopupMenu(bool activatable);
   virtual WebKit::WebWidget* createPopupMenu(
       const WebKit::WebPopupMenuInfo& info);
+  virtual WebKit::WebStorageNamespace* createSessionStorageNamespace();
   virtual void didAddMessageToConsole(
       const WebKit::WebConsoleMessage& message,
       const WebKit::WebString& source_name, unsigned source_line);
-- 
cgit v1.1