Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(465)

Side by Side Diff: third_party/WebKit/Source/core/frame/RemoteFrameView.h

Issue 2832883003: Remove unneeded Convert* methods and move many from FrameViewBase to FrameView (Closed)
Patch Set: fix ScrollableArea::ConvertFromScrollbarToContainingFrameViewBase and remove dchecks Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef RemoteFrameView_h 5 #ifndef RemoteFrameView_h
6 #define RemoteFrameView_h 6 #define RemoteFrameView_h
7 7
8 #include "core/frame/FrameOrPlugin.h" 8 #include "core/frame/FrameOrPlugin.h"
9 #include "platform/FrameViewBase.h" 9 #include "platform/FrameViewBase.h"
10 #include "platform/geometry/IntRect.h" 10 #include "platform/geometry/IntRect.h"
(...skipping 27 matching lines...) Expand all
38 void InvalidateRect(const IntRect&); 38 void InvalidateRect(const IntRect&);
39 void SetFrameRect(const IntRect&) override; 39 void SetFrameRect(const IntRect&) override;
40 const IntRect& FrameRect() const override { 40 const IntRect& FrameRect() const override {
41 return FrameViewBase::FrameRect(); 41 return FrameViewBase::FrameRect();
42 } 42 }
43 void Paint(GraphicsContext&, const CullRect&) const override {} 43 void Paint(GraphicsContext&, const CullRect&) const override {}
44 void Hide() override; 44 void Hide() override;
45 void Show() override; 45 void Show() override;
46 void SetParentVisible(bool) override; 46 void SetParentVisible(bool) override;
47 47
48 IntRect ConvertFromContainingFrameViewBase(const IntRect&) const override;
49
48 DECLARE_VIRTUAL_TRACE(); 50 DECLARE_VIRTUAL_TRACE();
49 51
50 private: 52 private:
51 explicit RemoteFrameView(RemoteFrame*); 53 explicit RemoteFrameView(RemoteFrame*);
52 54
53 void UpdateRemoteViewportIntersection(); 55 void UpdateRemoteViewportIntersection();
54 56
55 // The properties and handling of the cycle between RemoteFrame 57 // The properties and handling of the cycle between RemoteFrame
56 // and its RemoteFrameView corresponds to that between LocalFrame 58 // and its RemoteFrameView corresponds to that between LocalFrame
57 // and FrameView. Please see the FrameView::m_frame comment for 59 // and FrameView. Please see the FrameView::m_frame comment for
58 // details. 60 // details.
59 Member<RemoteFrame> remote_frame_; 61 Member<RemoteFrame> remote_frame_;
60 62
61 IntRect last_viewport_intersection_; 63 IntRect last_viewport_intersection_;
62 }; 64 };
63 65
64 DEFINE_TYPE_CASTS(RemoteFrameView, 66 DEFINE_TYPE_CASTS(RemoteFrameView,
65 FrameViewBase, 67 FrameViewBase,
66 frameViewBase, 68 frameViewBase,
67 frameViewBase->IsRemoteFrameView(), 69 frameViewBase->IsRemoteFrameView(),
68 frameViewBase.IsRemoteFrameView()); 70 frameViewBase.IsRemoteFrameView());
69 71
70 } // namespace blink 72 } // namespace blink
71 73
72 #endif // RemoteFrameView_h 74 #endif // RemoteFrameView_h
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/frame/FrameView.cpp ('k') | third_party/WebKit/Source/core/frame/RemoteFrameView.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698