| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2014 Google Inc. All rights reserved. | 2 * Copyright (C) 2014 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 17 matching lines...) Expand all Loading... |
| 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 29 */ | 29 */ |
| 30 | 30 |
| 31 #include "config.h" | 31 #include "config.h" |
| 32 #include "modules/geolocation/GeolocationInspectorAgent.h" | 32 #include "modules/geolocation/GeolocationInspectorAgent.h" |
| 33 | 33 |
| 34 #include "modules/geolocation/GeolocationController.h" | 34 #include "modules/geolocation/GeolocationController.h" |
| 35 | 35 |
| 36 namespace blink { | 36 namespace blink { |
| 37 | 37 |
| 38 PassOwnPtr<GeolocationInspectorAgent> GeolocationInspectorAgent::create() | 38 PassOwnPtrWillBeRawPtr<GeolocationInspectorAgent> GeolocationInspectorAgent::cre
ate() |
| 39 { | 39 { |
| 40 return adoptPtr(new GeolocationInspectorAgent()); | 40 return adoptPtrWillBeNoop(new GeolocationInspectorAgent()); |
| 41 } | 41 } |
| 42 | 42 |
| 43 GeolocationInspectorAgent::~GeolocationInspectorAgent() | 43 GeolocationInspectorAgent::~GeolocationInspectorAgent() |
| 44 { | 44 { |
| 45 } | 45 } |
| 46 | 46 |
| 47 GeolocationInspectorAgent::GeolocationInspectorAgent() | 47 GeolocationInspectorAgent::GeolocationInspectorAgent() |
| 48 : InspectorBaseAgent<GeolocationInspectorAgent>("Geolocation") | 48 : InspectorBaseAgent<GeolocationInspectorAgent>("Geolocation") |
| 49 , m_geolocationOverridden(false) | 49 , m_geolocationOverridden(false) |
| 50 { | 50 { |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 82 GeolocationPosition* GeolocationInspectorAgent::overrideGeolocationPosition(Geol
ocationPosition* position) | 82 GeolocationPosition* GeolocationInspectorAgent::overrideGeolocationPosition(Geol
ocationPosition* position) |
| 83 { | 83 { |
| 84 if (m_geolocationOverridden) { | 84 if (m_geolocationOverridden) { |
| 85 if (position) | 85 if (position) |
| 86 m_platformGeolocationPosition = position; | 86 m_platformGeolocationPosition = position; |
| 87 return m_geolocationPosition.get(); | 87 return m_geolocationPosition.get(); |
| 88 } | 88 } |
| 89 return position; | 89 return position; |
| 90 } | 90 } |
| 91 | 91 |
| 92 void GeolocationInspectorAgent::AddController(GeolocationController* controller) | 92 void GeolocationInspectorAgent::addController(GeolocationController* controller) |
| 93 { | 93 { |
| 94 m_controllers.add(controller); | 94 m_controllers.add(controller); |
| 95 } | 95 } |
| 96 | 96 |
| 97 void GeolocationInspectorAgent::RemoveController(GeolocationController* controll
er) | 97 void GeolocationInspectorAgent::removeController(GeolocationController* controll
er) |
| 98 { | 98 { |
| 99 m_controllers.remove(controller); | 99 m_controllers.remove(controller); |
| 100 } | 100 } |
| 101 | 101 |
| 102 void GeolocationInspectorAgent::trace(Visitor* visitor) |
| 103 { |
| 104 #if ENABLE(OILPAN) |
| 105 visitor->trace(m_controllers); |
| 106 #endif |
| 107 visitor->trace(m_geolocationPosition); |
| 108 visitor->trace(m_platformGeolocationPosition); |
| 109 InspectorBaseAgent::trace(visitor); |
| 110 } |
| 111 |
| 102 } // namespace blink | 112 } // namespace blink |
| OLD | NEW |