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

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

Issue 854453003: Revert of Revert of Reland factor out window proxy management portions of ScriptController. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebase and deflake test Created 5 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 | 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 135 matching lines...) Expand 10 before | Expand all | Expand 10 after
146 #include "core/rendering/RenderObject.h" 146 #include "core/rendering/RenderObject.h"
147 #include "core/rendering/RenderTreeAsText.h" 147 #include "core/rendering/RenderTreeAsText.h"
148 #include "core/rendering/RenderView.h" 148 #include "core/rendering/RenderView.h"
149 #include "core/rendering/style/StyleInheritedData.h" 149 #include "core/rendering/style/StyleInheritedData.h"
150 #include "core/timing/Performance.h" 150 #include "core/timing/Performance.h"
151 #include "modules/geolocation/GeolocationController.h" 151 #include "modules/geolocation/GeolocationController.h"
152 #include "modules/notifications/NotificationPermissionClient.h" 152 #include "modules/notifications/NotificationPermissionClient.h"
153 #include "modules/push_messaging/PushController.h" 153 #include "modules/push_messaging/PushController.h"
154 #include "modules/screen_orientation/ScreenOrientationController.h" 154 #include "modules/screen_orientation/ScreenOrientationController.h"
155 #include "modules/speech/SpeechRecognitionController.h" 155 #include "modules/speech/SpeechRecognitionController.h"
156 #include "platform/ScriptForbiddenScope.h"
156 #include "platform/TraceEvent.h" 157 #include "platform/TraceEvent.h"
157 #include "platform/UserGestureIndicator.h" 158 #include "platform/UserGestureIndicator.h"
158 #include "platform/clipboard/ClipboardUtilities.h" 159 #include "platform/clipboard/ClipboardUtilities.h"
159 #include "platform/fonts/FontCache.h" 160 #include "platform/fonts/FontCache.h"
160 #include "platform/graphics/GraphicsContext.h" 161 #include "platform/graphics/GraphicsContext.h"
161 #include "platform/graphics/GraphicsLayerClient.h" 162 #include "platform/graphics/GraphicsLayerClient.h"
162 #include "platform/graphics/skia/SkiaUtils.h" 163 #include "platform/graphics/skia/SkiaUtils.h"
163 #include "platform/heap/Handle.h" 164 #include "platform/heap/Handle.h"
164 #include "platform/network/ResourceRequest.h" 165 #include "platform/network/ResourceRequest.h"
165 #include "platform/scroll/ScrollTypes.h" 166 #include "platform/scroll/ScrollTypes.h"
(...skipping 534 matching lines...) Expand 10 before | Expand all | Expand 10 after
700 701
701 void WebLocalFrameImpl::dispatchUnloadEvent() 702 void WebLocalFrameImpl::dispatchUnloadEvent()
702 { 703 {
703 if (!frame()) 704 if (!frame())
704 return; 705 return;
705 frame()->loader().dispatchUnloadEvent(); 706 frame()->loader().dispatchUnloadEvent();
706 } 707 }
707 708
708 NPObject* WebLocalFrameImpl::windowObject() const 709 NPObject* WebLocalFrameImpl::windowObject() const
709 { 710 {
710 if (!frame()) 711 if (!frame() || ScriptForbiddenScope::isScriptForbidden())
711 return 0; 712 return 0;
712 return frame()->script().windowScriptNPObject(); 713 return frame()->script().windowScriptNPObject();
713 } 714 }
714 715
715 void WebLocalFrameImpl::bindToWindowObject(const WebString& name, NPObject* obje ct) 716 void WebLocalFrameImpl::bindToWindowObject(const WebString& name, NPObject* obje ct)
716 { 717 {
717 bindToWindowObject(name, object, 0); 718 bindToWindowObject(name, object, 0);
718 } 719 }
719 720
720 void WebLocalFrameImpl::bindToWindowObject(const WebString& name, NPObject* obje ct, void*) 721 void WebLocalFrameImpl::bindToWindowObject(const WebString& name, NPObject* obje ct, void*)
(...skipping 1291 matching lines...) Expand 10 before | Expand all | Expand 10 after
2012 { 2013 {
2013 m_frameWidget = frameWidget; 2014 m_frameWidget = frameWidget;
2014 } 2015 }
2015 2016
2016 WebFrameWidgetImpl* WebLocalFrameImpl::frameWidget() const 2017 WebFrameWidgetImpl* WebLocalFrameImpl::frameWidget() const
2017 { 2018 {
2018 return m_frameWidget; 2019 return m_frameWidget;
2019 } 2020 }
2020 2021
2021 } // namespace blink 2022 } // namespace blink
OLDNEW
« Source/bindings/core/v8/WindowProxyManager.h ('K') | « Source/bindings/core/v8/v8.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698