| 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.content.browser; | 5 package org.chromium.content.browser; |
| 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.Rect; | 10 import android.graphics.Rect; |
| (...skipping 203 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 214 @Override | 214 @Override |
| 215 protected int computeVerticalScrollOffset() { | 215 protected int computeVerticalScrollOffset() { |
| 216 return mContentViewCore.computeVerticalScrollOffset(); | 216 return mContentViewCore.computeVerticalScrollOffset(); |
| 217 } | 217 } |
| 218 | 218 |
| 219 @Override | 219 @Override |
| 220 protected int computeVerticalScrollRange() { | 220 protected int computeVerticalScrollRange() { |
| 221 return mContentViewCore.computeVerticalScrollRange(); | 221 return mContentViewCore.computeVerticalScrollRange(); |
| 222 } | 222 } |
| 223 | 223 |
| 224 @Override |
| 225 protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) { |
| 226 ContentViewClient client = mContentViewCore.getContentViewClient(); |
| 227 |
| 228 // Allow the ContentViewClient to override the ContentView's width. |
| 229 int desiredWidthMeasureSpec = client.getDesiredWidthMeasureSpec(); |
| 230 if (MeasureSpec.getMode(desiredWidthMeasureSpec) != MeasureSpec.UNSPECIF
IED) { |
| 231 widthMeasureSpec = desiredWidthMeasureSpec; |
| 232 } |
| 233 |
| 234 // Allow the ContentViewClient to override the ContentView's height. |
| 235 int desiredHeightMeasureSpec = client.getDesiredHeightMeasureSpec(); |
| 236 if (MeasureSpec.getMode(desiredHeightMeasureSpec) != MeasureSpec.UNSPECI
FIED) { |
| 237 heightMeasureSpec = desiredHeightMeasureSpec; |
| 238 } |
| 239 |
| 240 super.onMeasure(widthMeasureSpec, heightMeasureSpec); |
| 241 } |
| 242 |
| 224 // End FrameLayout overrides. | 243 // End FrameLayout overrides. |
| 225 | 244 |
| 226 @Override | 245 @Override |
| 227 public boolean awakenScrollBars(int startDelay, boolean invalidate) { | 246 public boolean awakenScrollBars(int startDelay, boolean invalidate) { |
| 228 return mContentViewCore.awakenScrollBars(startDelay, invalidate); | 247 return mContentViewCore.awakenScrollBars(startDelay, invalidate); |
| 229 } | 248 } |
| 230 | 249 |
| 231 @Override | 250 @Override |
| 232 public boolean awakenScrollBars() { | 251 public boolean awakenScrollBars() { |
| 233 return super.awakenScrollBars(); | 252 return super.awakenScrollBars(); |
| (...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 315 | 334 |
| 316 @Override | 335 @Override |
| 317 public boolean super_awakenScrollBars(int startDelay, boolean invalidate) { | 336 public boolean super_awakenScrollBars(int startDelay, boolean invalidate) { |
| 318 return super.awakenScrollBars(startDelay, invalidate); | 337 return super.awakenScrollBars(startDelay, invalidate); |
| 319 } | 338 } |
| 320 | 339 |
| 321 ////////////////////////////////////////////////////////////////////////////
/////////////////// | 340 ////////////////////////////////////////////////////////////////////////////
/////////////////// |
| 322 // End Implementation of ContentViewCore.InternalAccessDelega
te // | 341 // End Implementation of ContentViewCore.InternalAccessDelega
te // |
| 323 ////////////////////////////////////////////////////////////////////////////
/////////////////// | 342 ////////////////////////////////////////////////////////////////////////////
/////////////////// |
| 324 } | 343 } |
| OLD | NEW |