diff options
| -rw-r--r-- | Source/JavaScriptCore/wtf/Platform.h | 2 | ||||
| -rw-r--r-- | Source/WebKit/android/nav/WebView.cpp | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/Source/JavaScriptCore/wtf/Platform.h b/Source/JavaScriptCore/wtf/Platform.h index fcd93c2..97fad0f 100644 --- a/Source/JavaScriptCore/wtf/Platform.h +++ b/Source/JavaScriptCore/wtf/Platform.h @@ -691,7 +691,7 @@ #define ENABLE_3D_RENDERING 1 #endif -#define ENABLE_ANDROID_NAVCACHE 1 +#define ENABLE_ANDROID_NAVCACHE 0 // ENABLE guards #define ENABLE_JAVA_BRIDGE 1 // Prevents Webkit from drawing the caret in textfields and textareas diff --git a/Source/WebKit/android/nav/WebView.cpp b/Source/WebKit/android/nav/WebView.cpp index 2bd76f5..7f7cf94 100644 --- a/Source/WebKit/android/nav/WebView.cpp +++ b/Source/WebKit/android/nav/WebView.cpp @@ -1311,7 +1311,8 @@ int getHandleLayerId(SelectText::HandleId handleId, SkIRect& cursorRect) { m_baseLayer->updateLayerPositions(m_visibleRect); LayerAndroid* root = compositeRoot(); LayerAndroid* layer = root ? root->findById(layerId) : 0; - rect = layer->drawTransform()->mapRect(rect); + if (layer && layer->drawTransform()) + rect = layer->drawTransform()->mapRect(rect); } cursorRect.set(rect.x(), rect.y(), rect.maxX(), rect.maxY()); return layerId; |