diff options
author | ojan@chromium.org <ojan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-22 14:41:03 +0000 |
---|---|---|
committer | ojan@chromium.org <ojan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-22 14:41:03 +0000 |
commit | 44d7c9d4cbbe8e74c1089fc7334c33d387c6d1ac (patch) | |
tree | e0741b37ea82b9ddc5d7429bc783fa711eb4cfbe /android_webview/renderer | |
parent | 1ea08fc2ae33438e39fb16febcfd2cb6af7045ae (diff) | |
download | chromium_src-44d7c9d4cbbe8e74c1089fc7334c33d387c6d1ac.zip chromium_src-44d7c9d4cbbe8e74c1089fc7334c33d387c6d1ac.tar.gz chromium_src-44d7c9d4cbbe8e74c1089fc7334c33d387c6d1ac.tar.bz2 |
Mark WebViewClient subclasses that return a null layerTreeView.
In a followup blink-side patch, returning a null layerTreeView without
returning true from allowsBrokenNullLayerTreeView will assert.
Soon, we'll delete the null layerTreeView codepath entirely.
This is to make sure we have all the cases identified and so
that new ones don't get added.
Remove the null-check in RenderWidget::initializeLayerTreeView.
It never sets compositor_ to null and on the blink side we
assert as such.
Review URL: https://codereview.chromium.org/242953005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@265252 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'android_webview/renderer')
-rw-r--r-- | android_webview/renderer/print_web_view_helper.cc | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/android_webview/renderer/print_web_view_helper.cc b/android_webview/renderer/print_web_view_helper.cc index b9d38fd4..006a371 100644 --- a/android_webview/renderer/print_web_view_helper.cc +++ b/android_webview/renderer/print_web_view_helper.cc @@ -537,6 +537,11 @@ class PrepareFrameAndViewForPrint : public blink::WebViewClient, return owns_web_view_ && frame() && frame()->isLoading(); } + // TODO(ojan): Remove this override and have this class use a non-null + // layerTreeView. + // blink::WebViewClient override: + virtual bool allowsBrokenNullLayerTreeView() const; + protected: // blink::WebViewClient override: virtual void didStopLoading(); @@ -671,6 +676,10 @@ void PrepareFrameAndViewForPrint::CopySelection( frame()->loadRequest(blink::WebURLRequest(GURL(url_str))); } +bool PrepareFrameAndViewForPrint::allowsBrokenNullLayerTreeView() const { + return true; +} + void PrepareFrameAndViewForPrint::didStopLoading() { DCHECK(!on_ready_.is_null()); // Don't call callback here, because it can delete |this| and WebView that is |