[Merge M54] aw: Fix FBO restore in webview functor

[Merge M54] aw: Fix FBO restore in webview functor

See bug for problem description.

Have AwGLSurface get the current FBO directly from
ScopedAppGLStateRestore. Conceptually ScopedAppGLStateRestore would be
in the ui/gl layer, so having AwGLSurface access it directly isn't
really a problem.

Seems a lot cleaner than dependency injection which involves crossing
many (conceptual) layers anyway. Global is bad, but any time GL executes
without ScopedAppGLStateRestore would indicate bigger bugs, so in
practice should be ok.

BUG=649738
Review-Url: https://codereview.chromium.org/2360423003
Cr-Commit-Position: refs/heads/master@{#420913}
(cherry picked from commit cf4731774e0d1110244be09be8cb456f83f5ce44)

Committed: https://chromium.googlesource.com/chromium/src/+/ea2934399b34646b59c0e5dc5793b52847ff69b6

[boliu, 2016-09-27 20:58:50]

Description was changed from

==========
[Merge M54] aw: Fix FBO restore in webview functor

See bug for problem description.

Have AwGLSurface get the current FBO directly from
ScopedAppGLStateRestore. Conceptually ScopedAppGLStateRestore would be
in the ui/gl layer, so having AwGLSurface access it directly isn't
really a problem.

Seems a lot cleaner than dependency injection which involves crossing
many (conceptual) layers anyway. Global is bad, but any time GL executes
without ScopedAppGLStateRestore would indicate bigger bugs, so in
practice should be ok.

BUG=649738

Review-Url: https://codereview.chromium.org/2360423003
Cr-Commit-Position: refs/heads/master@{#420913}
(cherry picked from commit cf4731774e0d1110244be09be8cb456f83f5ce44)
==========

to

==========
[Merge M54] aw: Fix FBO restore in webview functor

See bug for problem description.

Have AwGLSurface get the current FBO directly from
ScopedAppGLStateRestore. Conceptually ScopedAppGLStateRestore would be
in the ui/gl layer, so having AwGLSurface access it directly isn't
really a problem.

Seems a lot cleaner than dependency injection which involves crossing
many (conceptual) layers anyway. Global is bad, but any time GL executes
without ScopedAppGLStateRestore would indicate bigger bugs, so in
practice should be ok.

BUG=649738

Review-Url: https://codereview.chromium.org/2360423003
Cr-Commit-Position: refs/heads/master@{#420913}
(cherry picked from commit cf4731774e0d1110244be09be8cb456f83f5ce44)

Committed:
https://chromium.googlesource.com/chromium/src/+/ea2934399b34646b59c0e5dc5793...
==========

[boliu, 2016-09-27 20:58:52]

Committed patchset #1 (id:1) manually as
ea2934399b34646b59c0e5dc5793b52847ff69b6.