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

Side by Side Diff: third_party/WebKit/Source/core/frame/LocalFrame.cpp

Issue 2710823003: NOCOMMIT prototype: GRC service plumbing and process priority
Patch Set: Buildfixes Created 3 years, 9 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
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 Lars Knoll <knoll@kde.org> 3 * 1999 Lars Knoll <knoll@kde.org>
4 * 1999 Antti Koivisto <koivisto@kde.org> 4 * 1999 Antti Koivisto <koivisto@kde.org>
5 * 2000 Simon Hausmann <hausmann@kde.org> 5 * 2000 Simon Hausmann <hausmann@kde.org>
6 * 2000 Stefan Schimanski <1Stein@gmx.de> 6 * 2000 Stefan Schimanski <1Stein@gmx.de>
7 * 2001 George Staikos <staikos@kde.org> 7 * 2001 George Staikos <staikos@kde.org>
8 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All 8 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All
9 * rights reserved. 9 * rights reserved.
10 * Copyright (C) 2005 Alexey Proskuryakov <ap@nypop.com> 10 * Copyright (C) 2005 Alexey Proskuryakov <ap@nypop.com>
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
82 #include "platform/ScriptForbiddenScope.h" 82 #include "platform/ScriptForbiddenScope.h"
83 #include "platform/WebFrameScheduler.h" 83 #include "platform/WebFrameScheduler.h"
84 #include "platform/graphics/GraphicsContext.h" 84 #include "platform/graphics/GraphicsContext.h"
85 #include "platform/graphics/StaticBitmapImage.h" 85 #include "platform/graphics/StaticBitmapImage.h"
86 #include "platform/graphics/paint/ClipRecorder.h" 86 #include "platform/graphics/paint/ClipRecorder.h"
87 #include "platform/graphics/paint/PaintCanvas.h" 87 #include "platform/graphics/paint/PaintCanvas.h"
88 #include "platform/graphics/paint/PaintController.h" 88 #include "platform/graphics/paint/PaintController.h"
89 #include "platform/graphics/paint/PaintRecordBuilder.h" 89 #include "platform/graphics/paint/PaintRecordBuilder.h"
90 #include "platform/graphics/paint/PaintSurface.h" 90 #include "platform/graphics/paint/PaintSurface.h"
91 #include "platform/graphics/paint/TransformDisplayItem.h" 91 #include "platform/graphics/paint/TransformDisplayItem.h"
92 #include "platform/instrumentation/resource_coordinator/FrameResourceCoordinator .h"
92 #include "platform/json/JSONValues.h" 93 #include "platform/json/JSONValues.h"
93 #include "platform/loader/fetch/ResourceFetcher.h" 94 #include "platform/loader/fetch/ResourceFetcher.h"
94 #include "platform/plugins/PluginData.h" 95 #include "platform/plugins/PluginData.h"
95 #include "platform/text/TextStream.h" 96 #include "platform/text/TextStream.h"
96 #include "public/platform/InterfaceProvider.h" 97 #include "public/platform/InterfaceProvider.h"
97 #include "public/platform/InterfaceRegistry.h" 98 #include "public/platform/InterfaceRegistry.h"
98 #include "public/platform/WebScreenInfo.h" 99 #include "public/platform/WebScreenInfo.h"
99 #include "public/platform/WebViewScheduler.h" 100 #include "public/platform/WebViewScheduler.h"
100 #include "third_party/skia/include/core/SkImage.h" 101 #include "third_party/skia/include/core/SkImage.h"
101 #include "wtf/PtrUtil.h" 102 #include "wtf/PtrUtil.h"
(...skipping 248 matching lines...) Expand 10 before | Expand all | Expand 10 after
350 visitor->trace(m_view); 351 visitor->trace(m_view);
351 visitor->trace(m_domWindow); 352 visitor->trace(m_domWindow);
352 visitor->trace(m_pagePopupOwner); 353 visitor->trace(m_pagePopupOwner);
353 visitor->trace(m_script); 354 visitor->trace(m_script);
354 visitor->trace(m_editor); 355 visitor->trace(m_editor);
355 visitor->trace(m_spellChecker); 356 visitor->trace(m_spellChecker);
356 visitor->trace(m_selection); 357 visitor->trace(m_selection);
357 visitor->trace(m_eventHandler); 358 visitor->trace(m_eventHandler);
358 visitor->trace(m_console); 359 visitor->trace(m_console);
359 visitor->trace(m_inputMethodController); 360 visitor->trace(m_inputMethodController);
361 visitor->trace(m_frameResourceCoordinator);
360 Frame::trace(visitor); 362 Frame::trace(visitor);
361 Supplementable<LocalFrame>::trace(visitor); 363 Supplementable<LocalFrame>::trace(visitor);
362 } 364 }
363 365
364 WindowProxy* LocalFrame::windowProxy(DOMWrapperWorld& world) { 366 WindowProxy* LocalFrame::windowProxy(DOMWrapperWorld& world) {
365 return m_script->windowProxy(world); 367 return m_script->windowProxy(world);
366 } 368 }
367 369
368 void LocalFrame::navigate(Document& originDocument, 370 void LocalFrame::navigate(Document& originDocument,
369 const KURL& url, 371 const KURL& url,
(...skipping 493 matching lines...) Expand 10 before | Expand all | Expand 10 after
863 m_spellChecker(SpellChecker::create(*this)), 865 m_spellChecker(SpellChecker::create(*this)),
864 m_selection(FrameSelection::create(*this)), 866 m_selection(FrameSelection::create(*this)),
865 m_eventHandler(new EventHandler(*this)), 867 m_eventHandler(new EventHandler(*this)),
866 m_console(FrameConsole::create(*this)), 868 m_console(FrameConsole::create(*this)),
867 m_inputMethodController(InputMethodController::create(*this)), 869 m_inputMethodController(InputMethodController::create(*this)),
868 m_navigationDisableCount(0), 870 m_navigationDisableCount(0),
869 m_pageZoomFactor(parentPageZoomFactor(this)), 871 m_pageZoomFactor(parentPageZoomFactor(this)),
870 m_textZoomFactor(parentTextZoomFactor(this)), 872 m_textZoomFactor(parentTextZoomFactor(this)),
871 m_inViewSourceMode(false), 873 m_inViewSourceMode(false),
872 m_interfaceProvider(interfaceProvider), 874 m_interfaceProvider(interfaceProvider),
873 m_interfaceRegistry(interfaceRegistry) { 875 m_interfaceRegistry(interfaceRegistry),
876 m_frameResourceCoordinator(
877 FrameResourceCoordinator::create(interfaceProvider)) {
874 if (isLocalRoot()) { 878 if (isLocalRoot()) {
875 m_instrumentingAgents = new InstrumentingAgents(); 879 m_instrumentingAgents = new InstrumentingAgents();
876 m_performanceMonitor = new PerformanceMonitor(this); 880 m_performanceMonitor = new PerformanceMonitor(this);
877 } else { 881 } else {
878 m_instrumentingAgents = localFrameRoot()->m_instrumentingAgents; 882 m_instrumentingAgents = localFrameRoot()->m_instrumentingAgents;
879 m_performanceMonitor = localFrameRoot()->m_performanceMonitor; 883 m_performanceMonitor = localFrameRoot()->m_performanceMonitor;
880 } 884 }
881 } 885 }
882 886
883 WebFrameScheduler* LocalFrame::frameScheduler() { 887 WebFrameScheduler* LocalFrame::frameScheduler() {
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
916 if (m_frame && m_frame->client() && m_frame->client()->frameBlameContext()) 920 if (m_frame && m_frame->client() && m_frame->client()->frameBlameContext())
917 m_frame->client()->frameBlameContext()->Enter(); 921 m_frame->client()->frameBlameContext()->Enter();
918 } 922 }
919 923
920 ScopedFrameBlamer::~ScopedFrameBlamer() { 924 ScopedFrameBlamer::~ScopedFrameBlamer() {
921 if (m_frame && m_frame->client() && m_frame->client()->frameBlameContext()) 925 if (m_frame && m_frame->client() && m_frame->client()->frameBlameContext())
922 m_frame->client()->frameBlameContext()->Leave(); 926 m_frame->client()->frameBlameContext()->Leave();
923 } 927 }
924 928
925 } // namespace blink 929 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698