Last Comment Bug 652361 - [OS/2] build break in nsObjectFrame after checkin for bug 266236
: [OS/2] build break in nsObjectFrame after checkin for bug 266236
Status: RESOLVED FIXED
:
Product: Core
Classification: Components
Component: Graphics (show other bugs)
: Trunk
: x86 OS/2
: -- major (vote)
: mozilla6
Assigned To: Walter Meinl
:
Mentors:
Depends on:
Blocks: 266236
  Show dependency treegraph
 
Reported: 2011-04-23 14:11 PDT by Walter Meinl
Modified: 2011-04-25 12:08 PDT (History)
4 users (show)
See Also:
Crash Signature:
(edit)
QA Whiteboard:
Iteration: ---
Points: ---
Has Regression Range: ---
Has STR: ---


Attachments
patch (1.07 KB, patch)
2011-04-23 14:17 PDT, Walter Meinl
zackw: review+
Details | Diff | Review
patch with header for checkin (1.27 KB, patch)
2011-04-24 15:13 PDT, Walter Meinl
no flags Details | Diff | Review

Description Walter Meinl 2011-04-23 14:11:26 PDT
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 2011-04-23 14:17:56 PDT
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) 2011-04-23 15:27:20 PDT
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 2011-04-24 15:13:36 PDT
Created attachment 528022 [details] [diff] [review]
patch with header for checkin
Comment 4 Daniel Holbert [:dholbert] 2011-04-25 11:01:55 PDT
Landed: http://hg.mozilla.org/mozilla-central/rev/9e66dd8f036f
Comment 5 Walter Meinl 2011-04-25 11:53:43 PDT
(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] 2011-04-25 12:08:08 PDT
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

Note You need to log in before you can comment on or make changes to this bug.