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

Side by Side Diff: android_webview/glue/java/src/com/android/webview/chromium/WebViewChromium.java

Issue 881383002: Return void in zoomBy plumbing to match zoomBy public API (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: always return true from WebViewChromium.zoomBy Created 5 years, 10 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
« no previous file with comments | « no previous file | android_webview/java/src/org/chromium/android_webview/AwContents.java » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 com.android.webview.chromium; 5 package com.android.webview.chromium;
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.Bitmap; 9 import android.graphics.Bitmap;
10 import android.graphics.Canvas; 10 import android.graphics.Canvas;
(...skipping 1430 matching lines...) Expand 10 before | Expand all | Expand 10 after
1441 @Override 1441 @Override
1442 public Boolean call() { 1442 public Boolean call() {
1443 return zoomOut(); 1443 return zoomOut();
1444 } 1444 }
1445 }); 1445 });
1446 return ret; 1446 return ret;
1447 } 1447 }
1448 return mAwContents.zoomOut(); 1448 return mAwContents.zoomOut();
1449 } 1449 }
1450 1450
1451 // TODO(paulmiller) Return void for consistency with AwContents.zoomBy and W ebView.zoomBy -
1452 // tricky because frameworks WebViewProvider.zoomBy must change simultaneous ly
1451 @Override 1453 @Override
1452 public boolean zoomBy(float factor) { 1454 public boolean zoomBy(float factor) {
1453 mFactory.startYourEngines(true); 1455 mFactory.startYourEngines(true);
1454 // This is an L API and therefore we can enforce stricter threading cons traints. 1456 // This is an L API and therefore we can enforce stricter threading cons traints.
1455 checkThread(); 1457 checkThread();
1456 return mAwContents.zoomBy(factor); 1458 mAwContents.zoomBy(factor);
1459 return true;
1457 } 1460 }
1458 1461
1459 @Override 1462 @Override
1460 public void dumpViewHierarchyWithProperties(BufferedWriter out, int level) { 1463 public void dumpViewHierarchyWithProperties(BufferedWriter out, int level) {
1461 // Intentional no-op 1464 // Intentional no-op
1462 } 1465 }
1463 1466
1464 @Override 1467 @Override
1465 public View findHierarchyView(String className, int hashCode) { 1468 public View findHierarchyView(String className, int hashCode) {
1466 // Intentional no-op 1469 // Intentional no-op
(...skipping 736 matching lines...) Expand 10 before | Expand all | Expand 10 after
2203 mAwContents.extractSmartClipData(x, y, width, height); 2206 mAwContents.extractSmartClipData(x, y, width, height);
2204 } 2207 }
2205 2208
2206 // Implements SmartClipProvider 2209 // Implements SmartClipProvider
2207 @Override 2210 @Override
2208 public void setSmartClipResultHandler(final Handler resultHandler) { 2211 public void setSmartClipResultHandler(final Handler resultHandler) {
2209 checkThread(); 2212 checkThread();
2210 mAwContents.setSmartClipResultHandler(resultHandler); 2213 mAwContents.setSmartClipResultHandler(resultHandler);
2211 } 2214 }
2212 } 2215 }
OLDNEW
« no previous file with comments | « no previous file | android_webview/java/src/org/chromium/android_webview/AwContents.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698