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
+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.
+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
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
GC_VALIDATION
GEOLOCATION
GESTURE_EVENTS
+GESTURE_RECOGNIZER
GGC
GLIB_SUPPORT
GLOBAL_FASTMALLOC_NEW
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
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
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
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
WRITE_BARRIER_PROFILING
WTF_MALLOC_VALIDATION
XHR_RESPONSE_BLOB
-XOR_DEBUG_AID
+XHTMLMP
XSLT
YARR_JIT
YARR_JIT_DEBUG
ACCESSIBILITY
+ASSEMBLER
AVCF
CG_INTERPOLATION_MEDIUM
COMPUTED_GOTO
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
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
#include "BackingStoreClient.h"
#include "BackingStore_p.h"
#include "CString.h"
+#include "ColorChooser.h"
#include "DatabaseTracker.h"
#include "Document.h"
#include "DumpRenderTreeClient.h"
return true;
}
+bool ChromeClientBlackBerry::hasOpenedPopup() const
+{
+ notImplemented();
+ return false;
+}
+
PassRefPtr<PopupMenu> ChromeClientBlackBerry::createPopupMenu(PopupMenuClient* client) const
{
return adoptRef(new PopupMenuBlackBerry(client));
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())
return windowPoint;
}
-IntRect ChromeClientBlackBerry::windowToScreen(const IntRect& windowRect) const
+IntRect ChromeClientBlackBerry::rootViewToScreen(const IntRect& windowRect) const
{
IntRect windowPoint(windowRect);
IntPoint location;
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);
}
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);
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();
}
#endif
+PassOwnPtr<ColorChooser> ChromeClientBlackBerry::createColorChooser(ColorChooserClient*, const Color&)
+{
+ return nullptr;
+}
+
+
} // namespace WebCore
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);
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>);
#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&) { }
#endif
virtual bool selectItemWritingDirectionIsNatural();
virtual bool selectItemAlignmentFollowsMenuWritingDirection();
+ virtual bool hasOpenedPopup() const;
virtual PassRefPtr<PopupMenu> createPopupMenu(PopupMenuClient*) const;
virtual PassRefPtr<SearchPopupMenu> createSearchPopupMenu(PopupMenuClient*) const;
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)
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()
{
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.
{
if (canRedo()) {
EditCommandStack::iterator back = --m_redoStack.end();
- RefPtr<EditCommand> command(*back);
+ RefPtr<UndoStep> command(*back);
m_redoStack.remove(back);
ASSERT(!m_inRedo);
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;
bool m_inRedo;
- typedef Deque<RefPtr<WebCore::EditCommand> > EditCommandStack;
+ typedef Deque<RefPtr<WebCore::UndoStep> > EditCommandStack;
EditCommandStack m_undoStack;
EditCommandStack m_redoStack;
};
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)
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,
#include <BlackBerryPlatformGeoTracker.h>
#include <BlackBerryPlatformGeoTrackerListener.h>
#include <GeolocationClient.h>
-#include <GeolocationPosition.h>
+#include <RefPtr.h>
namespace BlackBerry {
namespace WebKit {
notImplemented();
}
+void InspectorClientBlackBerry::closeInspectorFrontend()
+{
+ notImplemented();
+}
+
+void InspectorClientBlackBerry::bringFrontendToFront()
+{
+ notImplemented();
+}
+
bool InspectorClientBlackBerry::sendMessageToFrontend(const String& message)
{
CString utf8Message = message.utf8();
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();
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()));