summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author John Reck <jreck@google.com> 2011-11-21 13:30:32 -0800
committer John Reck <jreck@google.com> 2011-11-21 13:30:32 -0800
commit0507ac4d94fc0ecb775391a7e80c921614f88a58 (patch)
tree4b1e876bbfd1ef6373e775aff6afac3c9e0c83a9
parent7859c1842c1f2e3c43415dfb5337a0b005bdb1c4 (diff)
Use isHighEndGfx to determine texture pool
Bug: 5639612 Change-Id: I0ccbf74c2638b61b7eb0769c851e74700f0aa191
-rw-r--r--core/java/android/webkit/WebView.java11
1 files changed, 9 insertions, 2 deletions
diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java
index 2e5f08fac70a..7045f8c29bca 100644
--- a/core/java/android/webkit/WebView.java
+++ b/core/java/android/webkit/WebView.java
@@ -17,6 +17,7 @@
package android.webkit;
import android.annotation.Widget;
+import android.app.ActivityManager;
import android.app.AlertDialog;
import android.content.BroadcastReceiver;
import android.content.ClipboardManager;
@@ -61,6 +62,7 @@ import android.speech.tts.TextToSpeech;
import android.util.AttributeSet;
import android.util.EventLog;
import android.util.Log;
+import android.view.Display;
import android.view.Gravity;
import android.view.HapticFeedbackConstants;
import android.view.HardwareCanvas;
@@ -77,6 +79,7 @@ import android.view.ViewConfiguration;
import android.view.ViewGroup;
import android.view.ViewParent;
import android.view.ViewTreeObserver;
+import android.view.WindowManager;
import android.view.accessibility.AccessibilityEvent;
import android.view.accessibility.AccessibilityManager;
import android.view.accessibility.AccessibilityNodeInfo;
@@ -8455,7 +8458,11 @@ public class WebView extends AbsoluteLayout
// nativeCreate sets mNativeClass to a non-zero value
String drawableDir = BrowserFrame.getRawResFilename(
BrowserFrame.DRAWABLEDIR, mContext);
- nativeCreate(msg.arg1, drawableDir);
+ WindowManager windowManager =
+ (WindowManager) mContext.getSystemService(Context.WINDOW_SERVICE);
+ Display display = windowManager.getDefaultDisplay();
+ nativeCreate(msg.arg1, drawableDir,
+ ActivityManager.isHighEndGfx(display));
if (mDelaySetPicture != null) {
setNewPicture(mDelaySetPicture, true);
mDelaySetPicture = null;
@@ -9484,7 +9491,7 @@ public class WebView extends AbsoluteLayout
private native Rect nativeCacheHitNodeBounds();
private native int nativeCacheHitNodePointer();
/* package */ native void nativeClearCursor();
- private native void nativeCreate(int ptr, String drawableDir);
+ private native void nativeCreate(int ptr, String drawableDir, boolean isHighEndGfx);
private native int nativeCursorFramePointer();
private native Rect nativeCursorNodeBounds();
private native int nativeCursorNodePointer();