Changeset 110991 in webkit
- Timestamp:
- Mar 16, 2012 5:23:07 AM (12 years ago)
- Location:
- trunk
- Files:
-
- 39 added
- 23 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/ChangeLog
r110896 r110991 1 2012-03-16 Kihong Kwon <kihong.kwon@samsung.com> 2 3 Support for Battery Status API. 4 https://bugs.webkit.org/show_bug.cgi?id=62698 5 6 Enable BATTERY_STATUS for WebKit-Efl. 7 http://www.w3.org/TR/battery-status/ 8 9 Reviewed by Adam Barth. 10 11 * Source/cmake/OptionsEfl.cmake: 12 * Source/cmakeconfig.h.cmake: 13 1 14 2012-03-15 Patrick Gansterer <paroga@webkit.org> 2 15 -
trunk/LayoutTests/ChangeLog
r110977 r110991 1 2012-03-16 Kihong Kwon <kihong.kwon@samsung.com> 2 3 Support for Battery Status API. 4 https://bugs.webkit.org/show_bug.cgi?id=62698 5 6 Add new test cases for Battery Status API. 7 http://www.w3.org/TR/battery-status/ 8 9 Reviewed by Adam Barth. 10 11 * batterystatus/add-listener-from-callback-expected.txt: Added. 12 * batterystatus/add-listener-from-callback.html: Added. 13 * batterystatus/basic-all-types-of-events-expected.txt: Added. 14 * batterystatus/basic-all-types-of-events.html: Added. 15 * batterystatus/basic-operation-expected.txt: Added. 16 * batterystatus/basic-operation.html: Added. 17 * batterystatus/event-after-navigation-expected.txt: Added. 18 * batterystatus/event-after-navigation.html: Added. 19 * batterystatus/multiple-frames-expected.txt: Added. 20 * batterystatus/multiple-frames.html: Added. 21 * batterystatus/resources/event-after-navigation-new.html: Added. 22 * batterystatus/script-tests/add-listener-from-callback.js: Added. 23 (checkBatteryStatus): 24 (firstListener): 25 (secondListener): 26 (maybeFinishTest): 27 * batterystatus/script-tests/basic-all-types-of-events.js: Added. 28 (checkBatteryStatus): 29 (battery): 30 * batterystatus/script-tests/basic-operation.js: Added. 31 * batterystatus/script-tests/event-after-navigation.js: Added. 32 * batterystatus/script-tests/multiple-frames.js: Added. 33 (checkBatteryStatus): 34 (checkChildBatteryStatus): 35 (mainFrameListener): 36 (childFrameListener): 37 (maybeFinishTest): 38 * batterystatus/script-tests/updates.js: Added. 39 (checkBatteryStatus): 40 (setBatteryStatus): 41 (firstListener): 42 (updateListener): 43 * batterystatus/script-tests/window-property.js: Added. 44 (hasOnBatteryProperty): 45 * batterystatus/updates-expected.txt: Added. 46 * batterystatus/updates.html: Added. 47 * batterystatus/window-property-expected.txt: Added. 48 * batterystatus/window-property.html: Added. 49 * platform/chromium/test_expectations.txt: 50 * platform/gtk/Skipped: 51 * platform/qt/Skipped: 52 * platform/win/Skipped: 53 * platform/wincairo/Skipped: 54 1 55 2012-03-16 Hajime Morrita <morrita@chromium.org> 2 56 -
trunk/LayoutTests/platform/chromium/test_expectations.txt
r110977 r110991 113 113 // Vibration API is not supported yet in the chromium port. 114 114 BUGWK72010 SKIP : fast/dom/navigator-vibration.html = FAIL 115 116 // Battery Status API is not supported yet in the chromium port. 117 BUGWK62698 SKIP : batterystatus = PASS FAIL 115 118 116 119 // ----------------------------------------------------------------- -
trunk/LayoutTests/platform/gtk/Skipped
r110974 r110991 402 402 # Pointer Lock is not implemented. 403 403 pointer-lock/ 404 405 #Battery Status API support not yet. http://webkit.org/b/62698 406 batterystatus 404 407 405 408 ############################################################################### -
trunk/LayoutTests/platform/mac/Skipped
r110939 r110991 584 584 canvas/philip/tests/2d.shadow.canvas.transparent.2.html 585 585 canvas/philip/tests/2d.shadow.image.transparent.2.html 586 587 # https://bugs.webkit.org/show_bug.cgi?id=62698 588 # Needs BatteryClient implementation. 589 batterystatus/ -
trunk/LayoutTests/platform/qt/Skipped
r110947 r110991 362 362 #Vibration API is not implemented. 363 363 fast/dom/navigator-vibration.html 364 365 #Battery Status API is not implemented. 366 batterystatus 364 367 365 368 # =========================================================================== # -
trunk/LayoutTests/platform/win/Skipped
r110939 r110991 1661 1661 #Vibration API is not implemented. 1662 1662 fast/dom/navigator-vibration.html 1663 1664 #Battery Status API is not implemented. 1665 batterystatus 1663 1666 1664 1667 # Those tests need a text baseline after lazily allocating layers. -
trunk/LayoutTests/platform/wincairo/Skipped
r110939 r110991 2059 2059 #Vibration API is not implemented. 2060 2060 fast/dom/navigator-vibration.html 2061 2062 #Battery Status API is not implemented. 2063 batterystatus -
trunk/Source/WebCore/CMakeLists.txt
r110957 r110991 2335 2335 ) 2336 2336 2337 IF (ENABLE_BATTERY_STATUS) 2338 LIST(APPEND WebCore_INCLUDE_DIRECTORIES 2339 "${WEBCORE_DIR}/Modules/battery" 2340 ) 2341 LIST(APPEND WebCore_IDL_FILES 2342 Modules/battery/NavigatorBattery.idl 2343 Modules/battery/BatteryManager.idl 2344 ) 2345 LIST(APPEND WebCore_SOURCES 2346 Modules/battery/NavigatorBattery.cpp 2347 Modules/battery/BatteryController.cpp 2348 Modules/battery/BatteryManager.cpp 2349 Modules/battery/BatteryStatus.cpp 2350 ) 2351 ENDIF () 2352 2337 2353 # Modules that the bindings generator scripts may use 2338 2354 SET(SCRIPTS_RESOLVE_SUPPLEMENTAL -
trunk/Source/WebCore/ChangeLog
r110989 r110991 1 2012-03-16 Kihong Kwon <kihong.kwon@samsung.com> 2 3 Support for Battery Status API 4 https://bugs.webkit.org/show_bug.cgi?id=62698 5 6 Battery Status API is implemented under the Navigator class. 7 Battery Status API has four types of events, and all events are operated based on a callback mechanism. 8 : onchargingchange, onchargingtimechange, ondischargingtimechange, onlevelchange. 9 The battery status can be accessed using BatteryManager(navigator.webkitBattery), and battery status is controlled by BatteryController which manages instances of BatteryManager. 10 When battery status event is raised, BatteryController calls all registered BatteryManager's event dispatcher. 11 http://www.w3.org/TR/battery-status/ 12 13 Reviewed by Adam Barth. 14 15 Tests: batterystatus/add-listener-from-callback.html 16 batterystatus/basic-all-types-of-events.html 17 batterystatus/basic-operation.html 18 batterystatus/event-after-navigation.html 19 batterystatus/multiple-frames.html 20 batterystatus/updates.html 21 batterystatus/window-property.html 22 23 * CMakeLists.txt: 24 * Modules/battery/BatteryClient.h: Added. 25 (WebCore): 26 (BatteryClient): 27 (WebCore::BatteryClient::~BatteryClient): 28 * Modules/battery/BatteryController.cpp: Added. 29 (WebCore): 30 (WebCore::BatteryController::BatteryController): 31 (WebCore::BatteryController::~BatteryController): 32 (WebCore::BatteryController::create): 33 (WebCore::BatteryController::addListener): 34 (WebCore::BatteryController::removeListener): 35 (WebCore::BatteryController::didChangeBatteryStatus): 36 (WebCore::BatteryController::supplementName): 37 (WebCore::BatteryController::isActive): 38 (WebCore::provideBatteryTo): 39 * Modules/battery/BatteryController.h: Added. 40 (WebCore): 41 (BatteryController): 42 (WebCore::BatteryController::client): 43 (WebCore::BatteryController::from): 44 * Modules/battery/BatteryManager.cpp: Added. 45 (WebCore): 46 (WebCore::BatteryManager::create): 47 (WebCore::BatteryManager::~BatteryManager): 48 (WebCore::BatteryManager::BatteryManager): 49 (WebCore::BatteryManager::charging): 50 (WebCore::BatteryManager::chargingTime): 51 (WebCore::BatteryManager::dischargingTime): 52 (WebCore::BatteryManager::level): 53 (WebCore::BatteryManager::didChangeBatteryStatus): 54 (WebCore::BatteryManager::suspend): 55 (WebCore::BatteryManager::resume): 56 (WebCore::BatteryManager::stop): 57 * Modules/battery/BatteryManager.h: Added. 58 (WebCore): 59 (BatteryManager): 60 (WebCore::BatteryManager::interfaceName): 61 (WebCore::BatteryManager::scriptExecutionContext): 62 (WebCore::BatteryManager::batteryControllerDestroyed): 63 (WebCore::BatteryManager::canSuspend): 64 (WebCore::BatteryManager::eventTargetData): 65 (WebCore::BatteryManager::ensureEventTargetData): 66 (WebCore::BatteryManager::refEventTarget): 67 (WebCore::BatteryManager::derefEventTarget): 68 * Modules/battery/BatteryManager.idl: Added. 69 * Modules/battery/BatteryStatus.cpp: Added. 70 (WebCore): 71 (WebCore::BatteryStatus::create): 72 (WebCore::BatteryStatus::BatteryStatus): 73 * Modules/battery/BatteryStatus.h: Added. 74 (WebCore): 75 (BatteryStatus): 76 (WebCore::BatteryStatus::charging): 77 (WebCore::BatteryStatus::chargingTime): 78 (WebCore::BatteryStatus::dischargingTime): 79 (WebCore::BatteryStatus::level): 80 * Modules/battery/NavigatorBattery.cpp: Added. 81 (WebCore): 82 (WebCore::NavigatorBattery::NavigatorBattery): 83 (WebCore::NavigatorBattery::~NavigatorBattery): 84 (WebCore::NavigatorBattery::webkitBattery): 85 (WebCore::NavigatorBattery::from): 86 (WebCore::NavigatorBattery::batteryManager): 87 * Modules/battery/NavigatorBattery.h: Added. 88 (WebCore): 89 (NavigatorBattery): 90 * Modules/battery/NavigatorBattery.idl: Added. 91 * dom/EventNames.h: 92 (WebCore): 93 * dom/EventTargetFactory.in: 94 * testing/Internals.cpp: 95 (WebCore::Internals::setBatteryStatus): 96 (WebCore): 97 * testing/Internals.h: 98 (Internals): 99 * testing/Internals.idl: 100 1 101 2012-03-16 Ilya Tikhonovsky <loislo@chromium.org> 2 102 -
trunk/Source/WebCore/dom/EventNames.h
r110731 r110991 42 42 macro(cached) \ 43 43 macro(change) \ 44 macro(chargingchange) \ 45 macro(chargingtimechange) \ 44 46 macro(checking) \ 45 47 macro(click) \ … … 56 58 macro(devicemotion) \ 57 59 macro(deviceorientation) \ 60 macro(dischargingtimechange) \ 58 61 macro(display) \ 59 62 macro(downloading) \ … … 75 78 macro(keypress) \ 76 79 macro(keyup) \ 80 macro(levelchange) \ 77 81 macro(load) \ 78 82 macro(loadstart) \ -
trunk/Source/WebCore/dom/EventTargetFactory.in
r110950 r110991 2 2 3 3 AudioContext conditional=WEB_AUDIO 4 BatteryManager conditional=BATTERY_STATUS 4 5 DedicatedWorkerContext conditional=WORKERS 5 6 DOMApplicationCache -
trunk/Source/WebCore/testing/Internals.cpp
r110706 r110991 68 68 #endif 69 69 70 #if ENABLE(BATTERY_STATUS) 71 #include "BatteryController.h" 72 #endif 73 70 74 namespace WebCore { 71 75 … … 715 719 } 716 720 717 } 721 void Internals::setBatteryStatus(Document* document, const String& eventType, bool charging, double chargingTime, double dischargingTime, double level, ExceptionCode& ec) 722 { 723 if (!document || !document->page()) { 724 ec = INVALID_ACCESS_ERR; 725 return; 726 } 727 728 #if ENABLE(BATTERY_STATUS) 729 BatteryController::from(document->page())->didChangeBatteryStatus(eventType, BatteryStatus::create(charging, chargingTime, dischargingTime, level)); 730 #else 731 UNUSED_PARAM(eventType); 732 UNUSED_PARAM(charging); 733 UNUSED_PARAM(chargingTime); 734 UNUSED_PARAM(dischargingTime); 735 UNUSED_PARAM(level); 736 #endif 737 } 738 739 } -
trunk/Source/WebCore/testing/Internals.h
r110706 r110991 137 137 InternalSettings* settings() const { return m_settings.get(); } 138 138 139 void setBatteryStatus(Document*, const String& eventType, bool charging, double chargingTime, double dischargingTime, double level, ExceptionCode&); 140 139 141 private: 140 142 explicit Internals(Document*); -
trunk/Source/WebCore/testing/Internals.idl
r110706 r110991 111 111 112 112 readonly attribute InternalSettings settings; 113 114 #if defined(ENABLE_BATTERY_STATUS) && ENABLE_BATTERY_STATUS 115 void setBatteryStatus(in Document document, in DOMString eventType, in boolean charging, in double chargingTime, in double dischargingTime, in double level) raises (DOMException); 116 #endif 113 117 }; 114 118 } -
trunk/Source/WebKit/ChangeLog
r110403 r110991 1 2012-03-16 Kihong Kwon <kihong.kwon@samsung.com> 2 3 Support for Battery Status API 4 https://bugs.webkit.org/show_bug.cgi?id=62698 5 6 Add include directory and file. 7 http://www.w3.org/TR/battery-status/ 8 9 Reviewed by Adam Barth. 10 11 * PlatformEfl.cmake: 12 1 13 2012-03-11 Timothy Hatcher <timothy@apple.com> 2 14 -
trunk/Source/WebKit/PlatformEfl.cmake
r108806 r110991 127 127 ENDIF () 128 128 129 IF (ENABLE_BATTERY_STATUS) 130 LIST(APPEND WebKit_INCLUDE_DIRECTORIES ${WEBCORE_DIR}/Modules/battery) 131 LIST(APPEND WebKit_SOURCES efl/WebCoreSupport/BatteryClientEfl.cpp) 132 ENDIF () 129 133 130 134 SET(WebKit_THEME_DEFINITION "") -
trunk/Source/WebKit/efl/ChangeLog
r110784 r110991 1 2012-03-16 Kihong Kwon <kihong.kwon@samsung.com> 2 3 Support for Battery Status API 4 https://bugs.webkit.org/show_bug.cgi?id=62698 5 6 Add BatteryClientEfl class implementation for the layout tests now. 7 BatteryClientEfl class is not fully implemented in this patch. 8 (It will be completed by other patch as necessary in the Efl port.) 9 http://www.w3.org/TR/battery-status/ 10 11 Reviewed by Adam Barth. 12 13 * WebCoreSupport/BatteryClientEfl.cpp: Added. 14 (WebCore): 15 (WebCore::BatteryClientEfl::BatteryClientEfl): 16 (WebCore::BatteryClientEfl::setController): 17 (WebCore::BatteryClientEfl::startUpdating): 18 (WebCore::BatteryClientEfl::stopUpdating): 19 (WebCore::BatteryClientEfl::batteryControllerDestroyed): 20 (WebCore::BatteryClientEfl::setBatteryStatus): 21 * WebCoreSupport/BatteryClientEfl.h: Added. 22 (WebCore): 23 (BatteryClientEfl): 24 (WebCore::BatteryClientEfl::~BatteryClientEfl): 25 * ewk/ewk_view.cpp: 26 (_Ewk_View_Private_Data): 27 (_ewk_view_priv_new): 28 1 29 2012-03-13 Jon Lee <jonlee@apple.com> 2 30 -
trunk/Source/WebKit/efl/ewk/ewk_view.cpp
r109205 r110991 73 73 #if ENABLE(VIBRATION) 74 74 #include "VibrationClientEfl.h" 75 #endif 76 77 #if ENABLE(BATTERY_STATUS) 78 #include "BatteryClientEfl.h" 75 79 #endif 76 80 … … 619 623 #endif 620 624 625 #if ENABLE(BATTERY_STATUS) 626 WebCore::provideBatteryTo(priv->page.get(), new WebCore::BatteryClientEfl); 627 #endif 628 621 629 priv->pageSettings = priv->page->settings(); 622 630 -
trunk/Source/cmake/OptionsEfl.cmake
r110896 r110991 65 65 SET(VERSION_SCRIPT "-Wl,--version-script,${CMAKE_MODULE_PATH}/eflsymbols.filter") 66 66 67 WEBKIT_FEATURE(ENABLE_BATTERY_STATUS "Enable battery status api" DEFAULT ON) 67 68 WEBKIT_FEATURE(ENABLE_BLOB "Enable blob slice" DEFAULT OFF) 68 69 WEBKIT_FEATURE(ENABLE_CHANNEL_MESSAGING "Enable channel messaging" DEFAULT ON) -
trunk/Source/cmakeconfig.h.cmake
r110713 r110991 7 7 8 8 #cmakedefine01 ENABLE_AS_IMAGE 9 #cmakedefine01 ENABLE_BATTERY_STATUS 9 10 #cmakedefine01 ENABLE_BLOB 10 11 #cmakedefine01 ENABLE_CHANNEL_MESSAGING -
trunk/Tools/ChangeLog
r110990 r110991 1 2012-03-16 Kihong Kwon <kihong.kwon@samsung.com> 2 3 Support for Battery Status API 4 https://bugs.webkit.org/show_bug.cgi?id=62698 5 6 Add include directory and file. 7 http://www.w3.org/TR/battery-status/ 8 9 Reviewed by Adam Barth. 10 11 * Scripts/build-webkit: 12 1 13 2012-03-16 Kishore Bolisetty <kbolisetty@innominds.com> 2 14 -
trunk/Tools/Scripts/build-webkit
r110963 r110991 71 71 $accelerated2dCanvasSupport, 72 72 $animationAPISupport, 73 $batterystatusAPISupport, 73 74 $blobSupport, 74 75 $channelMessagingSupport, … … 161 162 define => "ENABLE_ANIMATION_API", default => isBlackBerry(), value => \$animationAPISupport }, 162 163 164 { option => "battery-status-api", desc => "Toggle battery status API support", 165 define => "ENABLE_BATTERY_STATUS", default => isEfl(), value => \$batterystatusAPISupport }, 166 163 167 { option => "blob", desc => "Toggle Blob support", 164 168 define => "ENABLE_BLOB", default => (isAppleMacWebKit() || isGtk() || isChromium() || isBlackBerry()), value => \$blobSupport },
Note: See TracChangeset
for help on using the changeset viewer.