Changeset 86391 in webkit


Ignore:
Timestamp:
May 12, 2011 4:06:09 PM (13 years ago)
Author:
Patrick Gansterer
Message:

2011-05-12 Patrick Gansterer <Patrick Gansterer>

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 <Patrick Gansterer>

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 <Patrick Gansterer>

Reviewed by Adam Barth.

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

  • WebView.cpp: (WebView::initWithFrame):
Location:
trunk/Source
Files:
10 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/ChangeLog

    r86390 r86391  
     12011-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
    1192011-05-12  Daniel Bates  <dbates@rim.com>
    220
  • trunk/Source/WebCore/WebCore.exp.in

    r86305 r86391  
    705705__ZN7WebCore4Page9goForwardEv
    706706__ZN7WebCore4Page9initGroupEv
    707 __ZN7WebCore4PageC1ERKNS0_11PageClientsE
     707__ZN7WebCore4PageC1ERNS0_11PageClientsE
    708708__ZN7WebCore4PageD1Ev
    709709__ZN7WebCore4Path14addRoundedRectERKNS_9FloatRectERKNS_9FloatSizeE
  • trunk/Source/WebCore/page/Page.cpp

    r86327 r86391  
    114114}
    115115
    116 Page::Page(const PageClients& pageClients)
     116Page::Page(PageClients& pageClients)
    117117    : m_chrome(adoptPtr(new Chrome(this, pageClients.chromeClient)))
    118118    , m_dragCaretController(adoptPtr(new DragCaretController))
     
    178178
    179179    if (pageClients.pluginHalterClient) {
    180         m_pluginHalter = adoptPtr(new PluginHalter(pageClients.pluginHalterClient));
     180        m_pluginHalter = adoptPtr(new PluginHalter(pageClients.pluginHalterClient.release()));
    181181        m_pluginHalter->setPluginAllowedRunTime(m_settings->pluginAllowedRunTime());
    182182    }
     
    964964    , dragClient(0)
    965965    , inspectorClient(0)
    966     , pluginHalterClient(0)
    967966    , geolocationClient(0)
    968967    , deviceMotionClient(0)
  • trunk/Source/WebCore/page/Page.h

    r86047 r86391  
    114114            DragClient* dragClient;
    115115            InspectorClient* inspectorClient;
    116             PluginHalterClient* pluginHalterClient;
     116            OwnPtr<PluginHalterClient> pluginHalterClient;
    117117            GeolocationClient* geolocationClient;
    118118            DeviceMotionClient* deviceMotionClient;
     
    123123        };
    124124
    125         Page(const PageClients&);
     125        Page(PageClients&);
    126126        ~Page();
    127127
  • trunk/Source/WebCore/page/PluginHalter.cpp

    r84881 r86391  
    2525
    2626#include "config.h"
    27 
    28 // FIXME: Remove this define!
    29 #define LOOSE_OWN_PTR
    30 
    3127#include "PluginHalter.h"
    3228
     
    3430#include "PlatformString.h"
    3531#include <wtf/CurrentTime.h>
     32#include <wtf/PassOwnPtr.h>
    3633#include <wtf/Vector.h>
    3734
     
    4037namespace WebCore {
    4138
    42 PluginHalter::PluginHalter(PluginHalterClient* client)
     39PluginHalter::PluginHalter(PassOwnPtr<PluginHalterClient> client)
    4340    : m_client(client)
    4441    , m_timer(this, &PluginHalter::timerFired)
  • trunk/Source/WebCore/page/PluginHalter.h

    r76248 r86391  
    3939    WTF_MAKE_NONCOPYABLE(PluginHalter); WTF_MAKE_FAST_ALLOCATED;
    4040public:
    41     PluginHalter(PluginHalterClient*);
     41    PluginHalter(PassOwnPtr<PluginHalterClient>);
    4242
    4343    void didStartPlugin(HaltablePlugin*);
  • trunk/Source/WebKit/mac/ChangeLog

    r86330 r86391  
     12011-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
    1112011-05-12  Nikolas Zimmermann  <nzimmermann@rim.com>
    212
  • trunk/Source/WebKit/mac/WebView/WebView.mm

    r85864 r86391  
    723723    pageClients.dragClient = new WebDragClient(self);
    724724    pageClients.inspectorClient = new WebInspectorClient(self);
    725     pageClients.pluginHalterClient = new WebPluginHalterClient(self);
     725    pageClients.pluginHalterClient = adoptPtr(new WebPluginHalterClient(self));
    726726#if ENABLE(CLIENT_BASED_GEOLOCATION)
    727727    pageClients.geolocationClient = new WebGeolocationClient(self);
  • trunk/Source/WebKit/win/ChangeLog

    r86336 r86391  
     12011-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
    1112011-05-12  Adam Roben  <aroben@apple.com>
    212
  • trunk/Source/WebKit/win/WebView.cpp

    r86285 r86391  
    26432643    pageClients.dragClient = new WebDragClient(this);
    26442644    pageClients.inspectorClient = new WebInspectorClient(this);
    2645     pageClients.pluginHalterClient = new WebPluginHalterClient(this);
     2645    pageClients.pluginHalterClient = adoptPtr(new WebPluginHalterClient(this));
    26462646#if ENABLE(CLIENT_BASED_GEOLOCATION)
    26472647    pageClients.geolocationClient = new WebGeolocationClient(this);
Note: See TracChangeset for help on using the changeset viewer.