Changeset 156543 in webkit
- Timestamp:
- Sep 27, 2013 8:09:01 AM (11 years ago)
- Location:
- trunk
- Files:
-
- 2 added
- 119 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/CMakeLists.txt
r156522 r156543 1746 1746 page/History.cpp 1747 1747 page/Location.cpp 1748 page/MainFrame.cpp 1748 1749 page/MouseEventWithHitTestResults.cpp 1749 1750 page/Navigator.cpp -
trunk/Source/WebCore/ChangeLog
r156542 r156543 1 2013-09-27 Darin Adler <darin@apple.com> 2 3 Add empty MainFrame class 4 https://bugs.webkit.org/show_bug.cgi?id=121770 5 6 Reviewed by Andreas Kling. 7 8 For now, MainFrame simply derives from Frame and adds nothing. 9 Next, we will make each Frame point back to its MainFrame. 10 11 * CMakeLists.txt: Added MainFrame.cpp/h. 12 * GNUmakefile.list.am: Ditto. 13 * Target.pri: Ditto. 14 * WebCore.exp.in: Ditto. 15 * WebCore.vcxproj/WebCore.vcxproj: Ditto. 16 * WebCore.vcxproj/WebCore.vcxproj.filters: Ditto. 17 * WebCore.xcodeproj/project.pbxproj: Ditto. 18 19 * page/Frame.cpp: 20 (WebCore::Frame::Frame): Use references instead of pointers for constructor. 21 (WebCore::Frame::create): Pass references instead of pointers to constructor. 22 * page/Frame.h: Made constructor protected instead of private, and marked 23 destructor virtual explicitly. Also marked virtual functions OVERRIDE and FINAL. 24 25 * page/MainFrame.cpp: Added. 26 * page/MainFrame.h: Added. 27 28 * page/Page.cpp: 29 (WebCore::Page::Page): Use MainFrame::create instead of Frame::create. 30 (WebCore::Page::frameIsMainFrame): Moved here, no longer inline. 31 (WebCore::Page::renderTreeSize): Use const Frame* instead of Frame*. 32 (WebCore::Page::checkSubframeCountConsistency): Ditto. 33 * page/Page.h: Changed mainFrame() to return MainFrame& and m_mainFrame to 34 be a RefPtr<MainFrame>. 35 36 * accessibility/mac/WebAccessibilityObjectWrapperMac.mm: 37 * bindings/js/PageScriptDebugServer.cpp: 38 * bindings/js/ScriptProfiler.cpp: 39 * bindings/js/ScriptState.cpp: 40 * css/MediaQueryEvaluator.cpp: 41 * dom/Document.cpp: 42 * history/CachedFrame.cpp: 43 * history/CachedPage.cpp: 44 * history/PageCache.cpp: 45 * html/HTMLPlugInImageElement.cpp: 46 * inspector/InspectorAgent.cpp: 47 * inspector/InspectorCanvasAgent.cpp: 48 * inspector/InspectorClient.cpp: 49 * inspector/InspectorDOMAgent.cpp: 50 * inspector/InspectorFrontendClientLocal.cpp: 51 * inspector/InspectorFrontendHost.cpp: 52 * inspector/InspectorInputAgent.cpp: 53 * inspector/InspectorInstrumentation.cpp: 54 * inspector/InspectorOverlay.cpp: 55 * inspector/InspectorPageAgent.cpp: 56 * inspector/PageRuntimeAgent.cpp: 57 * loader/FrameLoader.cpp: 58 * loader/HistoryController.cpp: 59 * loader/archive/mhtml/MHTMLArchive.cpp: 60 * page/AutoscrollController.cpp: 61 * page/Chrome.cpp: 62 * page/ContextMenuController.cpp: 63 * page/DOMWindow.cpp: 64 * page/DragController.cpp: 65 * page/EventHandler.cpp: 66 * page/FocusController.cpp: 67 * page/FrameTree.cpp: 68 * page/FrameView.cpp: 69 * page/GestureTapHighlighter.cpp: 70 * page/PageGroup.cpp: 71 * page/PageGroupLoadDeferrer.cpp: 72 * page/PageSerializer.cpp: 73 * page/PageThrottler.cpp: 74 * page/Settings.cpp: 75 * page/SpatialNavigation.cpp: 76 * page/mac/DragControllerMac.mm: 77 * page/mac/PageMac.cpp: 78 * page/scrolling/ScrollingCoordinator.cpp: 79 * page/scrolling/mac/ScrollingCoordinatorMac.mm: 80 * platform/graphics/texmap/coordinated/CompositingCoordinator.cpp: 81 * plugins/DOMMimeType.cpp: 82 * storage/StorageEventDispatcher.cpp: 83 * svg/graphics/SVGImage.cpp: 84 * testing/InternalSettings.cpp: 85 * testing/Internals.cpp: 86 Include MainFrame.h instead of Frame.h as needed. 87 1 88 2013-09-27 Gyuyoung Kim <gyuyoung.kim@samsung.com> 2 89 -
trunk/Source/WebCore/GNUmakefile.list.am
r156522 r156543 4212 4212 Source/WebCore/page/Location.cpp \ 4213 4213 Source/WebCore/page/Location.h \ 4214 Source/WebCore/page/MainFrame.cpp \ 4215 Source/WebCore/page/MainFrame.h \ 4214 4216 Source/WebCore/page/MediaCanStartListener.h \ 4215 4217 Source/WebCore/page/MouseEventWithHitTestResults.cpp \ -
trunk/Source/WebCore/Target.pri
r156458 r156543 897 897 page/History.cpp \ 898 898 page/Location.cpp \ 899 page/MainFrame.cpp \ 899 900 page/MouseEventWithHitTestResults.cpp \ 900 901 page/Navigator.cpp \ -
trunk/Source/WebCore/WebCore.exp.in
r156522 r156543 860 860 __ZN7WebCore4Page15didMoveOnscreenEv 861 861 __ZN7WebCore4Page16countFindMatchesERKN3WTF6StringEjj 862 __ZN7WebCore4Page16frameIsMainFrameEPKNS_5FrameE 862 863 __ZN7WebCore4Page16setCanStartMediaEb 863 864 __ZN7WebCore4Page16setDefersLoadingEb -
trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj
r156458 r156543 7178 7178 <ClCompile Include="..\page\animation\KeyframeAnimation.cpp" /> 7179 7179 <ClCompile Include="..\page\Location.cpp" /> 7180 <ClCompile Include="..\page\MainFrame.cpp" /> 7180 7181 <ClCompile Include="..\page\MouseEventWithHitTestResults.cpp" /> 7181 7182 <ClCompile Include="..\page\Navigator.cpp" /> … … 18822 18823 <ClInclude Include="..\page\animation\KeyframeAnimation.h" /> 18823 18824 <ClInclude Include="..\page\Location.h" /> 18825 <ClInclude Include="..\page\MainFrame.h" /> 18824 18826 <ClInclude Include="..\page\MouseEventWithHitTestResults.h" /> 18825 18827 <ClInclude Include="..\page\Navigator.h" /> -
trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters
r156458 r156543 793 793 <Filter>page</Filter> 794 794 </ClCompile> 795 <ClCompile Include="..\page\MainFrame.cpp"> 796 <Filter>page</Filter> 797 </ClCompile> 795 798 <ClCompile Include="..\page\PrintContext.cpp"> 796 799 <Filter>page</Filter> … … 7712 7715 </ClInclude> 7713 7716 <ClInclude Include="..\page\Location.h"> 7717 <Filter>page</Filter> 7718 </ClInclude> 7719 <ClInclude Include="..\page\MainFrame.h"> 7714 7720 <Filter>page</Filter> 7715 7721 </ClInclude> -
trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj
r156522 r156543 2878 2878 9327A94209968D1A0068A546 /* HTMLOptionsCollection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9327A94109968D1A0068A546 /* HTMLOptionsCollection.cpp */; }; 2879 2879 932871C00B20DEB70049035A /* PlatformMenuDescription.h in Headers */ = {isa = PBXBuildFile; fileRef = 932871BF0B20DEB70049035A /* PlatformMenuDescription.h */; settings = {ATTRIBUTES = (Private, ); }; }; 2880 932AD70517EFA2C30038F8FF /* MainFrame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 932AD70317EFA2C30038F8FF /* MainFrame.cpp */; }; 2881 932AD70617EFA2C40038F8FF /* MainFrame.h in Headers */ = {isa = PBXBuildFile; fileRef = 932AD70417EFA2C30038F8FF /* MainFrame.h */; settings = {ATTRIBUTES = (Private, ); }; }; 2880 2882 932E16090AF578340025F408 /* FrameLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 932E16080AF578340025F408 /* FrameLoader.cpp */; }; 2881 2883 93309DD6099E64920056E581 /* AppendNodeCommand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93309D87099E64910056E581 /* AppendNodeCommand.cpp */; }; … … 9475 9477 9327A94109968D1A0068A546 /* HTMLOptionsCollection.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HTMLOptionsCollection.cpp; sourceTree = "<group>"; }; 9476 9478 932871BF0B20DEB70049035A /* PlatformMenuDescription.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PlatformMenuDescription.h; sourceTree = "<group>"; }; 9479 932AD70317EFA2C30038F8FF /* MainFrame.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MainFrame.cpp; sourceTree = "<group>"; }; 9480 932AD70417EFA2C30038F8FF /* MainFrame.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MainFrame.h; sourceTree = "<group>"; }; 9477 9481 932E16080AF578340025F408 /* FrameLoader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FrameLoader.cpp; sourceTree = "<group>"; }; 9478 9482 93309D87099E64910056E581 /* AppendNodeCommand.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AppendNodeCommand.cpp; sourceTree = "<group>"; }; … … 15308 15312 BCE1C4190D982980003B02F2 /* Location.h */, 15309 15313 BCE1C4220D9829F2003B02F2 /* Location.idl */, 15314 932AD70317EFA2C30038F8FF /* MainFrame.cpp */, 15315 932AD70417EFA2C30038F8FF /* MainFrame.h */, 15310 15316 BC59DEFA169DEDD80016AC34 /* make_settings.pl */, 15311 15317 931BCC601124DFCB00BE70DD /* MediaCanStartListener.h */, … … 21503 21509 buildActionMask = 2147483647; 21504 21510 files = ( 21511 932AD70617EFA2C40038F8FF /* MainFrame.h in Headers */, 21505 21512 FE115FAB167988CD00249134 /* AbstractDatabaseServer.h in Headers */, 21506 21513 9A528E8417D7F52F00AA9518 /* FloatingObjects.h in Headers */, … … 25709 25716 FD31609412B026F700C1A359 /* FFTConvolver.cpp in Sources */, 25710 25717 FD31609612B026F700C1A359 /* FFTFrame.cpp in Sources */, 25718 932AD70517EFA2C30038F8FF /* MainFrame.cpp in Sources */, 25711 25719 FD3160C012B0272A00C1A359 /* FFTFrameMac.cpp in Sources */, 25712 25720 976D6C80122B8A3D001FD1F7 /* File.cpp in Sources */, -
trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm
r156168 r156543 49 49 #import "Editor.h" 50 50 #import "Font.h" 51 #import "Frame.h"52 51 #import "FrameLoaderClient.h" 53 52 #import "FrameSelection.h" … … 60 59 #import "HTMLTextAreaElement.h" 61 60 #import "LocalizedStrings.h" 61 #import "MainFrame.h" 62 62 #import "Page.h" 63 63 #import "RenderTextControl.h" -
trunk/Source/WebCore/bindings/js/PageScriptDebugServer.cpp
r155229 r156543 37 37 #include "Document.h" 38 38 #include "EventLoop.h" 39 #include "Frame.h"40 39 #include "FrameView.h" 41 40 #include "JSDOMWindowCustom.h" 41 #include "MainFrame.h" 42 42 #include "Page.h" 43 43 #include "PageGroup.h" -
trunk/Source/WebCore/bindings/js/ScriptProfiler.cpp
r155736 r156543 31 31 #include "ScriptProfiler.h" 32 32 33 #include "Frame.h"34 33 #include "GCController.h" 35 34 #include "JSDOMBinding.h" 36 35 #include "JSDOMWindow.h" 36 #include "MainFrame.h" 37 37 #include "Page.h" 38 38 #include "ScriptObject.h" -
trunk/Source/WebCore/bindings/js/ScriptState.cpp
r155736 r156543 33 33 34 34 #include "Document.h" 35 #include "Frame.h"36 35 #include "JSDOMWindowBase.h" 36 #include "MainFrame.h" 37 37 #include "Node.h" 38 38 #include "Page.h" -
trunk/Source/WebCore/css/MediaQueryEvaluator.cpp
r156260 r156543 38 38 #include "DOMWindow.h" 39 39 #include "FloatRect.h" 40 #include "Frame.h"41 40 #include "FrameView.h" 42 41 #include "InspectorInstrumentation.h" 43 42 #include "IntRect.h" 43 #include "MainFrame.h" 44 44 #include "MediaFeatureNames.h" 45 45 #include "MediaList.h" -
trunk/Source/WebCore/dom/Document.cpp
r156444 r156543 68 68 #include "FontLoader.h" 69 69 #include "FormController.h" 70 #include "Frame.h"71 70 #include "FrameLoader.h" 72 71 #include "FrameLoaderClient.h" … … 104 103 #include "Language.h" 105 104 #include "Logging.h" 105 #include "MainFrame.h" 106 106 #include "MediaCanStartListener.h" 107 107 #include "MediaQueryList.h" -
trunk/Source/WebCore/history/CachedFrame.cpp
r156270 r156543 36 36 #include "ExceptionCode.h" 37 37 #include "FocusController.h" 38 #include "Frame.h"39 38 #include "FrameLoader.h" 40 39 #include "FrameLoaderClient.h" … … 43 42 #include "HistoryItem.h" 44 43 #include "Logging.h" 44 #include "MainFrame.h" 45 45 #include "Page.h" 46 46 #include "PageTransitionEvent.h" -
trunk/Source/WebCore/history/CachedPage.cpp
r155150 r156543 30 30 #include "Element.h" 31 31 #include "FocusController.h" 32 #include "Frame.h"33 32 #include "FrameView.h" 33 #include "MainFrame.h" 34 34 #include "Node.h" 35 35 #include "Page.h" -
trunk/Source/WebCore/history/PageCache.cpp
r155529 r156543 37 37 #include "Document.h" 38 38 #include "DocumentLoader.h" 39 #include "Frame.h"40 39 #include "FrameLoader.h" 41 40 #include "FrameLoaderClient.h" … … 46 45 #include "HistoryItem.h" 47 46 #include "Logging.h" 47 #include "MainFrame.h" 48 48 #include "Page.h" 49 49 #include "Settings.h" -
trunk/Source/WebCore/html/HTMLPlugInImageElement.cpp
r156408 r156543 35 35 #include "LocalizedStrings.h" 36 36 #include "Logging.h" 37 #include "MainFrame.h" 37 38 #include "MouseEvent.h" 38 39 #include "NodeList.h" -
trunk/Source/WebCore/inspector/InspectorAgent.cpp
r155736 r156543 37 37 #include "Document.h" 38 38 #include "DocumentLoader.h" 39 #include "Frame.h"40 39 #include "GraphicsContext.h" 41 40 #include "InjectedScriptHost.h" … … 47 46 #include "InspectorValues.h" 48 47 #include "InstrumentingAgents.h" 48 #include "MainFrame.h" 49 49 #include "Page.h" 50 50 #include "ResourceRequest.h" -
trunk/Source/WebCore/inspector/InspectorCanvasAgent.cpp
r155736 r156543 37 37 #include "BindingVisitors.h" 38 38 #include "DOMWindow.h" 39 #include "Frame.h"40 39 #include "HTMLCanvasElement.h" 41 40 #include "HTMLNames.h" … … 47 46 #include "InspectorState.h" 48 47 #include "InstrumentingAgents.h" 48 #include "MainFrame.h" 49 49 #include "NodeList.h" 50 50 #include "Page.h" -
trunk/Source/WebCore/inspector/InspectorClient.cpp
r154658 r156543 35 35 #include "InspectorClient.h" 36 36 37 #include " Frame.h"37 #include "MainFrame.h" 38 38 #include "Page.h" 39 39 #include "ScriptController.h" -
trunk/Source/WebCore/inspector/InspectorDOMAgent.cpp
r156289 r156543 61 61 #include "File.h" 62 62 #include "FileList.h" 63 #include "Frame.h"64 63 #include "FrameTree.h" 65 64 #include "HTMLElement.h" … … 80 79 #include "IntRect.h" 81 80 #include "JSEventListener.h" 81 #include "MainFrame.h" 82 82 #include "MutationEvent.h" 83 83 #include "Node.h" -
trunk/Source/WebCore/inspector/InspectorFrontendClientLocal.cpp
r155736 r156543 39 39 #include "Document.h" 40 40 #include "FloatRect.h" 41 #include "Frame.h"42 41 #include "FrameLoadRequest.h" 43 42 #include "FrameLoader.h" … … 47 46 #include "InspectorFrontendHost.h" 48 47 #include "InspectorPageAgent.h" 48 #include "MainFrame.h" 49 49 #include "Page.h" 50 50 #include "ScriptController.h" -
trunk/Source/WebCore/inspector/InspectorFrontendHost.cpp
r155736 r156543 41 41 #include "DOMWrapperWorld.h" 42 42 #include "Element.h" 43 #include "Frame.h"44 43 #include "FrameLoader.h" 45 44 #include "HitTestResult.h" … … 48 47 #include "InspectorController.h" 49 48 #include "InspectorFrontendClient.h" 49 #include "MainFrame.h" 50 50 #include "Page.h" 51 51 #include "Pasteboard.h" -
trunk/Source/WebCore/inspector/InspectorInputAgent.cpp
r154658 r156543 37 37 #include "Chrome.h" 38 38 #include "EventHandler.h" 39 #include "Frame.h"40 39 #include "FrameView.h" 41 40 #include "IntPoint.h" 42 41 #include "IntRect.h" 43 42 #include "IntSize.h" 43 #include "MainFrame.h" 44 44 #include "Page.h" 45 45 #include "PlatformEvent.h" -
trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp
r156422 r156543 65 65 #include "InspectorWorkerAgent.h" 66 66 #include "InstrumentingAgents.h" 67 #include "MainFrame.h" 67 68 #include "PageDebuggerAgent.h" 68 69 #include "PageRuntimeAgent.h" -
trunk/Source/WebCore/inspector/InspectorOverlay.cpp
r156292 r156543 36 36 #include "Element.h" 37 37 #include "EmptyClients.h" 38 #include "Frame.h"39 38 #include "FrameView.h" 40 39 #include "GraphicsContext.h" … … 42 41 #include "InspectorOverlayPage.h" 43 42 #include "InspectorValues.h" 43 #include "MainFrame.h" 44 44 #include "Node.h" 45 45 #include "Page.h" -
trunk/Source/WebCore/inspector/InspectorPageAgent.cpp
r154828 r156543 67 67 #include "InspectorValues.h" 68 68 #include "InstrumentingAgents.h" 69 #include "MainFrame.h" 69 70 #include "MemoryCache.h" 70 71 #include "Page.h" -
trunk/Source/WebCore/inspector/PageRuntimeAgent.cpp
r155736 r156543 36 36 37 37 #include "Document.h" 38 #include "Frame.h"39 38 #include "InjectedScript.h" 40 39 #include "InjectedScriptManager.h" … … 42 41 #include "InspectorState.h" 43 42 #include "InstrumentingAgents.h" 43 #include "MainFrame.h" 44 44 #include "Page.h" 45 45 #include "PageConsole.h" -
trunk/Source/WebCore/loader/FrameLoader.cpp
r155894 r156543 61 61 #include "FormState.h" 62 62 #include "FormSubmission.h" 63 #include "Frame.h"64 63 #include "FrameLoadRequest.h" 65 64 #include "FrameLoaderClient.h" … … 82 81 #include "Logging.h" 83 82 #include "MIMETypeRegistry.h" 83 #include "MainFrame.h" 84 84 #include "MemoryCache.h" 85 85 #include "Page.h" -
trunk/Source/WebCore/loader/HistoryController.cpp
r155529 r156543 36 36 #include "Document.h" 37 37 #include "DocumentLoader.h" 38 #include "Frame.h"39 38 #include "FrameLoader.h" 40 39 #include "FrameLoaderClient.h" … … 44 43 #include "HistoryItem.h" 45 44 #include "Logging.h" 45 #include "MainFrame.h" 46 46 #include "Page.h" 47 47 #include "PageCache.h" -
trunk/Source/WebCore/loader/archive/mhtml/MHTMLArchive.cpp
r154658 r156543 32 32 33 33 #if ENABLE(MHTML) 34 34 35 #include "MHTMLArchive.h" 35 36 36 37 #include "Document.h" 37 #include "Frame.h"38 38 #include "MHTMLParser.h" 39 39 #include "MIMETypeRegistry.h" 40 #include "MainFrame.h" 40 41 #include "Page.h" 41 42 #include "PageSerializer.h" … … 43 44 #include "SchemeRegistry.h" 44 45 #include "SharedBuffer.h" 45 46 #include <time.h> 46 47 #include <wtf/CryptographicallyRandomNumber.h> 47 48 #include <wtf/DateMath.h> … … 54 55 #include <sys/time.h> 55 56 #endif 56 #include <time.h>57 58 57 59 58 namespace WebCore { … … 243 242 244 243 } 244 245 245 #endif -
trunk/Source/WebCore/page/AutoscrollController.cpp
r156158 r156543 30 30 31 31 #include "EventHandler.h" 32 #include "Frame.h"33 32 #include "FrameView.h" 34 33 #include "HitTestResult.h" 34 #include "MainFrame.h" 35 35 #include "Page.h" 36 36 #include "RenderBox.h" -
trunk/Source/WebCore/page/Chrome.cpp
r155731 r156543 31 31 #include "FileList.h" 32 32 #include "FloatRect.h" 33 #include "Frame.h"34 33 #include "FrameTree.h" 35 34 #include "Geolocation.h" … … 40 39 #include "Icon.h" 41 40 #include "InspectorInstrumentation.h" 41 #include "MainFrame.h" 42 42 #include "Page.h" 43 43 #include "PageGroupLoadDeferrer.h" -
trunk/Source/WebCore/page/ContextMenuController.cpp
r155723 r156543 46 46 #include "ExceptionCodePlaceholder.h" 47 47 #include "FormState.h" 48 #include "Frame.h"49 48 #include "FrameLoadRequest.h" 50 49 #include "FrameLoader.h" … … 56 55 #include "InspectorController.h" 57 56 #include "LocalizedStrings.h" 57 #include "MainFrame.h" 58 58 #include "MouseEvent.h" 59 59 #include "NavigationAction.h" -
trunk/Source/WebCore/page/DOMWindow.cpp
r156424 r156543 62 62 #include "FloatRect.h" 63 63 #include "FocusController.h" 64 #include "Frame.h"65 64 #include "FrameLoadRequest.h" 66 65 #include "FrameLoader.h" … … 73 72 #include "KURL.h" 74 73 #include "Location.h" 74 #include "MainFrame.h" 75 75 #include "MediaQueryList.h" 76 76 #include "MediaQueryMatcher.h" -
trunk/Source/WebCore/page/DragController.cpp
r155785 r156543 46 46 #include "ExceptionCodePlaceholder.h" 47 47 #include "FloatRect.h" 48 #include "Frame.h"49 48 #include "FrameLoadRequest.h" 50 49 #include "FrameLoader.h" … … 60 59 #include "Image.h" 61 60 #include "ImageOrientation.h" 61 #include "MainFrame.h" 62 62 #include "MoveSelectionCommand.h" 63 63 #include "Page.h" -
trunk/Source/WebCore/page/EventHandler.cpp
r156397 r156543 48 48 #include "FloatRect.h" 49 49 #include "FocusController.h" 50 #include "Frame.h"51 50 #include "FrameLoader.h" 52 51 #include "FrameSelection.h" … … 63 62 #include "InspectorInstrumentation.h" 64 63 #include "KeyboardEvent.h" 64 #include "MainFrame.h" 65 65 #include "MouseEvent.h" 66 66 #include "MouseEventWithHitTestResults.h" -
trunk/Source/WebCore/page/FocusController.cpp
r156339 r156543 39 39 #include "EventNames.h" 40 40 #include "ExceptionCode.h" 41 #include "Frame.h"42 41 #include "FrameSelection.h" 43 42 #include "FrameTree.h" … … 50 49 #include "HitTestResult.h" 51 50 #include "KeyboardEvent.h" 51 #include "MainFrame.h" 52 52 #include "NodeRenderingTraversal.h" 53 53 #include "Page.h" -
trunk/Source/WebCore/page/Frame.cpp
r156270 r156543 67 67 #include "JSDOMWindowShell.h" 68 68 #include "Logging.h" 69 #include "MainFrame.h" 69 70 #include "MathMLNames.h" 70 71 #include "MediaFeatureNames.h" … … 151 152 } 152 153 153 inline Frame::Frame(Page* page, HTMLFrameOwnerElement* ownerElement, FrameLoaderClient*frameLoaderClient)154 : m_page( page)155 , m_settings(&page ->settings())154 Frame::Frame(Page& page, HTMLFrameOwnerElement* ownerElement, FrameLoaderClient& frameLoaderClient) 155 : m_page(&page) 156 , m_settings(&page.settings()) 156 157 , m_treeNode(this, parentFromOwnerElement(ownerElement)) 157 , m_loader(*this, *frameLoaderClient)158 , m_loader(*this, frameLoaderClient) 158 159 , m_navigationScheduler(this) 159 160 , m_ownerElement(ownerElement) … … 171 172 , m_activeDOMObjectsAndAnimationsSuspendedCount(0) 172 173 { 173 ASSERT(page);174 174 AtomicString::init(); 175 175 HTMLNames::init(); … … 189 189 #endif 190 190 } else { 191 page ->incrementSubframeCount();191 page.incrementSubframeCount(); 192 192 ownerElement->setContentFrame(this); 193 193 } … … 205 205 PassRefPtr<Frame> Frame::create(Page* page, HTMLFrameOwnerElement* ownerElement, FrameLoaderClient* client) 206 206 { 207 return adoptRef(new Frame(page, ownerElement, client)); 207 ASSERT(page); 208 ASSERT(client); 209 return adoptRef(new Frame(*page, ownerElement, *client)); 208 210 } 209 211 -
trunk/Source/WebCore/page/Frame.h
r155591 r156543 101 101 ScrollbarMode = ScrollbarAuto, bool verticalLock = false); 102 102 103 ~Frame();103 virtual ~Frame(); 104 104 105 105 void addDestructionObserver(FrameDestructionObserver*); … … 198 198 // ======== 199 199 200 protected: 201 Frame(Page&, HTMLFrameOwnerElement*, FrameLoaderClient&); 202 200 203 private: 201 Frame(Page*, HTMLFrameOwnerElement*, FrameLoaderClient*);202 203 204 void injectUserScriptsForWorld(DOMWrapperWorld*, const UserScriptVector&, UserScriptInjectionTime); 204 205 … … 243 244 private: 244 245 // TiledBackingStoreClient interface 245 virtual void tiledBackingStorePaintBegin() ;246 virtual void tiledBackingStorePaint(GraphicsContext*, const IntRect&) ;247 virtual void tiledBackingStorePaintEnd(const Vector<IntRect>& paintedArea) ;248 virtual IntRect tiledBackingStoreContentsRect() ;249 virtual IntRect tiledBackingStoreVisibleRect() ;250 virtual Color tiledBackingStoreBackgroundColor() const ;246 virtual void tiledBackingStorePaintBegin() OVERRIDE FINAL; 247 virtual void tiledBackingStorePaint(GraphicsContext*, const IntRect&) OVERRIDE FINAL; 248 virtual void tiledBackingStorePaintEnd(const Vector<IntRect>& paintedArea) OVERRIDE FINAL; 249 virtual IntRect tiledBackingStoreContentsRect() OVERRIDE FINAL; 250 virtual IntRect tiledBackingStoreVisibleRect() OVERRIDE FINAL; 251 virtual Color tiledBackingStoreBackgroundColor() const OVERRIDE FINAL; 251 252 252 253 OwnPtr<TiledBackingStore> m_tiledBackingStore; -
trunk/Source/WebCore/page/FrameTree.cpp
r155894 r156543 23 23 24 24 #include "Document.h" 25 #include "Frame.h"26 25 #include "FrameView.h" 27 26 #include "HTMLFrameOwnerElement.h" 27 #include "MainFrame.h" 28 28 #include "Page.h" 29 29 #include "PageGroup.h" -
trunk/Source/WebCore/page/FrameView.cpp
r156424 r156543 42 42 #include "FontCache.h" 43 43 #include "FontLoader.h" 44 #include "Frame.h"45 44 #include "FrameLoader.h" 46 45 #include "FrameLoaderClient.h" … … 56 55 #include "InspectorController.h" 57 56 #include "InspectorInstrumentation.h" 57 #include "MainFrame.h" 58 58 #include "OverflowEvent.h" 59 59 #include "ProgressTracker.h" -
trunk/Source/WebCore/page/GestureTapHighlighter.cpp
r154658 r156543 32 32 33 33 #include "Element.h" 34 #include "Frame.h"35 34 #include "FrameView.h" 36 35 #include "GraphicsContext.h" 37 36 #include "GraphicsTypes.h" 37 #include "MainFrame.h" 38 38 #include "Node.h" 39 39 #include "Page.h" -
trunk/Source/WebCore/page/Page.cpp
r156422 r156543 42 42 #include "FileSystem.h" 43 43 #include "FocusController.h" 44 #include "Frame.h"45 44 #include "FrameLoader.h" 46 45 #include "FrameLoaderClient.h" … … 54 53 #include "InspectorInstrumentation.h" 55 54 #include "Logging.h" 55 #include "MainFrame.h" 56 56 #include "MediaCanStartListener.h" 57 57 #include "Navigator.h" … … 143 143 , m_progress(ProgressTracker::create()) 144 144 , m_backForwardController(createOwned<BackForwardController>(*this, pageClients.backForwardClient)) 145 , m_mainFrame( Frame::create(this, 0,pageClients.loaderClientForMainFrame))145 , m_mainFrame(MainFrame::create(*this, *pageClients.loaderClientForMainFrame)) 146 146 , m_theme(RenderTheme::themeForPage(this)) 147 147 , m_editorClient(pageClients.editorClient) … … 240 240 } 241 241 242 bool Page::frameIsMainFrame(const Frame* frame) 243 { 244 return frame == m_mainFrame.get(); 245 } 246 242 247 ArenaSize Page::renderTreeSize() const 243 248 { 244 249 ArenaSize total(0, 0); 245 for ( Frame* frame = &mainFrame(); frame; frame = frame->tree().traverseNext()) {250 for (const Frame* frame = &mainFrame(); frame; frame = frame->tree().traverseNext()) { 246 251 if (!frame->document()) 247 252 continue; … … 1233 1238 1234 1239 int subframeCount = 0; 1235 for ( Frame* frame = &mainFrame(); frame; frame = frame->tree().traverseNext())1240 for (const Frame* frame = &mainFrame(); frame; frame = frame->tree().traverseNext()) 1236 1241 ++subframeCount; 1237 1242 -
trunk/Source/WebCore/page/Page.h
r155529 r156543 76 76 class InspectorClient; 77 77 class InspectorController; 78 class MainFrame; 78 79 class MediaCanStartListener; 79 80 class Node; … … 162 163 PlugInClient* plugInClient() const { return m_plugInClient; } 163 164 164 Frame& mainFrame() const { return *m_mainFrame; } 165 bool frameIsMainFrame(const Frame* frame) { return frame == m_mainFrame.get(); } 165 MainFrame& mainFrame() { return *m_mainFrame; } 166 const MainFrame& mainFrame() const { return *m_mainFrame; } 167 bool frameIsMainFrame(const Frame*); 166 168 167 169 bool openedByDOM() const; … … 465 467 466 468 const OwnPtr<BackForwardController> m_backForwardController; 467 const RefPtr< Frame> m_mainFrame;469 const RefPtr<MainFrame> m_mainFrame; 468 470 469 471 mutable RefPtr<PluginData> m_pluginData; -
trunk/Source/WebCore/page/PageGroup.cpp
r156422 r156543 32 32 #include "Document.h" 33 33 #include "DocumentStyleSheetCollection.h" 34 #include "Frame.h"35 34 #include "GroupSettings.h" 35 #include "MainFrame.h" 36 36 #include "Page.h" 37 37 #include "PageCache.h" -
trunk/Source/WebCore/page/PageGroupLoadDeferrer.cpp
r155731 r156543 24 24 #include "Document.h" 25 25 #include "DocumentParser.h" 26 #include " Frame.h"26 #include "MainFrame.h" 27 27 #include "Page.h" 28 28 #include "PageGroup.h" -
trunk/Source/WebCore/page/PageSerializer.cpp
r156260 r156543 38 38 #include "Document.h" 39 39 #include "Element.h" 40 #include "Frame.h"41 40 #include "HTMLFrameOwnerElement.h" 42 41 #include "HTMLHeadElement.h" … … 49 48 #include "Image.h" 50 49 #include "MIMETypeRegistry.h" 50 #include "MainFrame.h" 51 51 #include "MarkupAccumulator.h" 52 52 #include "Page.h" -
trunk/Source/WebCore/page/PageThrottler.cpp
r154658 r156543 29 29 #include "Chrome.h" 30 30 #include "ChromeClient.h" 31 #include " Frame.h"31 #include "MainFrame.h" 32 32 #include "Page.h" 33 33 #include "PageActivityAssertionToken.h" -
trunk/Source/WebCore/page/Settings.cpp
r156337 r156543 35 35 #include "Font.h" 36 36 #include "FontGenericFamilies.h" 37 #include "Frame.h"38 37 #include "FrameTree.h" 39 38 #include "FrameView.h" … … 41 40 #include "HistoryItem.h" 42 41 #include "InspectorInstrumentation.h" 42 #include "MainFrame.h" 43 43 #include "Page.h" 44 44 #include "PageCache.h" -
trunk/Source/WebCore/page/SpatialNavigation.cpp
r155507 r156543 30 30 #include "SpatialNavigation.h" 31 31 32 #include "Frame.h"33 32 #include "FrameTree.h" 34 33 #include "FrameView.h" … … 38 37 #include "HTMLNames.h" 39 38 #include "IntRect.h" 39 #include "MainFrame.h" 40 40 #include "Node.h" 41 41 #include "Page.h" … … 46 46 namespace WebCore { 47 47 48 static RectsAlignment alignmentForRects(FocusDirection, const LayoutRect&, const LayoutRect&, const LayoutSize& viewSize);49 48 static bool areRectsFullyAligned(FocusDirection, const LayoutRect&, const LayoutRect&); 50 49 static bool areRectsPartiallyAligned(FocusDirection, const LayoutRect&, const LayoutRect&); -
trunk/Source/WebCore/page/mac/DragControllerMac.mm
r155731 r156543 28 28 29 29 #if ENABLE(DRAG_SUPPORT) 30 30 31 #import "Clipboard.h" 31 32 #import "DOMElementInternal.h" … … 33 34 #import "DragData.h" 34 35 #import "Element.h" 35 #import "Frame.h"36 36 #import "FrameView.h" 37 #import "MainFrame.h" 37 38 #import "Page.h" 38 39 #import "Pasteboard.h" -
trunk/Source/WebCore/page/mac/PageMac.cpp
r154558 r156543 28 28 29 29 #include "config.h" 30 #include "Page.h" 31 30 32 #include "DocumentLoader.h" 31 #include "Frame.h"32 33 #include "FrameLoader.h" 33 34 #include "FrameTree.h" 34 #include " Page.h"35 #include "MainFrame.h" 35 36 36 37 namespace WebCore { -
trunk/Source/WebCore/page/scrolling/ScrollingCoordinator.cpp
r155164 r156543 29 29 30 30 #include "Document.h" 31 #include "Frame.h"32 31 #include "FrameView.h" 33 32 #include "GraphicsLayer.h" 34 33 #include "IntRect.h" 34 #include "MainFrame.h" 35 35 #include "Page.h" 36 36 #include "PlatformWheelEvent.h" -
trunk/Source/WebCore/page/scrolling/mac/ScrollingCoordinatorMac.mm
r154658 r156543 31 31 32 32 #include "GraphicsLayer.h" 33 #include "Frame.h"34 33 #include "FrameView.h" 35 34 #include "IntRect.h" 35 #include "MainFrame.h" 36 36 #include "Page.h" 37 37 #include "PlatformWheelEvent.h" … … 49 49 #include "ScrollingTree.h" 50 50 #include "TiledBacking.h" 51 52 51 #include <wtf/Functional.h> 53 52 #include <wtf/MainThread.h> -
trunk/Source/WebCore/platform/graphics/texmap/coordinated/CompositingCoordinator.cpp
r154658 r156543 28 28 29 29 #if USE(COORDINATED_GRAPHICS) 30 30 31 #include "CompositingCoordinator.h" 31 32 32 #include "Frame.h"33 33 #include "FrameView.h" 34 34 #include "GraphicsContext.h" 35 35 #include "InspectorController.h" 36 #include "MainFrame.h" 36 37 #include "Page.h" 37 38 #include "Settings.h" 38 39 #include <wtf/CurrentTime.h> 39 40 #include <wtf/TemporaryChange.h> 41 42 // FIXME: Having this in the platform directory is a layering violation. This does not belong here. 40 43 41 44 namespace WebCore { -
trunk/Source/WebCore/plugins/DOMMimeType.cpp
r155194 r156543 21 21 22 22 #include "DOMPlugin.h" 23 #include "Frame.h"24 23 #include "FrameLoader.h" 25 24 #include "FrameLoaderClient.h" 25 #include "MainFrame.h" 26 26 #include "Page.h" 27 27 #include "PluginData.h" -
trunk/Source/WebCore/storage/StorageEventDispatcher.cpp
r154658 r156543 30 30 #include "DOMWindow.h" 31 31 #include "EventNames.h" 32 #include "Frame.h"33 32 #include "InspectorInstrumentation.h" 33 #include "MainFrame.h" 34 34 #include "Page.h" 35 35 #include "PageGroup.h" -
trunk/Source/WebCore/svg/graphics/SVGImage.cpp
r156391 r156543 34 34 #include "DocumentLoader.h" 35 35 #include "ElementIterator.h" 36 #include "Frame.h"37 36 #include "FrameView.h" 38 37 #include "ImageBuffer.h" 39 38 #include "ImageObserver.h" 40 39 #include "IntRect.h" 40 #include "MainFrame.h" 41 41 #include "RenderSVGRoot.h" 42 42 #include "RenderStyle.h" -
trunk/Source/WebCore/testing/InternalSettings.cpp
r156435 r156543 31 31 #include "Document.h" 32 32 #include "ExceptionCode.h" 33 #include "Frame.h"34 33 #include "FrameView.h" 35 34 #include "Language.h" 36 35 #include "LocaleToScriptMapping.h" 36 #include "MainFrame.h" 37 37 #include "Page.h" 38 38 #include "PageGroup.h" -
trunk/Source/WebCore/testing/Internals.cpp
r156522 r156543 47 47 #include "ExceptionCode.h" 48 48 #include "FormController.h" 49 #include "Frame.h"50 49 #include "FrameLoader.h" 51 50 #include "FrameView.h" … … 69 68 #include "IntRect.h" 70 69 #include "Language.h" 70 #include "MainFrame.h" 71 71 #include "MallocStatistics.h" 72 72 #include "MemoryCache.h" -
trunk/Source/WebKit/efl/ChangeLog
r156424 r156543 1 2013-09-27 Darin Adler <darin@apple.com> 2 3 Add empty MainFrame class 4 https://bugs.webkit.org/show_bug.cgi?id=121770 5 6 Reviewed by Andreas Kling. 7 8 * WebCoreSupport/AcceleratedCompositingContextEfl.cpp: 9 * WebCoreSupport/InspectorClientEfl.cpp: 10 * ewk/ewk_view.cpp: 11 Include MainFrame.h instead of Frame.h as needed. 12 1 13 2013-09-25 Brent Fulgham <bfulgham@apple.com> 2 14 -
trunk/Source/WebKit/efl/WebCoreSupport/AcceleratedCompositingContextEfl.cpp
r154658 r156543 28 28 #include "GraphicsLayerTextureMapper.h" 29 29 #include "HostWindow.h" 30 #include "MainFrame.h" 30 31 #include "PageClientEfl.h" 31 32 #include "TextureMapperGL.h" -
trunk/Source/WebKit/efl/WebCoreSupport/InspectorClientEfl.cpp
r155475 r156543 23 23 24 24 #if ENABLE(INSPECTOR) 25 25 26 #include "EflInspectorUtilities.h" 26 27 #include "InspectorController.h" 28 #include "MainFrame.h" 27 29 #include "NotImplemented.h" 28 30 #include "ewk_view_private.h" -
trunk/Source/WebKit/efl/ewk/ewk_view.cpp
r156424 r156543 39 39 #include "EventHandler.h" 40 40 #include "FocusController.h" 41 #include "Frame.h"42 41 #include "FrameLoaderClientEfl.h" 43 42 #include "FrameSelection.h" … … 53 52 #include "JSDOMWindow.h" 54 53 #include "JSLock.h" 54 #include "MainFrame.h" 55 55 #include "NetworkStorageSession.h" 56 56 #include "Operations.h" -
trunk/Source/WebKit/gtk/ChangeLog
r156424 r156543 1 2013-09-27 Darin Adler <darin@apple.com> 2 3 Add empty MainFrame class 4 https://bugs.webkit.org/show_bug.cgi?id=121770 5 6 Reviewed by Andreas Kling. 7 8 * WebCoreSupport/AcceleratedCompositingContextGL.cpp: 9 * WebCoreSupport/ChromeClientGtk.cpp: 10 * WebCoreSupport/FrameLoaderClientGtk.cpp: 11 * WebCoreSupport/GtkAdjustmentWatcher.cpp: 12 * webkit/webkitwebframe.cpp: 13 * webkit/webkitwebview.cpp: 14 * webkit/webkitviewportattributes.cpp: 15 Include MainFrame.h instead of Frame.h as needed. 16 1 17 2013-09-25 Brent Fulgham <bfulgham@apple.com> 2 18 -
trunk/Source/WebKit/gtk/WebCoreSupport/AcceleratedCompositingContextGL.cpp
r156261 r156543 23 23 24 24 #include "CairoUtilities.h" 25 #include "Frame.h"26 25 #include "FrameView.h" 27 26 #include "GraphicsLayerTextureMapper.h" 28 27 #include "GtkVersioning.h" 28 #include "MainFrame.h" 29 29 #include "PlatformContextCairo.h" 30 30 #include "Settings.h" -
trunk/Source/WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp
r155507 r156543 47 47 #include "IntRect.h" 48 48 #include "KURL.h" 49 #include "MainFrame.h" 49 50 #include "NavigationAction.h" 50 51 #include "NotImplemented.h" -
trunk/Source/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp
r155591 r156543 53 53 #include "Language.h" 54 54 #include "MIMETypeRegistry.h" 55 #include "MainFrame.h" 55 56 #include "MouseEvent.h" 56 57 #include "NotImplemented.h" -
trunk/Source/WebKit/gtk/WebCoreSupport/GtkAdjustmentWatcher.cpp
r154658 r156543 20 20 #include "GtkAdjustmentWatcher.h" 21 21 22 #include "Frame.h"23 22 #include "FrameView.h" 23 #include "MainFrame.h" 24 24 #include "Page.h" 25 25 #include "Scrollbar.h" -
trunk/Source/WebKit/gtk/webkit/webkitviewportattributes.cpp
r154658 r156543 24 24 #include "Chrome.h" 25 25 #include "Document.h" 26 #include " Frame.h"26 #include "MainFrame.h" 27 27 #include "Page.h" 28 28 #include "webkitglobalsprivate.h" -
trunk/Source/WebKit/gtk/webkit/webkitwebframe.cpp
r154658 r156543 49 49 #include "JSDOMWindow.h" 50 50 #include "JSElement.h" 51 #include "MainFrame.h" 51 52 #include "PlatformContextCairo.h" 52 53 #include "PrintContext.h" -
trunk/Source/WebKit/gtk/webkit/webkitwebview.cpp
r156424 r156543 72 72 #include "HitTestResult.h" 73 73 #include "InspectorClientGtk.h" 74 #include "MainFrame.h" 74 75 #include "MemoryCache.h" 75 76 #include "MouseEventWithHitTestResults.h" -
trunk/Source/WebKit/mac/ChangeLog
r156522 r156543 1 2013-09-27 Darin Adler <darin@apple.com> 2 3 Add empty MainFrame class 4 https://bugs.webkit.org/show_bug.cgi?id=121770 5 6 Reviewed by Andreas Kling. 7 8 * WebCoreSupport/WebDragClient.mm: 9 * WebCoreSupport/WebInspectorClient.mm: 10 * WebCoreSupport/WebPlatformStrategies.mm: 11 * WebView/WebFrame.mm: 12 * WebView/WebHTMLView.mm: 13 * WebView/WebView.mm: 14 Include MainFrame.h instead of Frame.h as needed. 15 1 16 2013-09-26 Eric Carlson <eric.carlson@apple.com> 2 17 -
trunk/Source/WebKit/mac/WebCoreSupport/WebDragClient.mm
r154658 r156543 47 47 #import <WebCore/EditorClient.h> 48 48 #import <WebCore/EventHandler.h> 49 #import <WebCore/Frame.h>50 49 #import <WebCore/FrameView.h> 51 50 #import <WebCore/Image.h> 51 #import <WebCore/MainFrame.h> 52 52 #import <WebCore/Page.h> 53 53 #import <WebCore/Pasteboard.h> -
trunk/Source/WebKit/mac/WebCoreSupport/WebInspectorClient.mm
r154828 r156543 44 44 #import "WebViewInternal.h" 45 45 #import <algorithm> 46 #import <WebCore/Frame.h>47 46 #import <WebCore/InspectorController.h> 48 47 #import <WebCore/InspectorFrontendClient.h> 48 #import <WebCore/MainFrame.h> 49 49 #import <WebCore/Page.h> 50 50 #import <WebCore/ScriptController.h> -
trunk/Source/WebKit/mac/WebCoreSupport/WebPlatformStrategies.mm
r156350 r156543 31 31 #import <WebCore/BlockExceptions.h> 32 32 #import <WebCore/Color.h> 33 #import <WebCore/MainFrame.h> 33 34 #import <WebCore/Page.h> 34 35 #import <WebCore/PageGroup.h> -
trunk/Source/WebKit/mac/WebView/WebFrame.mm
r155591 r156543 70 70 #import <WebCore/EventHandler.h> 71 71 #import <WebCore/EventNames.h> 72 #import <WebCore/Frame.h>73 72 #import <WebCore/FrameLoadRequest.h> 74 73 #import <WebCore/FrameLoader.h> … … 82 81 #import <WebCore/JSNode.h> 83 82 #import <WebCore/LegacyWebArchive.h> 83 #import <WebCore/MainFrame.h> 84 84 #import <WebCore/Page.h> 85 85 #import <WebCore/PlatformEventFactoryMac.h> -
trunk/Source/WebKit/mac/WebView/WebHTMLView.mm
r155641 r156543 105 105 #import <WebCore/LegacyWebArchive.h> 106 106 #import <WebCore/MIMETypeRegistry.h> 107 #import <WebCore/MainFrame.h> 107 108 #import <WebCore/Page.h> 108 109 #import <WebCore/PlatformEventFactoryMac.h> -
trunk/Source/WebKit/mac/WebView/WebView.mm
r156522 r156543 132 132 #import <WebCore/ExceptionHandlers.h> 133 133 #import <WebCore/FocusController.h> 134 #import <WebCore/Frame.h>135 134 #import <WebCore/FrameLoader.h> 136 135 #import <WebCore/FrameSelection.h> … … 152 151 #import <WebCore/Logging.h> 153 152 #import <WebCore/MIMETypeRegistry.h> 153 #import <WebCore/MainFrame.h> 154 154 #import <WebCore/MemoryPressureHandler.h> 155 155 #import <WebCore/NodeList.h> -
trunk/Source/WebKit/qt/ChangeLog
r156535 r156543 1 2013-09-27 Darin Adler <darin@apple.com> 2 3 Add empty MainFrame class 4 https://bugs.webkit.org/show_bug.cgi?id=121770 5 6 Reviewed by Andreas Kling. 7 8 * Source/WebKit/qt/WebCoreSupport/InspectorClientQt.cpp: 9 * Source/WebKit/qt/WebCoreSupport/ChromeClientQt.cpp: 10 * Source/WebKit/qt/WebCoreSupport/QWebFrameAdapter.cpp: 11 * Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.cpp: 12 * Source/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp: 13 * Source/WebKit/qt/WebCoreSupport/QWebPageAdapter.cpp: 14 Include MainFrame.h instead of Frame.h as needed. 15 1 16 2013-09-27 Allan Sandfeld Jensen <allan.jensen@digia.com> 2 17 -
trunk/Source/WebKit/qt/WebCoreSupport/ChromeClientQt.cpp
r155507 r156543 38 38 #include "FileChooser.h" 39 39 #include "FileIconLoader.h" 40 #include "Frame.h"41 40 #include "FrameLoadRequest.h" 42 41 #include "FrameLoader.h" … … 44 43 #include "FrameView.h" 45 44 #include "Geolocation.h" 46 #if USE(ACCELERATED_COMPOSITING)47 #include "GraphicsLayer.h"48 #endif49 45 #include "HTMLFormElement.h" 50 46 #include "HitTestResult.h" 51 47 #include "Icon.h" 48 #include "MainFrame.h" 52 49 #include "NavigationAction.h" 53 50 #include "NetworkingContext.h" … … 69 66 #include "qwebsecurityorigin_p.h" 70 67 #include "qwebsettings.h" 71 72 68 #include <qabstractanimation.h> 73 69 #include <qdebug.h> … … 76 72 #include <wtf/CurrentTime.h> 77 73 #include <wtf/OwnPtr.h> 74 75 #if USE(ACCELERATED_COMPOSITING) 76 #include "GraphicsLayer.h" 77 #endif 78 78 79 79 #if ENABLE(VIDEO) && ((USE(GSTREAMER) && USE(NATIVE_FULLSCREEN_VIDEO)) || USE(QT_MULTIMEDIA)) -
trunk/Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.cpp
r156424 r156543 40 40 #include "FocusController.h" 41 41 #include "Font.h" 42 #include "Frame.h"43 42 #include "FrameLoadRequest.h" 44 43 #include "FrameLoaderClientQt.h" … … 55 54 #include "InspectorController.h" 56 55 #include "JSNode.h" 56 #include "MainFrame.h" 57 57 #include "NodeList.h" 58 58 #include "NotificationPresenterClientQt.h" -
trunk/Source/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp
r156330 r156543 50 50 #include "HistoryItem.h" 51 51 #include "HitTestResult.h" 52 #if ENABLE(ICONDATABASE)53 #include "IconDatabaseClientQt.h"54 #endif55 52 #include "JSDOMWindowBase.h" 56 53 #include "MIMETypeRegistry.h" 54 #include "MainFrame.h" 57 55 #include "MouseEvent.h" 58 56 #include "NotImplemented.h" … … 83 81 #include "qwebpluginfactory.h" 84 82 #include "qwebsettings.h" 85 86 83 #include <QCoreApplication> 87 84 #include <QDebug> … … 93 90 #include <wtf/OwnPtr.h> 94 91 #include <wtf/text/StringBuilder.h> 92 93 #if ENABLE(ICONDATABASE) 94 #include "IconDatabaseClientQt.h" 95 #endif 95 96 96 97 static QMap<unsigned long, QString> dumpAssignedUrls; -
trunk/Source/WebKit/qt/WebCoreSupport/InspectorClientQt.cpp
r154658 r156543 32 32 #include "InspectorClientQt.h" 33 33 34 #include "Frame.h"35 34 #include "FrameView.h" 36 35 #include "InspectorController.h" 37 36 #include "InspectorFrontend.h" 38 37 #include "InspectorServerQt.h" 38 #include "MainFrame.h" 39 39 #include "NotImplemented.h" 40 40 #include "Page.h" -
trunk/Source/WebKit/qt/WebCoreSupport/NotificationPresenterClientQt.cpp
r154658 r156543 37 37 #include "EventNames.h" 38 38 #include "KURL.h" 39 #include "MainFrame.h" 39 40 #include "Page.h" 40 41 #include "QWebFrameAdapter.h" -
trunk/Source/WebKit/qt/WebCoreSupport/QWebFrameAdapter.cpp
r154983 r156543 28 28 #include "EventHandler.h" 29 29 #include "FocusController.h" 30 #include "Frame.h"31 30 #include "FrameLoadRequest.h" 32 31 #include "FrameLoaderClientQt.h" … … 38 37 #include "JSDOMWindowBase.h" 39 38 #include "KURL.h" 39 #include "MainFrame.h" 40 40 #include "NavigationScheduler.h" 41 41 #include "NetworkingContext.h" … … 50 50 #include "TextureMapperLayerClientQt.h" 51 51 #include "TiledBackingStore.h" 52 #if ENABLE(GESTURE_EVENTS)53 #include "PlatformGestureEvent.h"54 #include "WebEventConversion.h"55 #endif56 52 #include "htmlediting.h" 57 53 #include "markup.h" … … 60 56 #include "qwebsecurityorigin_p.h" 61 57 #include "qwebsettings.h" 62 63 58 #include <IntRect.h> 64 59 #include <IntSize.h> 65 60 #include <QFileInfo> 66 61 #include <QNetworkRequest> 62 63 #if ENABLE(GESTURE_EVENTS) 64 #include "PlatformGestureEvent.h" 65 #include "WebEventConversion.h" 66 #endif 67 67 68 68 using namespace WebCore; -
trunk/Source/WebKit/qt/WebCoreSupport/QWebPageAdapter.cpp
r155672 r156543 30 30 #include "ContextMenuClientQt.h" 31 31 #include "ContextMenuController.h" 32 #if ENABLE(DEVICE_ORIENTATION)33 #include "DeviceMotionClientMock.h"34 #include "DeviceMotionController.h"35 #include "DeviceOrientationClientMock.h"36 #include "DeviceOrientationController.h"37 #if HAVE(QTSENSORS)38 #include "DeviceMotionClientQt.h"39 #include "DeviceOrientationClientQt.h"40 #endif41 #endif42 32 #include "DocumentLoader.h" 43 33 #include "DragClientQt.h" … … 52 42 #include "FrameSelection.h" 53 43 #include "FrameView.h" 54 #if ENABLE(GEOLOCATION)55 #include "GeolocationClientMock.h"56 #include "GeolocationController.h"57 #if HAVE(QTLOCATION)58 #include "GeolocationClientQt.h"59 #endif60 #endif61 44 #include "GeolocationPermissionClientQt.h" 62 45 #include "HTMLFrameOwnerElement.h" … … 69 52 #include "LocalizedStrings.h" 70 53 #include "MIMETypeRegistry.h" 54 #include "MainFrame.h" 71 55 #include "MemoryCache.h" 72 56 #include "NetworkingContext.h" … … 107 91 #include <QWheelEvent> 108 92 93 #if ENABLE(DEVICE_ORIENTATION) 94 #include "DeviceMotionClientMock.h" 95 #include "DeviceMotionController.h" 96 #include "DeviceOrientationClientMock.h" 97 #include "DeviceOrientationController.h" 98 #if HAVE(QTSENSORS) 99 #include "DeviceMotionClientQt.h" 100 #include "DeviceOrientationClientQt.h" 101 #endif 102 #endif 103 104 #if ENABLE(GEOLOCATION) 105 #include "GeolocationClientMock.h" 106 #include "GeolocationController.h" 107 #if HAVE(QTLOCATION) 108 #include "GeolocationClientQt.h" 109 #endif 110 #endif 111 109 112 // from text/qfont.cpp 110 113 QT_BEGIN_NAMESPACE -
trunk/Source/WebKit/win/ChangeLog
r156433 r156543 1 2013-09-27 Darin Adler <darin@apple.com> 2 3 Add empty MainFrame class 4 https://bugs.webkit.org/show_bug.cgi?id=121770 5 6 Reviewed by Andreas Kling. 7 8 * win/WebCoreSupport/WebDragClient.cpp: 9 * win/WebCoreSupport/WebContextMenuClient.cpp: 10 * win/WebDropSource.cpp: 11 * win/WebFrame.cpp: 12 * win/WebView.cpp: 13 Include MainFrame.h instead of Frame.h as needed. 14 1 15 2013-09-25 Roger Fong <roger_fong@apple.com> 2 16 -
trunk/Source/WebKit/win/WebCoreSupport/WebContextMenuClient.cpp
r154658 r156543 31 31 #include "WebLocalizableStrings.h" 32 32 #include "WebView.h" 33 34 33 #include <WebCore/ContextMenu.h> 35 34 #include <WebCore/ContextMenuController.h> 36 35 #include <WebCore/Editor.h> 37 36 #include <WebCore/Event.h> 38 #include <WebCore/Frame .h>37 #include <WebCore/FrameLoadRequest.h> 39 38 #include <WebCore/FrameLoader.h> 40 #include <WebCore/FrameLoadRequest.h> 39 #include <WebCore/MainFrame.h> 40 #include <WebCore/NotImplemented.h> 41 41 #include <WebCore/Page.h> 42 42 #include <WebCore/ResourceRequest.h> 43 #include <WebCore/NotImplemented.h>44 43 45 44 using namespace WebCore; -
trunk/Source/WebKit/win/WebCoreSupport/WebDragClient.cpp
r154658 r156543 26 26 #include "config.h" 27 27 #include "WebDragClient.h" 28 28 29 #include "WebDropSource.h" 29 30 #include "WebKitGraphics.h" 30 31 #include "WebView.h" 31 32 32 #include <WebCore/Clipboard.h> 33 33 #include <WebCore/DragController.h> 34 34 #include <WebCore/DragData.h> 35 35 #include <WebCore/EventHandler.h> 36 #include <WebCore/FrameView.h> 37 #include <WebCore/GraphicsContext.h> 38 #include <WebCore/MainFrame.h> 36 39 #include <WebCore/Page.h> 37 40 #include <WebCore/Pasteboard.h> 38 41 #include <WebCore/PlatformMouseEvent.h> 39 #include <WebCore/Frame.h>40 #include <WebCore/FrameView.h>41 #include <WebCore/GraphicsContext.h>42 42 #include <shlobj.h> 43 43 -
trunk/Source/WebKit/win/WebDropSource.cpp
r154658 r156543 33 33 #include <WebCore/DragActions.h> 34 34 #include <WebCore/EventHandler.h> 35 #include <WebCore/Frame.h>36 35 #include <WebCore/FrameView.h> 36 #include <WebCore/MainFrame.h> 37 37 #include <WebCore/Page.h> 38 38 #include <WebCore/PlatformMouseEvent.h> -
trunk/Source/WebKit/win/WebFrame.cpp
r154658 r156543 65 65 #include <WebCore/EventHandler.h> 66 66 #include <WebCore/FormState.h> 67 #include <WebCore/Frame.h>68 67 #include <WebCore/FrameLoader.h> 69 68 #include <WebCore/FrameLoadRequest.h> … … 82 81 #include <WebCore/JSDOMWindow.h> 83 82 #include <WebCore/KeyboardEvent.h> 83 #include <WebCore/MainFrame.h> 84 84 #include <WebCore/MouseRelatedEvent.h> 85 85 #include <WebCore/NotImplemented.h> -
trunk/Source/WebKit/win/WebView.cpp
r156433 r156543 90 90 #include <WebCore/FloatQuad.h> 91 91 #include <WebCore/FocusController.h> 92 #include <WebCore/Frame.h>93 92 #include <WebCore/FrameLoader.h> 94 93 #include <WebCore/FrameSelection.h> … … 112 111 #include <WebCore/Logging.h> 113 112 #include <WebCore/MIMETypeRegistry.h> 113 #include <WebCore/MainFrame.h> 114 114 #include <WebCore/MemoryCache.h> 115 115 #include <WebCore/NotImplemented.h> -
trunk/Source/WebKit2/ChangeLog
r156535 r156543 1 2013-09-27 Darin Adler <darin@apple.com> 2 3 Add empty MainFrame class 4 https://bugs.webkit.org/show_bug.cgi?id=121770 5 6 Reviewed by Andreas Kling. 7 8 * WebProcess/FullScreen/WebFullScreenManager.cpp: 9 * WebProcess/InjectedBundle/API/c/WKBundlePage.cpp: 10 * WebProcess/InjectedBundle/InjectedBundle.cpp: 11 * WebProcess/Plugins/PluginView.cpp: 12 * WebProcess/Storage/StorageAreaMap.cpp: 13 * WebProcess/WebCoreSupport/WebChromeClient.cpp: 14 * WebProcess/WebCoreSupport/WebContextMenuClient.cpp: 15 * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp: 16 * WebProcess/WebCoreSupport/WebPlatformStrategies.cpp: 17 * WebProcess/WebCoreSupport/mac/WebContextMenuClientMac.mm: 18 * WebProcess/WebPage/FindController.cpp: 19 * WebProcess/WebPage/PageOverlay.cpp: 20 * WebProcess/WebPage/WebInspector.cpp: 21 * WebProcess/WebPage/WebPage.cpp: 22 * WebProcess/WebPage/atk/WebPageAccessibilityObjectAtk.cpp: 23 * WebProcess/WebPage/gtk/LayerTreeHostGtk.cpp: 24 * WebProcess/WebPage/mac/LayerTreeHostMac.mm: 25 * WebProcess/WebPage/mac/RemoteLayerTreeContext.mm: 26 * WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm: 27 * WebProcess/WebPage/mac/WKAccessibilityWebPageObject.mm: 28 * WebProcess/WebPage/mac/WebPageMac.mm: 29 Include MainFrame.h instead of Frame.h as needed. 30 1 31 2013-09-27 Allan Sandfeld Jensen <allan.jensen@digia.com> 2 32 -
trunk/Source/WebKit2/WebProcess/FullScreen/WebFullScreenManager.cpp
r154877 r156543 35 35 #include <WebCore/Color.h> 36 36 #include <WebCore/Element.h> 37 #include <WebCore/Frame.h>38 37 #include <WebCore/FrameView.h> 38 #include <WebCore/MainFrame.h> 39 39 #include <WebCore/Page.h> 40 40 #include <WebCore/RenderLayer.h> -
trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.cpp
r156063 r156543 47 47 #include "WebURL.h" 48 48 #include "WebURLRequest.h" 49 50 49 #include <WebCore/AXObjectCache.h> 51 50 #include <WebCore/AccessibilityObject.h> 52 #include <WebCore/Frame.h>53 51 #include <WebCore/KURL.h> 52 #include <WebCore/MainFrame.h> 54 53 #include <WebCore/Page.h> 55 54 #include <wtf/StdLibExtras.h> -
trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp
r156424 r156543 51 51 #include <WebCore/ApplicationCache.h> 52 52 #include <WebCore/ApplicationCacheStorage.h> 53 #include <WebCore/Frame.h>54 53 #include <WebCore/FrameLoader.h> 55 54 #include <WebCore/FrameView.h> … … 60 59 #include <WebCore/JSDOMWindow.h> 61 60 #include <WebCore/JSNotification.h> 61 #include <WebCore/MainFrame.h> 62 62 #include <WebCore/Page.h> 63 63 #include <WebCore/PageGroup.h> -
trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp
r155888 r156543 43 43 #include <WebCore/EventHandler.h> 44 44 #include <WebCore/FocusController.h> 45 #include <WebCore/Frame.h>46 45 #include <WebCore/FrameLoadRequest.h> 47 46 #include <WebCore/FrameLoader.h> … … 53 52 #include <WebCore/HostWindow.h> 54 53 #include <WebCore/MIMETypeRegistry.h> 54 #include <WebCore/MainFrame.h> 55 55 #include <WebCore/MouseEvent.h> 56 56 #include <WebCore/NetscapePlugInStreamLoader.h> -
trunk/Source/WebKit2/WebProcess/Storage/StorageAreaMap.cpp
r154658 r156543 36 36 #include "WebProcess.h" 37 37 #include <WebCore/DOMWindow.h> 38 #include <WebCore/ Frame.h>38 #include <WebCore/MainFrame.h> 39 39 #include <WebCore/Page.h> 40 40 #include <WebCore/PageGroup.h> -
trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp
r156472 r156543 56 56 #include <WebCore/FileChooser.h> 57 57 #include <WebCore/FileIconLoader.h> 58 #include <WebCore/Frame.h>59 58 #include <WebCore/FrameLoadRequest.h> 60 59 #include <WebCore/FrameLoader.h> … … 65 64 #include <WebCore/HTMLPlugInImageElement.h> 66 65 #include <WebCore/Icon.h> 66 #include <WebCore/MainFrame.h> 67 67 #include <WebCore/NotImplemented.h> 68 68 #include <WebCore/Page.h> -
trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebContextMenuClient.cpp
r154658 r156543 35 35 #include <WebCore/ContextMenu.h> 36 36 #include <WebCore/Event.h> 37 #include <WebCore/Frame.h>38 37 #include <WebCore/FrameLoader.h> 38 #include <WebCore/MainFrame.h> 39 39 #include <WebCore/NotImplemented.h> 40 40 #include <WebCore/Page.h> -
trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp
r155615 r156543 56 56 #include <WebCore/DocumentLoader.h> 57 57 #include <WebCore/FormState.h> 58 #include <WebCore/Frame.h>59 58 #include <WebCore/FrameLoadRequest.h> 60 59 #include <WebCore/FrameLoader.h> … … 65 64 #include <WebCore/HistoryItem.h> 66 65 #include <WebCore/MIMETypeRegistry.h> 66 #include <WebCore/MainFrame.h> 67 67 #include <WebCore/MouseEvent.h> 68 68 #include <WebCore/NotImplemented.h> -
trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp
r156350 r156543 43 43 #include "WebProcessProxyMessages.h" 44 44 #include <WebCore/Color.h> 45 #include <WebCore/Frame.h>46 45 #include <WebCore/KURL.h> 47 46 #include <WebCore/LoaderStrategy.h> 47 #include <WebCore/MainFrame.h> 48 48 #include <WebCore/NetworkStorageSession.h> 49 49 #include <WebCore/NetworkingContext.h> -
trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebContextMenuClientMac.mm
r154658 r156543 33 33 #import "WebPage.h" 34 34 #import "WebPageProxyMessages.h" 35 #import <WebCore/Frame.h>36 35 #import <WebCore/FrameView.h> 36 #import <WebCore/MainFrame.h> 37 37 #import <WebCore/Page.h> 38 38 #import <wtf/text/WTFString.h> -
trunk/Source/WebKit2/WebProcess/WebPage/FindController.cpp
r154883 r156543 36 36 #include <WebCore/FloatQuad.h> 37 37 #include <WebCore/FocusController.h> 38 #include <WebCore/Frame.h>39 38 #include <WebCore/FrameView.h> 40 39 #include <WebCore/GraphicsContext.h> 40 #include <WebCore/MainFrame.h> 41 41 #include <WebCore/Page.h> 42 42 #include <WebCore/PluginDocument.h> -
trunk/Source/WebKit2/WebProcess/WebPage/PageOverlay.cpp
r154658 r156543 29 29 #include "WebPage.h" 30 30 #include "WebProcess.h" 31 #include <WebCore/Frame.h>32 31 #include <WebCore/FrameView.h> 33 32 #include <WebCore/GraphicsContext.h> 33 #include <WebCore/MainFrame.h> 34 34 #include <WebCore/Page.h> 35 35 #include <WebCore/ScrollbarTheme.h> -
trunk/Source/WebKit2/WebProcess/WebPage/WebInspector.cpp
r154828 r156543 34 34 #include "WebPageCreationParameters.h" 35 35 #include "WebProcess.h" 36 #include <WebCore/Frame.h>37 36 #include <WebCore/InspectorController.h> 38 37 #include <WebCore/InspectorFrontendChannel.h> 39 38 #include <WebCore/InspectorFrontendClient.h> 39 #include <WebCore/MainFrame.h> 40 40 #include <WebCore/Page.h> 41 41 #include <WebCore/ScriptController.h> -
trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp
r156472 r156543 99 99 #include <WebCore/FocusController.h> 100 100 #include <WebCore/FormState.h> 101 #include <WebCore/Frame.h>102 101 #include <WebCore/FrameLoadRequest.h> 103 102 #include <WebCore/FrameLoaderTypes.h> … … 112 111 #include <WebCore/KeyboardEvent.h> 113 112 #include <WebCore/MIMETypeRegistry.h> 113 #include <WebCore/MainFrame.h> 114 114 #include <WebCore/MouseEvent.h> 115 115 #include <WebCore/Page.h> -
trunk/Source/WebKit2/WebProcess/WebPage/atk/WebPageAccessibilityObjectAtk.cpp
r154658 r156543 31 31 #include "WebPage.h" 32 32 #include <WebCore/AXObjectCache.h> 33 #include <WebCore/ Frame.h>33 #include <WebCore/MainFrame.h> 34 34 #include <WebCore/Page.h> 35 35 -
trunk/Source/WebKit2/WebProcess/WebPage/gtk/LayerTreeHostGtk.cpp
r155533 r156543 41 41 #endif 42 42 43 #include <WebCore/Frame.h>44 43 #include <WebCore/FrameView.h> 45 44 #include <WebCore/GLContext.h> 46 45 #include <WebCore/GraphicsLayerTextureMapper.h> 46 #include <WebCore/MainFrame.h> 47 47 #include <WebCore/Page.h> 48 48 #include <WebCore/Settings.h> -
trunk/Source/WebKit2/WebProcess/WebPage/mac/LayerTreeHostMac.mm
r155414 r156543 32 32 #import "WebProcess.h" 33 33 #import <QuartzCore/CATransaction.h> 34 #import <WebCore/Frame.h>35 34 #import <WebCore/FrameView.h> 36 35 #import <WebCore/GraphicsLayerCA.h> 36 #import <WebCore/MainFrame.h> 37 37 #import <WebCore/PlatformCALayer.h> 38 38 #import <WebCore/Settings.h> -
trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeContext.mm
r154658 r156543 31 31 #import "RemoteLayerTreeHostMessages.h" 32 32 #import "WebPage.h" 33 #import <WebCore/Frame.h>34 33 #import <WebCore/FrameView.h> 34 #import <WebCore/MainFrame.h> 35 35 #import <WebCore/Page.h> 36 36 #import <wtf/PassOwnPtr.h> -
trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm
r156472 r156543 37 37 #import "WebProcess.h" 38 38 #import <QuartzCore/QuartzCore.h> 39 #import <WebCore/Frame.h>40 39 #import <WebCore/FrameView.h> 41 40 #import <WebCore/GraphicsContext.h> 42 41 #import <WebCore/GraphicsLayerCA.h> 42 #import <WebCore/MainFrame.h> 43 43 #import <WebCore/Page.h> 44 44 #import <WebCore/RenderView.h> -
trunk/Source/WebKit2/WebProcess/WebPage/mac/WKAccessibilityWebPageObject.mm
r154963 r156543 36 36 #import "WKStringCF.h" 37 37 #import <WebCore/AXObjectCache.h> 38 #import <WebCore/Frame.h>39 38 #import <WebCore/FrameView.h> 39 #import <WebCore/MainFrame.h> 40 40 #import <WebCore/Page.h> 41 41 #import <WebCore/ScrollView.h> -
trunk/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm
r154877 r156543 49 49 #import <WebCore/EventHandler.h> 50 50 #import <WebCore/FocusController.h> 51 #import <WebCore/Frame.h>52 51 #import <WebCore/FrameLoader.h> 53 52 #import <WebCore/FrameView.h> … … 56 55 #import <WebCore/KeyboardEvent.h> 57 56 #import <WebCore/MIMETypeRegistry.h> 57 #import <WebCore/MainFrame.h> 58 58 #import <WebCore/NetworkingContext.h> 59 59 #import <WebCore/Page.h> -
trunk/Tools/Scripts/webkitpy/style/checkers/cpp.py
r156403 r156543 517 517 self._clean_lines = clean_lines 518 518 self._parameter_list = None 519 520 def modifiers_and_return_type(self):521 """Returns the modifiers and the return type."""522 # Go backwards from where the function name is until we encounter one of several things:523 # ';' or '{' or '}' or 'private:', etc. or '#' or return Position(0, 0)524 elided = self._clean_lines.elided525 start_modifiers = _rfind_in_lines(r';|\{|\}|((private|public|protected):)|(#.*)',526 elided, self.parameter_start_position, Position(0, 0))527 return SingleLineView(elided, start_modifiers, self.function_name_start_position).single_line.strip()528 519 529 520 def parameter_list(self): … … 1597 1588 1598 1589 1599 def check_function_definition_and_pass_ptr(type_text, row, location_description,error):1590 def check_function_definition_and_pass_ptr(type_text, row, error): 1600 1591 """Check that function definitions for use Pass*Ptr instead of *Ptr. 1601 1592 1602 1593 Args: 1603 type_text: A string containing the type. (For return values, it may contain more than the type.)1594 type_text: A string containing the type. 1604 1595 row: The row number of the type. 1605 location_description: Used to indicate where the type is. This is either 'parameter' or 'return'.1606 1596 error: The function to call with any errors found. 1607 1597 """ … … 1612 1602 type_name = bad_type_usage.group(0) 1613 1603 error(row, 'readability/pass_ptr', 5, 1614 'The %s type should use Pass%s instead of %s.' % (location_description,type_name, type_name))1604 'The parameter type should use Pass%s instead of %s.' % (type_name, type_name)) 1615 1605 1616 1606 … … 1631 1621 return 1632 1622 1633 modifiers_and_return_type = function_state.modifiers_and_return_type()1634 check_function_definition_and_pass_ptr(modifiers_and_return_type, function_state.function_name_start_position.row, 'return', error)1635 1636 1623 parameter_list = function_state.parameter_list() 1637 1624 for parameter in parameter_list: 1638 check_function_definition_and_pass_ptr(parameter.type, parameter.row, 'parameter',error)1625 check_function_definition_and_pass_ptr(parameter.type, parameter.row, error) 1639 1626 1640 1627 # Do checks specific to function declarations and parameter names. -
trunk/Tools/Scripts/webkitpy/style/checkers/cpp_unittest.py
r156105 r156543 3441 3441 '{\n' 3442 3442 '}', 3443 ' The return type should use PassRefPtr instead of RefPtr. [readability/pass_ptr] [5]')3443 '') 3444 3444 self.assert_pass_ptr_check( 3445 3445 'OwnPtr<Type1> myFunction(int)\n'
Note: See TracChangeset
for help on using the changeset viewer.