diff options
| -rw-r--r-- | WebCore/dom/Node.cpp | 4 | ||||
| -rw-r--r-- | WebCore/platform/android/ScrollViewAndroid.cpp | 5 | ||||
| -rw-r--r-- | WebCore/platform/graphics/android/FontAndroid.cpp | 2 | ||||
| -rw-r--r-- | WebCore/plugins/PluginView.cpp | 2 | ||||
| -rw-r--r-- | WebCore/plugins/android/PluginViewAndroid.cpp | 2 |
5 files changed, 9 insertions, 6 deletions
diff --git a/WebCore/dom/Node.cpp b/WebCore/dom/Node.cpp index bda4aa9..ccea070 100644 --- a/WebCore/dom/Node.cpp +++ b/WebCore/dom/Node.cpp @@ -107,10 +107,6 @@ #include <runtime/JSGlobalData.h> #endif -#if ENABLE(TOUCH_EVENTS) -#include "ChromeClient.h" -#endif - #define DUMP_NODE_STATISTICS 0 using namespace std; diff --git a/WebCore/platform/android/ScrollViewAndroid.cpp b/WebCore/platform/android/ScrollViewAndroid.cpp index e45df53..f9e4285 100644 --- a/WebCore/platform/android/ScrollViewAndroid.cpp +++ b/WebCore/platform/android/ScrollViewAndroid.cpp @@ -97,12 +97,15 @@ void ScrollView::platformRepaintContentRectangle(const IntRect &rect, bool now) // vis from rect. This can compute up to four rectangular slices. void ScrollView::platformOffscreenContentRectangle(const IntRect& vis, const IntRect& rect) { + android::WebViewCore* core = android::WebViewCore::getWebViewCore(this); + if (!core) // SVG does not instantiate webviewcore + return; // and doesn't need to record drawing offscreen SkRegion rectRgn = SkRegion(rect); rectRgn.op(vis, SkRegion::kDifference_Op); SkRegion::Iterator iter(rectRgn); for (; !iter.done(); iter.next()) { const SkIRect& diff = iter.rect(); - android::WebViewCore::getWebViewCore(this)->offInvalidate(diff); + core->offInvalidate(diff); } } #endif diff --git a/WebCore/platform/graphics/android/FontAndroid.cpp b/WebCore/platform/graphics/android/FontAndroid.cpp index 0a67188..53d874a 100644 --- a/WebCore/platform/graphics/android/FontAndroid.cpp +++ b/WebCore/platform/graphics/android/FontAndroid.cpp @@ -188,7 +188,7 @@ FloatRect Font::selectionRectForComplexText(const TextRun& run, SkScalar spacing = paint.getFontMetrics(&metrics); return FloatRect(point.x(), - point.y() - floorf(SkScalarToFloat(-metrics.fAscent)), + point.y(), roundf(SkScalarToFloat(width)), roundf(SkScalarToFloat(spacing))); } diff --git a/WebCore/plugins/PluginView.cpp b/WebCore/plugins/PluginView.cpp index da01a43..fe24109 100644 --- a/WebCore/plugins/PluginView.cpp +++ b/WebCore/plugins/PluginView.cpp @@ -171,8 +171,10 @@ void PluginView::handleEvent(Event* event) else if (event->isKeyboardEvent()) handleKeyboardEvent(static_cast<KeyboardEvent*>(event)); #if defined(ANDROID_PLUGINS) +#if ENABLE(TOUCH_EVENTS) else if (event->isTouchEvent()) handleTouchEvent(static_cast<TouchEvent*>(event)); +#endif else if (event->type() == eventNames().DOMFocusOutEvent) handleFocusEvent(false); else if (event->type() == eventNames().DOMFocusInEvent) diff --git a/WebCore/plugins/android/PluginViewAndroid.cpp b/WebCore/plugins/android/PluginViewAndroid.cpp index ab6d365..cb069bc 100644 --- a/WebCore/plugins/android/PluginViewAndroid.cpp +++ b/WebCore/plugins/android/PluginViewAndroid.cpp @@ -185,6 +185,7 @@ void PluginView::platformDestroy() delete m_window; } +#if ENABLE(TOUCH_EVENTS) void PluginView::handleTouchEvent(TouchEvent* event) { if (!m_window->isAcceptingEvent(kTouch_ANPEventFlag)) @@ -228,6 +229,7 @@ void PluginView::handleTouchEvent(TouchEvent* event) if (m_window->sendEvent(evt)) event->preventDefault(); } +#endif void PluginView::handleMouseEvent(MouseEvent* event) { |