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

Issue 2136553002: Remove GetPlatformDefaultEGLNativeDisplay() function. (Closed)

Created:
4 years, 5 months ago by kylechar
Modified:
4 years, 5 months ago
Reviewers:
piman
CC:
chromium-reviews, kalyank, ozone-reviews_chromium.org
Base URL:
https://chromium.googlesource.com/chromium/src.git@master
Target Ref:
refs/pending/heads/master
Project:
chromium
Visibility:
Public.

Description

Remove GetPlatformDefaultEGLNativeDisplay() function. During EGL initialization GetPlatformDefaultEGLNativeDisplay() gets called. This function is conditionally compiled for each platform. Under Ozone the function calls into OzonePlatform to get the EGL native_display to use. This ordering requires that //ui/gl depends on //ui/ozone which we want to break. This CL removes GetPlatformDefaultEGLNativeDisplay() and instead passes in the EGL native_display to GLSurfaceEGL::InitializeOneOff() or GLSurfaceEGL::InitializeDisplay(). For tests EGL_DEFAULT_DISPLAY is always passed in. The GL initialization and autogen binding code needs to be rearranged to accomplish this. For EGL generated code split the client extension bindings and extension bindings into two separate methods. The client extension bindings need to be initialized before GLSurfaceEGL::InitializeDisplay() is called while the extension bindings need to be initialized after. Also fix a problem preventing generate_bindings.py from running with missing extension information due to a recent change. BUG=611142 Committed: https://crrev.com/7dd36fe1e9bab00078cecd98616364ccf5e8b957 Cr-Commit-Position: refs/heads/master@{#406643}

Patch Set 1 #

Patch Set 2 : Missing comment. #

Patch Set 3 : Rebase. #

Patch Set 4 : Fix win GYP linker settings. #

Patch Set 5 : Fix initialization order. #

Patch Set 6 : Fix test. #

Patch Set 7 : Add SetNativeDisplay back. #

Patch Set 8 : Rebase. #

Patch Set 9 : Back to original. #

Unified diffs Side-by-side diffs Delta from patch set Stats (+95 lines, -98 lines) Patch
M ui/gl/BUILD.gn View 1 2 3 4 5 6 7 2 chunks +0 lines, -3 lines 0 comments Download
M ui/gl/egl_api_unittest.cc View 1 2 3 4 5 6 7 8 2 chunks +3 lines, -0 lines 0 comments Download
M ui/gl/generate_bindings.py View 1 2 3 4 5 6 7 8 3 chunks +6 lines, -2 lines 0 comments Download
M ui/gl/gl.gyp View 1 2 3 4 1 chunk +0 lines, -3 lines 0 comments Download
M ui/gl/gl_bindings.h View 1 2 3 4 5 6 7 8 1 chunk +1 line, -0 lines 0 comments Download
M ui/gl/gl_bindings.cc View 7 8 1 chunk +1 line, -1 line 0 comments Download
M ui/gl/gl_bindings_autogen_egl.cc View 1 2 3 4 5 6 7 8 2 chunks +4 lines, -1 line 0 comments Download
M ui/gl/gl_egl_api_implementation.cc View 7 8 1 chunk +0 lines, -1 line 0 comments Download
M ui/gl/gl_surface_egl.h View 1 2 3 4 5 7 8 3 chunks +3 lines, -5 lines 0 comments Download
M ui/gl/gl_surface_egl.cc View 1 2 3 4 5 6 7 8 4 chunks +37 lines, -22 lines 0 comments Download
D ui/gl/gl_surface_egl_android.cc View 1 chunk +0 lines, -15 lines 0 comments Download
D ui/gl/gl_surface_egl_ozone.cc View 1 chunk +0 lines, -18 lines 0 comments Download
D ui/gl/gl_surface_egl_win.cc View 1 chunk +0 lines, -15 lines 0 comments Download
M ui/gl/gl_surface_egl_x11.cc View 2 chunks +0 lines, -5 lines 0 comments Download
M ui/gl/init/BUILD.gn View 2 chunks +5 lines, -0 lines 0 comments Download
M ui/gl/init/gl_init.gyp View 1 2 3 4 1 chunk +22 lines, -0 lines 0 comments Download
M ui/gl/init/gl_initializer_android.cc View 7 8 1 chunk +1 line, -1 line 0 comments Download
M ui/gl/init/gl_initializer_ozone.cc View 7 8 2 chunks +7 lines, -4 lines 0 comments Download
M ui/gl/init/gl_initializer_win.cc View 7 8 2 chunks +3 lines, -1 line 0 comments Download
M ui/gl/init/gl_initializer_x11.cc View 7 8 2 chunks +2 lines, -1 line 0 comments Download

