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

Issue 2514633002: Revert of Android: support multiple displays on C++ side (Closed)

Created:
4 years, 1 month ago by Tima Vaisburd
Modified:
4 years, 1 month ago
CC:
chromium-reviews, jam, darin-cc_chromium.org, agrieve+watch_chromium.org
Target Ref:
refs/pending/heads/master
Project:
chromium
Visibility:
Public.

Description

Revert of Android: support multiple displays on C++ side (patchset #32 id:690001 of https://codereview.chromium.org/2416403002/ ) Reason for revert: Revert to see whether it fixes failures in webkit_tests, e.g. https://uberchromegw.corp.google.com/i/chromium.webkit/builders/WebKit%20Android%20%28Nexus4%29/builds/57004 see http://crbug.com/666420 unexpected_failures: svg/batik/text/textAnchor3.svg images/paletted-png-with-color-profile.html svg/W3C-SVG-1.1-SE/coords-dom-02-f.svg svg/as-background-image/svg-width-100p-as-background.html Original issue's description: > Android: support multiple displays on C++ side > > Starting with API 17 Android can have multiple displays. > > CL https://codereview.chromium.org/2361633002 introduced the map > of DisplayAndroid objects on Java side. This CL uses the information > from Java layer to maintain a similar map on the native side. > > Similar to other platforms, an individual display is represented > by a Display object, and the collection of all displays in the > system is the Screen object. The Screen object for Android > maintains the mapping between the Android display ID and Display > and receives updates from DisplayAndroidManager.java through JNI. > Therefore the Screen implementation is placed in DisplayAndroidManager > class. > > The Screen interface assumes the existence of the primary display. > To support this we always add the primary display on the Java side > (it is propagated to native) during the initialization of > DisplayAndroidManager.java > > Native DisplayAndroidManager obtains the display ID from WindowAndroid > and thus depends on /ui/android. This CL places the manager in /ui/android > as well. Because of this we have to explicitly initialize the Screen > singleton by calling SetScreenAndroid() (similar to > other platforms) instead of creating the Screen object on demand. > > The explicit initialization of the Screen happens on most platforms, > and required some tests modification. > > Note: the explicit initialization of the Android Screen object required > some tests modification. Since the screen used to be created on demand, > we could have missed some tests that run on Android and not > covered by CQ. > > BUG=625089 > > Committed: https://crrev.com/3da850c3bfadcf3d83407bb4aa9b1e047cbd44a8 > Cr-Commit-Position: refs/heads/master@{#432310} TBR=boliu@chromium.org,tedchoc@chromium.org,mthiesse@chromium.org,sky@chromium.org,derat@chromium.org # Not skipping CQ checks because original CL landed more than 1 days ago. BUG=625089 Committed: https://crrev.com/ece04082b79fd30261b48ad895e7f05beeda7823 Cr-Commit-Position: refs/heads/master@{#433108}

Patch Set 1 #

Unified diffs Side-by-side diffs Delta from patch set Stats (+103 lines, -527 lines) Patch
M content/browser/browser_main_loop.cc View 2 chunks +0 lines, -7 lines 0 comments Download
M content/browser/renderer_host/render_widget_host_unittest.cc View 3 chunks +0 lines, -3 lines 0 comments Download
M content/public/test/test_renderer_host.h View 2 chunks +0 lines, -5 lines 0 comments Download
M content/public/test/test_renderer_host.cc View 3 chunks +0 lines, -6 lines 0 comments Download
M content/test/BUILD.gn View 2 chunks +0 lines, -2 lines 0 comments Download
M ui/android/BUILD.gn View 3 chunks +0 lines, -17 lines 0 comments Download
M ui/android/DEPS View 1 chunk +2 lines, -1 line 0 comments Download
D ui/android/display_android_manager.h View 1 chunk +0 lines, -59 lines 0 comments Download
D ui/android/display_android_manager.cc View 1 chunk +0 lines, -119 lines 0 comments Download
D ui/android/dummy_screen_android.h View 1 chunk +0 lines, -22 lines 0 comments Download
D ui/android/dummy_screen_android.cc View 1 chunk +0 lines, -63 lines 0 comments Download
M ui/android/java/src/org/chromium/ui/base/WindowAndroid.java View 3 chunks +4 lines, -8 lines 0 comments Download
M ui/android/java/src/org/chromium/ui/display/DisplayAndroid.java View 6 chunks +9 lines, -100 lines 0 comments Download
M ui/android/java/src/org/chromium/ui/display/DisplayAndroidManager.java View 6 chunks +12 lines, -71 lines 0 comments Download
D ui/android/screen_android.h View 1 chunk +0 lines, -23 lines 0 comments Download
M ui/android/ui_android_jni_registrar.cc View 1 chunk +0 lines, -2 lines 0 comments Download
M ui/android/window_android.h View 3 chunks +1 line, -11 lines 0 comments Download
M ui/android/window_android.cc View 3 chunks +5 lines, -6 lines 0 comments Download
M ui/display/BUILD.gn View 2 chunks +4 lines, -1 line 0 comments Download
A ui/display/android/screen_android.cc View 1 chunk +65 lines, -0 lines 0 comments Download
M ui/display/screen.cc View 1 chunk +1 line, -1 line 0 comments Download

Messages

Total messages: 8 (3 generated)
Tima Vaisburd
Created Revert of Android: support multiple displays on C++ side
4 years, 1 month ago (2016-11-18 00:20:57 UTC) #2
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.org/2514633002/1
4 years, 1 month ago (2016-11-18 00:23:15 UTC) #3
commit-bot: I haz the power
Committed patchset #1 (id:1)
4 years, 1 month ago (2016-11-18 04:39:19 UTC) #5
commit-bot: I haz the power
Patchset 1 (id:??) landed as https://crrev.com/ece04082b79fd30261b48ad895e7f05beeda7823 Cr-Commit-Position: refs/heads/master@{#433108}
4 years, 1 month ago (2016-11-18 04:45:08 UTC) #7
Matt Giuca
4 years, 1 month ago (2016-11-18 04:57:05 UTC) #8
Message was sent while issue was closed.
On 2016/11/18 04:45:08, commit-bot: I haz the power wrote:
> Patchset 1 (id:??) landed as
> https://crrev.com/ece04082b79fd30261b48ad895e7f05beeda7823
> Cr-Commit-Position: refs/heads/master@{#433108}

It finally landed!

PS: Please set BUG= when creating a revert to include the tracking bug for the
test failure (i.e., in this case 666420), so that when it lands it shows up in
that bug.

Powered by Google App Engine
This is Rietveld 408576698