| Index: content/public/android/java/src/org/chromium/content/browser/PopupZoomer.java
|
| diff --git a/content/public/android/java/src/org/chromium/content/browser/PopupZoomer.java b/content/public/android/java/src/org/chromium/content/browser/PopupZoomer.java
|
| index 62ef0a00622c985abaa3cd3ffbae9cb19e28dc88..bec4df581dd348df7631b23d3a57e622c6c2f034 100644
|
| --- a/content/public/android/java/src/org/chromium/content/browser/PopupZoomer.java
|
| +++ b/content/public/android/java/src/org/chromium/content/browser/PopupZoomer.java
|
| @@ -55,7 +55,7 @@ class PopupZoomer extends View {
|
| public boolean onLongPress(View v, MotionEvent event);
|
| }
|
|
|
| - private OnTapListener mOnTapListener = null;
|
| + private OnTapListener mOnTapListener;
|
|
|
| /**
|
| * Interface to be implemented to add and remove PopupZoomer to/from the view hierarchy.
|
| @@ -65,7 +65,7 @@ class PopupZoomer extends View {
|
| public void onPopupZoomerHidden(PopupZoomer zoomer);
|
| }
|
|
|
| - private OnVisibilityChangedListener mOnVisibilityChangedListener = null;
|
| + private OnVisibilityChangedListener mOnVisibilityChangedListener;
|
|
|
| // Cached drawable used to frame the zooming popup.
|
| // TODO(tonyg): This should be marked purgeable so that if the system wants to recover this
|
| @@ -80,14 +80,14 @@ class PopupZoomer extends View {
|
| private final Interpolator mShowInterpolator = new OvershootInterpolator();
|
| private final Interpolator mHideInterpolator = new ReverseInterpolator(mShowInterpolator);
|
|
|
| - private boolean mAnimating = false;
|
| - private boolean mShowing = false;
|
| - private long mAnimationStartTime = 0;
|
| + private boolean mAnimating;
|
| + private boolean mShowing;
|
| + private long mAnimationStartTime;
|
|
|
| // The time that was left for the outwards animation to finish.
|
| // This is used in the case that the zoomer is cancelled while it is still animating outwards,
|
| // to avoid having it jump to full size then animate closed.
|
| - private long mTimeLeft = 0;
|
| + private long mTimeLeft;
|
|
|
| // initDimensions() needs to be called in onDraw().
|
| private boolean mNeedsToInitDimensions;
|
| @@ -103,7 +103,7 @@ class PopupZoomer extends View {
|
|
|
| // How far to shift the canvas after all zooming is done, to keep it inside the bounds of the
|
| // view (including margin).
|
| - private float mShiftX = 0, mShiftY = 0;
|
| + private float mShiftX, mShiftY;
|
| // The magnification factor of the popup. It is recomputed once we have mTargetBounds and
|
| // mZoomedBitmap.
|
| private float mScale = 1.0f;
|
|
|