Changeset 121808 in webkit
- Timestamp:
- Jul 3, 2012 4:31:49 PM (12 years ago)
- Location:
- trunk/Source/WebKit2
- Files:
-
- 15 added
- 13 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit2/CMakeLists.txt
r121449 r121808 23 23 "${WEBKIT2_DIR}/WebProcess/ApplicationCache" 24 24 "${WEBKIT2_DIR}/WebProcess/Authentication" 25 "${WEBKIT2_DIR}/WebProcess/Battery" 25 26 "${WEBKIT2_DIR}/WebProcess/Cookies" 26 27 "${WEBKIT2_DIR}/WebProcess/Downloads" … … 138 139 Shared/VisitedLinkTable.cpp 139 140 Shared/WebBackForwardListItem.cpp 141 Shared/WebBatteryStatus.cpp 140 142 Shared/WebConnection.cpp 141 143 Shared/WebConnectionClient.cpp … … 215 217 UIProcess/WebApplicationCacheManagerProxy.cpp 216 218 UIProcess/WebBackForwardList.cpp 219 UIProcess/WebBatteryManagerProxy.cpp 220 UIProcess/WebBatteryProvider.cpp 217 221 UIProcess/WebConnectionToWebProcess.cpp 218 222 UIProcess/WebContext.cpp … … 265 269 UIProcess/API/C/WKBackForwardList.cpp 266 270 UIProcess/API/C/WKBackForwardListItem.cpp 271 UIProcess/API/C/WKBatteryManager.cpp 267 272 UIProcess/API/C/WKContext.cpp 268 273 UIProcess/API/C/WKCookieManager.cpp … … 330 335 WebProcess/Authentication/AuthenticationManager.cpp 331 336 337 WebProcess/Battery/WebBatteryManager.cpp 338 332 339 WebProcess/Cookies/WebCookieManager.cpp 333 340 … … 403 410 WebProcess/ResourceCache/WebResourceCacheManager.cpp 404 411 412 WebProcess/WebCoreSupport/WebBatteryClient.cpp 405 413 WebProcess/WebCoreSupport/WebChromeClient.cpp 406 414 WebProcess/WebCoreSupport/WebColorChooser.cpp … … 449 457 UIProcess/LayerTreeCoordinatorProxy.messages.in 450 458 UIProcess/WebApplicationCacheManagerProxy.messages.in 459 UIProcess/WebBatteryManagerProxy.messages.in 451 460 UIProcess/WebContext.messages.in 452 461 UIProcess/WebCookieManagerProxy.messages.in … … 474 483 WebProcess/Authentication/AuthenticationManager.messages.in 475 484 485 WebProcess/Battery/WebBatteryManager.messages.in 486 476 487 WebProcess/Cookies/WebCookieManager.messages.in 477 488 -
trunk/Source/WebKit2/ChangeLog
r121777 r121808 1 2012-07-03 Christophe Dumez <christophe.dumez@intel.com> 2 3 [WK2] Add support for Battery Status API 4 https://bugs.webkit.org/show_bug.cgi?id=89558 5 6 Reviewed by Anders Carlsson. 7 8 Add support for Battery Status API to WebKit2. 9 10 * CMakeLists.txt: 11 * DerivedSources.pri: 12 * GNUmakefile.am: 13 * GNUmakefile.list.am: 14 * Platform/CoreIPC/MessageID.h: 15 * Shared/API/c/WKBase.h: 16 * Shared/APIObject.h: 17 * Shared/WebBatteryStatus.cpp: Added. 18 (WebKit): 19 (WebKit::WebBatteryStatus::WebBatteryStatus): 20 (WebKit::WebBatteryStatus::~WebBatteryStatus): 21 (WebKit::WebBatteryStatus::Data::encode): 22 (WebKit::WebBatteryStatus::Data::decode): 23 * Shared/WebBatteryStatus.h: Added. 24 (WebKit): 25 (WebBatteryStatus): 26 (Data): 27 (WebKit::WebBatteryStatus::create): 28 (WebKit::WebBatteryStatus::isCharging): 29 (WebKit::WebBatteryStatus::chargingTime): 30 (WebKit::WebBatteryStatus::dischargingTime): 31 (WebKit::WebBatteryStatus::level): 32 (WebKit::WebBatteryStatus::data): 33 (WebKit::WebBatteryStatus::type): 34 * Target.pri: 35 * UIProcess/API/C/WKAPICast.h: 36 (WebKit): 37 * UIProcess/API/C/WKBatteryManager.cpp: Added. 38 (WKBatteryManagerGetTypeID): 39 * UIProcess/API/C/WKBatteryManager.h: Added. 40 * UIProcess/WebBatteryManagerProxy.cpp: Added. 41 (WebKit): 42 (WebKit::WebBatteryManagerProxy::create): 43 (WebKit::WebBatteryManagerProxy::WebBatteryManagerProxy): 44 (WebKit::WebBatteryManagerProxy::~WebBatteryManagerProxy): 45 (WebKit::WebBatteryManagerProxy::invalidate): 46 (WebKit::WebBatteryManagerProxy::initializeProvider): 47 (WebKit::WebBatteryManagerProxy::didReceiveMessage): 48 (WebKit::WebBatteryManagerProxy::startUpdating): 49 (WebKit::WebBatteryManagerProxy::stopUpdating): 50 (WebKit::WebBatteryManagerProxy::providerDidChangeBatteryStatus): 51 (WebKit::WebBatteryManagerProxy::providerUpdateBatteryStatus): 52 * UIProcess/WebBatteryManagerProxy.h: Added. 53 (CoreIPC): 54 (WebKit): 55 (WebBatteryManagerProxy): 56 (WebKit::WebBatteryManagerProxy::clearContext): 57 (WebKit::WebBatteryManagerProxy::type): 58 * UIProcess/WebBatteryManagerProxy.messages.in: Added. 59 * UIProcess/WebBatteryProvider.cpp: Added. 60 (WebKit): 61 (WebKit::WebBatteryProvider::startUpdating): 62 (WebKit::WebBatteryProvider::stopUpdating): 63 * UIProcess/WebBatteryProvider.h: Added. 64 (WebKit): 65 (WebBatteryProvider): 66 * WebKit2.pri: 67 * WebProcess/Battery/WebBatteryManager.cpp: Added. 68 (WebKit): 69 (WebKit::WebBatteryManager::WebBatteryManager): 70 (WebKit::WebBatteryManager::~WebBatteryManager): 71 (WebKit::WebBatteryManager::didReceiveMessage): 72 (WebKit::WebBatteryManager::registerWebPage): 73 (WebKit::WebBatteryManager::unregisterWebPage): 74 (WebKit::WebBatteryManager::didChangeBatteryStatus): 75 (WebKit::WebBatteryManager::updateBatteryStatus): 76 * WebProcess/Battery/WebBatteryManager.h: Added. 77 (CoreIPC): 78 (WebKit): 79 (WebBatteryManager): 80 * WebProcess/Battery/WebBatteryManager.messages.in: Added. 81 * WebProcess/WebCoreSupport/WebBatteryClient.cpp: Added. 82 (WebKit): 83 (WebKit::WebBatteryClient::startUpdating): 84 (WebKit::WebBatteryClient::stopUpdating): 85 (WebKit::WebBatteryClient::batteryControllerDestroyed): 86 * WebProcess/WebCoreSupport/WebBatteryClient.h: Added. 87 (WebKit): 88 (WebBatteryClient): 89 (WebKit::WebBatteryClient::WebBatteryClient): 90 (WebKit::WebBatteryClient::~WebBatteryClient): 91 * WebProcess/WebProcess.cpp: 92 (WebKit::WebProcess::WebProcess): 93 (WebKit::WebProcess::didReceiveMessage): 94 * WebProcess/WebProcess.h: 95 (WebProcess): 96 (WebKit::WebProcess::batteryManager): 97 1 98 2012-07-03 Tor Arne Vestbø <tor.arne.vestbo@nokia.com> 2 99 -
trunk/Source/WebKit2/DerivedSources.pri
r121777 r121808 39 39 WebProcess/ApplicationCache \ 40 40 WebProcess/Authentication \ 41 WebProcess/Battery \ 41 42 WebProcess/Cookies \ 42 43 WebProcess/FullScreen \ … … 70 71 WebApplicationCacheManager.messages.in \ 71 72 WebApplicationCacheManagerProxy.messages.in \ 73 WebBatteryManager.messages.in \ 74 WebBatteryManagerProxy.messages.in \ 72 75 WebContext.messages.in \ 73 76 WebCookieManager.messages.in \ -
trunk/Source/WebKit2/GNUmakefile.am
r121332 r121808 60 60 -I$(srcdir)/Source/WebKit2/WebProcess/ApplicationCache \ 61 61 -I$(srcdir)/Source/WebKit2/WebProcess/Authentication \ 62 -I$(srcdir)/Source/WebKit2/WebProcess/Battery \ 62 63 -I$(srcdir)/Source/WebKit2/WebProcess/Cookies \ 63 64 -I$(srcdir)/Source/WebKit2/WebProcess/Downloads \ … … 212 213 $(WebKit2)/WebProcess/ApplicationCache \ 213 214 $(WebKit2)/WebProcess/Authentication \ 215 $(WebKit2)/WebProcess/Battery \ 214 216 $(WebKit2)/WebProcess/Cookies \ 215 217 $(WebKit2)/WebProcess/FullScreen \ … … 514 516 $(shell ls $(WebKit2)/WebProcess/ApplicationCache/*.in) \ 515 517 $(shell ls $(WebKit2)/WebProcess/Authentication/*.in) \ 518 $(shell ls $(WebKit2)/WebProcess/Battery/*.in) \ 516 519 $(shell ls $(WebKit2)/WebProcess/Cookies/*.in) \ 517 520 $(shell ls $(WebKit2)/WebProcess/FullScreen/*.in) \ -
trunk/Source/WebKit2/GNUmakefile.list.am
r121449 r121808 48 48 $(WebKit2)/UIProcess/API/C/WKBackForwardList.h \ 49 49 $(WebKit2)/UIProcess/API/C/WKBackForwardListItem.h \ 50 $(WebKit2)/UIProcess/API/C/WKBatteryManager.h \ 50 51 $(WebKit2)/UIProcess/API/C/WKContext.h \ 51 52 $(WebKit2)/UIProcess/API/C/WKContextPrivate.h \ … … 153 154 DerivedSources/WebKit2/WebApplicationCacheManagerProxyMessageReceiver.cpp \ 154 155 DerivedSources/WebKit2/WebApplicationCacheManagerProxyMessages.h \ 156 DerivedSources/WebKit2/WebBatteryManagerMessageReceiver.cpp \ 157 DerivedSources/WebKit2/WebBatteryManagerMessages.h \ 158 DerivedSources/WebKit2/WebBatteryManagerProxyMessageReceiver.cpp \ 159 DerivedSources/WebKit2/WebBatteryManagerProxyMessages.h \ 155 160 DerivedSources/WebKit2/WebContextMessageReceiver.cpp \ 156 161 DerivedSources/WebKit2/WebContextMessages.h \ … … 422 427 Source/WebKit2/Shared/WebBackForwardListItem.cpp \ 423 428 Source/WebKit2/Shared/WebBackForwardListItem.h \ 429 Source/WebKit2/Shared/WebBatteryStatus.cpp \ 430 Source/WebKit2/Shared/WebBatteryStatus.h \ 424 431 Source/WebKit2/Shared/WebCertificateInfo.h \ 425 432 Source/WebKit2/Shared/WebConnection.cpp \ … … 506 513 Source/WebKit2/UIProcess/API/C/WKBackForwardListItem.cpp \ 507 514 Source/WebKit2/UIProcess/API/C/WKBackForwardListItem.h \ 515 Source/WebKit2/UIProcess/API/C/WKBatteryManager.cpp \ 516 Source/WebKit2/UIProcess/API/C/WKBatteryManager.h \ 508 517 Source/WebKit2/UIProcess/API/C/WKContext.cpp \ 509 518 Source/WebKit2/UIProcess/API/C/WKContext.h \ … … 775 784 Source/WebKit2/UIProcess/WebBackForwardList.cpp \ 776 785 Source/WebKit2/UIProcess/WebBackForwardList.h \ 786 Source/WebKit2/UIProcess/WebBatteryManagerProxy.cpp \ 787 Source/WebKit2/UIProcess/WebBatteryManagerProxy.h \ 788 Source/WebKit2/UIProcess/WebBatteryProvider.cpp \ 789 Source/WebKit2/UIProcess/WebBatteryProvider.h \ 777 790 Source/WebKit2/UIProcess/WebColorChooserProxy.h \ 778 791 Source/WebKit2/UIProcess/WebConnectionToWebProcess.cpp \ … … 869 882 Source/WebKit2/WebProcess/Authentication/AuthenticationManager.cpp \ 870 883 Source/WebKit2/WebProcess/Authentication/AuthenticationManager.h \ 884 Source/WebKit2/WebProcess/Battery/WebBatteryManager.cpp \ 885 Source/WebKit2/WebProcess/Battery/WebBatteryManager.h \ 871 886 Source/WebKit2/WebProcess/Cookies/WebCookieManager.h \ 872 887 Source/WebKit2/WebProcess/Cookies/WebCookieManager.cpp \ … … 1017 1032 Source/WebKit2/WebProcess/WebCoreSupport/soup/WebFrameNetworkingContext.h \ 1018 1033 Source/WebKit2/WebProcess/WebCoreSupport/WebAlternativeTextClient.h \ 1034 Source/WebKit2/WebProcess/WebCoreSupport/WebBatteryClient.cpp \ 1035 Source/WebKit2/WebProcess/WebCoreSupport/WebBatteryClient.h \ 1019 1036 Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp \ 1020 1037 Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h \ -
trunk/Source/WebKit2/Platform/CoreIPC/MessageID.h
r121221 r121808 41 41 MessageClassLayerTreeCoordinator, 42 42 MessageClassWebApplicationCacheManager, 43 MessageClassWebBatteryManagerProxy, 43 44 MessageClassWebCookieManager, 44 45 MessageClassWebDatabaseManager, … … 63 64 MessageClassLayerTreeCoordinatorProxy, 64 65 MessageClassWebApplicationCacheManagerProxy, 66 MessageClassWebBatteryManager, 65 67 MessageClassWebContext, 66 68 MessageClassWebContextLegacy, -
trunk/Source/WebKit2/Shared/API/c/WKBase.h
r120925 r121808 87 87 typedef const struct OpaqueWKBackForwardList* WKBackForwardListRef; 88 88 typedef const struct OpaqueWKBackForwardListItem* WKBackForwardListItemRef; 89 typedef const struct OpaqueWKBatteryManager* WKBatteryManagerRef; 90 typedef const struct OpaqueWKBatteryStatus* WKBatteryStatusRef; 89 91 typedef const struct OpaqueWKResourceCacheManager* WKResourceCacheManagerRef; 90 92 typedef const struct OpaqueWKContext* WKContextRef; -
trunk/Source/WebKit2/Shared/APIObject.h
r120301 r121808 73 73 TypeBackForwardList, 74 74 TypeBackForwardListItem, 75 TypeBatteryManager, 76 TypeBatteryStatus, 75 77 TypeCacheManager, 76 78 TypeContext, -
trunk/Source/WebKit2/Target.pri
r121777 r121808 98 98 Shared/WebCoreArgumentCoders.h \ 99 99 Shared/WebBackForwardListItem.h \ 100 Shared/WebBatteryStatus.h \ 100 101 Shared/WebCertificateInfo.h \ 101 102 Shared/WebConnection.h \ … … 146 147 UIProcess/API/C/WKBackForwardList.h \ 147 148 UIProcess/API/C/WKBackForwardListItem.h \ 149 UIProcess/API/C/WKBatteryManager.h \ 148 150 UIProcess/API/C/WKContext.h \ 149 151 UIProcess/API/C/WKContextPrivate.h \ … … 232 234 UIProcess/WebApplicationCacheManagerProxy.h \ 233 235 UIProcess/WebBackForwardList.h \ 236 UIProcess/WebBatteryManagerProxy.h \ 237 UIProcess/WebBatteryProvider.h \ 234 238 UIProcess/WebColorChooserProxy.h \ 235 239 UIProcess/WebConnectionToWebProcess.h \ … … 298 302 WebProcess/ApplicationCache/WebApplicationCacheManager.h \ 299 303 WebProcess/Authentication/AuthenticationManager.h \ 304 WebProcess/Battery/WebBatteryManager.h \ 300 305 WebProcess/Cookies/WebCookieManager.h \ 301 306 WebProcess/Downloads/Download.h \ … … 348 353 WebProcess/Plugins/PluginProcessConnection.h \ 349 354 WebProcess/Plugins/PluginProcessConnectionManager.h \ 355 WebProcess/WebCoreSupport/WebBatteryClient.h \ 350 356 WebProcess/WebCoreSupport/WebChromeClient.h \ 351 357 WebProcess/WebCoreSupport/WebColorChooser.h \ … … 463 469 Shared/VisitedLinkTable.cpp \ 464 470 Shared/WebBackForwardListItem.cpp \ 471 Shared/WebBatteryStatus.cpp \ 465 472 Shared/WebConnection.cpp \ 466 473 Shared/WebConnectionClient.cpp \ … … 510 517 UIProcess/API/C/WKBackForwardList.cpp \ 511 518 UIProcess/API/C/WKBackForwardListItem.cpp \ 519 UIProcess/API/C/WKBatteryManager.cpp \ 512 520 UIProcess/API/C/WKContext.cpp \ 513 521 UIProcess/API/C/WKCredential.cpp \ … … 586 594 UIProcess/WebApplicationCacheManagerProxy.cpp \ 587 595 UIProcess/WebBackForwardList.cpp \ 596 UIProcess/WebBatteryManagerProxy.cpp \ 597 UIProcess/WebBatteryProvider.cpp \ 588 598 UIProcess/WebConnectionToWebProcess.cpp \ 589 599 UIProcess/WebContext.cpp \ … … 655 665 WebProcess/ApplicationCache/WebApplicationCacheManager.cpp \ 656 666 WebProcess/Authentication/AuthenticationManager.cpp \ 667 WebProcess/Battery/WebBatteryManager.cpp \ 657 668 WebProcess/Cookies/WebCookieManager.cpp \ 658 669 WebProcess/Cookies/qt/WebCookieManagerQt.cpp \ … … 718 729 WebProcess/Plugins/PluginProcessConnection.cpp \ 719 730 WebProcess/Plugins/PluginProcessConnectionManager.cpp \ 731 WebProcess/WebCoreSupport/WebBatteryClient.cpp \ 720 732 WebProcess/WebCoreSupport/WebChromeClient.cpp \ 721 733 WebProcess/WebCoreSupport/WebColorChooser.cpp \ -
trunk/Source/WebKit2/UIProcess/API/C/WKAPICast.h
r120925 r121808 57 57 class WebBackForwardList; 58 58 class WebBackForwardListItem; 59 class WebBatteryManagerProxy; 60 class WebBatteryStatus; 59 61 class WebResourceCacheManagerProxy; 60 62 class WebContext; … … 95 97 WK_ADD_API_MAPPING(WKBackForwardListItemRef, WebBackForwardListItem) 96 98 WK_ADD_API_MAPPING(WKBackForwardListRef, WebBackForwardList) 99 WK_ADD_API_MAPPING(WKBatteryManagerRef, WebBatteryManagerProxy) 100 WK_ADD_API_MAPPING(WKBatteryStatusRef, WebBatteryStatus) 97 101 WK_ADD_API_MAPPING(WKResourceCacheManagerRef, WebResourceCacheManagerProxy) 98 102 WK_ADD_API_MAPPING(WKContextRef, WebContext) -
trunk/Source/WebKit2/WebKit2.pri
r121228 r121808 38 38 $$SOURCE_DIR/WebProcess/ApplicationCache \ 39 39 $$SOURCE_DIR/WebProcess/Authentication \ 40 $$SOURCE_DIR/WebProcess/Battery \ 40 41 $$SOURCE_DIR/WebProcess/Cookies \ 41 42 $$SOURCE_DIR/WebProcess/Cookies/qt \ -
trunk/Source/WebKit2/WebProcess/WebProcess.cpp
r121707 r121808 146 146 , m_textCheckerState() 147 147 , m_geolocationManager(this) 148 #if ENABLE(BATTERY_STATUS) 149 , m_batteryManager(this) 150 #endif 148 151 #if ENABLE(NOTIFICATIONS) || ENABLE(LEGACY_NOTIFICATIONS) 149 152 , m_notificationManager(this) … … 633 636 return; 634 637 } 638 639 #if ENABLE(BATTERY_STATUS) 640 if (messageID.is<CoreIPC::MessageClassWebBatteryManager>()) { 641 m_batteryManager.didReceiveMessage(connection, messageID, arguments); 642 return; 643 } 644 #endif 635 645 636 646 if (messageID.is<CoreIPC::MessageClassWebIconDatabaseProxy>()) { -
trunk/Source/WebKit2/WebProcess/WebProcess.h
r119349 r121808 58 58 #endif 59 59 60 #if ENABLE(BATTERY_STATUS) 61 #include "WebBatteryManager.h" 62 #endif 63 60 64 #if ENABLE(NOTIFICATIONS) || ENABLE(LEGACY_NOTIFICATIONS) 61 65 #include "WebNotificationManager.h" … … 143 147 // Geolocation 144 148 WebGeolocationManager& geolocationManager() { return m_geolocationManager; } 149 150 #if ENABLE(BATTERY_STATUS) 151 WebBatteryManager& batteryManager() { return m_batteryManager; } 152 #endif 145 153 146 154 #if ENABLE(NOTIFICATIONS) || ENABLE(LEGACY_NOTIFICATIONS) … … 287 295 TextCheckerState m_textCheckerState; 288 296 WebGeolocationManager m_geolocationManager; 297 #if ENABLE(BATTERY_STATUS) 298 WebBatteryManager m_batteryManager; 299 #endif 289 300 #if ENABLE(NOTIFICATIONS) || ENABLE(LEGACY_NOTIFICATIONS) 290 301 WebNotificationManager m_notificationManager;
Note: See TracChangeset
for help on using the changeset viewer.