Changeset 128767 in webkit


Ignore:
Timestamp:
Sep 17, 2012 9:06:54 AM (12 years ago)
Author:
rwlbuis@webkit.org
Message:

[BlackBerry] Fix compile problems in WebKit/blackberry
​https://bugs.webkit.org/show_bug.cgi?id=96926

Reviewed by Antonio Gomes.

This code is slightly out of date and so will not compile, fix it.

  • WebCoreSupport/BatteryClientBlackBerry.cpp:

(WebCore::BatteryClientBlackBerry::BatteryClientBlackBerry):

  • WebCoreSupport/BatteryClientBlackBerry.h:

(WebKit):

  • WebCoreSupport/CredentialTransformData.h:
  • WebCoreSupport/DeviceOrientationClientBlackBerry.cpp:

(DeviceOrientationClientBlackBerry::onOrientation):

  • WebCoreSupport/InspectorClientBlackBerry.h:
  • WebCoreSupport/PagePopupBlackBerry.cpp:
  • WebKitSupport/DOMSupport.cpp:

(BlackBerry::WebKit::DOMSupport::isDateTimeInputField):
(BlackBerry::WebKit::DOMSupport::isTextBasedContentEditableElement):

  • WebKitSupport/DumpRenderTreeSupport.cpp:

(DumpRenderTreeSupport::numberOfPendingGeolocationPermissionRequests):

  • WebKitSupport/InPageSearchManager.cpp:

(BlackBerry::WebKit::InPageSearchManager::scopeStringMatches):

