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

Unified Diff: sky/engine/core/frame/FrameView.cpp

Issue 685593005: Remove concept of child Widgets. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years, 2 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « sky/engine/core/frame/FrameView.h ('k') | sky/engine/core/rendering/RenderLayerScrollableArea.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/core/frame/FrameView.cpp
diff --git a/sky/engine/core/frame/FrameView.cpp b/sky/engine/core/frame/FrameView.cpp
index 92d5ced24ca6c6a4766bb706d59850d7680f5865..a688b25f8e0641fe892d18ddd6909d766609e57a 100644
--- a/sky/engine/core/frame/FrameView.cpp
+++ b/sky/engine/core/frame/FrameView.cpp
@@ -98,7 +98,6 @@ FrameView::FrameView(LocalFrame* frame)
PassRefPtr<FrameView> FrameView::create(LocalFrame* frame)
{
RefPtr<FrameView> view = adoptRef(new FrameView(frame));
- view->show();
return view.release();
}
@@ -107,8 +106,6 @@ PassRefPtr<FrameView> FrameView::create(LocalFrame* frame, const IntSize& initia
RefPtr<FrameView> view = adoptRef(new FrameView(frame));
view->Widget::setFrameRect(IntRect(view->location(), initialSize));
view->setLayoutSizeInternal(initialSize);
-
- view->show();
return view.release();
}
@@ -1430,21 +1427,6 @@ void FrameView::removeScrollableArea(ScrollableArea* scrollableArea)
m_scrollableAreas->remove(scrollableArea);
}
-void FrameView::addChild(PassRefPtr<Widget> prpChild)
-{
- Widget* child = prpChild.get();
- ASSERT(child != this && !child->parent());
- child->setParent(this);
- m_children.add(prpChild);
-}
-
-void FrameView::removeChild(Widget* widget)
-{
- ASSERT(widget->parent() == this);
- widget->setParent(0);
- m_children.remove(widget);
-}
-
bool FrameView::wheelEvent(const PlatformWheelEvent& wheelEvent)
{
// FIXME(sky): Remove
@@ -1477,16 +1459,6 @@ void FrameView::setCursor(const Cursor& cursor)
page->chrome().setCursor(cursor);
}
-void FrameView::frameRectsChanged()
-{
- if (layoutSizeFixedToFrameSize())
- setLayoutSizeInternal(frameRect().size());
-
- for (const auto& widget : m_children) {
- widget->frameRectsChanged();
- }
-}
-
void FrameView::setLayoutSizeInternal(const IntSize& size)
{
if (m_layoutSize == size)
« no previous file with comments | « sky/engine/core/frame/FrameView.h ('k') | sky/engine/core/rendering/RenderLayerScrollableArea.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698