[BlackBerry] Syncing up left over bits in WebCoreSupport from our local branch to...

https://bugs.webkit.org/show_bug.cgi?id=81120

Patch by Nima Ghanavatian <nghanavatian@rim.com> on 2012-03-16
Reviewed by Rob Buis.

This is a consolidation of various changes that are in our local dev branch
but do not appear in our upstreamed port.

* WebCoreSupport/AboutDataEnableFeatures.in:
* WebCoreSupport/AboutDataHaveFeatures.in:
* WebCoreSupport/AboutDataUseFeatures.in:
* WebCoreSupport/ChromeClientBlackBerry.cpp:
(WebCore::ChromeClientBlackBerry::hasOpenedPopup):
(WebCore):
(WebCore::ChromeClientBlackBerry::screenToRootView):
(WebCore::ChromeClientBlackBerry::rootViewToScreen):
(WebCore::ChromeClientBlackBerry::invalidateRootView):
(WebCore::ChromeClientBlackBerry::invalidateContentsAndRootView):
(WebCore::ChromeClientBlackBerry::invalidateContentsForSlowScroll):
(WebCore::ChromeClientBlackBerry::scrollableAreasDidChange):
(WebCore::ChromeClientBlackBerry::createColorChooser):
* WebCoreSupport/ChromeClientBlackBerry.h:
(ChromeClientBlackBerry):
(WebCore::ChromeClientBlackBerry::numTouchEventHandlersChanged):
* WebCoreSupport/EditorClientBlackBerry.cpp:
(WebCore::EditorClientBlackBerry::registerUndoStep):
(WebCore::EditorClientBlackBerry::registerRedoStep):
(WebCore::EditorClientBlackBerry::undo):
(WebCore::EditorClientBlackBerry::redo):
* WebCoreSupport/EditorClientBlackBerry.h:
(EditorClientBlackBerry):
* WebCoreSupport/GeolocationControllerClientBlackBerry.cpp:
(GeolocationControllerClientBlackBerry::requestPermission):
(GeolocationControllerClientBlackBerry::cancelPermissionRequest):
* WebCoreSupport/GeolocationControllerClientBlackBerry.h:
* WebCoreSupport/InspectorClientBlackBerry.cpp:
(WebCore::InspectorClientBlackBerry::closeInspectorFrontend):
(WebCore):
(WebCore::InspectorClientBlackBerry::bringFrontendToFront):
* WebCoreSupport/InspectorClientBlackBerry.h:
(InspectorClientBlackBerry):
* WebCoreSupport/NotificationPresenterImpl.cpp:
(WebCore::NotificationPresenterImpl::show):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@111050 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebKit/blackberry/ChangeLog b/Source/WebKit/blackberry/ChangeLog
index d608a3b328b8340dfc5a5b89eb852ec7cc56053f..f5c3f39979a27bf7520bb67a22d0cc82ac7f893d 100644 (file)
--- a/Source/WebKit/blackberry/ChangeLog
+++ b/Source/WebKit/blackberry/ChangeLog
@@ -1,3 +1,49 @@
+2012-03-16  Nima Ghanavatian  <nghanavatian@rim.com>
+
+        [BlackBerry] Syncing up left over bits in WebCoreSupport from our local branch to upstream
+        https://bugs.webkit.org/show_bug.cgi?id=81120
+
+        Reviewed by Rob Buis.
+
+        This is a consolidation of various changes that are in our local dev branch
+        but do not appear in our upstreamed port.
+
+        * WebCoreSupport/AboutDataEnableFeatures.in:
+        * WebCoreSupport/AboutDataHaveFeatures.in:
+        * WebCoreSupport/AboutDataUseFeatures.in:
+        * WebCoreSupport/ChromeClientBlackBerry.cpp:
+        (WebCore::ChromeClientBlackBerry::hasOpenedPopup):
+        (WebCore):
+        (WebCore::ChromeClientBlackBerry::screenToRootView):
+        (WebCore::ChromeClientBlackBerry::rootViewToScreen):
+        (WebCore::ChromeClientBlackBerry::invalidateRootView):
+        (WebCore::ChromeClientBlackBerry::invalidateContentsAndRootView):
+        (WebCore::ChromeClientBlackBerry::invalidateContentsForSlowScroll):
+        (WebCore::ChromeClientBlackBerry::scrollableAreasDidChange):
+        (WebCore::ChromeClientBlackBerry::createColorChooser):
+        * WebCoreSupport/ChromeClientBlackBerry.h:
+        (ChromeClientBlackBerry):
+        (WebCore::ChromeClientBlackBerry::numTouchEventHandlersChanged):
+        * WebCoreSupport/EditorClientBlackBerry.cpp:
+        (WebCore::EditorClientBlackBerry::registerUndoStep):
+        (WebCore::EditorClientBlackBerry::registerRedoStep):
+        (WebCore::EditorClientBlackBerry::undo):
+        (WebCore::EditorClientBlackBerry::redo):
+        * WebCoreSupport/EditorClientBlackBerry.h:
+        (EditorClientBlackBerry):
+        * WebCoreSupport/GeolocationControllerClientBlackBerry.cpp:
+        (GeolocationControllerClientBlackBerry::requestPermission):
+        (GeolocationControllerClientBlackBerry::cancelPermissionRequest):
+        * WebCoreSupport/GeolocationControllerClientBlackBerry.h:
+        * WebCoreSupport/InspectorClientBlackBerry.cpp:
+        (WebCore::InspectorClientBlackBerry::closeInspectorFrontend):
+        (WebCore):
+        (WebCore::InspectorClientBlackBerry::bringFrontendToFront):
+        * WebCoreSupport/InspectorClientBlackBerry.h:
+        (InspectorClientBlackBerry):
+        * WebCoreSupport/NotificationPresenterImpl.cpp:
+        (WebCore::NotificationPresenterImpl::show):
+
 2012-03-16  Mike Fenton  <mifenton@rim.com>
 
         [BlackBerry] Input fields with id of e-mail and url should be styled as such.

