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

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

Issue 834203003: Revert of Revert of Revert of Reland factor out window proxy management (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: 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
« no previous file with comments | « Source/bindings/core/v8/v8.gypi ('k') | no next file » | 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) 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"
157 #include "platform/TraceEvent.h" 156 #include "platform/TraceEvent.h"
158 #include "platform/UserGestureIndicator.h" 157 #include "platform/UserGestureIndicator.h"
159 #include "platform/clipboard/ClipboardUtilities.h" 158 #include "platform/clipboard/ClipboardUtilities.h"
160 #include "platform/fonts/FontCache.h" 159 #include "platform/fonts/FontCache.h"
161 #include "platform/graphics/GraphicsContext.h" 160 #include "platform/graphics/GraphicsContext.h"
162 #include "platform/graphics/GraphicsLayerClient.h" 161 #include "platform/graphics/GraphicsLayerClient.h"
163 #include "platform/graphics/skia/SkiaUtils.h" 162 #include "platform/graphics/skia/SkiaUtils.h"
164 #include "platform/heap/Handle.h" 163 #include "platform/heap/Handle.h"
165 #include "platform/network/ResourceRequest.h" 164 #include "platform/network/ResourceRequest.h"
166 #include "platform/scroll/ScrollTypes.h" 165 #include "platform/scroll/ScrollTypes.h"
(...skipping 534 matching lines...) Expand 10 before | Expand all | Expand 10 after
701 700
702 void WebLocalFrameImpl::dispatchUnloadEvent() 701 void WebLocalFrameImpl::dispatchUnloadEvent()
703 { 702 {
704 if (!frame()) 703 if (!frame())
705 return; 704 return;
706 frame()->loader().dispatchUnloadEvent(); 705 frame()->loader().dispatchUnloadEvent();
707 } 706 }
708 707
709 NPObject* WebLocalFrameImpl::windowObject() const 708 NPObject* WebLocalFrameImpl::windowObject() const
710 { 709 {
711 if (!frame() || ScriptForbiddenScope::isScriptForbidden()) 710 if (!frame())
712 return 0; 711 return 0;
713 return frame()->script().windowScriptNPObject(); 712 return frame()->script().windowScriptNPObject();
714 } 713 }
715 714
716 void WebLocalFrameImpl::bindToWindowObject(const WebString& name, NPObject* obje ct) 715 void WebLocalFrameImpl::bindToWindowObject(const WebString& name, NPObject* obje ct)
717 { 716 {
718 bindToWindowObject(name, object, 0); 717 bindToWindowObject(name, object, 0);
719 } 718 }
720 719
721 void WebLocalFrameImpl::bindToWindowObject(const WebString& name, NPObject* obje ct, void*) 720 void WebLocalFrameImpl::bindToWindowObject(const WebString& name, NPObject* obje ct, void*)
(...skipping 1291 matching lines...) Expand 10 before | Expand all | Expand 10 after
2013 { 2012 {
2014 m_frameWidget = frameWidget; 2013 m_frameWidget = frameWidget;
2015 } 2014 }
2016 2015
2017 WebFrameWidgetImpl* WebLocalFrameImpl::frameWidget() const 2016 WebFrameWidgetImpl* WebLocalFrameImpl::frameWidget() const
2018 { 2017 {
2019 return m_frameWidget; 2018 return m_frameWidget;
2020 } 2019 }
2021 2020
2022 } // namespace blink 2021 } // namespace blink
OLDNEW
« no previous file with comments | « Source/bindings/core/v8/v8.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698