Commit 03df15be authored by paroga@webkit.org's avatar paroga@webkit.org

2011-05-12 Patrick Gansterer <paroga@webkit.org>

        Reviewed by Adam Barth.

        Enable OwnPtr strict mode in PluginHalter
        https://bugs.webkit.org/show_bug.cgi?id=60681

        Pass PluginHalterClient as (Pass)OwnPtr to Page and PluginHalter.

        * WebCore.exp.in:
        * page/Page.cpp:
        (WebCore::Page::Page):
        (WebCore::Page::PageClients::PageClients):
        * page/Page.h:
        * page/PluginHalter.cpp:
        (WebCore::PluginHalter::PluginHalter):
        * page/PluginHalter.h:
2011-05-12  Patrick Gansterer  <paroga@webkit.org>

        Reviewed by Adam Barth.

        Enable OwnPtr strict mode in PluginHalter
        https://bugs.webkit.org/show_bug.cgi?id=60681

        * WebView/WebView.mm:
        (-[WebView _commonInitializationWithFrameName:groupName:usesDocumentViews:]):
2011-05-12  Patrick Gansterer  <paroga@webkit.org>

        Reviewed by Adam Barth.

        Enable OwnPtr strict mode in PluginHalter
        https://bugs.webkit.org/show_bug.cgi?id=60681

        * WebView.cpp:
        (WebView::initWithFrame):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@86391 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent ee1c625e