diff --git a/Source/WebKit/blackberry/WebCoreSupport/AboutDataEnableFeatures.in b/Source/WebKit/blackberry/WebCoreSupport/AboutDataEnableFeatures.in
index 9326d80d87aa88cea5c890842ab61f83d6145e77..a05ac6822ca15893ddd27e9debfc74281799b966 100644 (file)
--- a/Source/WebKit/blackberry/WebCoreSupport/AboutDataEnableFeatures.in
+++ b/Source/WebKit/blackberry/WebCoreSupport/AboutDataEnableFeatures.in
@@ -1,27 +1,25 @@
+3D_CANVAS
 3D_PLUGIN
 3D_RENDERING
 ACCELERATED_2D_CANVAS
 ASSEMBLER
 ASSEMBLER_WX_EXCLUSIVE
 BLACKBERRY_CREDENTIAL_PERSIST
+BLACKBERRY_DEBUG_MEMORY
 BLOB
 BRANCH_COMPACTION
 CHANNEL_MESSAGING
 CODEBLOCK_SAMPLING
 COMPARE_AND_SWAP
 COMPUTED_GOTO_INTERPRETER
-CONSISTENCY_CHECK
 CONTEXT_MENUS
 CSS_FILTERS
-CSS_GRID_LAYOUT
-CSS_LAYOUT_GRID
 CSS_SHADERS
 DASHBOARD_SUPPORT
+DATAGRID
 DATALIST
 DATA_TRANSFER_ITEMS
 DEBUG_MATH_LAYOUT
-DEBUG_PROPAGATION_VERBOSE
-DEBUG_VERBOSE
 DEBUG_WITH_BREAKPOINT
 DETAILS
 DEVICE_ORIENTATION
@@ -30,12 +28,15 @@ DIRECTORY_UPLOAD
 DOUBLE_TAP_CENTERS
 DOWNLOAD_ATTRIBUTE
 DRAG_SUPPORT
+EVENT_MODE_METATAGS
 EXECUTABLE_ALLOCATOR_DEMAND
 EXECUTABLE_ALLOCATOR_FIXED
+EXPERIMENTAL_FEATURE
 FAST_MALLOC_MATCH_VALIDATION
 FAST_MOBILE_SCROLLING
 FILE_SYSTEM
 FILTERS
