Index: third_party/WebKit/Source/core/frame/RemoteFrameView.h |
diff --git a/third_party/WebKit/Source/core/frame/RemoteFrameView.h b/third_party/WebKit/Source/core/frame/RemoteFrameView.h |
index 9026625253064e4a371b69a9756877574de63dac..343e1dfeb5e9811fd74e27189ce59c02717e6ce4 100644 |
--- a/third_party/WebKit/Source/core/frame/RemoteFrameView.h |
+++ b/third_party/WebKit/Source/core/frame/RemoteFrameView.h |
@@ -7,7 +7,6 @@ |
#include "core/frame/FrameOrPlugin.h" |
#include "core/frame/FrameView.h" |
-#include "platform/FrameViewBase.h" |
#include "platform/geometry/IntRect.h" |
#include "platform/heap/Handle.h" |
@@ -18,7 +17,6 @@ class GraphicsContext; |
class RemoteFrame; |
class RemoteFrameView final : public GarbageCollectedFinalized<RemoteFrameView>, |
joelhockey
2017/05/01 23:04:35
The main point of this CL is to stop RemoteFrameVi
|
- public FrameViewBase, |
public FrameOrPlugin { |
USING_GARBAGE_COLLECTED_MIXIN(RemoteFrameView); |
@@ -27,9 +25,8 @@ class RemoteFrameView final : public GarbageCollectedFinalized<RemoteFrameView>, |
~RemoteFrameView() override; |
- bool IsRemoteFrameView() const override { return true; } |
- void SetParent(FrameViewBase*) override; |
- FrameViewBase* Parent() const override { return parent_; } |
+ void SetParent(FrameView*) override; |
+ FrameView* Parent() const override { return parent_; } |
RemoteFrame& GetFrame() const { |
ASSERT(remote_frame_); |
@@ -42,19 +39,18 @@ class RemoteFrameView final : public GarbageCollectedFinalized<RemoteFrameView>, |
void InvalidateRect(const IntRect&); |
void SetFrameRect(const IntRect&) override; |
const IntRect& FrameRect() const override { return frame_rect_; } |
- IntPoint Location() const override { return frame_rect_.Location(); } |
void Paint(GraphicsContext&, const CullRect&) const override {} |
void Hide() override; |
void Show() override; |
void SetParentVisible(bool) override; |
- IntRect ConvertFromContainingFrameViewBase(const IntRect&) const override; |
- |
DECLARE_VIRTUAL_TRACE(); |
private: |
explicit RemoteFrameView(RemoteFrame*); |
+ IntRect ConvertFromRootFrame(const IntRect&) const; |
+ |
void UpdateRemoteViewportIntersection(); |
// The properties and handling of the cycle between RemoteFrame |
@@ -69,12 +65,6 @@ class RemoteFrameView final : public GarbageCollectedFinalized<RemoteFrameView>, |
bool parent_visible_; |
}; |
-DEFINE_TYPE_CASTS(RemoteFrameView, |
- FrameViewBase, |
- frameViewBase, |
- frameViewBase->IsRemoteFrameView(), |
- frameViewBase.IsRemoteFrameView()); |
- |
} // namespace blink |
#endif // RemoteFrameView_h |