Modified: trunk/Source/WebKit/chromium/src/ChromeClientImpl.cpp (106083 => 106084)
--- trunk/Source/WebKit/chromium/src/ChromeClientImpl.cpp 2012-01-27 04:43:58 UTC (rev 106083)
+++ trunk/Source/WebKit/chromium/src/ChromeClientImpl.cpp 2012-01-27 04:48:24 UTC (rev 106084)
@@ -773,7 +773,7 @@
// transparent to the WebView.
m_webView->popupOpened(popupContainer);
}
- static_cast<WebPopupMenuImpl*>(webwidget)->Init(popupContainer, bounds);
+ static_cast<WebPopupMenuImpl*>(webwidget)->init(popupContainer, bounds);
}
void ChromeClientImpl::popupClosed(WebCore::PopupContainer* popupContainer)
Modified: trunk/Source/WebKit/chromium/src/WebPopupMenuImpl.cpp (106083 => 106084)
--- trunk/Source/WebKit/chromium/src/WebPopupMenuImpl.cpp 2012-01-27 04:43:58 UTC (rev 106083)
+++ trunk/Source/WebKit/chromium/src/WebPopupMenuImpl.cpp 2012-01-27 04:48:24 UTC (rev 106084)
@@ -32,25 +32,23 @@
#include "WebPopupMenuImpl.h"
#include "Cursor.h"
-#include "FramelessScrollView.h"
#include "FrameView.h"
+#include "FramelessScrollView.h"
#include "IntRect.h"
#include "NotImplemented.h"
-#include "painting/GraphicsContextBuilder.h"
#include "PlatformKeyboardEvent.h"
#include "PlatformMouseEvent.h"
#include "PlatformWheelEvent.h"
#include "PopupContainer.h"
#include "PopupMenuChromium.h"
#include "SkiaUtils.h"
-
#include "WebInputEvent.h"
#include "WebInputEventConversion.h"
#include "WebRange.h"
-#include "platform/WebRect.h"
#include "WebViewClient.h"
#include "WebWidgetClient.h"
-
+#include "painting/GraphicsContextBuilder.h"
+#include "platform/WebRect.h"
#include <skia/ext/platform_canvas.h>
#if ENABLE(GESTURE_RECOGNIZER)
@@ -79,7 +77,7 @@
, m_gestureRecognizer(WebCore::PlatformGestureRecognizer::create())
#endif
{
- // set to impossible point so we always get the first mouse pos
+ // Set to impossible point so we always get the first mouse position.
m_lastMousePosition = WebPoint(-1, -1);
}
@@ -89,20 +87,20 @@
m_widget->setClient(0);
}
-void WebPopupMenuImpl::Init(FramelessScrollView* widget, const WebRect& bounds)
+void WebPopupMenuImpl::init(FramelessScrollView* widget, const WebRect& bounds)
{
m_widget = widget;
m_widget->setClient(this);
if (m_client) {
m_client->setWindowRect(bounds);
- m_client->show(WebNavigationPolicy()); // Policy is ignored
+ m_client->show(WebNavigationPolicy()); // Policy is ignored.
}
}
-void WebPopupMenuImpl::MouseMove(const WebMouseEvent& event)
+void WebPopupMenuImpl::handleMouseMove(const WebMouseEvent& event)
{
- // don't send mouse move messages if the mouse hasn't moved.
+ // Don't send mouse move messages if the mouse hasn't moved.
if (event.x != m_lastMousePosition.x || event.y != m_lastMousePosition.y) {
m_lastMousePosition = WebPoint(event.x, event.y);
m_widget->handleMouseMoveEvent(PlatformMouseEventBuilder(m_widget, event));
@@ -113,34 +111,34 @@
}
}
-void WebPopupMenuImpl::MouseLeave(const WebMouseEvent& event)
+void WebPopupMenuImpl::handleMouseLeave(const WebMouseEvent& event)
{
m_widget->handleMouseMoveEvent(PlatformMouseEventBuilder(m_widget, event));
}
-void WebPopupMenuImpl::MouseDown(const WebMouseEvent& event)
+void WebPopupMenuImpl::handleMouseDown(const WebMouseEvent& event)
{
m_widget->handleMouseDownEvent(PlatformMouseEventBuilder(m_widget, event));
}
-void WebPopupMenuImpl::MouseUp(const WebMouseEvent& event)
+void WebPopupMenuImpl::handleMouseUp(const WebMouseEvent& event)
{
mouseCaptureLost();
m_widget->handleMouseReleaseEvent(PlatformMouseEventBuilder(m_widget, event));
}
-void WebPopupMenuImpl::MouseWheel(const WebMouseWheelEvent& event)
+void WebPopupMenuImpl::handleMouseWheel(const WebMouseWheelEvent& event)
{
m_widget->handleWheelEvent(PlatformWheelEventBuilder(m_widget, event));
}
-bool WebPopupMenuImpl::GestureEvent(const WebGestureEvent& event)
+bool WebPopupMenuImpl::handleGestureEvent(const WebGestureEvent& event)
{
return m_widget->handleGestureEvent(PlatformGestureEventBuilder(m_widget, event));
}
#if ENABLE(TOUCH_EVENTS)
-bool WebPopupMenuImpl::TouchEvent(const WebTouchEvent& event)
+bool WebPopupMenuImpl::handleTouchEvent(const WebTouchEvent& event)
{
PlatformTouchEventBuilder touchEventBuilder(m_widget, event);
@@ -154,7 +152,7 @@
}
#endif
-bool WebPopupMenuImpl::KeyEvent(const WebKeyboardEvent& event)
+bool WebPopupMenuImpl::handleKeyEvent(const WebKeyboardEvent& event)
{
return m_widget->handleKeyEvent(PlatformKeyboardEventBuilder(event));
}
@@ -168,7 +166,7 @@
m_client = 0;
- deref(); // Balances ref() from WebWidget::Create
+ deref(); // Balances ref() from WebPopupMenu::create.
}
void WebPopupMenuImpl::willStartLiveResize()
@@ -218,7 +216,7 @@
notImplemented();
}
-void WebPopupMenuImpl::composite(bool finish)
+void WebPopupMenuImpl::composite(bool)
{
notImplemented();
}
@@ -228,28 +226,28 @@
if (!m_widget)
return false;
- // TODO (jcampan): WebKit seems to always return false on mouse events
- // methods. For now we'll assume it has processed them (as we are only
- // interested in whether keyboard events are processed).
+ // FIXME: WebKit seems to always return false on mouse events methods. For
+ // now we'll assume it has processed them (as we are only interested in
+ // whether keyboard events are processed).
switch (inputEvent.type) {
case WebInputEvent::MouseMove:
- MouseMove(*static_cast<const WebMouseEvent*>(&inputEvent));
+ handleMouseMove(*static_cast<const WebMouseEvent*>(&inputEvent));
return true;
case WebInputEvent::MouseLeave:
- MouseLeave(*static_cast<const WebMouseEvent*>(&inputEvent));
+ handleMouseLeave(*static_cast<const WebMouseEvent*>(&inputEvent));
return true;
case WebInputEvent::MouseWheel:
- MouseWheel(*static_cast<const WebMouseWheelEvent*>(&inputEvent));
+ handleMouseWheel(*static_cast<const WebMouseWheelEvent*>(&inputEvent));
return true;
case WebInputEvent::MouseDown:
- MouseDown(*static_cast<const WebMouseEvent*>(&inputEvent));
+ handleMouseDown(*static_cast<const WebMouseEvent*>(&inputEvent));
return true;
case WebInputEvent::MouseUp:
- MouseUp(*static_cast<const WebMouseEvent*>(&inputEvent));
+ handleMouseUp(*static_cast<const WebMouseEvent*>(&inputEvent));
return true;
// In Windows, RawKeyDown only has information about the physical key, but
@@ -264,13 +262,13 @@
case WebInputEvent::KeyDown:
case WebInputEvent::KeyUp:
case WebInputEvent::Char:
- return KeyEvent(*static_cast<const WebKeyboardEvent*>(&inputEvent));
+ return handleKeyEvent(*static_cast<const WebKeyboardEvent*>(&inputEvent));
case WebInputEvent::TouchStart:
case WebInputEvent::TouchMove:
case WebInputEvent::TouchEnd:
case WebInputEvent::TouchCancel:
- return TouchEvent(*static_cast<const WebTouchEvent*>(&inputEvent));
+ return handleTouchEvent(*static_cast<const WebTouchEvent*>(&inputEvent));
case WebInputEvent::GestureScrollBegin:
case WebInputEvent::GestureScrollEnd:
@@ -280,7 +278,7 @@
case WebInputEvent::GestureTap:
case WebInputEvent::GestureTapDown:
case WebInputEvent::GestureDoubleTap:
- return GestureEvent(*static_cast<const WebGestureEvent*>(&inputEvent));
+ return handleGestureEvent(*static_cast<const WebGestureEvent*>(&inputEvent));
case WebInputEvent::Undefined:
case WebInputEvent::MouseEnter:
@@ -294,7 +292,7 @@
{
}
-void WebPopupMenuImpl::setFocus(bool enable)
+void WebPopupMenuImpl::setFocus(bool)
{
}
@@ -303,9 +301,7 @@
PopupMenuChromium::setMinimumRowHeight(minimumRowHeight);
}
-bool WebPopupMenuImpl::setComposition(
- const WebString& text, const WebVector<WebCompositionUnderline>& underlines,
- int selectionStart, int selectionEnd)
+bool WebPopupMenuImpl::setComposition(const WebString&, const WebVector<WebCompositionUnderline>&, int, int)
{
return false;
}
@@ -315,7 +311,7 @@
return false;
}
-bool WebPopupMenuImpl::confirmComposition(const WebString& text)
+bool WebPopupMenuImpl::confirmComposition(const WebString&)
{
return false;
}
@@ -339,7 +335,7 @@
return false;
}
-void WebPopupMenuImpl::setTextDirection(WebTextDirection direction)
+void WebPopupMenuImpl::setTextDirection(WebTextDirection)
{
}
@@ -347,11 +343,6 @@
//-----------------------------------------------------------------------------
// WebCore::HostWindow
-void WebPopupMenuImpl::invalidateContents(const IntRect&, bool)
-{
- notImplemented();
-}
-
void WebPopupMenuImpl::invalidateRootView(const IntRect&, bool)
{
notImplemented();
@@ -374,9 +365,7 @@
{
}
-void WebPopupMenuImpl::scroll(const IntSize& scrollDelta,
- const IntRect& scrollRect,
- const IntRect& clipRect)
+void WebPopupMenuImpl::scroll(const IntSize& scrollDelta, const IntRect& scrollRect, const IntRect& clipRect)
{
if (m_client) {
int dx = scrollDelta.width();
@@ -397,12 +386,6 @@
return IntRect();
}
-void WebPopupMenuImpl::scrollRectIntoView(const IntRect&) const
-{
- // Nothing to be done here since we do not have the concept of a container
- // that implements its own scrolling.
-}
-
void WebPopupMenuImpl::scrollbarsModeDidChange() const
{
// Nothing to be done since we have no concept of different scrollbar modes.
Modified: trunk/Source/WebKit/chromium/src/WebPopupMenuImpl.h (106083 => 106084)
--- trunk/Source/WebKit/chromium/src/WebPopupMenuImpl.h 2012-01-27 04:43:58 UTC (rev 106083)
+++ trunk/Source/WebKit/chromium/src/WebPopupMenuImpl.h 2012-01-27 04:48:24 UTC (rev 106084)
@@ -32,8 +32,8 @@
#define WebPopupMenuImpl_h
#include "FramelessScrollViewClient.h"
-#include "platform/WebPoint.h"
#include "WebPopupMenu.h"
+#include "platform/WebPoint.h"
#include "platform/WebSize.h"
#include <wtf/OwnPtr.h>
#include <wtf/RefCounted.h>
@@ -65,81 +65,78 @@
public RefCounted<WebPopupMenuImpl> {
WTF_MAKE_FAST_ALLOCATED;
public:
- // WebWidget
- virtual void close();
- virtual WebSize size() { return m_size; }
- virtual void willStartLiveResize();
- virtual void resize(const WebSize&);
- virtual void willEndLiveResize();
- virtual void animate(double frameBeginTime);
- virtual void layout();
- virtual void paint(WebCanvas* canvas, const WebRect& rect);
- virtual void themeChanged();
- virtual void composite(bool finish);
- virtual bool handleInputEvent(const WebInputEvent&);
- virtual void mouseCaptureLost();
- virtual void setFocus(bool enable);
+ // WebWidget functions:
+ virtual void close() OVERRIDE;
+ virtual WebSize size() OVERRIDE { return m_size; }
+ virtual void willStartLiveResize() OVERRIDE;
+ virtual void resize(const WebSize&) OVERRIDE;
+ virtual void willEndLiveResize() OVERRIDE;
+ virtual void animate(double frameBeginTime) OVERRIDE;
+ virtual void layout() OVERRIDE;
+ virtual void paint(WebCanvas*, const WebRect&) OVERRIDE;
+ virtual void themeChanged() OVERRIDE;
+ virtual void composite(bool finish) OVERRIDE;
+ virtual bool handleInputEvent(const WebInputEvent&) OVERRIDE;
+ virtual void mouseCaptureLost() OVERRIDE;
+ virtual void setFocus(bool enable) OVERRIDE;
virtual bool setComposition(
const WebString& text,
const WebVector<WebCompositionUnderline>& underlines,
- int selectionStart, int selectionEnd);
- virtual bool confirmComposition();
- virtual bool confirmComposition(const WebString& text);
- virtual bool compositionRange(size_t* location, size_t* length);
- virtual WebTextInputType textInputType();
- virtual bool caretOrSelectionRange(size_t* location, size_t* length);
- virtual void setTextDirection(WebTextDirection direction);
- virtual bool isAcceleratedCompositingActive() const { return false; }
+ int selectionStart, int selectionEnd) OVERRIDE;
+ virtual bool confirmComposition() OVERRIDE;
+ virtual bool confirmComposition(const WebString& text) OVERRIDE;
+ virtual bool compositionRange(size_t* location, size_t* length) OVERRIDE;
+ virtual WebTextInputType textInputType() OVERRIDE;
+ virtual bool caretOrSelectionRange(size_t* location, size_t* length) OVERRIDE;
+ virtual void setTextDirection(WebTextDirection) OVERRIDE;
+ virtual bool isAcceleratedCompositingActive() const OVERRIDE { return false; }
// WebPopupMenuImpl
- void Init(WebCore::FramelessScrollView* widget,
- const WebRect& bounds);
+ void init(WebCore::FramelessScrollView* widget, const WebRect& bounds);
WebWidgetClient* client() { return m_client; }
- void MouseMove(const WebMouseEvent&);
- void MouseLeave(const WebMouseEvent&);
- void MouseDown(const WebMouseEvent&);
- void MouseUp(const WebMouseEvent&);
- void MouseDoubleClick(const WebMouseEvent&);
- void MouseWheel(const WebMouseWheelEvent&);
- bool GestureEvent(const WebGestureEvent&);
- bool TouchEvent(const WebTouchEvent&);
- bool KeyEvent(const WebKeyboardEvent&);
+ void handleMouseMove(const WebMouseEvent&);
+ void handleMouseLeave(const WebMouseEvent&);
+ void handleMouseDown(const WebMouseEvent&);
+ void handleMouseUp(const WebMouseEvent&);
+ void handleMouseDoubleClick(const WebMouseEvent&);
+ void handleMouseWheel(const WebMouseWheelEvent&);
+ bool handleGestureEvent(const WebGestureEvent&);
+ bool handleTouchEvent(const WebTouchEvent&);
+ bool handleKeyEvent(const WebKeyboardEvent&);
protected:
- friend class WebPopupMenu; // For WebPopupMenu::create
+ friend class WebPopupMenu; // For WebPopupMenu::create.
friend class WTF::RefCounted<WebPopupMenuImpl>;
- WebPopupMenuImpl(WebWidgetClient* client);
+ WebPopupMenuImpl(WebWidgetClient*);
~WebPopupMenuImpl();
// WebCore::HostWindow methods:
- virtual void invalidateContents(const WebCore::IntRect&, bool);
- virtual void invalidateRootView(const WebCore::IntRect&, bool);
- virtual void invalidateContentsAndRootView(const WebCore::IntRect&, bool);
- virtual void invalidateContentsForSlowScroll(const WebCore::IntRect&, bool);
- virtual void scheduleAnimation();
+ virtual void invalidateRootView(const WebCore::IntRect&, bool) OVERRIDE;
+ virtual void invalidateContentsAndRootView(const WebCore::IntRect&, bool) OVERRIDE;
+ virtual void invalidateContentsForSlowScroll(const WebCore::IntRect&, bool) OVERRIDE;
+ virtual void scheduleAnimation() OVERRIDE;
virtual void scroll(
const WebCore::IntSize& scrollDelta, const WebCore::IntRect& scrollRect,
- const WebCore::IntRect& clipRect);
- virtual WebCore::IntPoint screenToRootView(const WebCore::IntPoint&) const;
- virtual WebCore::IntRect rootViewToScreen(const WebCore::IntRect&) const;
- virtual PlatformPageClient platformPageClient() const { return 0; }
- virtual void scrollRectIntoView(const WebCore::IntRect&) const;
- virtual void scrollbarsModeDidChange() const;
- virtual void setCursor(const WebCore::Cursor&);
- virtual void setCursorHiddenUntilMouseMoves(bool);
+ const WebCore::IntRect& clipRect) OVERRIDE;
+ virtual WebCore::IntPoint screenToRootView(const WebCore::IntPoint&) const OVERRIDE;
+ virtual WebCore::IntRect rootViewToScreen(const WebCore::IntRect&) const OVERRIDE;
+ virtual PlatformPageClient platformPageClient() const OVERRIDE { return 0; }
+ virtual void scrollbarsModeDidChange() const OVERRIDE;
+ virtual void setCursor(const WebCore::Cursor&) OVERRIDE;
+ virtual void setCursorHiddenUntilMouseMoves(bool) OVERRIDE;
// WebCore::FramelessScrollViewClient methods:
- virtual void popupClosed(WebCore::FramelessScrollView*);
+ virtual void popupClosed(WebCore::FramelessScrollView*) OVERRIDE;
WebWidgetClient* m_client;
WebSize m_size;
WebPoint m_lastMousePosition;
- // This is a non-owning ref. The popup will notify us via popupClosed()
+ // This is a non-owning ref. The popup will notify us via popupClosed()
// before it is destroyed.
WebCore::FramelessScrollView* m_widget;
