Commit 03f9f9f3 authored by michaelbai's avatar michaelbai Committed by Commit bot

Remove never_lint from WebView

BUG=532593, 542435

Review URL: https://codereview.chromium.org/1397083003

Cr-Commit-Position: refs/heads/master@{#353956}
parent 40ba3ca8
...@@ -12,7 +12,6 @@ ...@@ -12,7 +12,6 @@
'variables': { 'variables': {
'native_lib_target': 'libwebviewchromium', 'native_lib_target': 'libwebviewchromium',
'native_lib_version_name': '<(version_full)', 'native_lib_version_name': '<(version_full)',
'never_lint': 1,
'shared_resources': 1, 'shared_resources': 1,
'extensions_to_not_compress': '.lpak,.pak,.bin,.dat', 'extensions_to_not_compress': '.lpak,.pak,.bin,.dat',
'asset_location': '<(INTERMEDIATE_DIR)/assets/', 'asset_location': '<(INTERMEDIATE_DIR)/assets/',
......
...@@ -10,7 +10,6 @@ ...@@ -10,7 +10,6 @@
'<(DEPTH)/android_webview/android_webview.gyp:android_webview_pak', '<(DEPTH)/android_webview/android_webview.gyp:android_webview_pak',
], ],
'variables': { 'variables': {
'never_lint': 1,
'resource_rewriter_package': 'com.android.webview.chromium', 'resource_rewriter_package': 'com.android.webview.chromium',
'resource_rewriter_dir': '<(intermediate_dir)/resource_rewriter', 'resource_rewriter_dir': '<(intermediate_dir)/resource_rewriter',
'resource_rewriter_path': '<(resource_rewriter_dir)/com/android/webview/chromium/ResourceRewriter.java', 'resource_rewriter_path': '<(resource_rewriter_dir)/com/android/webview/chromium/ResourceRewriter.java',
......
...@@ -4,6 +4,8 @@ ...@@ -4,6 +4,8 @@
package com.android.webview.chromium; package com.android.webview.chromium;
import android.annotation.SuppressLint;
import android.annotation.TargetApi;
import android.app.assist.AssistStructure.ViewNode; import android.app.assist.AssistStructure.ViewNode;
import android.content.Context; import android.content.Context;
import android.content.res.Configuration; import android.content.res.Configuration;
...@@ -196,6 +198,7 @@ class WebViewChromium implements WebViewProvider, WebViewProvider.ScrollDelegate ...@@ -196,6 +198,7 @@ class WebViewChromium implements WebViewProvider, WebViewProvider.ScrollDelegate
@Override @Override
// BUG=6790250 |javaScriptInterfaces| was only ever used by the obsolete DumpRenderTree // BUG=6790250 |javaScriptInterfaces| was only ever used by the obsolete DumpRenderTree
// so is ignored. TODO: remove it from WebViewProvider. // so is ignored. TODO: remove it from WebViewProvider.
@TargetApi(Build.VERSION_CODES.LOLLIPOP)
public void init(final Map<String, Object> javaScriptInterfaces, public void init(final Map<String, Object> javaScriptInterfaces,
final boolean privateBrowsing) { final boolean privateBrowsing) {
if (privateBrowsing) { if (privateBrowsing) {
...@@ -1712,6 +1715,7 @@ class WebViewChromium implements WebViewProvider, WebViewProvider.ScrollDelegate ...@@ -1712,6 +1715,7 @@ class WebViewChromium implements WebViewProvider, WebViewProvider.ScrollDelegate
} }
@Override @Override
@SuppressLint("DrawAllocation")
public void onDraw(final Canvas canvas) { public void onDraw(final Canvas canvas) {
mFactory.startYourEngines(true); mFactory.startYourEngines(true);
if (checkNeedsPost()) { if (checkNeedsPost()) {
...@@ -2008,6 +2012,7 @@ class WebViewChromium implements WebViewProvider, WebViewProvider.ScrollDelegate ...@@ -2008,6 +2012,7 @@ class WebViewChromium implements WebViewProvider, WebViewProvider.ScrollDelegate
} }
@Override @Override
@SuppressLint("DrawAllocation")
public void onMeasure(final int widthMeasureSpec, final int heightMeasureSpec) { public void onMeasure(final int widthMeasureSpec, final int heightMeasureSpec) {
mFactory.startYourEngines(false); mFactory.startYourEngines(false);
if (checkNeedsPost()) { if (checkNeedsPost()) {
......
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
package com.android.webview.chromium; package com.android.webview.chromium;
import android.annotation.TargetApi;
import android.content.Context; import android.content.Context;
import android.graphics.Bitmap; import android.graphics.Bitmap;
import android.graphics.BitmapFactory; import android.graphics.BitmapFactory;
...@@ -79,6 +80,8 @@ import java.util.WeakHashMap; ...@@ -79,6 +80,8 @@ import java.util.WeakHashMap;
* choose the latter, because it makes for a cleaner design. * choose the latter, because it makes for a cleaner design.
*/ */
@SuppressWarnings("deprecation") @SuppressWarnings("deprecation")
// You shouldn't change TargetApi, please see how Android M API was added.
@TargetApi(Build.VERSION_CODES.LOLLIPOP)
public class WebViewContentsClientAdapter extends AwContentsClient { public class WebViewContentsClientAdapter extends AwContentsClient {
// TAG is chosen for consistency with classic webview tracing. // TAG is chosen for consistency with classic webview tracing.
private static final String TAG = "WebViewCallback"; private static final String TAG = "WebViewCallback";
......
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
package com.android.webview.chromium; package com.android.webview.chromium;
import android.annotation.TargetApi;
import android.app.Application; import android.app.Application;
import android.content.Context; import android.content.Context;
import android.content.ContextWrapper; import android.content.ContextWrapper;
...@@ -11,6 +12,7 @@ import android.content.pm.PackageInfo; ...@@ -11,6 +12,7 @@ import android.content.pm.PackageInfo;
import android.content.res.AssetManager; import android.content.res.AssetManager;
import android.content.res.Resources; import android.content.res.Resources;
import android.graphics.Canvas; import android.graphics.Canvas;
import android.os.Build;
import android.os.Trace; import android.os.Trace;
import android.util.SparseArray; import android.util.SparseArray;
import android.view.View; import android.view.View;
...@@ -197,6 +199,7 @@ class WebViewDelegateFactory { ...@@ -197,6 +199,7 @@ class WebViewDelegateFactory {
* reflection to call into hidden frameworks APIs released in the API-21 version of the * reflection to call into hidden frameworks APIs released in the API-21 version of the
* framework. * framework.
*/ */
@TargetApi(Build.VERSION_CODES.LOLLIPOP)
private static class Api21CompatibilityDelegate implements WebViewDelegate { private static class Api21CompatibilityDelegate implements WebViewDelegate {
/** Copy of Trace.TRACE_TAG_WEBVIEW */ /** Copy of Trace.TRACE_TAG_WEBVIEW */
private static final long TRACE_TAG_WEBVIEW = 1L << 4; private static final long TRACE_TAG_WEBVIEW = 1L << 4;
......
...@@ -41,6 +41,10 @@ Still reading? ...@@ -41,6 +41,10 @@ Still reading?
<issue id="HandlerLeak"> <issue id="HandlerLeak">
<ignore path="remoting/android/java/src/org/chromium/chromoting/TapGestureDetector.java"/> <ignore path="remoting/android/java/src/org/chromium/chromoting/TapGestureDetector.java"/>
</issue> </issue>
<issue id="IconMissingDensityFolder">
<!-- see crbug.com/542435 -->
<ignore path="android_webview/apk/java/res" />
</issue>
<issue id="IconDensities"> <issue id="IconDensities">
<!-- crbug.com/457918 is tracking missing assets --> <!-- crbug.com/457918 is tracking missing assets -->
<ignore path="components/web_contents_delegate_android/android/java/res/drawable-xxhdpi"/> <ignore path="components/web_contents_delegate_android/android/java/res/drawable-xxhdpi"/>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment