1168075 - [bluetooth2] Build break on flame-kk after enabling bluetooth api v2.

Status: RESOLVED FIXED

(Core :: WebRTC, defect)

Description

[Bruce Sun [:brsun]]

We encounter build breaks on flame-kk when building bluetooth2[1] using m-c.

It might be related to missing header files in |CanvasCaptureMediaStream.h|.

[1] https://bugzilla.mozilla.org/attachment.cgi?id=8606105

Comment 1

[Bruce Sun [:brsun]]

Attachment: bug1168075_canvas_capture_media_stream_build_fail.patch

Hi Andreas,

I've tried this patch and it can make my flame-kk build success with bluetooth api v2. Do you think this modification make sense?

Comment 2

[Andreas Pehrson [:pehrsons]]

Comment on attachment 8610073 [details] [diff] [review]
bug1168075_canvas_capture_media_stream_build_fail.patch

Review of attachment 8610073 [details] [diff] [review]:
-----------------------------------------------------------------

Hmm, how did just enabling bluetooth2 break canvas streaming? They seem completely orthogonal to me.

::: dom/media/CanvasCaptureMediaStream.h
@@ +6,5 @@
>  #ifndef mozilla_dom_CanvasCaptureMediaStream_h_
>  #define mozilla_dom_CanvasCaptureMediaStream_h_
>  
> +#include "DOMMediaStream.h"
> +#include "StreamBuffer.h"

Is it possible to forward declare stuff here and do the includes in the .cpp?

Comment 3

[Andreas Pehrson [:pehrsons]]

Do you have build logs or similar, showing the errors you got, anywhere?

Comment 4

[Bruce Sun [:brsun]]

Attachment: build_fail.txt

Comment 5

[Andreas Pehrson [:pehrsons]]

Comment on attachment 8610073 [details] [diff] [review]
bug1168075_canvas_capture_media_stream_build_fail.patch

Review of attachment 8610073 [details] [diff] [review]:
-----------------------------------------------------------------

Ah, I see. Include order has changed and at least some typedefs are needed from these headers. Yeah, seems like the right fix.

Comment 6

[Bruce Sun [:brsun]]

Attachment: bug1168075_canvas_capture_media_stream_build_fail.commit.patch

Comment 7

[Bruce Sun [:brsun]]

Build results on Treeherder seem good:
 - https://treeherder.mozilla.org/#/jobs?repo=try&revision=59789e1058c4
 - https://treeherder.mozilla.org/#/jobs?repo=try&revision=9285c38b7034

Comment 8

[Pulsebot]

https://hg.mozilla.org/integration/mozilla-inbound/rev/af26700a02ed

Comment 9

[Carsten Book [:Tomcat]]

https://hg.mozilla.org/integration/mozilla-inbound/rev/af26700a02ed

Comment 10

[Wes Kocher (:KWierso) (Not reading bugmail; email directly if needed)]

https://hg.mozilla.org/mozilla-central/rev/af26700a02ed