Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(110)

Side by Side Diff: chrome/android/java/src/org/chromium/chrome/browser/compositor/CompositorViewHolder.java

Issue 2201483002: Improve transition between opaque and translucent compositor views. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: replaced hide logic with one counter Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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.chrome.browser.compositor; 5 package org.chromium.chrome.browser.compositor;
6 6
7 import android.content.Context; 7 import android.content.Context;
8 import android.graphics.Canvas; 8 import android.graphics.Canvas;
9 import android.graphics.Color; 9 import android.graphics.Color;
10 import android.graphics.Paint; 10 import android.graphics.Paint;
11 import android.graphics.Rect; 11 import android.graphics.Rect;
12 import android.graphics.RectF; 12 import android.graphics.RectF;
13 import android.os.Bundle; 13 import android.os.Bundle;
14 import android.os.Handler; 14 import android.os.Handler;
15 import android.support.design.widget.CoordinatorLayout; 15 import android.support.design.widget.CoordinatorLayout;
16 import android.support.v4.view.ViewCompat; 16 import android.support.v4.view.ViewCompat;
17 import android.support.v4.view.accessibility.AccessibilityEventCompat; 17 import android.support.v4.view.accessibility.AccessibilityEventCompat;
18 import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat; 18 import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat;
19 import android.support.v4.widget.ExploreByTouchHelper; 19 import android.support.v4.widget.ExploreByTouchHelper;
20 import android.util.AttributeSet; 20 import android.util.AttributeSet;
21 import android.util.Pair; 21 import android.util.Pair;
22 import android.view.DragEvent; 22 import android.view.DragEvent;
23 import android.view.MotionEvent; 23 import android.view.MotionEvent;
24 import android.view.SurfaceView;
25 import android.view.View; 24 import android.view.View;
26 import android.view.ViewGroup; 25 import android.view.ViewGroup;
27 import android.view.accessibility.AccessibilityEvent; 26 import android.view.accessibility.AccessibilityEvent;
28 import android.widget.FrameLayout; 27 import android.widget.FrameLayout;
29 28
30 import org.chromium.base.SysUtils; 29 import org.chromium.base.SysUtils;
31 import org.chromium.base.TraceEvent; 30 import org.chromium.base.TraceEvent;
32 import org.chromium.base.annotations.SuppressFBWarnings; 31 import org.chromium.base.annotations.SuppressFBWarnings;
33 import org.chromium.chrome.R; 32 import org.chromium.chrome.R;
34 import org.chromium.chrome.browser.compositor.Invalidator.Client; 33 import org.chromium.chrome.browser.compositor.Invalidator.Client;
(...skipping 382 matching lines...) Expand 10 before | Expand all | Expand 10 after
417 } 416 }
418 417
419 /** 418 /**
420 * @return The {@link LayoutManager} associated with this view. 419 * @return The {@link LayoutManager} associated with this view.
421 */ 420 */
422 public LayoutManager getLayoutManager() { 421 public LayoutManager getLayoutManager() {
423 return mLayoutManager; 422 return mLayoutManager;
424 } 423 }
425 424
426 /** 425 /**
427 * @return The SurfaceView used by the Compositor. 426 * @return The SurfaceView proxy used by the Compositor.
428 */ 427 */
429 public SurfaceView getSurfaceView() { 428 public View getCompositorView() {
430 return mCompositorView; 429 return mCompositorView;
431 } 430 }
432 431
433 private View getActiveView() { 432 private View getActiveView() {
434 if (mLayoutManager == null || mTabModelSelector == null) return null; 433 if (mLayoutManager == null || mTabModelSelector == null) return null;
435 Tab tab = mTabModelSelector.getCurrentTab(); 434 Tab tab = mTabModelSelector.getCurrentTab();
436 return tab != null ? tab.getContentView() : null; 435 return tab != null ? tab.getContentView() : null;
437 } 436 }
438 437
439 private ContentViewCore getActiveContent() { 438 private ContentViewCore getActiveContent() {
(...skipping 689 matching lines...) Expand 10 before | Expand all | Expand 10 after
1129 if (mPixelRect.width() == 0) { 1128 if (mPixelRect.width() == 0) {
1130 mPixelRect.right = mPixelRect.left + 1; 1129 mPixelRect.right = mPixelRect.left + 1;
1131 } 1130 }
1132 if (mPixelRect.height() == 0) { 1131 if (mPixelRect.height() == 0) {
1133 mPixelRect.bottom = mPixelRect.top + 1; 1132 mPixelRect.bottom = mPixelRect.top + 1;
1134 } 1133 }
1135 return mPixelRect; 1134 return mPixelRect;
1136 } 1135 }
1137 } 1136 }
1138 } 1137 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698