← Back to branch summary

~osomon/oxide/im-fake-key-events

« back to all changes in this revision

Viewing changes to shared/browser/oxide_web_frame.h

  • Committer: Chris Coulson
  • Date: 2014-03-28 12:04:05 UTC
  • Revision ID: chris.coulson@canonical.com-20140328120405-2dskp93f8jx9217w
The oxide::WebFrame destructor reenters virtual functions implemented by derived classes - add back a Destroy() method and make its destructor private

Show diffs side-by-side

added added

removed removed

Lines of Context:
shared/browser/oxide_web_frame.h
23
23
 
24
24
#include "base/basictypes.h"
25
25
#include "base/memory/weak_ptr.h"
26
 
#include "base/supports_user_data.h"
27
26
#include "ipc/ipc_sender.h"
28
27
#include "url/gurl.h"
29
28
 
41
40
// Represents a document frame in the renderer (a top-level frame or iframe).
42
41
// This is designed to be subclassed by each implementation. Each instance
43
42
// of this will typically own a publicly exposed webframe
44
 
class WebFrame : public ScriptMessageTarget,
45
 
                 public base::SupportsUserData {
 
43
class WebFrame : public ScriptMessageTarget {
46
44
 public:
47
45
  typedef std::vector<ScriptMessageRequestImplBrowser *> ScriptMessageRequestVector;
48
46
 
49
 
  virtual ~WebFrame();
 
47
  void Destroy();
50
48
 
51
49
  static WebFrame* FromFrameTreeNode(content::FrameTreeNode* node);
52
50
 
91
89
 
92
90
 protected:
93
91
  WebFrame(content::FrameTreeNode* node, WebView* view);
 
92
  virtual ~WebFrame();
94
93
 
95
94
 private:
96
95
  friend class ScriptMessageRequestImplBrowser;
119
118
  int next_message_serial_;
120
119
  ScriptMessageRequestVector current_script_message_requests_;
121
120
  base::WeakPtrFactory<WebFrame> weak_factory_;
 
121
  bool destroyed_;
122
122
 
123
123
  DISALLOW_COPY_AND_ASSIGN(WebFrame);
124
124
};