2011-05-12 Patrick Gansterer <paroga@webkit.org>
Reviewed by Adam Barth.
Enable OwnPtr strict mode in PluginHalter
https://bugs.webkit.org/show_bug.cgi?id=60681
Pass PluginHalterClient as (Pass)OwnPtr to Page and PluginHalter.
* WebCore.exp.in:
* page/Page.cpp:
(WebCore::Page::Page):
(WebCore::Page::PageClients::PageClients):
* page/Page.h:
* page/PluginHalter.cpp:
(WebCore::PluginHalter::PluginHalter):
* page/PluginHalter.h:
2011-05-12 Daniel Bates <dbates@rim.com>
Reviewed by Adele Peterson.
......@@ -704,7 +704,7 @@ __ZN7WebCore4Page6goBackEv
__ZN7WebCore4Page8goToItemEPNS_11HistoryItemENS_13FrameLoadTypeE
__ZN7WebCore4Page9goForwardEv
__ZN7WebCore4Page9initGroupEv
__ZN7WebCore4PageC1ERKNS0_11PageClientsE
__ZN7WebCore4PageC1ERNS0_11PageClientsE
__ZN7WebCore4PageD1Ev
__ZN7WebCore4Path14addRoundedRectERKNS_9FloatRectERKNS_9FloatSizeE
__ZN7WebCore4PathC1Ev
......
......@@ -113,7 +113,7 @@ static void networkStateChanged()
frames[i]->document()->dispatchWindowEvent(Event::create(eventName, false, false));
}
Page::Page(const PageClients& pageClients)
Page::Page(PageClients& pageClients)
: m_chrome(adoptPtr(new Chrome(this, pageClients.chromeClient)))
, m_dragCaretController(adoptPtr(new DragCaretController))
#if ENABLE(DRAG_SUPPORT)
......@@ -177,7 +177,7 @@ Page::Page(const PageClients& pageClients)
allPages->add(this);
if (pageClients.pluginHalterClient) {
m_pluginHalter = adoptPtr(new PluginHalter(pageClients.pluginHalterClient));
m_pluginHalter = adoptPtr(new PluginHalter(pageClients.pluginHalterClient.release()));
m_pluginHalter->setPluginAllowedRunTime(m_settings->pluginAllowedRunTime());
}
......@@ -963,7 +963,6 @@ Page::PageClients::PageClients()
, editorClient(0)
, dragClient(0)
, inspectorClient(0)
, pluginHalterClient(0)
, geolocationClient(0)
, deviceMotionClient(0)
, deviceOrientationClient(0)
......
......@@ -113,7 +113,7 @@ namespace WebCore {
EditorClient* editorClient;
DragClient* dragClient;
InspectorClient* inspectorClient;
PluginHalterClient* pluginHalterClient;
OwnPtr<PluginHalterClient> pluginHalterClient;
GeolocationClient* geolocationClient;
DeviceMotionClient* deviceMotionClient;
DeviceOrientationClient* deviceOrientationClient;
......@@ -122,7 +122,7 @@ namespace WebCore {
MediaStreamClient* mediaStreamClient;
};
Page(const PageClients&);
Page(PageClients&);
~Page();
void setNeedsRecalcStyleInAllFrames();
......
......@@ -24,22 +24,19 @@
*/
#include "config.h"
// FIXME: Remove this define!
#define LOOSE_OWN_PTR
#include "PluginHalter.h"
#include "HaltablePlugin.h"
#include "PlatformString.h"
#include <wtf/CurrentTime.h>
#include <wtf/PassOwnPtr.h>
#include <wtf/Vector.h>
using namespace std;
namespace WebCore {
PluginHalter::PluginHalter(PluginHalterClient* client)
PluginHalter::PluginHalter(PassOwnPtr<PluginHalterClient> client)
: m_client(client)
, m_timer(this, &PluginHalter::timerFired)
, m_pluginAllowedRunTime(numeric_limits<unsigned>::max())
......
......@@ -38,7 +38,7 @@ class HaltablePlugin;
class PluginHalter {
WTF_MAKE_NONCOPYABLE(PluginHalter); WTF_MAKE_FAST_ALLOCATED;
public:
PluginHalter(PluginHalterClient*);
PluginHalter(PassOwnPtr<PluginHalterClient>);
void didStartPlugin(HaltablePlugin*);
void didStopPlugin(HaltablePlugin*);
......
2011-05-12 Patrick Gansterer <paroga@webkit.org>
Reviewed by Adam Barth.
Enable OwnPtr strict mode in PluginHalter
https://bugs.webkit.org/show_bug.cgi?id=60681
* WebView/WebView.mm:
(-[WebView _commonInitializationWithFrameName:groupName:usesDocumentViews:]):
2011-05-12 Nikolas Zimmermann <nzimmermann@rim.com>
Reviewed by Darin Adler.
......
......@@ -722,7 +722,7 @@ static NSString *leakOutlookQuirksUserScriptContents()
pageClients.editorClient = new WebEditorClient(self);
pageClients.dragClient = new WebDragClient(self);
pageClients.inspectorClient = new WebInspectorClient(self);
pageClients.pluginHalterClient = new WebPluginHalterClient(self);
pageClients.pluginHalterClient = adoptPtr(new WebPluginHalterClient(self));
#if ENABLE(CLIENT_BASED_GEOLOCATION)
pageClients.geolocationClient = new WebGeolocationClient(self);
#endif
......
2011-05-12 Patrick Gansterer <paroga@webkit.org>
Reviewed by Adam Barth.
Enable OwnPtr strict mode in PluginHalter
https://bugs.webkit.org/show_bug.cgi?id=60681
* WebView.cpp:
(WebView::initWithFrame):
2011-05-12 Adam Roben <aroben@apple.com>
A little gtest cleanup after r86287
......
......@@ -2642,7 +2642,7 @@ HRESULT STDMETHODCALLTYPE WebView::initWithFrame(
pageClients.editorClient = new WebEditorClient(this);
pageClients.dragClient = new WebDragClient(this);
pageClients.inspectorClient = new WebInspectorClient(this);
pageClients.pluginHalterClient = new WebPluginHalterClient(this);
pageClients.pluginHalterClient = adoptPtr(new WebPluginHalterClient(this));
#if ENABLE(CLIENT_BASED_GEOLOCATION)
pageClients.geolocationClient = new WebGeolocationClient(this);
#endif
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment