Changeset 112495 in webkit


Ignore:
Timestamp:
Mar 28, 2012 7:57:04 PM (12 years ago)
Author:
gyuyoung.kim@samsung.com
Message:

Remove ScriptExecutionContext from NavigatorBattery.idl
​https://bugs.webkit.org/show_bug.cgi?id=82556

Reviewed by Adam Barth.

As Bug 73528 comment #71, NavigatorBattery.idl doesn't need to have ScriptExecutionContext.
Document can be used instead of ScriptExecutionContext.

Tests: batterystatus/add-listener-from-callback.html

batterystatus/basic-all-types-of-events.html
batterystatus/basic-operation.html
batterystatus/event-after-navigation.html
batterystatus/multiple-frames.html
batterystatus/updates.html
batterystatus/window-property.html

  • Modules/battery/BatteryManager.cpp:

(WebCore::BatteryManager::create):
(WebCore::BatteryManager::BatteryManager):

  • Modules/battery/BatteryManager.h:

(BatteryManager):

  • Modules/battery/NavigatorBattery.cpp:

(WebCore::NavigatorBattery::webkitBattery):

  • Modules/battery/NavigatorBattery.h:

(NavigatorBattery):

  • Modules/battery/NavigatorBattery.idl:
Location:
trunk/Source/WebCore
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r112494 r112495  
     12012-03-28  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
     2
     3        Remove ScriptExecutionContext from NavigatorBattery.idl
     4        https://bugs.webkit.org/show_bug.cgi?id=82556
     5
     6        Reviewed by Adam Barth.
     7
     8        As Bug 73528 comment #71, NavigatorBattery.idl doesn't need to have ScriptExecutionContext.
     9        Document can be used instead of ScriptExecutionContext.
     10
     11        Tests: batterystatus/add-listener-from-callback.html
     12               batterystatus/basic-all-types-of-events.html
     13               batterystatus/basic-operation.html
     14               batterystatus/event-after-navigation.html
     15               batterystatus/multiple-frames.html
     16               batterystatus/updates.html
     17               batterystatus/window-property.html
     18
     19        * Modules/battery/BatteryManager.cpp:
     20        (WebCore::BatteryManager::create):
     21        (WebCore::BatteryManager::BatteryManager):
     22        * Modules/battery/BatteryManager.h:
     23        (BatteryManager):
     24        * Modules/battery/NavigatorBattery.cpp:
     25        (WebCore::NavigatorBattery::webkitBattery):
     26        * Modules/battery/NavigatorBattery.h:
     27        (NavigatorBattery):
     28        * Modules/battery/NavigatorBattery.idl:
     29
    1302012-03-28  Jason Liu  <jason.liu@torchmobile.com.cn>
    231

  • trunk/Source/WebCore/Modules/battery/BatteryManager.cpp

    r110991 r112495  
    3232namespace WebCore {
    3333
    34 PassRefPtr<BatteryManager> BatteryManager::create(ScriptExecutionContext* context, Navigator* navigator)
     34PassRefPtr<BatteryManager> BatteryManager::create(Navigator* navigator)
    3535{
    36     RefPtr<BatteryManager> batteryManager(adoptRef(new BatteryManager(context, navigator)));
     36    RefPtr<BatteryManager> batteryManager(adoptRef(new BatteryManager(navigator)));
    3737    batteryManager->suspendIfNeeded();
    3838    return batteryManager.release();
    … …  
    4343}
    4444
    45 BatteryManager::BatteryManager(ScriptExecutionContext* context, Navigator* navigator)
    46     : ActiveDOMObject(context, this)
     45BatteryManager::BatteryManager(Navigator* navigator)
     46    : ActiveDOMObject(navigator->frame()->document(), this)
    4747    , m_batteryController(BatteryController::from(navigator->frame()->page()))
    4848    , m_batteryStatus(0)

  • trunk/Source/WebCore/Modules/battery/BatteryManager.h

    r110991 r112495  
    3636public:
    3737    virtual ~BatteryManager();
    38     static PassRefPtr<BatteryManager> create(ScriptExecutionContext*, Navigator*);
     38    static PassRefPtr<BatteryManager> create(Navigator*);
    3939
    4040    // EventTarget implementation.
    … …  
    6969
    7070private:
    71     BatteryManager(ScriptExecutionContext*, Navigator*);
     71    explicit BatteryManager(Navigator*);
    7272
    7373    // EventTarget implementation.

  • trunk/Source/WebCore/Modules/battery/NavigatorBattery.cpp

    r111770 r112495  
    3838}
    3939
    40 BatteryManager* NavigatorBattery::webkitBattery(ScriptExecutionContext* context, Navigator* navigator)
     40BatteryManager* NavigatorBattery::webkitBattery(Navigator* navigator)
    4141{
    4242    if (!navigator->frame())
    … …  
    4545    NavigatorBattery* navigatorBattery = NavigatorBattery::from(navigator);
    4646    if (!navigatorBattery->m_batteryManager)
    47         navigatorBattery->m_batteryManager = BatteryManager::create(context, navigator);
     47        navigatorBattery->m_batteryManager = BatteryManager::create(navigator);
    4848    return navigatorBattery->m_batteryManager.get();
    4949}

  • trunk/Source/WebCore/Modules/battery/NavigatorBattery.h

    r110991 r112495  
    3737    static NavigatorBattery* from(Navigator*);
    3838
    39     static BatteryManager* webkitBattery(ScriptExecutionContext*, Navigator*);
     39    static BatteryManager* webkitBattery(Navigator*);
    4040    BatteryManager* batteryManager();
    4141

  • trunk/Source/WebCore/Modules/battery/NavigatorBattery.idl

    r110991 r112495  
    2121
    2222    interface [
    23         CallWith=ScriptExecutionContext,
    2423        Conditional=BATTERY_STATUS,
    2524        Supplemental=Navigator
Note: See TracChangeset for help on using the changeset viewer.