Changeset 102207 in webkit


Ignore:
Timestamp:
Dec 6, 2011 6:37:25 PM (12 years ago)
Author:
leo.yang@torchmobile.com.cn
Message:

Upstream about: feature in WebKit/blackberry/WebCoreSupport/
https://bugs.webkit.org/show_bug.cgi?id=73612

Reviewed by Antonio Gomes.

Source/WebCore:

  • PlatformBlackBerry.cmake: Move platform/network/blackberry/AboutData.{h, cpp}

to WebKit/blackberry/WebCoreSupport

Source/WebKit:

  • blackberry/CMakeListsBlackBerry.txt:
  • blackberry/WebCoreSupport/AboutData.cpp: Added.

(WebCore::numberToHTMLTr):
(WebCore::configPage):
(WebCore::cacheTypeStatisticToHTMLTr):
(WebCore::memoryPage):

  • blackberry/WebCoreSupport/AboutData.h: Added.
  • blackberry/WebCoreSupport/AboutDataEnableFeatures.in: Added.
  • blackberry/WebCoreSupport/AboutDataHaveFeatures.in: Added.
  • blackberry/WebCoreSupport/AboutDataUseFeatures.in: Added.
  • blackberry/WebCoreSupport/generateAboutDataFeatures.pl: Added.
Location:
trunk/Source
Files:
7 added
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/ChangeLog

    r102205 r102207  
     12011-12-06  Leo Yang  <leo.yang@torchmobile.com.cn>
     2
     3        Upstream about: feature in WebKit/blackberry/WebCoreSupport/
     4        https://bugs.webkit.org/show_bug.cgi?id=73612
     5
     6        Reviewed by Antonio Gomes.
     7
     8        * PlatformBlackBerry.cmake: Move platform/network/blackberry/AboutData.{h, cpp}
     9                                    to WebKit/blackberry/WebCoreSupport
     10
    1112011-12-06  Benjamin Poulain  <bpoulain@apple.com>
    212
  • trunk/Source/WebCore/PlatformBlackBerry.cmake

    r101579 r102207  
    8787LIST(APPEND WebCore_SOURCES
    8888    platform/network/ProxyServer.cpp
    89     platform/network/blackberry/AboutData.cpp
    9089    platform/network/blackberry/DeferredData.cpp
    9190    platform/network/blackberry/MultipartResponseDelegate.cpp
     
    182181    platform/image-decoders/png/PNGImageDecoder.cpp
    183182    platform/image-encoders/JPEGImageEncoder.cpp
    184     platform/network/blackberry/AboutData.cpp
    185183    platform/network/blackberry/MultipartResponseDelegate.cpp
    186184    platform/network/blackberry/NetworkManager.cpp
  • trunk/Source/WebKit/ChangeLog

    r101744 r102207  
     12011-12-06  Leo Yang  <leo.yang@torchmobile.com.cn>
     2
     3        Upstream about: feature in WebKit/blackberry/WebCoreSupport/
     4        https://bugs.webkit.org/show_bug.cgi?id=73612
     5
     6        Reviewed by Antonio Gomes.
     7
     8        * blackberry/CMakeListsBlackBerry.txt:
     9        * blackberry/WebCoreSupport/AboutData.cpp: Added.
     10        (WebCore::numberToHTMLTr):
     11        (WebCore::configPage):
     12        (WebCore::cacheTypeStatisticToHTMLTr):
     13        (WebCore::memoryPage):
     14        * blackberry/WebCoreSupport/AboutData.h: Added.
     15        * blackberry/WebCoreSupport/AboutDataEnableFeatures.in: Added.
     16        * blackberry/WebCoreSupport/AboutDataHaveFeatures.in: Added.
     17        * blackberry/WebCoreSupport/AboutDataUseFeatures.in: Added.
     18        * blackberry/WebCoreSupport/generateAboutDataFeatures.pl: Added.
     19
    1202011-12-01  Ryuan Choi  <ryuan.choi@samsung.com>
    221
  • trunk/Source/WebKit/blackberry/CMakeListsBlackBerry.txt

    r101191 r102207  
    4747    blackberry/Api/WebPageGroupLoadDeferrer.cpp
    4848    blackberry/Api/WebSettings.cpp
     49    blackberry/WebCoreSupport/AboutData.cpp
    4950    blackberry/WebCoreSupport/CacheClientBlackBerry.cpp
    5051    blackberry/WebCoreSupport/ChromeClientBlackBerry.cpp
     
    192193    COMMENT "Web Inspector resources building..."
    193194)
     195
     196# Generate contents for AboutData.cpp
     197ADD_CUSTOM_COMMAND(
     198    OUTPUT ${DERIVED_SOURCES_WEBCORE_DIR}/AboutDataHaveFeatures.cpp
     199    MAIN_DEPENDENCY ${WEBKIT_DIR}/blackberry/WebCoreSupport/AboutDataHaveFeatures.in ${WEBKIT_DIR}/blackberry/WebCoreSupport/generateAboutDataFeatures.pl
     200    COMMAND ${PERL_EXECUTABLE} ${WEBKIT_DIR}/blackberry/WebCoreSupport/generateAboutDataFeatures.pl HAVE ${WEBKIT_DIR}/blackberry/WebCoreSupport/AboutDataHaveFeatures.in ${DERIVED_SOURCES_WEBCORE_DIR}/AboutDataHaveFeatures.cpp
     201)
     202
     203ADD_CUSTOM_COMMAND(
     204    OUTPUT ${DERIVED_SOURCES_WEBCORE_DIR}/AboutDataEnableFeatures.cpp
     205    MAIN_DEPENDENCY ${WEBKIT_DIR}/blackberry/WebCoreSupport/AboutDataEnableFeatures.in ${WEBKIT_DIR}/blackberry/WebCoreSupport/generateAboutDataFeatures.pl
     206    COMMAND ${PERL_EXECUTABLE} ${WEBKIT_DIR}/blackberry/WebCoreSupport/generateAboutDataFeatures.pl ENABLE ${WEBKIT_DIR}/blackberry/WebCoreSupport/AboutDataEnableFeatures.in ${DERIVED_SOURCES_WEBCORE_DIR}/AboutDataEnableFeatures.cpp
     207)
     208
     209ADD_CUSTOM_COMMAND(
     210    OUTPUT ${DERIVED_SOURCES_WEBCORE_DIR}/AboutDataUseFeatures.cpp
     211    MAIN_DEPENDENCY ${WEBKIT_DIR}/blackberry/WebCoreSupport/AboutDataUseFeatures.in ${WEBKIT_DIR}/blackberry/WebCoreSupport/generateAboutDataFeatures.pl
     212    COMMAND ${PERL_EXECUTABLE} ${WEBKIT_DIR}/blackberry/WebCoreSupport/generateAboutDataFeatures.pl USE ${WEBKIT_DIR}/blackberry/WebCoreSupport/AboutDataUseFeatures.in ${DERIVED_SOURCES_WEBCORE_DIR}/AboutDataUseFeatures.cpp
     213)
     214
     215ADD_CUSTOM_TARGET(
     216    aboutFeatures ALL
     217    DEPENDS ${DERIVED_SOURCES_WEBCORE_DIR}/AboutDataHaveFeatures.cpp ${DERIVED_SOURCES_WEBCORE_DIR}/AboutDataEnableFeatures.cpp ${DERIVED_SOURCES_WEBCORE_DIR}/AboutDataUseFeatures.cpp
     218)
Note: See TracChangeset for help on using the changeset viewer.