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

Side by Side Diff: Source/core/page/FrameView.h

Issue 23728003: Return Frame&, not Frame* from RenderView::frame() (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: fixed PopupMenuTest build Created 7 years, 3 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/page/Frame.cpp ('k') | Source/core/page/FrameView.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 reserv ed. 7 Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserv ed.
8 8
9 This library is free software; you can redistribute it and/or 9 This library is free software; you can redistribute it and/or
10 modify it under the terms of the GNU Library General Public 10 modify it under the terms of the GNU Library General Public
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
66 66
67 virtual ~FrameView(); 67 virtual ~FrameView();
68 68
69 virtual HostWindow* hostWindow() const; 69 virtual HostWindow* hostWindow() const;
70 70
71 virtual void invalidateRect(const IntRect&); 71 virtual void invalidateRect(const IntRect&);
72 virtual void setFrameRect(const IntRect&); 72 virtual void setFrameRect(const IntRect&);
73 73
74 virtual bool scheduleAnimation(); 74 virtual bool scheduleAnimation();
75 75
76 Frame* frame() const { return m_frame.get(); } 76 Frame& frame() const { return *m_frame; }
77 77
78 RenderView* renderView() const { return m_frame->contentRenderer(); } 78 RenderView* renderView() const { return m_frame->contentRenderer(); }
79 79
80 int mapFromLayoutToCSSUnits(LayoutUnit); 80 int mapFromLayoutToCSSUnits(LayoutUnit);
81 LayoutUnit mapFromCSSToLayoutUnits(int); 81 LayoutUnit mapFromCSSToLayoutUnits(int);
82 82
83 LayoutUnit marginWidth() const { return m_margins.width(); } // -1 means def ault 83 LayoutUnit marginWidth() const { return m_margins.width(); } // -1 means def ault
84 LayoutUnit marginHeight() const { return m_margins.height(); } // -1 means d efault 84 LayoutUnit marginHeight() const { return m_margins.height(); } // -1 means d efault
85 void setMarginWidth(LayoutUnit); 85 void setMarginWidth(LayoutUnit);
86 void setMarginHeight(LayoutUnit); 86 void setMarginHeight(LayoutUnit);
(...skipping 489 matching lines...) Expand 10 before | Expand all | Expand 10 after
576 ASSERT(!widget || widget->isFrameView()); 576 ASSERT(!widget || widget->isFrameView());
577 return static_cast<const FrameView*>(widget); 577 return static_cast<const FrameView*>(widget);
578 } 578 }
579 579
580 // This will catch anyone doing an unnecessary cast. 580 // This will catch anyone doing an unnecessary cast.
581 void toFrameView(const FrameView*); 581 void toFrameView(const FrameView*);
582 582
583 } // namespace WebCore 583 } // namespace WebCore
584 584
585 #endif // FrameView_h 585 #endif // FrameView_h
OLDNEW
« no previous file with comments | « Source/core/page/Frame.cpp ('k') | Source/core/page/FrameView.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698