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

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

Issue 2871453002: Delete widget tree (FrameView::parent_) (Closed)
Patch Set: Remove deferred state Created 3 years, 7 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 /* 1 /*
2 Copyright (C) 1997 Martin Jones (mjones@kde.org) 2 Copyright (C) 1997 Martin Jones (mjones@kde.org)
3 (C) 1998 Waldo Bastian (bastian@kde.org) 3 (C) 1998 Waldo Bastian (bastian@kde.org)
4 (C) 1998, 1999 Torben Weis (weis@kde.org) 4 (C) 1998, 1999 Torben Weis (weis@kde.org)
5 (C) 1999 Lars Knoll (knoll@kde.org) 5 (C) 1999 Lars Knoll (knoll@kde.org)
6 (C) 1999 Antti Koivisto (koivisto@kde.org) 6 (C) 1999 Antti Koivisto (koivisto@kde.org)
7 Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights 7 Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights
8 reserved. 8 reserved.
9 9
10 This library is free software; you can redistribute it and/or 10 This library is free software; you can redistribute it and/or
(...skipping 475 matching lines...) Expand 10 before | Expand all | Expand 10 after
486 } // Whether or not we have been explicitly marked as visible or not. 486 } // Whether or not we have been explicitly marked as visible or not.
487 bool IsParentVisible() const { 487 bool IsParentVisible() const {
488 return parent_visible_; 488 return parent_visible_;
489 } // Whether or not our parent is visible. 489 } // Whether or not our parent is visible.
490 bool IsVisible() const { 490 bool IsVisible() const {
491 return self_visible_ && parent_visible_; 491 return self_visible_ && parent_visible_;
492 } // Whether or not we are actually visible. 492 } // Whether or not we are actually visible.
493 void SetParentVisible(bool) override; 493 void SetParentVisible(bool) override;
494 void SetSelfVisible(bool v) { self_visible_ = v; } 494 void SetSelfVisible(bool v) { self_visible_ = v; }
495 void SetParent(FrameView*) override; 495 void SetParent(FrameView*) override;
496 FrameView* Parent() const override { return parent_; } 496 FrameView* Parent() const override;
497 void SetFrameOrPluginState(FrameOrPluginState) override;
498 FrameOrPluginState GetFrameOrPluginState() const override {
499 return frame_view_state_;
500 }
497 void RemoveChild(FrameOrPlugin*); 501 void RemoveChild(FrameOrPlugin*);
498 using PluginSet = HeapHashSet<Member<PluginView>>; 502 using PluginSet = HeapHashSet<Member<PluginView>>;
499 const PluginSet& Plugins() const { return plugins_; } 503 const PluginSet& Plugins() const { return plugins_; }
500 void AddPlugin(PluginView*); 504 void AddPlugin(PluginView*);
501 // Custom scrollbars in PaintLayerScrollableArea need to be called with 505 // Custom scrollbars in PaintLayerScrollableArea need to be called with
502 // StyleChanged whenever window focus is changed. 506 // StyleChanged whenever window focus is changed.
503 void RemoveScrollbar(Scrollbar*); 507 void RemoveScrollbar(Scrollbar*);
504 void AddScrollbar(Scrollbar*); 508 void AddScrollbar(Scrollbar*);
505 509
506 // If the scroll view does not use a native widget, then it will have 510 // If the scroll view does not use a native widget, then it will have
(...skipping 563 matching lines...) Expand 10 before | Expand all | Expand 10 after
1070 EmbeddedObjectSet part_update_set_; 1074 EmbeddedObjectSet part_update_set_;
1071 1075
1072 // FIXME: These are just "children" of the FrameView and should be 1076 // FIXME: These are just "children" of the FrameView and should be
1073 // Member<FrameView> instead. 1077 // Member<FrameView> instead.
1074 HashSet<RefPtr<LayoutPart>> parts_; 1078 HashSet<RefPtr<LayoutPart>> parts_;
1075 1079
1076 Member<LocalFrame> frame_; 1080 Member<LocalFrame> frame_;
1077 1081
1078 IntRect frame_rect_; 1082 IntRect frame_rect_;
1079 Member<FrameView> parent_; 1083 Member<FrameView> parent_;
1084 FrameOrPluginState frame_view_state_;
1080 bool self_visible_; 1085 bool self_visible_;
1081 bool parent_visible_; 1086 bool parent_visible_;
1082 1087
1083 WebDisplayMode display_mode_; 1088 WebDisplayMode display_mode_;
1084 1089
1085 DisplayShape display_shape_; 1090 DisplayShape display_shape_;
1086 1091
1087 bool can_have_scrollbars_; 1092 bool can_have_scrollbars_;
1088 1093
1089 bool has_pending_layout_; 1094 bool has_pending_layout_;
(...skipping 189 matching lines...) Expand 10 before | Expand all | Expand 10 after
1279 frame_or_plugin.IsFrameView()); 1284 frame_or_plugin.IsFrameView());
1280 DEFINE_TYPE_CASTS(FrameView, 1285 DEFINE_TYPE_CASTS(FrameView,
1281 ScrollableArea, 1286 ScrollableArea,
1282 scrollableArea, 1287 scrollableArea,
1283 scrollableArea->IsFrameView(), 1288 scrollableArea->IsFrameView(),
1284 scrollableArea.IsFrameView()); 1289 scrollableArea.IsFrameView());
1285 1290
1286 } // namespace blink 1291 } // namespace blink
1287 1292
1288 #endif // FrameView_h 1293 #endif // FrameView_h
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/frame/FrameOrPlugin.h ('k') | third_party/WebKit/Source/core/frame/FrameView.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698