Cleanup: Stop creating RenderViewObservers from chrome/ in RenderViewer.

chrome/renderer/render_view_wrapper.h

Index: chrome/renderer/render_view_wrapper.h
===================================================================
--- chrome/renderer/render_view_wrapper.h	(revision 0)
+++ chrome/renderer/render_view_wrapper.h	(revision 0)
@@ -0,0 +1,48 @@
+// Copyright (c) 2011 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.
+
+#ifndef CHROME_RENDERER_RENDER_VIEW_WRAPPER_H_
+#define CHROME_RENDERER_RENDER_VIEW_WRAPPER_H_
+#pragma once
+
+#include "content/renderer/render_view_observer.h"
+#include "ui/gfx/native_widget_types.h"
+
+class PrintWebViewHelper;
+class RenderView;
+class SearchBox;
+
+struct RendererPreferences;
+
+namespace WebKit {
+class WebView;
+}
+
+class RenderViewWrapper : public RenderViewObserver {

[jam, 2011/03/29 18:31:59]

it seems a little confusing to call this RenderViewWrapper, since it's just
another observer, and doesn't actually contain a RenderView as a member (i.e.
wrapping it).

[Lei Zhang, 2011/03/30 22:05:43]

It was a poorly chosen name, but I had to name it something. In any case, this
is gone now.

+ public:
+  RenderViewWrapper(RenderView* rv,
+                    gfx::NativeViewId parent_hwnd,
+                    int32 opener_id,
+                    const RendererPreferences& renderer_prefs,
+                    const string16& frame_name);
+  virtual ~RenderViewWrapper();
+
+  static RenderViewWrapper* FromWebView(WebKit::WebView* webview);
+
+  SearchBox* searchbox() const;

[jam, 2011/03/29 18:31:59]

The interface of RenderViewObserver allows the implementor to delete themselves
at any time. So it would seem unfortunate to have weak pointers to RVO's, since
that will eventually lead to using deleted objects.  I realize that a few of the
RVO implementations will need to be accessed given a RV.  I wonder if we can
have some templatized helper that these objects can use to automatically
register/unregister themself on creation and then have a getter based on a
RenderView?

As for the tests, I think we just need to restructure them a bit so that we
don't need to keep the PrintWebViewHelper and other objects as a weak pointer.

[Lei Zhang, 2011/03/30 22:05:43]

I don't have a templatized helper, but I added a |type_| string member to RVOs,
and for the ones we care about, we can set it to a unique per class value. I
also added RenderView::GetObserver(std::string type) to retrieve the RVO we care
about for a given RV.
Ya, I got rid of the weak pointers because I added the method above.

+
+ private:
+  FRIEND_TEST_ALL_PREFIXES(RenderViewTest, BlockScriptInitiatedPrinting);
+  FRIEND_TEST_ALL_PREFIXES(RenderViewTest, OnPrintPages);
+  FRIEND_TEST_ALL_PREFIXES(RenderViewTest, PrintLayoutTest);
+  FRIEND_TEST_ALL_PREFIXES(RenderViewTest, PrintWithIframe);
+
+  // The following RenderViewObservers are weak pointers.
+  PrintWebViewHelper* print_helper_;
+  SearchBox* searchbox_;
+
+  DISALLOW_COPY_AND_ASSIGN(RenderViewWrapper);
+};
+
+#endif  // CHROME_RENDERER_RENDER_VIEW_WRAPPER_H_
Property changes on: chrome/renderer/render_view_wrapper.h
___________________________________________________________________
Added: svn:eol-style
   + LF