652361 - [OS/2] build break in nsObjectFrame after checkin for bug 266236

Status: RESOLVED FIXED

Description

[Walter Meinl]

User-Agent:       Mozilla/5.0 (OS/2; Warp 4.5; rv:2.0.1) Gecko/20100101 Firefox/4.0.1
Build Identifier: 

E:/hg-src/hg/comm-central/mozilla/layout/generic/nsObjectFrame.cpp: In function 'void* GetPSFromRC(nsRenderingContext&)':
E:/hg-src/hg/comm-central/mozilla/layout/generic/nsObjectFrame.cpp:1673: error: 'aRenderingContext' was not declared in this scope
E:/hg-src/hg/comm-central/mozilla/layout/generic/nsObjectFrame.cpp:1676: error: expected type-specifier before 'gfxOS2Surface'
E:/hg-src/hg/comm-central/mozilla/layout/generic/nsObjectFrame.cpp:1676: error: expected '>' before 'gfxOS2Surface'
E:/hg-src/hg/comm-central/mozilla/layout/generic/nsObjectFrame.cpp:1676: error: expected '(' before 'gfxOS2Surface'
E:/hg-src/hg/comm-central/mozilla/layout/generic/nsObjectFrame.cpp:1676: error: 'gfxOS2Surface' was not declared in this scope
E:/hg-src/hg/comm-central/mozilla/layout/generic/nsObjectFrame.cpp:1676: error: expected primary-expression before '>' token
E:/hg-src/hg/comm-central/mozilla/layout/generic/nsObjectFrame.cpp:1677: error: 'class gfxASurface' has no member named 'GetPS'
E:/hg-src/hg/comm-central/mozilla/layout/generic/nsObjectFrame.cpp:1677: error: expected ')' before ';' token

The respective failing code:
+#ifdef XP_OS2
+static void *
+GetPSFromRC(nsRenderingContext& aRC)
+{
+  nsRefPtr<gfxASurface>
+    surf = aRenderingContext.ThebesContext()->CurrentSurface();
+  if (!surf || surf->CairoStatus())
+    return nsnull;
+  return (void *)(static_cast<gfxOS2Surface*>
+                  (static_cast<gfxASurface*>(surf.get()))->GetPS());
+}
+#endif

Reproducible: Always

Comment 1

[Walter Meinl]

Created attachment 527964 [details] [diff] [review]
patch

s/aCR/aRenderingContext solves the first error 'aRenderingContext' was not declared in this scope
adding gfxOS2Surface.h to the list of includes the other ones

Comment 2

[Zack Weinberg (:zwol)]

Comment on attachment 527964 [details] [diff] [review]
patch

Thanks for the patch, and sorry for making these silly mistakes in the first place. :-/

Comment 3

[Walter Meinl]

Created attachment 528022 [details] [diff] [review]
patch with header for checkin

Comment 4

[Daniel Holbert [:dholbert]]

Landed: http://hg.mozilla.org/mozilla-central/rev/9e66dd8f036f

Comment 5

[Walter Meinl]

(In reply to comment #4)
> Landed: http://hg.mozilla.org/mozilla-central/rev/9e66dd8f036f

Ups sorry, this patch contained in addition a chmod 755 for build/os2/test_os2.cmd.

Comment 6

[Daniel Holbert [:dholbert]]

Ah, thanks for catching that.

Before pushing, I did visually compared the patch for checkin vs. the reviewed patch, but bugzilla's diff-viewer didn't show me the chmod change.

Reverted the chmod in a followup DONTBUILD push (to save releng machine time):
http://hg.mozilla.org/mozilla-central/rev/c777c6ff78ed