Update mojo sdk to rev e083961bf11fd0c94d40be8853761da529b6d444

Update mojo sdk to rev e083961bf11fd0c94d40be8853761da529b6d444

TBR=jam@chromium.org

Committed: https://crrev.com/37273cab357d03ad9d2bcfa4ae467567ce93e2c4
Cr-Commit-Position: refs/heads/master@{#302038}

[Aaron Boodman, 2014-10-27 20:19:44]

aa@chromium.org changed reviewers:
+ jamesr@chromium.org

[jamesr, 2014-10-27 20:28:20]

mostly lgtm. there's one bit that changed on the chromium side in a way that we
should take, but we haven't updated the mojo repo with the change yet. Chromium
side change is:
https://chromium.googlesource.com/chromium/src/+/44d2e5c45975ab36f29035552521....
 Can either revert that part of this roll and then update the mojo side or land
the mojo side patch and regenerate the SDK roll - up to you

https://codereview.chromium.org/683583002/diff/1/content/common/render_frame_...
File content/common/render_frame_setup.mojom (right):

https://codereview.chromium.org/683583002/diff/1/content/common/render_frame_...
content/common/render_frame_setup.mojom:5: import
"../../mojo/public/interfaces/application/service_provider.mojom";
huh, not your change why the ../../ ? i thought mojom includes were resolved
relative to the root

https://codereview.chromium.org/683583002/diff/1/mojo/edk/system/channel_endp...
File mojo/edk/system/channel_endpoint_id.h (right):

https://codereview.chromium.org/683583002/diff/1/mojo/edk/system/channel_endp...
mojo/edk/system/channel_endpoint_id.h:139: #if defined(COMPILER_GCC)
actually we don't need this any more, the hashing in the chromium side got
better but it appears we didn't update the mojo repo to use the newer form. the
LHS here is the code we should have in the mojo repo

[Aaron Boodman, 2014-10-27 20:39:55]

On Mon, Oct 27, 2014 at 1:28 PM, <jamesr@chromium.org> wrote:

> mostly lgtm. there's one bit that changed on the chromium side in a way
> that we
> should take, but we haven't updated the mojo repo with the change yet.
> Chromium
> side change is:
> https://chromium.googlesource.com/chromium/src/+/
> 44d2e5c45975ab36f29035552521e41ae512c8bf.
>  Can either revert that part of this roll and then update the mojo side or
> land
> the mojo side patch and regenerate the SDK roll - up to you
>

Seems we should definitely not be taking partial rolls.

Can't I just land this as-is and then when we pull the change from Chromium
to mojo, it will naturally get propagated here on next roll.


>
>
> https://codereview.chromium.org/683583002/diff/1/content/
> common/render_frame_setup.mojom
> File content/common/render_frame_setup.mojom (right):
>
> https://codereview.chromium.org/683583002/diff/1/content/
> common/render_frame_setup.mojom#newcode5
> content/common/render_frame_setup.mojom:5: import
> "../../mojo/public/interfaces/application/service_provider.mojom";
> huh, not your change why the ../../ ? i thought mojom includes were
> resolved relative to the root
>
> https://codereview.chromium.org/683583002/diff/1/mojo/edk/
> system/channel_endpoint_id.h
> File mojo/edk/system/channel_endpoint_id.h (right):
>
> https://codereview.chromium.org/683583002/diff/1/mojo/edk/
> system/channel_endpoint_id.h#newcode139
> mojo/edk/system/channel_endpoint_id.h:139: #if defined(COMPILER_GCC)
> actually we don't need this any more, the hashing in the chromium side
> got better but it appears we didn't update the mojo repo to use the
> newer form. the LHS here is the code we should have in the mojo repo
>
> https://codereview.chromium.org/683583002/
>

To unsubscribe from this group and stop receiving emails from it, send an email
to chromium-reviews+unsubscribe@chromium.org.

[jamesr, 2014-10-27 20:48:02]

I believe the files was patched in the chromium checkin so it would compile
everywhere, so I don't think that'll work.

[jamesr, 2014-10-27 20:48:48]

Indeed:

FAILED: ninja -t msvc -e environment.x64 -- E:\b\build\goma/gomacc
"E:\b\depot_tools\win_toolchain\vs2013_files\VC\bin\amd64\cl.exe" /nologo
/showIncludes /FC
@obj\mojo\edk\system\mojo_message_pipe_perftests.message_pipe_perftest.obj.rsp
/c ..\..\mojo\edk\system\message_pipe_perftest.cc
/Foobj\mojo\edk\system\mojo_message_pipe_perftests.message_pipe_perftest.obj
/Fdobj\mojo\edk\mojo_message_pipe_perftests.cc.pdb 
e:\b\depot_tools\win_toolchain\vs2013_files\vc\include\xstddef(328) :error
C2338: The C++ Standard doesn't provide a hash for this type.
        e:\b\depot_tools\win_toolchain\vs2013_files\vc\include\type_traits(572)
: see reference to class template instantiation 'std::hash<Key>' being compiled
        with
        [
            Key=mojo::system::ChannelEndpointId
        ]
        e:\b\depot_tools\win_toolchain\vs2013_files\vc\include\xhash(196) : see
reference to class template instantiation 'std::is_empty<_Hasher>' being
compiled
        with
        [
            _Hasher=std::hash<mojo::system::ChannelEndpointId>
        ]
        e:\b\depot_tools\win_toolchain\vs2013_files\vc\include\xhash(220) : see
reference to class template instantiation
'std::_Hash_oper2<false,_Hasher,_Keyeq>' being compiled
        with
        [
            _Hasher=std::hash<mojo::system::ChannelEndpointId>
,            _Keyeq=std::equal_to<mojo::system::ChannelEndpointId>
        ]
        e:\b\depot_tools\win_toolchain\vs2013_files\vc\include\unordered_map(23)
: see reference to class template instantiation
'std::_Uhash_compare<_Kty,_Hasher,_Keyeq>' being compiled
        with
        [
            _Kty=mojo::system::ChannelEndpointId
,            _Hasher=std::hash<mojo::system::ChannelEndpointId>
,            _Keyeq=std::equal_to<mojo::system::ChannelEndpointId>
        ]
        e:\b\depot_tools\win_toolchain\vs2013_files\vc\include\xhash(255) : see
reference to class template instantiation
'std::_Umap_traits<_Kty,_Ty,std::_Uhash_compare<_Kty,_Hasher,_Keyeq>,_Alloc,false>'
being compiled
        with
        [
            _Kty=mojo::system::ChannelEndpointId
,            _Ty=scoped_refptr<mojo::system::ChannelEndpoint>
,            _Hasher=std::hash<mojo::system::ChannelEndpointId>
,            _Keyeq=std::equal_to<mojo::system::ChannelEndpointId>
,            _Alloc=std::allocator<std::pair<const
mojo::system::ChannelEndpointId,scoped_refptr<mojo::system::ChannelEndpoint>>>
        ]
        e:\b\depot_tools\win_toolchain\vs2013_files\vc\include\unordered_map(81)
: see reference to class template instantiation
'std::_Hash<std::_Umap_traits<_Kty,_Ty,std::_Uhash_compare<_Kty,_Hasher,_Keyeq>,_Alloc,false>>'
being compiled
        with
        [
            _Kty=mojo::system::ChannelEndpointId
,            _Ty=scoped_refptr<mojo::system::ChannelEndpoint>
,            _Hasher=std::hash<mojo::system::ChannelEndpointId>
,            _Keyeq=std::equal_to<mojo::system::ChannelEndpointId>
,            _Alloc=std::allocator<std::pair<const
mojo::system::ChannelEndpointId,scoped_refptr<mojo::system::ChannelEndpoint>>>
        ]
        e:\b\build\slave\win\build\src\mojo\edk\system\channel.h(182) : see
reference to class template instantiation
'std::unordered_map<mojo::system::ChannelEndpointId,scoped_refptr<mojo::system::ChannelEndpoint>,std::hash<Key>,std::equal_to<Key>,std::allocator<std::pair<const
Key,T>>>' being compiled
        with
        [
            Key=mojo::system::ChannelEndpointId
,            T=scoped_refptr<mojo::system::ChannelEndpoint>
        ]
ninja: build stopped: subcommand failed.

This part of the repo isn't merged as part of normal rolls since it lives
canonically in mojo, so someone will have to make the change in the mojo side
first.

[Aaron Boodman, 2014-10-28 22:37:54]

Patchset #2 (id:20001) has been deleted

[Aaron Boodman, 2014-10-28 22:38:48]

https://codereview.chromium.org/683583002/diff/1/content/common/render_frame_...
File content/common/render_frame_setup.mojom (right):

https://codereview.chromium.org/683583002/diff/1/content/common/render_frame_...
content/common/render_frame_setup.mojom:5: import
"../../mojo/public/interfaces/application/service_provider.mojom";
On 2014/10/27 20:28:19, jamesr wrote:
> huh, not your change why the ../../ ? i thought mojom includes were resolved
> relative to the root

shrug, done

https://codereview.chromium.org/683583002/diff/1/mojo/edk/system/channel_endp...
File mojo/edk/system/channel_endpoint_id.h (right):

https://codereview.chromium.org/683583002/diff/1/mojo/edk/system/channel_endp...
mojo/edk/system/channel_endpoint_id.h:139: #if defined(COMPILER_GCC)
On 2014/10/27 20:28:20, jamesr wrote:
> actually we don't need this any more, the hashing in the chromium side got
> better but it appears we didn't update the mojo repo to use the newer form.
the
> LHS here is the code we should have in the mojo repo

Done.

[Aaron Boodman, 2014-10-29 04:42:19]

The CQ bit was checked by aa@chromium.org

[commit-bot: I haz the power, 2014-10-29 04:42:49]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/683583002/60001

[commit-bot: I haz the power, 2014-10-29 04:49:23]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-10-29 04:49:25]

