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

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

Issue 23581008: Revert r154797: "Move isValid/isCurrentColor from Color to StyleColor" (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org> 2 * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org>
3 * 1999-2001 Lars Knoll <knoll@kde.org> 3 * 1999-2001 Lars Knoll <knoll@kde.org>
4 * 1999-2001 Antti Koivisto <koivisto@kde.org> 4 * 1999-2001 Antti Koivisto <koivisto@kde.org>
5 * 2000-2001 Simon Hausmann <hausmann@kde.org> 5 * 2000-2001 Simon Hausmann <hausmann@kde.org>
6 * 2000-2001 Dirk Mueller <mueller@kde.org> 6 * 2000-2001 Dirk Mueller <mueller@kde.org>
7 * 2000 Stefan Schimanski <1Stein@gmx.de> 7 * 2000 Stefan Schimanski <1Stein@gmx.de>
8 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved. 8 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
9 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) 9 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
10 * Copyright (C) 2008 Eric Seidel <eric@webkit.org> 10 * Copyright (C) 2008 Eric Seidel <eric@webkit.org>
(...skipping 10 matching lines...) Expand all
21 * 21 *
22 * You should have received a copy of the GNU Library General Public License 22 * You should have received a copy of the GNU Library General Public License
23 * along with this library; see the file COPYING.LIB. If not, write to 23 * along with this library; see the file COPYING.LIB. If not, write to
24 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 24 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
25 * Boston, MA 02110-1301, USA. 25 * Boston, MA 02110-1301, USA.
26 */ 26 */
27 27
28 #ifndef Frame_h 28 #ifndef Frame_h
29 #define Frame_h 29 #define Frame_h
30 30
31 #include "core/css/StyleColor.h"
32 #include "core/loader/FrameLoader.h" 31 #include "core/loader/FrameLoader.h"
33 #include "core/loader/NavigationScheduler.h" 32 #include "core/loader/NavigationScheduler.h"
34 #include "core/page/AdjustViewSizeOrNot.h" 33 #include "core/page/AdjustViewSizeOrNot.h"
35 #include "core/page/FrameTree.h" 34 #include "core/page/FrameTree.h"
36 #include "core/platform/ScrollTypes.h" 35 #include "core/platform/ScrollTypes.h"
37 #include "core/platform/graphics/IntSize.h" 36 #include "core/platform/graphics/IntSize.h"
38 #include "wtf/Forward.h" 37 #include "wtf/Forward.h"
39 #include "wtf/RefCounted.h" 38 #include "wtf/RefCounted.h"
40 39
41 namespace WebCore { 40 namespace WebCore {
(...skipping 24 matching lines...) Expand all
66 class TreeScope; 65 class TreeScope;
67 class VisiblePosition; 66 class VisiblePosition;
68 class Widget; 67 class Widget;
69 68
70 class Frame : public RefCounted<Frame> { 69 class Frame : public RefCounted<Frame> {
71 public: 70 public:
72 static PassRefPtr<Frame> create(Page*, HTMLFrameOwnerElement*, FrameLoad erClient*); 71 static PassRefPtr<Frame> create(Page*, HTMLFrameOwnerElement*, FrameLoad erClient*);
73 72
74 void init(); 73 void init();
75 void setView(PassRefPtr<FrameView>); 74 void setView(PassRefPtr<FrameView>);
76 void createView(const IntSize&, const StyleColor&, bool, 75 void createView(const IntSize&, const Color&, bool,
77 const IntSize& fixedLayoutSize = IntSize(), bool useFixedLayout = fa lse, ScrollbarMode = ScrollbarAuto, bool horizontalLock = false, 76 const IntSize& fixedLayoutSize = IntSize(), bool useFixedLayout = fa lse, ScrollbarMode = ScrollbarAuto, bool horizontalLock = false,
78 ScrollbarMode = ScrollbarAuto, bool verticalLock = false); 77 ScrollbarMode = ScrollbarAuto, bool verticalLock = false);
79 78
80 ~Frame(); 79 ~Frame();
81 80
82 void addDestructionObserver(FrameDestructionObserver*); 81 void addDestructionObserver(FrameDestructionObserver*);
83 void removeDestructionObserver(FrameDestructionObserver*); 82 void removeDestructionObserver(FrameDestructionObserver*);
84 83
85 void willDetachPage(); 84 void willDetachPage();
86 void detachFromPage(); 85 void detachFromPage();
(...skipping 189 matching lines...) Expand 10 before | Expand all | Expand 10 after
276 } 275 }
277 276
278 inline EventHandler* Frame::eventHandler() const 277 inline EventHandler* Frame::eventHandler() const
279 { 278 {
280 return m_eventHandler.get(); 279 return m_eventHandler.get();
281 } 280 }
282 281
283 } // namespace WebCore 282 } // namespace WebCore
284 283
285 #endif // Frame_h 284 #endif // Frame_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698