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

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

Issue 209713003: Make DOMWrapperWorld::current() return a reference instead of a pointer (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 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 | Annotate | Revision Log
« no previous file with comments | « Source/web/FrameLoaderClientImpl.h ('k') | Source/web/tests/CustomEventTest.cpp » ('j') | 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, 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2009, 2012 Google Inc. All rights reserved.
3 * Copyright (C) 2011 Apple Inc. All rights reserved. 3 * Copyright (C) 2011 Apple Inc. All rights reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are 6 * modification, are permitted provided that the following conditions are
7 * met: 7 * met:
8 * 8 *
9 * * Redistributions of source code must retain the above copyright 9 * * Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
104 104
105 FrameLoaderClientImpl::FrameLoaderClientImpl(WebFrameImpl* frame) 105 FrameLoaderClientImpl::FrameLoaderClientImpl(WebFrameImpl* frame)
106 : m_webFrame(frame) 106 : m_webFrame(frame)
107 { 107 {
108 } 108 }
109 109
110 FrameLoaderClientImpl::~FrameLoaderClientImpl() 110 FrameLoaderClientImpl::~FrameLoaderClientImpl()
111 { 111 {
112 } 112 }
113 113
114 void FrameLoaderClientImpl::dispatchDidClearWindowObjectInWorld(DOMWrapperWorld* world) 114 void FrameLoaderClientImpl::dispatchDidClearWindowObjectInWorld(DOMWrapperWorld& world)
115 { 115 {
116 if (m_webFrame->client()) { 116 if (m_webFrame->client()) {
117 m_webFrame->client()->didClearWindowObject(m_webFrame, world->worldId()) ; 117 m_webFrame->client()->didClearWindowObject(m_webFrame, world.worldId());
118 Document* document = m_webFrame->frame()->document(); 118 Document* document = m_webFrame->frame()->document();
119 if (document) { 119 if (document) {
120 WheelController::from(*document); 120 WheelController::from(*document);
121 if (RuntimeEnabledFeatures::deviceMotionEnabled()) 121 if (RuntimeEnabledFeatures::deviceMotionEnabled())
122 DeviceMotionController::from(*document); 122 DeviceMotionController::from(*document);
123 if (RuntimeEnabledFeatures::deviceOrientationEnabled()) 123 if (RuntimeEnabledFeatures::deviceOrientationEnabled())
124 DeviceOrientationController::from(*document); 124 DeviceOrientationController::from(*document);
125 if (RuntimeEnabledFeatures::screenOrientationEnabled()) 125 if (RuntimeEnabledFeatures::screenOrientationEnabled())
126 ScreenOrientationController::from(*document); 126 ScreenOrientationController::from(*document);
127 if (RuntimeEnabledFeatures::gamepadEnabled()) 127 if (RuntimeEnabledFeatures::gamepadEnabled())
(...skipping 673 matching lines...) Expand 10 before | Expand all | Expand 10 after
801 return adoptPtr(m_webFrame->client()->createApplicationCacheHost(m_webFrame, client)); 801 return adoptPtr(m_webFrame->client()->createApplicationCacheHost(m_webFrame, client));
802 } 802 }
803 803
804 void FrameLoaderClientImpl::didStopAllLoaders() 804 void FrameLoaderClientImpl::didStopAllLoaders()
805 { 805 {
806 if (m_webFrame->client()) 806 if (m_webFrame->client())
807 m_webFrame->client()->didAbortLoading(m_webFrame); 807 m_webFrame->client()->didAbortLoading(m_webFrame);
808 } 808 }
809 809
810 } // namespace blink 810 } // namespace blink
OLDNEW
« no previous file with comments | « Source/web/FrameLoaderClientImpl.h ('k') | Source/web/tests/CustomEventTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698