Try jobs failed on following builders:
  chromium_presubmit on tryserver.chromium.linux
(http://build.chromium.org/p/tryserver.chromium.linux/builders/chromium_presub...)

[Aaron Boodman, 2014-10-29 05:05:52]

The CQ bit was checked by aa@chromium.org

[commit-bot: I haz the power, 2014-10-29 05:06:46]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/683583002/60001

[commit-bot: I haz the power, 2014-10-29 05:46:08]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-10-29 05:46:09]

Try jobs failed on following builders:
  android_clang_dbg_recipe on tryserver.chromium.linux
(http://build.chromium.org/p/tryserver.chromium.linux/builders/android_clang_d...)

[Aaron Boodman, 2014-10-29 23:29:13]

The CQ bit was checked by aa@chromium.org

[commit-bot: I haz the power, 2014-10-29 23:30:01]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/683583002/100001

[commit-bot: I haz the power, 2014-10-29 23:41:34]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-10-29 23:41:35]

Try jobs failed on following builders:
  linux_gpu on tryserver.chromium.gpu
(http://build.chromium.org/p/tryserver.chromium.gpu/builders/linux_gpu/builds/...)
  android_dbg_tests_recipe on tryserver.chromium.linux
(http://build.chromium.org/p/tryserver.chromium.linux/builders/android_dbg_tes...)
  linux_chromium_gn_rel on tryserver.chromium.linux
(http://build.chromium.org/p/tryserver.chromium.linux/builders/linux_chromium_...)

[Aaron Boodman, 2014-10-30 04:38:27]

The CQ bit was checked by aa@chromium.org

[commit-bot: I haz the power, 2014-10-30 04:38:38]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/683583002/120001

[commit-bot: I haz the power, 2014-10-30 05:34:40]

Committed patchset #6 (id:120001)

[commit-bot: I haz the power, 2014-10-30 05:35:32]

Patchset 6 (id:??) landed as
https://crrev.com/37273cab357d03ad9d2bcfa4ae467567ce93e2c4
Cr-Commit-Position: refs/heads/master@{#302038}

[binjin, 2014-10-30 10:43:09]

A revert of this CL (patchset #6 id:120001) has been created in
https://codereview.chromium.org/694463002/ by binjin@chromium.org.

The reason for reverting is: Suspected to cause android bot failures:
New warnings.
Please fix, or perhaps add to
/b/build/slave/Android_Builder__dbg_/build/src/build/android/findbugs_filter/findbugs_known_bugs.txt
--------------------------------------------------------------------------------
M D DLS: Dead store to other in
org.chromium.mojo.bindings.test.mojom.imported.ImportedInterface_Internal$ImportedInterfaceDoSomethingParams.equals(Object)
 At ImportedInterface_Internal.java
M D DLS: Dead store to other in
org.chromium.mojo.bindings.test.mojom.math.Calculator_Internal$CalculatorClearParams.equals(Object)
 At Calculator_Internal.java
M D DLS: Dead store to other in
org.chromium.mojo.bindings.test.mojom.mojo.IntegrationTestInterface2_Internal$IntegrationTestInterface2Method0Params.equals(Object)
 At IntegrationTestInterface2_Internal.java
M D DLS: Dead store to other in
org.chromium.mojo.bindings.test.mojom.regression_tests.CheckMethodWithEmptyResponse_Internal$CheckMethodWithEmptyResponseWithParameterAndEmptyResponseResponseParams.equals(Object)
 At CheckMethodWithEmptyResponse_Internal.java
M D DLS: Dead store to other in
org.chromium.mojo.bindings.test.mojom.regression_tests.CheckMethodWithEmptyResponse_Internal$CheckMethodWithEmptyResponseWithouParameterAndEmptyResponseParams.equals(Object)
 At CheckMethodWithEmptyResponse_Internal.java
M D DLS: Dead store to other in
org.chromium.mojo.bindings.test.mojom.regression_tests.CheckMethodWithEmptyResponse_Internal$CheckMethodWithEmptyResponseWithouParameterAndEmptyResponseResponseParams.equals(Object)
 At CheckMethodWithEmptyResponse_Internal.java
M D DLS: Dead store to other in
org.chromium.mojo.bindings.test.mojom.regression_tests.EmptyStruct.equals(Object)
 At EmptyStruct.java
M D DLS: Dead store to other in
org.chromium.mojo.bindings.test.mojom.sample.NamedObject_Internal$NamedObjectGetNameParams.equals(Object)
 At NamedObject_Internal.java
M D DLS: Dead store to other in
org.chromium.mojo.bindings.test.mojom.test_structs.EmptyStruct.equals(Object) 
At EmptyStruct.java
--------------------------------------------------------------------------------

*** 9 FindBugs warnings! ***
*** 9: new ***

.

[qsr, 2014-10-30 11:39:26]

Findbugs errors fixed by: https://codereview.chromium.org/692823003