Messages

Total messages: 48 (29 generated)
kylechar
4 years, 5 months ago (2016-07-08 16:47:25 UTC) #4
piman
LGTM, thanks for the refactor!
4 years, 5 months ago (2016-07-08 16:56:20 UTC) #5
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/2136553002/130001
4 years, 5 months ago (2016-07-14 18:18:54 UTC) #16
commit-bot: I haz the power
Try jobs failed on following builders: cast_shell_android on master.tryserver.chromium.android (JOB_FAILED, https://build.chromium.org/p/tryserver.chromium.android/builders/cast_shell_android/builds/96313)
4 years, 5 months ago (2016-07-14 19:09:43 UTC) #18
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/2136553002/130001
4 years, 5 months ago (2016-07-14 19:48:57 UTC) #20
commit-bot: I haz the power
Try jobs failed on following builders: linux_android_rel_ng on master.tryserver.chromium.android (JOB_FAILED, https://build.chromium.org/p/tryserver.chromium.android/builders/linux_android_rel_ng/builds/104206)
4 years, 5 months ago (2016-07-14 21:07:24 UTC) #22
kylechar
It seems like changing the initialization order to avoid adding a GLSurfaceEGL::SetNativeDisplay() is caused crashes ...
4 years, 5 months ago (2016-07-15 16:42:19 UTC) #25
piman
On 2016/07/15 16:42:19, kylechar wrote: > It seems like changing the initialization order to avoid ...
4 years, 5 months ago (2016-07-18 22:20:43 UTC) #29
chromium-reviews
No useful stack traces (no symbols) but here is the link to the logs from ...
4 years, 5 months ago (2016-07-18 23:55:31 UTC) #30
piman
On Mon, Jul 18, 2016 at 4:54 PM, Kyle Charbonneau <kylechar@google.com> wrote: > No useful ...
4 years, 5 months ago (2016-07-19 00:00:59 UTC) #31
chromium-reviews
Isn't the bug with ps6 just that it calls: void DriverEGL::InitializeExtensionBindings() { std::string extensions(GetPlatformExtensions()); and ...
4 years, 5 months ago (2016-07-19 19:05:26 UTC) #32
kylechar
Yep, that appears to be exactly why. It's not that it was called to early. ...
4 years, 5 months ago (2016-07-19 19:25:13 UTC) #33
piman
On Tue, Jul 19, 2016 at 12:25 PM, <kylechar@chromium.org> wrote: > Yep, that appears to ...
4 years, 5 months ago (2016-07-19 20:47:56 UTC) #34
kylechar
Alright, back to the original scheme. I split the client extension initialization and extension initialization ...
4 years, 5 months ago (2016-07-20 18:40:34 UTC) #38
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/2136553002/190001
4 years, 5 months ago (2016-07-20 19:38:31 UTC) #43
commit-bot: I haz the power
Committed patchset #9 (id:190001)
4 years, 5 months ago (2016-07-20 19:44:20 UTC) #44
commit-bot: I haz the power
CQ bit was unchecked.
4 years, 5 months ago (2016-07-20 19:44:30 UTC) #45
commit-bot: I haz the power
Patchset 9 (id:??) landed as https://crrev.com/7dd36fe1e9bab00078cecd98616364ccf5e8b957 Cr-Commit-Position: refs/heads/master@{#406643}
4 years, 5 months ago (2016-07-20 19:46:58 UTC) #47
piman
4 years, 5 months ago (2016-07-20 21:45:24 UTC) #48
Message was sent while issue was closed.
LGTM, thanks!

Powered by Google App Engine
This is Rietveld 408576698