Fix GPU acceleration on Intel GMA*

Fix GPU acceleration on Intel GMA*

BUG=578303
R=Zhenyao Mo, Ken Russell
CQ_INCLUDE_TRYBOTS=tryserver.chromium.win:win_optional_gpu_tests_rel

Committed: https://crrev.com/04f05e57fe272290b9ceddb288d919434277165e
Cr-Commit-Position: refs/heads/master@{#376827}

[Lof, 2016-02-22 15:44:25]

Description was changed from

==========
Fix GPU acceleration on Intel GMA*

BUG=578303
R=Zhenyao Mo, Ken Russell
==========

to

==========
Fix GPU acceleration on Intel GMA*

BUG=578303
R=Zhenyao Mo, Ken Russell
CQ_INCLUDE_TRYBOTS=tryserver.chromium.win:win_optional_gpu_tests_rel
==========

[Lof, 2016-02-22 15:48:13]

Hi!

GPU acceleration was broken in https://codereview.chromium.org/1503223005 on
Intel GMA*
It's due to drivers.size() == 2 (same gpu) here 
https://code.google.com/p/chromium/codesearch#chromium/src/gpu/config/gpu_inf...
So I wrote test for this case.

[Zhenyao Mo, 2016-02-22 17:05:21]

https://codereview.chromium.org/1719113002/diff/1/gpu/config/gpu_control_list.cc
File gpu/config/gpu_control_list.cc (right):

https://codereview.chromium.org/1719113002/diff/1/gpu/config/gpu_control_list...
gpu/config/gpu_control_list.cc:1155: if (gpu_info.secondary_gpus[ii].active ||
candidates.empty())
This logic doesn't look right.

It should be after this for-loop, if candidates.empty(), push_back gpu_info.gpu.

[Lof, 2016-02-22 17:21:19]

On 2016/02/22 17:05:21, Zhenyao Mo wrote:
> This logic doesn't look right.
> It should be after this for-loop, if candidates.empty(), push_back
gpu_info.gpu.
You are right. Fixed.

[Zhenyao Mo, 2016-02-22 17:24:34]

On 2016/02/22 17:21:19, Lof wrote:
> On 2016/02/22 17:05:21, Zhenyao Mo wrote:
> > This logic doesn't look right.
> > It should be after this for-loop, if candidates.empty(), push_back
> gpu_info.gpu.
> You are right. Fixed.

lgtm

Thanks for fixing this.

[Ken Russell (switch to Gerrit), 2016-02-22 19:41:16]

lgtm too for what it's worth.

[Lof, 2016-02-22 20:28:42]

The CQ bit was checked by lof84@yandex-team.ru

[commit-bot: I haz the power, 2016-02-22 20:30:57]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1719113002/20001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1719113002/20001

[commit-bot: I haz the power, 2016-02-22 22:21:28]

Committed patchset #2 (id:20001)

[commit-bot: I haz the power, 2016-02-22 22:22:57]

Description was changed from

==========
Fix GPU acceleration on Intel GMA*

BUG=578303
R=Zhenyao Mo, Ken Russell
CQ_INCLUDE_TRYBOTS=tryserver.chromium.win:win_optional_gpu_tests_rel
==========

to

==========
Fix GPU acceleration on Intel GMA*

BUG=578303
R=Zhenyao Mo, Ken Russell
CQ_INCLUDE_TRYBOTS=tryserver.chromium.win:win_optional_gpu_tests_rel

Committed: https://crrev.com/04f05e57fe272290b9ceddb288d919434277165e
Cr-Commit-Position: refs/heads/master@{#376827}
==========

[commit-bot: I haz the power, 2016-02-22 22:22:57]

Patchset 2 (id:??) landed as
https://crrev.com/04f05e57fe272290b9ceddb288d919434277165e
Cr-Commit-Position: refs/heads/master@{#376827}