Changeset 86391 in webkit
- Timestamp:
- May 12, 2011 4:06:09 PM (13 years ago)
- Location:
- trunk/Source
- Files:
-
- 10 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r86390 r86391 1 2011-05-12 Patrick Gansterer <paroga@webkit.org> 2 3 Reviewed by Adam Barth. 4 5 Enable OwnPtr strict mode in PluginHalter 6 https://bugs.webkit.org/show_bug.cgi?id=60681 7 8 Pass PluginHalterClient as (Pass)OwnPtr to Page and PluginHalter. 9 10 * WebCore.exp.in: 11 * page/Page.cpp: 12 (WebCore::Page::Page): 13 (WebCore::Page::PageClients::PageClients): 14 * page/Page.h: 15 * page/PluginHalter.cpp: 16 (WebCore::PluginHalter::PluginHalter): 17 * page/PluginHalter.h: 18 1 19 2011-05-12 Daniel Bates <dbates@rim.com> 2 20 -
trunk/Source/WebCore/WebCore.exp.in
r86305 r86391 705 705 __ZN7WebCore4Page9goForwardEv 706 706 __ZN7WebCore4Page9initGroupEv 707 __ZN7WebCore4PageC1ER KNS0_11PageClientsE707 __ZN7WebCore4PageC1ERNS0_11PageClientsE 708 708 __ZN7WebCore4PageD1Ev 709 709 __ZN7WebCore4Path14addRoundedRectERKNS_9FloatRectERKNS_9FloatSizeE -
trunk/Source/WebCore/page/Page.cpp
r86327 r86391 114 114 } 115 115 116 Page::Page( constPageClients& pageClients)116 Page::Page(PageClients& pageClients) 117 117 : m_chrome(adoptPtr(new Chrome(this, pageClients.chromeClient))) 118 118 , m_dragCaretController(adoptPtr(new DragCaretController)) … … 178 178 179 179 if (pageClients.pluginHalterClient) { 180 m_pluginHalter = adoptPtr(new PluginHalter(pageClients.pluginHalterClient ));180 m_pluginHalter = adoptPtr(new PluginHalter(pageClients.pluginHalterClient.release())); 181 181 m_pluginHalter->setPluginAllowedRunTime(m_settings->pluginAllowedRunTime()); 182 182 } … … 964 964 , dragClient(0) 965 965 , inspectorClient(0) 966 , pluginHalterClient(0)967 966 , geolocationClient(0) 968 967 , deviceMotionClient(0) -
trunk/Source/WebCore/page/Page.h
r86047 r86391 114 114 DragClient* dragClient; 115 115 InspectorClient* inspectorClient; 116 PluginHalterClient*pluginHalterClient;116 OwnPtr<PluginHalterClient> pluginHalterClient; 117 117 GeolocationClient* geolocationClient; 118 118 DeviceMotionClient* deviceMotionClient; … … 123 123 }; 124 124 125 Page( constPageClients&);125 Page(PageClients&); 126 126 ~Page(); 127 127 -
trunk/Source/WebCore/page/PluginHalter.cpp
r84881 r86391 25 25 26 26 #include "config.h" 27 28 // FIXME: Remove this define!29 #define LOOSE_OWN_PTR30 31 27 #include "PluginHalter.h" 32 28 … … 34 30 #include "PlatformString.h" 35 31 #include <wtf/CurrentTime.h> 32 #include <wtf/PassOwnPtr.h> 36 33 #include <wtf/Vector.h> 37 34 … … 40 37 namespace WebCore { 41 38 42 PluginHalter::PluginHalter(P luginHalterClient*client)39 PluginHalter::PluginHalter(PassOwnPtr<PluginHalterClient> client) 43 40 : m_client(client) 44 41 , m_timer(this, &PluginHalter::timerFired) -
trunk/Source/WebCore/page/PluginHalter.h
r76248 r86391 39 39 WTF_MAKE_NONCOPYABLE(PluginHalter); WTF_MAKE_FAST_ALLOCATED; 40 40 public: 41 PluginHalter(P luginHalterClient*);41 PluginHalter(PassOwnPtr<PluginHalterClient>); 42 42 43 43 void didStartPlugin(HaltablePlugin*); -
trunk/Source/WebKit/mac/ChangeLog
r86330 r86391 1 2011-05-12 Patrick Gansterer <paroga@webkit.org> 2 3 Reviewed by Adam Barth. 4 5 Enable OwnPtr strict mode in PluginHalter 6 https://bugs.webkit.org/show_bug.cgi?id=60681 7 8 * WebView/WebView.mm: 9 (-[WebView _commonInitializationWithFrameName:groupName:usesDocumentViews:]): 10 1 11 2011-05-12 Nikolas Zimmermann <nzimmermann@rim.com> 2 12 -
trunk/Source/WebKit/mac/WebView/WebView.mm
r85864 r86391 723 723 pageClients.dragClient = new WebDragClient(self); 724 724 pageClients.inspectorClient = new WebInspectorClient(self); 725 pageClients.pluginHalterClient = new WebPluginHalterClient(self);725 pageClients.pluginHalterClient = adoptPtr(new WebPluginHalterClient(self)); 726 726 #if ENABLE(CLIENT_BASED_GEOLOCATION) 727 727 pageClients.geolocationClient = new WebGeolocationClient(self); -
trunk/Source/WebKit/win/ChangeLog
r86336 r86391 1 2011-05-12 Patrick Gansterer <paroga@webkit.org> 2 3 Reviewed by Adam Barth. 4 5 Enable OwnPtr strict mode in PluginHalter 6 https://bugs.webkit.org/show_bug.cgi?id=60681 7 8 * WebView.cpp: 9 (WebView::initWithFrame): 10 1 11 2011-05-12 Adam Roben <aroben@apple.com> 2 12 -
trunk/Source/WebKit/win/WebView.cpp
r86285 r86391 2643 2643 pageClients.dragClient = new WebDragClient(this); 2644 2644 pageClients.inspectorClient = new WebInspectorClient(this); 2645 pageClients.pluginHalterClient = new WebPluginHalterClient(this);2645 pageClients.pluginHalterClient = adoptPtr(new WebPluginHalterClient(this)); 2646 2646 #if ENABLE(CLIENT_BASED_GEOLOCATION) 2647 2647 pageClients.geolocationClient = new WebGeolocationClient(this);
Note: See TracChangeset
for help on using the changeset viewer.