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

Side by Side Diff: third_party/WebKit/WebCore/page/FrameView.h

Issue 21165: Revert the merge. Mac build is mysteriously broken. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 11 years, 10 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) 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 17 matching lines...) Expand all
28 #include "IntSize.h" 28 #include "IntSize.h"
29 #include "RenderLayer.h" 29 #include "RenderLayer.h"
30 #include "ScrollView.h" 30 #include "ScrollView.h"
31 #include <wtf/Forward.h> 31 #include <wtf/Forward.h>
32 #include <wtf/OwnPtr.h> 32 #include <wtf/OwnPtr.h>
33 33
34 namespace WebCore { 34 namespace WebCore {
35 35
36 class Color; 36 class Color;
37 class Event; 37 class Event;
38 class EventTargetNode;
38 class Frame; 39 class Frame;
39 class FrameViewPrivate; 40 class FrameViewPrivate;
40 class IntRect; 41 class IntRect;
41 class Node; 42 class Node;
42 class PlatformMouseEvent; 43 class PlatformMouseEvent;
43 class RenderLayer; 44 class RenderLayer;
44 class RenderObject; 45 class RenderObject;
45 class RenderPartObject; 46 class RenderPartObject;
46 class ScheduledEvent; 47 class ScheduledEvent;
47 class String; 48 class String;
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
150 void beginDeferredRepaints(); 151 void beginDeferredRepaints();
151 void endDeferredRepaints(); 152 void endDeferredRepaints();
152 153
153 #if ENABLE(DASHBOARD_SUPPORT) 154 #if ENABLE(DASHBOARD_SUPPORT)
154 void updateDashboardRegions(); 155 void updateDashboardRegions();
155 #endif 156 #endif
156 void updateControlTints(); 157 void updateControlTints();
157 158
158 void restoreScrollbar(); 159 void restoreScrollbar();
159 160
160 void scheduleEvent(PassRefPtr<Event>, PassRefPtr<Node>); 161 void scheduleEvent(PassRefPtr<Event>, PassRefPtr<EventTargetNode>);
161 void pauseScheduledEvents(); 162 void pauseScheduledEvents();
162 void resumeScheduledEvents(); 163 void resumeScheduledEvents();
163 void postLayoutTimerFired(Timer<FrameView>*); 164 void postLayoutTimerFired(Timer<FrameView>*);
164 165
165 bool wasScrolledByUser() const; 166 bool wasScrolledByUser() const;
166 void setWasScrolledByUser(bool); 167 void setWasScrolledByUser(bool);
167 168
168 void addWidgetToUpdate(RenderPartObject*); 169 void addWidgetToUpdate(RenderPartObject*);
169 void removeWidgetToUpdate(RenderPartObject*); 170 void removeWidgetToUpdate(RenderPartObject*);
170 171
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
264 bool m_isPainting; 265 bool m_isPainting;
265 266
266 bool m_isVisuallyNonEmpty; 267 bool m_isVisuallyNonEmpty;
267 bool m_firstVisuallyNonEmptyLayoutCallbackPending; 268 bool m_firstVisuallyNonEmptyLayoutCallbackPending;
268 }; 269 };
269 270
270 } // namespace WebCore 271 } // namespace WebCore
271 272
272 #endif // FrameView_h 273 #endif // FrameView_h
273 274
OLDNEW
« no previous file with comments | « third_party/WebKit/WebCore/page/EventHandler.cpp ('k') | third_party/WebKit/WebCore/page/FrameView.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698