1182371 - Misc cleanup

Status: RESOLVED FIXED

(Core :: Graphics: CanvasWebGL, defect)

Description

[Kelsey Gilbert [:jgilbert]]

Attachment: 0007-Fix-non-unified-build-for-dom-canvas.patch

Comment 1

[Kelsey Gilbert [:jgilbert]]

Attachment: 0007-Fix-non-unified-build-for-dom-canvas.patch

Comment 2

[Kelsey Gilbert [:jgilbert]]

Attachment: 0012-webgl-Prune-many-includes-from-headers-remove-using-.patch

Oops, this one looks big.

Comment 3

[Kelsey Gilbert [:jgilbert]]

Attachment: 0001-No-aPrefix-for-args-in-dom-canvas-webgl.patch

Comment 4

[Kelsey Gilbert [:jgilbert]]

Attachment: 0008-Fix-shadowed-variables-in-dom-canvas.patch

Comment 5

[u480271]

Comment on attachment 8631953 [details] [diff] [review]
0012-webgl-Prune-many-includes-from-headers-remove-using-.patch

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

R+ conditional on nits and the header includes being sorted out in a follow-up patch.

::: dom/canvas/WebGL2ContextTransformFeedback.cpp
@@ +213,5 @@
>      if (!ValidateObject("getTransformFeedbackVarying: program", program))
>          return nullptr;
>  
> +    RefPtr<WebGLActiveInfo> ret = program->GetTransformFeedbackVarying(index);
> +    nsRefPtr<WebGLActiveInfo> ret2 = ret;

Ughhhhhhhh

::: dom/canvas/WebGLBuffer.h
@@ +8,4 @@
>  
>  #include "GLDefs.h"
>  #include "mozilla/LinkedList.h"
> +//#include "mozilla/MemoryReporting.h"

Please remove

@@ +14,2 @@
>  #include "WebGLObjectModel.h"
> +//#include "WebGLStrongTypes.h"

Please remove

::: dom/canvas/WebGLContext.cpp
@@ +6,5 @@
>  #include "WebGLContext.h"
>  
> +#include <queue>
> +
> +#include "../../js/xpconnect/wrappers/AccessCheck.h"

From IRC, I'm going to assume that this will be reverted.

@@ -1910,5 @@
>      size_t overshoot = value + multiple - 1;
>  
> -    if (true) {
> -        int value = 2;
> -        (void)value;

Yeah, OK.

::: dom/canvas/WebGLContextGL.cpp
@@ +57,1 @@
>  using namespace mozilla::dom;

If you've prefixed all the dom ns members, then should you remove these using directives?

::: dom/canvas/WebGLObjectModel.h
@@ +7,4 @@
>  #define WEBGLOBJECTMODEL_H_
>  
>  #include "nsCycleCollectionNoteChild.h"
> +//#include "nsICanvasRenderingContextInternal.h"

Remove

::: dom/canvas/WebGLQuery.h
@@ +6,4 @@
>  #ifndef WEBGL_QUERY_H_
>  #define WEBGL_QUERY_H_
>  
> +#include "../../mfbt/LinkedList.h"

Not this way.

@@ -6,4 @@
>  #ifndef WEBGL_QUERY_H_
>  #define WEBGL_QUERY_H_
>  
> -#include "mozilla/LinkedList.h"

It should be this way, right?

::: dom/canvas/WebGLTexture.h
@@ +10,4 @@
>  #include "mozilla/Assertions.h"
>  #include "mozilla/CheckedInt.h"
>  #include "mozilla/LinkedList.h"
> +//#include "nsAlgorithm.h"

remove

::: dom/canvas/moz.build
@@ +160,4 @@
>  CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS']
>  CXXFLAGS += CONFIG['TK_CFLAGS']
>  
> +use_static_analysis = False

What does this do?

Comment 6

[Kelsey Gilbert [:jgilbert]]

Attachment: 0001-No-aPrefix-for-args-in-dom-canvas-webgl.patch

r=kamidphish

Comment 7

[Kelsey Gilbert [:jgilbert]]

Attachment: 0002-Fix-non-unified-build-for-dom-canvas.patch

r=kamidphish

Comment 8

[Kelsey Gilbert [:jgilbert]]

Attachment: 0003-Fix-shadowed-variables-in-dom-canvas.patch

r=kamidphish

Comment 9

[Kelsey Gilbert [:jgilbert]]

Attachment: 0004-webgl-Prune-many-includes-from-headers-remove-using-.patch

r=kamidphish

Comment 10

[Kelsey Gilbert [:jgilbert]]

Attachment: 0005-Fix-includes.patch

Fixes the weird include format I was playing with, and fixes includes in WebGLFormats.cpp.

Comment 11

[Pulsebot]

https://hg.mozilla.org/integration/mozilla-inbound/rev/2e3bce121f7c

Comment 12

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/mozilla-central/rev/2e3bce121f7c