+FIXED_REPORTED_SIZE
 FTPDIR
 FULLSCREEN_API
 GAMEPAD
@@ -43,6 +44,7 @@ GC_LOGGING
 GC_VALIDATION
 GEOLOCATION
 GESTURE_EVENTS
+GESTURE_RECOGNIZER
 GGC
 GLIB_SUPPORT
 GLOBAL_FASTMALLOC_NEW
@@ -59,15 +61,11 @@ INPUT_TYPE_TIME
 INPUT_TYPE_WEEK
 INSPECTOR
 INTERPRETER
-JAVA_BRIDGE
 JAVASCRIPT_DEBUGGER
 JAVASCRIPT_I18N_API
+JAVA_BRIDGE
 JIT
-JIT_ASSERT
-JIT_BREAK_ON_EVERY_BLOCK
-JIT_BREAK_ON_EVERY_FUNCTION
-JIT_BREAK_ON_EVERY_NODE
-JIT_BREAK_ON_SPECULATION_FAILURE
+JIT_OPTIMIZE_PROPERTY_ACCESS
 JIT_USE_SOFT_MODULO
 JIT_VERBOSE
 JIT_VERBOSE_OSR
@@ -87,17 +85,17 @@ MUTATION_OBSERVERS
 NETSCAPE_PLUGIN_API
 NETSCAPE_PLUGIN_METADATA_CACHE
 NEW_XML
-NO_LISTBOX_RENDERING
 NOTIFICATIONS
+NO_LISTBOX_RENDERING
 OPCODE_SAMPLING
 OPCODE_STATS
+OPENTYPE_SANITIZER
 ORIENTATION_EVENTS
-OSR_ENTRY
-PAGE_CACHE
 PAGE_VISIBILITY_API
 PAN_SCROLLING
 PARALLEL_GC
 PARALLEL_JOBS
+PASSWORD_ECHO
 PLUGIN_PACKAGE_SIMPLE_HASH
 PLUGIN_PROCESS
 PLUGIN_PROXY_FOR_VIDEO
@@ -109,20 +107,22 @@ REGEXP_TRACING
 REGISTER_PROTOCOL_HANDLER
 REPAINT_THROTTLING
 REQUEST_ANIMATION_FRAME
-RESTRICTIONS
 RUBBER_BANDING
 RUN_TIME_HEURISTICS
+RXI_IMAGE_FORMAT
 SAMPLING_COUNTERS
 SAMPLING_FLAGS
 SAMPLING_REGIONS
 SAMPLING_THREAD
 SHARED_WORKERS
 SIMPLE_HEAP_PROFILING
+SINGLE_THREADED
+SKIA_GPU_CANVAS
+SKIA_TEXT
 SMOOTH_SCROLLING
 SPEECH_INPUT
 SPELLCHECK
 SQL_DATABASE
-SUCCESS_STATS
 SVG
 SVG_DOM_OBJC_BINDINGS
 SVG_FONTS
@@ -132,16 +132,16 @@ THREADING_LIBDISPATCH
 THREADING_OPENMP
 TOUCH_EVENTS
 TOUCH_ICON_LOADING
-V_028D10_FORCE_DISABLE
 VALUE_PROFILER
-VERBOSE_SPECULATION_FAILURE
 VERBOSE_VALUE_PROFILE
-VERBOSE_VALUE_RECOVERIES
 VIDEO
 VIDEO_TRACK
+VIEWPORT_REFLOW
+WEBDOM
+WEBGL
+WEBKIT2
 WEB_ARCHIVE
 WEB_AUDIO
-WEBGL
 WEB_PROCESS_SANDBOX
 WEB_SOCKETS
 WEB_TIMING
@@ -149,7 +149,7 @@ WORKERS
 WRITE_BARRIER_PROFILING
 WTF_MALLOC_VALIDATION
 XHR_RESPONSE_BLOB
-XOR_DEBUG_AID
+XHTMLMP
 XSLT
 YARR_JIT
 YARR_JIT_DEBUG

