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

Side by Side Diff: Source/web/WebLocalFrameImpl.cpp

Issue 910983005: Decouple performance() from LocalDOMWindow (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 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) 2009 Google Inc. All rights reserved. 2 * Copyright (C) 2009 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after
140 #include "core/loader/SubstituteData.h" 140 #include "core/loader/SubstituteData.h"
141 #include "core/page/Chrome.h" 141 #include "core/page/Chrome.h"
142 #include "core/page/EventHandler.h" 142 #include "core/page/EventHandler.h"
143 #include "core/page/FocusController.h" 143 #include "core/page/FocusController.h"
144 #include "core/page/FrameTree.h" 144 #include "core/page/FrameTree.h"
145 #include "core/page/Page.h" 145 #include "core/page/Page.h"
146 #include "core/page/PrintContext.h" 146 #include "core/page/PrintContext.h"
147 #include "core/rendering/RenderBox.h" 147 #include "core/rendering/RenderBox.h"
148 #include "core/rendering/RenderFrame.h" 148 #include "core/rendering/RenderFrame.h"
149 #include "core/rendering/RenderView.h" 149 #include "core/rendering/RenderView.h"
150 #include "core/timing/DOMWindowPerformance.h"
150 #include "core/timing/Performance.h" 151 #include "core/timing/Performance.h"
151 #include "modules/geolocation/GeolocationController.h" 152 #include "modules/geolocation/GeolocationController.h"
152 #include "modules/notifications/NotificationPermissionClient.h" 153 #include "modules/notifications/NotificationPermissionClient.h"
153 #include "modules/presentation/PresentationController.h" 154 #include "modules/presentation/PresentationController.h"
154 #include "modules/push_messaging/PushController.h" 155 #include "modules/push_messaging/PushController.h"
155 #include "modules/screen_orientation/ScreenOrientationController.h" 156 #include "modules/screen_orientation/ScreenOrientationController.h"
156 #include "platform/ScriptForbiddenScope.h" 157 #include "platform/ScriptForbiddenScope.h"
157 #include "platform/TraceEvent.h" 158 #include "platform/TraceEvent.h"
158 #include "platform/UserGestureIndicator.h" 159 #include "platform/UserGestureIndicator.h"
159 #include "platform/clipboard/ClipboardUtilities.h" 160 #include "platform/clipboard/ClipboardUtilities.h"
(...skipping 519 matching lines...) Expand 10 before | Expand all | Expand 10 after
679 { 680 {
680 if (!frame() || !frame()->document()) 681 if (!frame() || !frame()->document())
681 return WebDocument(); 682 return WebDocument();
682 return WebDocument(frame()->document()); 683 return WebDocument(frame()->document());
683 } 684 }
684 685
685 WebPerformance WebLocalFrameImpl::performance() const 686 WebPerformance WebLocalFrameImpl::performance() const
686 { 687 {
687 if (!frame()) 688 if (!frame())
688 return WebPerformance(); 689 return WebPerformance();
689 return WebPerformance(frame()->domWindow()->performance()); 690 return WebPerformance(DOMWindowPerformance::performance(*(frame()->domWindow ())));
690 } 691 }
691 692
692 bool WebLocalFrameImpl::dispatchBeforeUnloadEvent() 693 bool WebLocalFrameImpl::dispatchBeforeUnloadEvent()
693 { 694 {
694 if (!frame()) 695 if (!frame())
695 return true; 696 return true;
696 return frame()->loader().shouldClose(); 697 return frame()->loader().shouldClose();
697 } 698 }
698 699
699 void WebLocalFrameImpl::dispatchUnloadEvent() 700 void WebLocalFrameImpl::dispatchUnloadEvent()
(...skipping 1302 matching lines...) Expand 10 before | Expand all | Expand 10 after
2002 { 2003 {
2003 m_frameWidget = frameWidget; 2004 m_frameWidget = frameWidget;
2004 } 2005 }
2005 2006
2006 WebFrameWidgetImpl* WebLocalFrameImpl::frameWidget() const 2007 WebFrameWidgetImpl* WebLocalFrameImpl::frameWidget() const
2007 { 2008 {
2008 return m_frameWidget; 2009 return m_frameWidget;
2009 } 2010 }
2010 2011
2011 } // namespace blink 2012 } // namespace blink
OLDNEW
« Source/modules/webmidi/MIDIOutput.cpp ('K') | « Source/modules/webmidi/MIDIOutput.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698