RemoteBridgeFrameOwner: keep better track of the attached frame

third_party/WebKit/Source/core/frame/FrameOwner.h

Index: third_party/WebKit/Source/core/frame/FrameOwner.h
diff --git a/third_party/WebKit/Source/core/frame/FrameOwner.h b/third_party/WebKit/Source/core/frame/FrameOwner.h
index 59cab0fe330d97a6a24505f89ab969fcf6e76eb9..76514d303bab4835d613678bebcae88d17362af1 100644
--- a/third_party/WebKit/Source/core/frame/FrameOwner.h
+++ b/third_party/WebKit/Source/core/frame/FrameOwner.h
@@ -12,6 +12,8 @@
 
 namespace blink {
 
+class Frame;
+
 // Oilpan: all FrameOwner instances are GCed objects. FrameOwner additionally
 // derives from GarbageCollectedMixin so that Member<FrameOwner> references can
 // be kept (e.g., Frame::m_owner.)
@@ -22,6 +24,9 @@ public:
 
     virtual bool isLocal() const = 0;
 
+    virtual void setContentFrame(Frame&) = 0;
+    virtual void clearContentFrame() = 0;
+
     virtual SandboxFlags getSandboxFlags() const = 0;
     virtual void dispatchLoad() = 0;
 
@@ -34,6 +39,28 @@ public:
     virtual int marginHeight() const = 0;
 };
 
+class CORE_EXPORT StubFrameOwner : public NoBaseWillBeGarbageCollectedFinalized<StubFrameOwner>, public FrameOwner {

[haraken, 2016/03/16 14:17:41]

Is there any better name than StubFrameOwner? DummyFrameOwner or something
better.

[dcheng, 2016/03/16 16:51:41]

Done.

+    WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(StubFrameOwner);
+public:
+    static PassOwnPtrWillBeRawPtr<StubFrameOwner> create()
+    {
+        return adoptPtrWillBeNoop(new StubFrameOwner);
+    }
+
+    DEFINE_INLINE_VIRTUAL_TRACE() { FrameOwner::trace(visitor); }
+
+    // FrameOwner overrides:
+    bool isLocal() const override { return false; }
+    void setContentFrame(Frame&) override { }
+    void clearContentFrame() override { }
+    SandboxFlags getSandboxFlags() const override { return SandboxNone; }
+    void dispatchLoad() override { }
+    void renderFallbackContent() override { }
+    ScrollbarMode scrollingMode() const override { return ScrollbarAuto; }
+    int marginWidth() const override { return -1; }
+    int marginHeight() const override { return -1; }
+};
+
 } // namespace blink
 
 #endif // FrameOwner_h