diff options
| author | Ben Murdoch <benm@google.com> | 2014-09-02 12:02:39 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2014-09-02 11:06:39 +0000 |
| commit | b3c7f6e4e8519a2adda1d4f3452e5e4de378a545 (patch) | |
| tree | 3c825f4eb9127b310c6c927c51dd2a48c8091928 | |
| parent | 7206eb6036df6405e721d690c86093a9c2fbd004 (diff) | |
| download | chromium_src-b3c7f6e4e8519a2adda1d4f3452e5e4de378a545.zip chromium_src-b3c7f6e4e8519a2adda1d4f3452e5e4de378a545.tar.gz chromium_src-b3c7f6e4e8519a2adda1d4f3452e5e4de378a545.tar.bz2 | |
Fix a crash reported by monkey tests.
BUG=405504
Review URL: https://codereview.chromium.org/501473002
Cr-Commit-Position: refs/heads/master@{#292359}
(cherry picked from commit 0b0bc19551b54548a5653aed72084f8ce60b2019)
Review URL: https://codereview.chromium.org/531753002
Cr-Commit-Position: refs/branch-heads/2125@{#170}
Cr-Branched-From: b68026d94bda36dd106a3d91a098719f952a9477-refs/heads/master@{#290040}
| -rw-r--r-- | content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java b/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java index ac921de..84a8deb 100644 --- a/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java +++ b/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java @@ -447,6 +447,11 @@ public class ContentViewCore @SuppressWarnings("deprecation") // AbsoluteLayout public void setAnchorViewPosition( View view, float x, float y, float width, float height) { + if (view.getParent() == null) { + // Ignore. setAnchorViewPosition has been called after the anchor view has + // already been released. + return; + } assert view.getParent() == mContainerViewAtCreation; float scale = (float) DeviceDisplayInfo.create(mContext).getDIPScale(); |