Location:
trunk/Source/WebKit/blackberry
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit/blackberry/ChangeLog

    r128766 r128767  
     12012-09-17  Rob Buis  <rbuis@rim.com>
     2
     3        [BlackBerry] Fix compile problems in WebKit/blackberry
     4        https://bugs.webkit.org/show_bug.cgi?id=96926
     5
     6        Reviewed by Antonio Gomes.
     7
     8        This code is slightly out of date and so will not compile, fix it.
     9
     10        * WebCoreSupport/BatteryClientBlackBerry.cpp:
     11        (WebCore::BatteryClientBlackBerry::BatteryClientBlackBerry):
     12        * WebCoreSupport/BatteryClientBlackBerry.h:
     13        (WebKit):
     14        * WebCoreSupport/CredentialTransformData.h:
     15        * WebCoreSupport/DeviceOrientationClientBlackBerry.cpp:
     16        (DeviceOrientationClientBlackBerry::onOrientation):
     17        * WebCoreSupport/InspectorClientBlackBerry.h:
     18        * WebCoreSupport/PagePopupBlackBerry.cpp:
     19        * WebKitSupport/DOMSupport.cpp:
     20        (BlackBerry::WebKit::DOMSupport::isDateTimeInputField):
     21        (BlackBerry::WebKit::DOMSupport::isTextBasedContentEditableElement):
     22        * WebKitSupport/DumpRenderTreeSupport.cpp:
     23        (DumpRenderTreeSupport::numberOfPendingGeolocationPermissionRequests):
     24        * WebKitSupport/InPageSearchManager.cpp:
     25        (BlackBerry::WebKit::InPageSearchManager::scopeStringMatches):
     26
    1272012-09-17  Antonio Gomes  <agomes@rim.com>
    228

  • trunk/Source/WebKit/blackberry/WebCoreSupport/BatteryClientBlackBerry.cpp

    r122743 r128767  
    2323
    2424#include "BatteryController.h"
     25#include "WebPage_p.h"
    2526#include <stdio.h>
    2627
    … …  
    2930BatteryClientBlackBerry::BatteryClientBlackBerry(BlackBerry::WebKit::WebPagePrivate* webPagePrivate)
    3031    : m_webPagePrivate(webPagePrivate)
    31     : m_tracker(0)
     32    , m_tracker(0)
    3233{
    3334}

  • trunk/Source/WebKit/blackberry/WebCoreSupport/BatteryClientBlackBerry.h

    r122743 r128767  
    2727#include <BlackBerryPlatformBatteryStatusTrackerListener.h>
    2828
     29namespace BlackBerry {
     30namespace WebKit {
     31class WebPagePrivate;
     32}
     33}
     34
    2935namespace WebCore {
    3036

  • trunk/Source/WebKit/blackberry/WebCoreSupport/CredentialTransformData.h

    r109698 r128767  
    2626
    2727namespace WebCore {
    28 
    29 class HTMLFormElement;
    3028
    3129struct CredentialTransformData {

  • trunk/Source/WebKit/blackberry/WebCoreSupport/DeviceOrientationClientBlackBerry.cpp

    r126209 r128767  
    7070void DeviceOrientationClientBlackBerry::onOrientation(const BlackBerry::Platform::DeviceOrientationEvent* event)
    7171{
    72     m_currentOrientation = DeviceOrientation::create(true, event->alpha, true, event->beta, true, event->gamma);
     72    m_currentOrientation = DeviceOrientationData::create(true, event->alpha, true, event->beta, true, event->gamma);
    7373    if (!m_controller)
    7474        return;

  • trunk/Source/WebKit/blackberry/WebCoreSupport/InspectorClientBlackBerry.h

    r128502 r128767  
    2323#include "InspectorClient.h"
    2424#include "InspectorFrontendChannel.h"
     25#include "InspectorOverlay.h"
    2526#include "InspectorOverlayBlackBerry.h"
    2627#include <wtf/HashMap.h>

  • trunk/Source/WebKit/blackberry/WebCoreSupport/PagePopupBlackBerry.cpp

    r128226 r128767  
    2020#include "PagePopupBlackBerry.h"
    2121
     22#include "DocumentLoader.h"
    2223#include "EmptyClients.h"
    2324#include "FrameView.h"

  • trunk/Source/WebKit/blackberry/WebKitSupport/DOMSupport.cpp

    r128106 r128767  
    171171
    172172    // The following types have popup's.
    173     if (inputElement->isDateControl()
    174         || inputElement->isDateTimeControl()
    175         || inputElement->isDateTimeLocalControl()
    176         || inputElement->isTimeControl()
    177         || inputElement->isMonthControl())
     173    if (inputElement->isDateField()
     174        || inputElement->isDateTimeField()
     175        || inputElement->isDateTimeLocalField()
     176        || inputElement->isTimeField()
     177        || inputElement->isMonthField())
    178178            return true;
    179179
    … …  
    250250        return false;
    251251
    252     if (element->isReadOnlyFormControl() || !element->isEnabledFormControl())
     252    if (element->isReadOnlyNode() || !element->isEnabledFormControl())
    253253        return false;
    254254

  • trunk/Source/WebKit/blackberry/WebKitSupport/DumpRenderTreeSupport.cpp

    r122204 r128767  
    2929#include "JSElement.h"
    3030#include "Page.h"
    31 #include "ViewportArguments.h"
    3231#include "WebPage_p.h"
    3332#include "bindings/js/GCController.h"
    … …  
    8786int DumpRenderTreeSupport::numberOfPendingGeolocationPermissionRequests(WebPage* webPage)
    8887{
    89     GeolocationClientMock* mockClient = toGeolocationClientMock(GeolocationController(corePage(webPage))->client());
     88    GeolocationClientMock* mockClient = toGeolocationClientMock(GeolocationController::from(corePage(webPage))->client());
    9089    return mockClient->numberOfPendingPermissionRequests();
    9190}

  • trunk/Source/WebKit/blackberry/WebKitSupport/InPageSearchManager.cpp

    r127594 r128767  
    2828#include "Page.h"
    2929#include "Range.h"
     30#include "ShadowRoot.h"
    3031#include "TextIterator.h"
    3132#include "Timer.h"
    … …  
    326327
    327328        searchRange->setStart(resultRange->endContainer(ec), resultRange->endOffset(ec), ec);
    328         Node* shadowTreeRoot = searchRange->shadowTreeRootNode();
     329        ShadowRoot* shadowTreeRoot = searchRange->shadowRoot();
    329330        if (searchRange->collapsed(ec) && shadowTreeRoot)
    330331            searchRange->setEnd(shadowTreeRoot, shadowTreeRoot->childNodeCount(), ec);
Note: See TracChangeset for help on using the changeset viewer.