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

Side by Side Diff: Source/WebCore/page/Page.h

Issue 11875020: Merge 138991 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1364/
Patch Set: Created 7 years, 11 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
« no previous file with comments | « Source/WebCore/WebCore.exp.in ('k') | Source/WebCore/page/Page.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) 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved. 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
3 * Copyright (C) 2008 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/) 3 * Copyright (C) 2008 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/)
4 * 4 *
5 * This library is free software; you can redistribute it and/or 5 * This library is free software; you can redistribute it and/or
6 * modify it under the terms of the GNU Library General Public 6 * modify it under the terms of the GNU Library General Public
7 * License as published by the Free Software Foundation; either 7 * License as published by the Free Software Foundation; either
8 * version 2 of the License, or (at your option) any later version. 8 * version 2 of the License, or (at your option) any later version.
9 * 9 *
10 * This library is distributed in the hope that it will be useful, 10 * This library is distributed in the hope that it will be useful,
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 class Debugger; 50 class Debugger;
51 } 51 }
52 52
53 namespace WebCore { 53 namespace WebCore {
54 54
55 class AlternativeTextClient; 55 class AlternativeTextClient;
56 class BackForwardController; 56 class BackForwardController;
57 class BackForwardList; 57 class BackForwardList;
58 class Chrome; 58 class Chrome;
59 class ChromeClient; 59 class ChromeClient;
60 class ClientRectList;
60 #if ENABLE(CONTEXT_MENUS) 61 #if ENABLE(CONTEXT_MENUS)
61 class ContextMenuClient; 62 class ContextMenuClient;
62 class ContextMenuController; 63 class ContextMenuController;
63 #endif 64 #endif
64 class Document; 65 class Document;
65 class DragCaretController; 66 class DragCaretController;
66 class DragClient; 67 class DragClient;
67 class DragController; 68 class DragController;
68 class EditorClient; 69 class EditorClient;
69 class FocusController; 70 class FocusController;
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after
193 #endif 194 #endif
194 #if ENABLE(POINTER_LOCK) 195 #if ENABLE(POINTER_LOCK)
195 PointerLockController* pointerLockController() const { return m_pointerL ockController.get(); } 196 PointerLockController* pointerLockController() const { return m_pointerL ockController.get(); }
196 #endif 197 #endif
197 ValidationMessageClient* validationMessageClient() const { return m_vali dationMessageClient; } 198 ValidationMessageClient* validationMessageClient() const { return m_vali dationMessageClient; }
198 199
199 ScrollingCoordinator* scrollingCoordinator(); 200 ScrollingCoordinator* scrollingCoordinator();
200 201
201 String scrollingStateTreeAsText(); 202 String scrollingStateTreeAsText();
202 String mainThreadScrollingReasonsAsText(); 203 String mainThreadScrollingReasonsAsText();
204 PassRefPtr<ClientRectList> nonFastScrollableRects(const Frame*);
203 205
204 Settings* settings() const { return m_settings.get(); } 206 Settings* settings() const { return m_settings.get(); }
205 ProgressTracker* progress() const { return m_progress.get(); } 207 ProgressTracker* progress() const { return m_progress.get(); }
206 BackForwardController* backForward() const { return m_backForwardControl ler.get(); } 208 BackForwardController* backForward() const { return m_backForwardControl ler.get(); }
207 209
208 FeatureObserver* featureObserver() { return &m_featureObserver; } 210 FeatureObserver* featureObserver() { return &m_featureObserver; }
209 211
210 enum ViewMode { 212 enum ViewMode {
211 ViewModeInvalid, 213 ViewModeInvalid,
212 ViewModeWindowed, 214 ViewModeWindowed,
(...skipping 266 matching lines...) Expand 10 before | Expand all | Expand 10 after
479 481
480 bool m_scriptedAnimationsSuspended; 482 bool m_scriptedAnimationsSuspended;
481 483
482 HashSet<String> m_seenPlugins; 484 HashSet<String> m_seenPlugins;
483 HashSet<String> m_seenMediaEngines; 485 HashSet<String> m_seenMediaEngines;
484 }; 486 };
485 487
486 } // namespace WebCore 488 } // namespace WebCore
487 489
488 #endif // Page_h 490 #endif // Page_h
OLDNEW
« no previous file with comments | « Source/WebCore/WebCore.exp.in ('k') | Source/WebCore/page/Page.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698