OLD | NEW |
1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 package org.chromium.android_webview.test; | 5 package org.chromium.android_webview.test; |
6 | 6 |
7 import android.content.Context; | 7 import android.content.Context; |
8 import android.content.res.Configuration; | 8 import android.content.res.Configuration; |
9 import android.graphics.Canvas; | 9 import android.graphics.Canvas; |
10 import android.graphics.PixelFormat; | 10 import android.graphics.PixelFormat; |
(...skipping 186 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
197 DrawGL.drawGL(mDrawGL, mViewContext, width, height, 0, 0, MO
DE_SYNC); | 197 DrawGL.drawGL(mDrawGL, mViewContext, width, height, 0, 0, MO
DE_SYNC); |
198 mCommittedScrollX = mLastScrollX; | 198 mCommittedScrollX = mLastScrollX; |
199 mCommittedScrollY = mLastScrollY; | 199 mCommittedScrollY = mLastScrollY; |
200 } | 200 } |
201 mNeedsDrawGL = false; | 201 mNeedsDrawGL = false; |
202 mNeedsProcessGL = false; | 202 mNeedsProcessGL = false; |
203 if (!waitForCompletion) { | 203 if (!waitForCompletion) { |
204 mSyncLock.notifyAll(); | 204 mSyncLock.notifyAll(); |
205 } | 205 } |
206 } | 206 } |
| 207 if (process) { |
| 208 DrawGL.drawGL(mDrawGL, mViewContext, width, height, 0, 0, MODE_P
ROCESS); |
| 209 } |
207 if (draw) { | 210 if (draw) { |
208 DrawGL.drawGL(mDrawGL, mViewContext, width, height, | 211 DrawGL.drawGL(mDrawGL, mViewContext, width, height, |
209 mCommittedScrollX, mCommittedScrollY, MODE_DRAW); | 212 mCommittedScrollX, mCommittedScrollY, MODE_DRAW); |
210 } else if (process) { | |
211 DrawGL.drawGL(mDrawGL, mViewContext, width, height, 0, 0, MODE_P
ROCESS); | |
212 } | 213 } |
213 | 214 |
214 if (waitForCompletion) { | 215 if (waitForCompletion) { |
215 synchronized (mSyncLock) { | 216 synchronized (mSyncLock) { |
216 mWaitForCompletion = false; | 217 mWaitForCompletion = false; |
217 mSyncLock.notifyAll(); | 218 mSyncLock.notifyAll(); |
218 } | 219 } |
219 } | 220 } |
220 } | 221 } |
221 } | 222 } |
(...skipping 286 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
508 public void setMeasuredDimension(int measuredWidth, int measuredHeight)
{ | 509 public void setMeasuredDimension(int measuredWidth, int measuredHeight)
{ |
509 AwTestContainerView.super.setMeasuredDimension(measuredWidth, measur
edHeight); | 510 AwTestContainerView.super.setMeasuredDimension(measuredWidth, measur
edHeight); |
510 } | 511 } |
511 | 512 |
512 @Override | 513 @Override |
513 public int super_getScrollBarStyle() { | 514 public int super_getScrollBarStyle() { |
514 return AwTestContainerView.super.getScrollBarStyle(); | 515 return AwTestContainerView.super.getScrollBarStyle(); |
515 } | 516 } |
516 } | 517 } |
517 } | 518 } |
OLD | NEW |