diff --git a/Source/WebKit/blackberry/WebCoreSupport/AboutDataHaveFeatures.in b/Source/WebKit/blackberry/WebCoreSupport/AboutDataHaveFeatures.in
index 15259d99c134738df2bc37f3295b5899dd3e5fb3..21f3c6dcc426d938a245238e285e818d50c1bd6f 100644 (file)
--- a/Source/WebKit/blackberry/WebCoreSupport/AboutDataHaveFeatures.in
+++ b/Source/WebKit/blackberry/WebCoreSupport/AboutDataHaveFeatures.in
@@ -1,4 +1,5 @@
 ACCESSIBILITY
+ASSEMBLER
 AVCF
 CG_INTERPOLATION_MEDIUM
 COMPUTED_GOTO

diff --git a/Source/WebKit/blackberry/WebCoreSupport/AboutDataUseFeatures.in b/Source/WebKit/blackberry/WebCoreSupport/AboutDataUseFeatures.in
index b744d904c0d669e93b554b20e44f1e0ba8872442..e1a7ced1587cd7459aa2b77412dd0d8eece0999e 100644 (file)
--- a/Source/WebKit/blackberry/WebCoreSupport/AboutDataUseFeatures.in
+++ b/Source/WebKit/blackberry/WebCoreSupport/AboutDataUseFeatures.in
@@ -13,13 +13,16 @@ CFURLCACHE
 CFURLSTORAGESESSIONS
 CG
 CG_INTERPOLATION_MEDIUM
+CHROME_NETWORK_STACK
 COREAUDIO
 CORE_TEXT
 CROSS_PLATFORM_CONTEXT_MENUS
 CURL
 DYNAMIC_ANNOTATIONS
 DYNAMIC_ANNOTATIONS_NOIMPL
+EGL
 EXPORT_MACROS
+EXTERNAL_CRASH
 FREETYPE
 GCC_COMPUTED_GOTO_WORKAROUND
 GLIB_UNICODE
@@ -40,14 +43,16 @@ MARKER_REMOVAL_UPON_EDITING
 MERSENNE_TWISTER_19937
 NEW_THEME
 OPENTYPE_SANITIZER
+OPENVG
+OPENVG_BLUR
 OS_RANDOMNESS
 PANGO
 PLATFORM_STRATEGIES
 PLUGIN_HOST_PROCESS
 PREEMPT_GEOLOCATION_PERMISSION
 PROTECTION_SPACE_AUTH_CALLBACK
-PTHREAD_GETSPECIFIC_DIRECT
 PTHREADS
+PTHREAD_GETSPECIFIC_DIRECT
 QT4_UNICODE
 QTKIT
 QT_MOBILITY_SYSTEMINFO

diff --git a/Source/WebKit/blackberry/WebCoreSupport/ChromeClientBlackBerry.cpp b/Source/WebKit/blackberry/WebCoreSupport/ChromeClientBlackBerry.cpp
index cf78729599c5f428a8045dcb1ad3528f86c87318..23368d5bfe5f0653cfdadd5557fe97fb06432dd5 100644 (file)
--- a/Source/WebKit/blackberry/WebCoreSupport/ChromeClientBlackBerry.cpp
+++ b/Source/WebKit/blackberry/WebCoreSupport/ChromeClientBlackBerry.cpp
@@ -24,6 +24,7 @@
 #include "BackingStoreClient.h"
 #include "BackingStore_p.h"
 #include "CString.h"
+#include "ColorChooser.h"
 #include "DatabaseTracker.h"
 #include "Document.h"
 #include "DumpRenderTreeClient.h"
@@ -279,6 +280,12 @@ bool ChromeClientBlackBerry::selectItemAlignmentFollowsMenuWritingDirection()
     return true;
 }
 
+bool ChromeClientBlackBerry::hasOpenedPopup() const
+{
+    notImplemented();
+    return false;
+}
+
 PassRefPtr<PopupMenu> ChromeClientBlackBerry::createPopupMenu(PopupMenuClient* client) const
 {
     return adoptRef(new PopupMenuBlackBerry(client));
@@ -377,7 +384,7 @@ IntRect ChromeClientBlackBerry::windowResizerRect() const
     return IntRect();
 }
 
