Diff
Modified: trunk/Source/WebKit/blackberry/ChangeLog (128766 => 128767)
--- trunk/Source/WebKit/blackberry/ChangeLog 2012-09-17 16:05:21 UTC (rev 128766)
+++ trunk/Source/WebKit/blackberry/ChangeLog 2012-09-17 16:06:54 UTC (rev 128767)
@@ -1,3 +1,29 @@
+2012-09-17 Rob Buis <[email protected]>
+
+ [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):
+
2012-09-17 Antonio Gomes <[email protected]>
[BlackBerry] BackingStorePrivate::resumeScreenAndBackingStoreUpdates more atomic
Modified: trunk/Source/WebKit/blackberry/WebCoreSupport/BatteryClientBlackBerry.cpp (128766 => 128767)
--- trunk/Source/WebKit/blackberry/WebCoreSupport/BatteryClientBlackBerry.cpp 2012-09-17 16:05:21 UTC (rev 128766)
+++ trunk/Source/WebKit/blackberry/WebCoreSupport/BatteryClientBlackBerry.cpp 2012-09-17 16:06:54 UTC (rev 128767)
@@ -22,13 +22,14 @@
#if ENABLE(BATTERY_STATUS)
#include "BatteryController.h"
+#include "WebPage_p.h"
#include <stdio.h>
namespace WebCore {
BatteryClientBlackBerry::BatteryClientBlackBerry(BlackBerry::WebKit::WebPagePrivate* webPagePrivate)
: m_webPagePrivate(webPagePrivate)
- : m_tracker(0)
+ , m_tracker(0)
{
}
Modified: trunk/Source/WebKit/blackberry/WebCoreSupport/BatteryClientBlackBerry.h (128766 => 128767)
--- trunk/Source/WebKit/blackberry/WebCoreSupport/BatteryClientBlackBerry.h 2012-09-17 16:05:21 UTC (rev 128766)
+++ trunk/Source/WebKit/blackberry/WebCoreSupport/BatteryClientBlackBerry.h 2012-09-17 16:06:54 UTC (rev 128767)
@@ -26,6 +26,12 @@
#include <BlackBerryPlatformBatteryStatusTracker.h>
#include <BlackBerryPlatformBatteryStatusTrackerListener.h>
+namespace BlackBerry {
+namespace WebKit {
+class WebPagePrivate;
+}
+}
+
namespace WebCore {
class BatteryStatus;
Modified: trunk/Source/WebKit/blackberry/WebCoreSupport/CredentialTransformData.h (128766 => 128767)
--- trunk/Source/WebKit/blackberry/WebCoreSupport/CredentialTransformData.h 2012-09-17 16:05:21 UTC (rev 128766)
+++ trunk/Source/WebKit/blackberry/WebCoreSupport/CredentialTransformData.h 2012-09-17 16:06:54 UTC (rev 128767)
@@ -26,8 +26,6 @@
namespace WebCore {
-class HTMLFormElement;
-
struct CredentialTransformData {
// If the provided form is suitable for password completion, isValid() will
// return true;
Modified: trunk/Source/WebKit/blackberry/WebCoreSupport/DeviceOrientationClientBlackBerry.cpp (128766 => 128767)
--- trunk/Source/WebKit/blackberry/WebCoreSupport/DeviceOrientationClientBlackBerry.cpp 2012-09-17 16:05:21 UTC (rev 128766)
+++ trunk/Source/WebKit/blackberry/WebCoreSupport/DeviceOrientationClientBlackBerry.cpp 2012-09-17 16:06:54 UTC (rev 128767)
@@ -69,7 +69,7 @@
void DeviceOrientationClientBlackBerry::onOrientation(const BlackBerry::Platform::DeviceOrientationEvent* event)
{
- m_currentOrientation = DeviceOrientation::create(true, event->alpha, true, event->beta, true, event->gamma);
+ m_currentOrientation = DeviceOrientationData::create(true, event->alpha, true, event->beta, true, event->gamma);
if (!m_controller)
return;
Modified: trunk/Source/WebKit/blackberry/WebCoreSupport/InspectorClientBlackBerry.h (128766 => 128767)
--- trunk/Source/WebKit/blackberry/WebCoreSupport/InspectorClientBlackBerry.h 2012-09-17 16:05:21 UTC (rev 128766)
+++ trunk/Source/WebKit/blackberry/WebCoreSupport/InspectorClientBlackBerry.h 2012-09-17 16:06:54 UTC (rev 128767)
@@ -22,6 +22,7 @@
#include "InspectorClient.h"
#include "InspectorFrontendChannel.h"
+#include "InspectorOverlay.h"
#include "InspectorOverlayBlackBerry.h"
#include <wtf/HashMap.h>
#include <wtf/text/WTFString.h>
Modified: trunk/Source/WebKit/blackberry/WebCoreSupport/PagePopupBlackBerry.cpp (128766 => 128767)
--- trunk/Source/WebKit/blackberry/WebCoreSupport/PagePopupBlackBerry.cpp 2012-09-17 16:05:21 UTC (rev 128766)
+++ trunk/Source/WebKit/blackberry/WebCoreSupport/PagePopupBlackBerry.cpp 2012-09-17 16:06:54 UTC (rev 128767)
@@ -19,6 +19,7 @@
#include "PagePopupBlackBerry.h"
+#include "DocumentLoader.h"
#include "EmptyClients.h"
#include "FrameView.h"
#include "JSDOMBinding.h"
Modified: trunk/Source/WebKit/blackberry/WebKitSupport/DOMSupport.cpp (128766 => 128767)
--- trunk/Source/WebKit/blackberry/WebKitSupport/DOMSupport.cpp 2012-09-17 16:05:21 UTC (rev 128766)
+++ trunk/Source/WebKit/blackberry/WebKitSupport/DOMSupport.cpp 2012-09-17 16:06:54 UTC (rev 128767)
@@ -170,11 +170,11 @@
const HTMLInputElement* inputElement = static_cast<const HTMLInputElement*>(element);
// The following types have popup's.
- if (inputElement->isDateControl()
- || inputElement->isDateTimeControl()
- || inputElement->isDateTimeLocalControl()
- || inputElement->isTimeControl()
- || inputElement->isMonthControl())
+ if (inputElement->isDateField()
+ || inputElement->isDateTimeField()
+ || inputElement->isDateTimeLocalField()
+ || inputElement->isTimeField()
+ || inputElement->isMonthField())
return true;
return false;
@@ -249,7 +249,7 @@
if (!element)
return false;
- if (element->isReadOnlyFormControl() || !element->isEnabledFormControl())
+ if (element->isReadOnlyNode() || !element->isEnabledFormControl())
return false;
if (isPopupInputField(element))
Modified: trunk/Source/WebKit/blackberry/WebKitSupport/DumpRenderTreeSupport.cpp (128766 => 128767)
--- trunk/Source/WebKit/blackberry/WebKitSupport/DumpRenderTreeSupport.cpp 2012-09-17 16:05:21 UTC (rev 128766)
+++ trunk/Source/WebKit/blackberry/WebKitSupport/DumpRenderTreeSupport.cpp 2012-09-17 16:06:54 UTC (rev 128767)
@@ -28,7 +28,6 @@
#include "JSCSSStyleDeclaration.h"
#include "JSElement.h"
#include "Page.h"
-#include "ViewportArguments.h"
#include "WebPage_p.h"
#include "bindings/js/GCController.h"
#include <_javascript_Core/APICast.h>
@@ -86,7 +85,7 @@
int DumpRenderTreeSupport::numberOfPendingGeolocationPermissionRequests(WebPage* webPage)
{
- GeolocationClientMock* mockClient = toGeolocationClientMock(GeolocationController(corePage(webPage))->client());
+ GeolocationClientMock* mockClient = toGeolocationClientMock(GeolocationController::from(corePage(webPage))->client());
return mockClient->numberOfPendingPermissionRequests();
}
Modified: trunk/Source/WebKit/blackberry/WebKitSupport/InPageSearchManager.cpp (128766 => 128767)
--- trunk/Source/WebKit/blackberry/WebKitSupport/InPageSearchManager.cpp 2012-09-17 16:05:21 UTC (rev 128766)
+++ trunk/Source/WebKit/blackberry/WebKitSupport/InPageSearchManager.cpp 2012-09-17 16:06:54 UTC (rev 128767)
@@ -27,6 +27,7 @@
#include "Node.h"
#include "Page.h"
#include "Range.h"
+#include "ShadowRoot.h"
#include "TextIterator.h"
#include "Timer.h"
#include "WebPage_p.h"
@@ -325,7 +326,7 @@
resultRange->ownerDocument()->markers()->addTextMatchMarker(resultRange.get(), foundActiveMatch);
searchRange->setStart(resultRange->endContainer(ec), resultRange->endOffset(ec), ec);
- Node* shadowTreeRoot = searchRange->shadowTreeRootNode();
+ ShadowRoot* shadowTreeRoot = searchRange->shadowRoot();
if (searchRange->collapsed(ec) && shadowTreeRoot)
searchRange->setEnd(shadowTreeRoot, shadowTreeRoot->childNodeCount(), ec);
m_resumeScopingFromRange = resultRange;