-IntPoint ChromeClientBlackBerry::screenToWindow(const IntPoint& screenPos) const
+IntPoint ChromeClientBlackBerry::screenToRootView(const IntPoint& screenPos) const
 {
     IntPoint windowPoint;
     if (Window* window = m_webPagePrivate->m_client->window())
@@ -387,7 +394,7 @@ IntPoint ChromeClientBlackBerry::screenToWindow(const IntPoint& screenPos) const
     return windowPoint;
 }
 
-IntRect ChromeClientBlackBerry::windowToScreen(const IntRect& windowRect) const
+IntRect ChromeClientBlackBerry::rootViewToScreen(const IntRect& windowRect) const
 {
     IntRect windowPoint(windowRect);
     IntPoint location;
@@ -525,12 +532,12 @@ void ChromeClientBlackBerry::contentsSizeChanged(Frame* frame, const IntSize& si
     m_webPagePrivate->contentsSizeChanged(size);
 }
 
-void ChromeClientBlackBerry::invalidateWindow(const IntRect& updateRect, bool immediate)
+void ChromeClientBlackBerry::invalidateRootView(const IntRect& updateRect, bool immediate)
 {
     m_webPagePrivate->m_backingStore->d->repaint(updateRect, false /*contentChanged*/, immediate);
 }
 
-void ChromeClientBlackBerry::invalidateContentsAndWindow(const IntRect& updateRect, bool immediate)
+void ChromeClientBlackBerry::invalidateContentsAndRootView(const IntRect& updateRect, bool immediate)
 {
     m_webPagePrivate->m_backingStore->d->repaint(updateRect, true /*contentChanged*/, immediate);
 }
@@ -538,7 +545,7 @@ void ChromeClientBlackBerry::invalidateContentsAndWindow(const IntRect& updateRe
 void ChromeClientBlackBerry::invalidateContentsForSlowScroll(const IntSize& delta, const IntRect& updateRect, bool immediate, const ScrollView* scrollView)
 {
     if (scrollView != m_webPagePrivate->m_mainFrame->view())
-        invalidateContentsAndWindow(updateRect, true /*immediate*/);
+        invalidateContentsAndRootView(updateRect, true /*immediate*/);
     else {
         BackingStoreClient* backingStoreClientForFrame = m_webPagePrivate->backingStoreClientForFrame(m_webPagePrivate->m_mainFrame);
         ASSERT(backingStoreClientForFrame);
@@ -566,7 +573,7 @@ void ChromeClientBlackBerry::scroll(const IntSize& delta, const IntRect& scrollV
 void ChromeClientBlackBerry::scrollableAreasDidChange()
 {
     typedef HashSet<ScrollableArea*> ScrollableAreaSet;
-    const ScrollableAreaSet* scrollableAreas = m_webPagePrivate->m_page->scrollableAreaSet();
+    const ScrollableAreaSet* scrollableAreas = m_webPagePrivate->m_mainFrame->view()->scrollableAreas();
 
     bool hasAtLeastOneInRegionScrollableArea = false;
     ScrollableAreaSet::iterator end = scrollableAreas->end();
@@ -740,4 +747,10 @@ bool ChromeClientBlackBerry::allowsAcceleratedCompositing() const
 }
 #endif
 
+PassOwnPtr<ColorChooser> ChromeClientBlackBerry::createColorChooser(ColorChooserClient*, const Color&)
+{
+    return nullptr;
+}
+
+
 } // namespace WebCore

diff --git a/Source/WebKit/blackberry/WebCoreSupport/ChromeClientBlackBerry.h b/Source/WebKit/blackberry/WebCoreSupport/ChromeClientBlackBerry.h
index f470f78fbc5245081853d618a77fd2d83026c72e..89350d291dd2383e25c6cfd58b9aacd3c2e159fa 100644 (file)
--- a/Source/WebKit/blackberry/WebCoreSupport/ChromeClientBlackBerry.h
+++ b/Source/WebKit/blackberry/WebCoreSupport/ChromeClientBlackBerry.h
@@ -70,13 +70,13 @@ public:
     virtual bool shouldInterruptJavaScript();
     virtual KeyboardUIMode keyboardUIMode();
     virtual IntRect windowResizerRect() const;
-    virtual void invalidateWindow(const IntRect&, bool);
-    virtual void invalidateContentsAndWindow(const IntRect&, bool);
+    virtual void invalidateRootView(const IntRect&, bool);
+    virtual void invalidateContentsAndRootView(const IntRect&, bool);
     virtual void invalidateContentsForSlowScroll(const IntSize&, const IntRect&, bool, const ScrollView*);
     virtual void scroll(const IntSize&, const IntRect&, const IntRect&);
     virtual void scrollableAreasDidChange();
-    virtual IntPoint screenToWindow(const IntPoint&) const;
-    virtual IntRect windowToScreen(const IntRect&) const;
+    virtual IntPoint screenToRootView(const IntPoint&) const;
+    virtual IntRect rootViewToScreen(const IntRect&) const;
     virtual void contentsSizeChanged(Frame*, const IntSize&) const;
     virtual void scrollRectIntoView(const IntRect&, const ScrollView*) const;
     virtual void mouseDidMoveOverElement(const HitTestResult&, unsigned int);
@@ -88,6 +88,7 @@ public:
     virtual void dispatchViewportPropertiesDidChange(const ViewportArguments&) const;
     virtual bool shouldRubberBandInDirection(ScrollDirection) const { return true; }
     virtual void numWheelEventHandlersChanged(unsigned) { }
+    virtual void numTouchEventHandlersChanged(unsigned) { }
     virtual void print(Frame*);
     virtual void exceededDatabaseQuota(Frame*, const String&);
     virtual void runOpenPanel(Frame*, PassRefPtr<FileChooser>);
@@ -103,6 +104,7 @@ public:
 #endif
 
 #if ENABLE(INPUT_COLOR)
+    virtual PassOwnPtr<ColorChooser> createColorChooser(ColorChooserClient*, const Color&);
     void openColorChooser(ColorChooser*, const Color&) { }
     void cleanupColorChooser(ColorChooser*) { }
     void setSelectedColorInColorChooser(ColorChooser*, const Color&) { }
@@ -131,6 +133,7 @@ public:
 #endif
     virtual bool selectItemWritingDirectionIsNatural();
     virtual bool selectItemAlignmentFollowsMenuWritingDirection();
+    virtual bool hasOpenedPopup() const;
     virtual PassRefPtr<PopupMenu> createPopupMenu(PopupMenuClient*) const;
     virtual PassRefPtr<SearchPopupMenu> createSearchPopupMenu(PopupMenuClient*) const;
 

diff --git a/Source/WebKit/blackberry/WebCoreSupport/EditorClientBlackBerry.cpp b/Source/WebKit/blackberry/WebCoreSupport/EditorClientBlackBerry.cpp
index c1002361de32f4e30b6c43367c9d51de14aa36c9..148be166361a29d1b3ea7735aaf5f37d3af049cf 100644 (file)
--- a/Source/WebKit/blackberry/WebCoreSupport/EditorClientBlackBerry.cpp
+++ b/Source/WebKit/blackberry/WebCoreSupport/EditorClientBlackBerry.cpp
@@ -257,7 +257,7 @@ void EditorClientBlackBerry::didSetSelectionTypesForPasteboard()
     notImplemented();
 }
 
-void EditorClientBlackBerry::registerCommandForUndo(PassRefPtr<EditCommand> command)
+void EditorClientBlackBerry::registerUndoStep(PassRefPtr<UndoStep> step)
 {
     // Remove the oldest item if we've reached the maximum capacity for the stack.
     if (m_undoStack.size() == maximumUndoStackDepth)
@@ -266,12 +266,12 @@ void EditorClientBlackBerry::registerCommandForUndo(PassRefPtr<EditCommand> comm
     if (!m_inRedo)
         m_redoStack.clear();
 
-    m_undoStack.append(command);
+    m_undoStack.append(step);
 }
 
-void EditorClientBlackBerry::registerCommandForRedo(PassRefPtr<EditCommand> command)
+void EditorClientBlackBerry::registerRedoStep(PassRefPtr<UndoStep> step)
 {
-    m_redoStack.append(command);
+    m_redoStack.append(step);
 }
 
 void EditorClientBlackBerry::clearUndoRedoOperations()
@@ -304,7 +304,7 @@ void EditorClientBlackBerry::undo()
 {
     if (canUndo()) {
         EditCommandStack::iterator back = --m_undoStack.end();
-        RefPtr<EditCommand> command(*back);
+        RefPtr<UndoStep> command(*back);
         m_undoStack.remove(back);
 
         // Unapply will call us back to push this command onto the redo stack.
@@ -316,7 +316,7 @@ void EditorClientBlackBerry::redo()
 {
     if (canRedo()) {
         EditCommandStack::iterator back = --m_redoStack.end();
-        RefPtr<EditCommand> command(*back);
+        RefPtr<UndoStep> command(*back);
         m_redoStack.remove(back);
 
         ASSERT(!m_inRedo);

diff --git a/Source/WebKit/blackberry/WebCoreSupport/EditorClientBlackBerry.h b/Source/WebKit/blackberry/WebCoreSupport/EditorClientBlackBerry.h
index 54a31009000298e891f073dd757c02ef51e017e8..486176b0d1858359bc5ae14234416a43313b20e8 100644 (file)
--- a/Source/WebKit/blackberry/WebCoreSupport/EditorClientBlackBerry.h
+++ b/Source/WebKit/blackberry/WebCoreSupport/EditorClientBlackBerry.h
@@ -60,8 +60,8 @@ public:
     virtual void didEndEditing();
     virtual void didWriteSelectionToPasteboard();
     virtual void didSetSelectionTypesForPasteboard();
-    virtual void registerCommandForUndo(PassRefPtr<EditCommand>);
-    virtual void registerCommandForRedo(PassRefPtr<EditCommand>);
+    virtual void registerUndoStep(PassRefPtr<UndoStep>);
+    virtual void registerRedoStep(PassRefPtr<UndoStep>);
     virtual void clearUndoRedoOperations();
     virtual bool canCopyCut(Frame*, bool) const;
     virtual bool canPaste(Frame*, bool) const;
@@ -108,7 +108,7 @@ private:
 
     bool m_inRedo;
 
-    typedef Deque<RefPtr<WebCore::EditCommand> > EditCommandStack;
+    typedef Deque<RefPtr<WebCore::UndoStep> > EditCommandStack;
     EditCommandStack m_undoStack;
     EditCommandStack m_redoStack;
 };

diff --git a/Source/WebKit/blackberry/WebCoreSupport/GeolocationControllerClientBlackBerry.cpp b/Source/WebKit/blackberry/WebCoreSupport/GeolocationControllerClientBlackBerry.cpp
index fd59f2e41ded73ce36915d32f61cc95cf4d6dfbd..ba22043e9f70d105ff06ac7b0cb04addd4e34472 100644 (file)
--- a/Source/WebKit/blackberry/WebCoreSupport/GeolocationControllerClientBlackBerry.cpp
+++ b/Source/WebKit/blackberry/WebCoreSupport/GeolocationControllerClientBlackBerry.cpp
@@ -66,7 +66,7 @@ void GeolocationControllerClientBlackBerry::requestPermission(Geolocation* locat
     Frame* frame = location->frame();
     if (!frame)
         return;
-    m_webPagePrivate->m_page->chrome()->requestGeolocationPermissionForFrame(frame, location);
+    m_webPagePrivate->m_page->chrome()->client()->requestGeolocationPermissionForFrame(frame, location);
 }
 
 void GeolocationControllerClientBlackBerry::cancelPermissionRequest(Geolocation* location)
@@ -74,7 +74,7 @@ void GeolocationControllerClientBlackBerry::cancelPermissionRequest(Geolocation*
     Frame* frame = location->frame();
     if (!frame)
         return;
-    m_webPagePrivate->m_page->chrome()->cancelGeolocationPermissionRequestForFrame(frame, location);
+    m_webPagePrivate->m_page->chrome()->client()->cancelGeolocationPermissionRequestForFrame(frame, location);
 }
 
 void GeolocationControllerClientBlackBerry::onLocationUpdate(double timestamp, double latitude, double longitude, double accuracy, double altitude, bool altitudeValid,

diff --git a/Source/WebKit/blackberry/WebCoreSupport/GeolocationControllerClientBlackBerry.h b/Source/WebKit/blackberry/WebCoreSupport/GeolocationControllerClientBlackBerry.h
index ea634bb97ebf4500fa3b87baa74f7b59c5cd09f0..c32449aeefacc8b6f6e8710950ced5ed07411c6c 100644 (file)
--- a/Source/WebKit/blackberry/WebCoreSupport/GeolocationControllerClientBlackBerry.h
+++ b/Source/WebKit/blackberry/WebCoreSupport/GeolocationControllerClientBlackBerry.h
@@ -22,7 +22,7 @@
 #include <BlackBerryPlatformGeoTracker.h>
 #include <BlackBerryPlatformGeoTrackerListener.h>
 #include <GeolocationClient.h>
-#include <GeolocationPosition.h>
+#include <RefPtr.h>
 
 namespace BlackBerry {
 namespace WebKit {

diff --git a/Source/WebKit/blackberry/WebCoreSupport/InspectorClientBlackBerry.cpp b/Source/WebKit/blackberry/WebCoreSupport/InspectorClientBlackBerry.cpp
index 73f887f30a2e57db8e5287254430a54f3eb723d4..0d5cdf4d1ff50fc781f8abd9d95f83c61901fc7b 100644 (file)
--- a/Source/WebKit/blackberry/WebCoreSupport/InspectorClientBlackBerry.cpp
+++ b/Source/WebKit/blackberry/WebCoreSupport/InspectorClientBlackBerry.cpp
@@ -124,6 +124,16 @@ void InspectorClientBlackBerry::openInspectorFrontend(InspectorController*)
     notImplemented();
 }
 
+void InspectorClientBlackBerry::closeInspectorFrontend()
+{
+    notImplemented();
+}
+
+void InspectorClientBlackBerry::bringFrontendToFront()
+{
+    notImplemented();
+}
+
 bool InspectorClientBlackBerry::sendMessageToFrontend(const String& message)
 {
     CString utf8Message = message.utf8();

diff --git a/Source/WebKit/blackberry/WebCoreSupport/InspectorClientBlackBerry.h b/Source/WebKit/blackberry/WebCoreSupport/InspectorClientBlackBerry.h
index f5cca1e87a918fa01fbb072fb4e64e8bb66e47ae..9ca2391f857307a64106764ec48722167c220c38 100644 (file)
--- a/Source/WebKit/blackberry/WebCoreSupport/InspectorClientBlackBerry.h
+++ b/Source/WebKit/blackberry/WebCoreSupport/InspectorClientBlackBerry.h
@@ -51,6 +51,8 @@ public:
     virtual void storeSetting(const String& key, const String& value);
     virtual void inspectorWindowObjectCleared();
     virtual void openInspectorFrontend(InspectorController*);
+    virtual void closeInspectorFrontend();
+    virtual void bringFrontendToFront();
     virtual bool sendMessageToFrontend(const String&);
     virtual void clearBrowserCache();
     virtual void clearBrowserCookies();

diff --git a/Source/WebKit/blackberry/WebCoreSupport/NotificationPresenterImpl.cpp b/Source/WebKit/blackberry/WebCoreSupport/NotificationPresenterImpl.cpp
index 4570f6b78ce3389fc5029647bd364afb044cc43b..6b292102946277da28e798d7eedf8b939c5319c7 100644 (file)
--- a/Source/WebKit/blackberry/WebCoreSupport/NotificationPresenterImpl.cpp
+++ b/Source/WebKit/blackberry/WebCoreSupport/NotificationPresenterImpl.cpp
@@ -65,7 +65,7 @@ bool NotificationPresenterImpl::show(Notification* notification)
         message = n->url().string();
     } else {
         // FIXME: Strip the content into one line.
-        message = n->contents().title() + ": " + n->contents().body();
+        message = n->contents().title + ": " + n->contents().body;
     }
 
     m_platformPresenter->show(std::string(uuid.utf8().data()), std::string(message.utf8().data()));