Closed
Bug 652361
Opened 11 years ago
Closed 11 years ago
[OS/2] build break in nsObjectFrame after checkin for bug 266236
Categories
(Core :: Graphics, defect)
Tracking
()
RESOLVED
FIXED
mozilla6
People
(Reporter: wuno, Assigned: wuno)
References
Details
Attachments
(2 files)
1.07 KB,
patch
|
zwol
:
review+
|
Details | Diff | Splinter Review |
1.27 KB,
patch
|
Details | Diff | Splinter Review |
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
Assignee | ||
Comment 1•11 years ago
|
||
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•11 years ago
|
||
Comment on attachment 527964 [details] [diff] [review] patch Thanks for the patch, and sorry for making these silly mistakes in the first place. :-/
Attachment #527964 -
Flags: review?(zackw) → review+
Assignee | ||
Comment 3•11 years ago
|
||
Assignee | ||
Updated•11 years ago
|
Keywords: checkin-needed
Comment 4•11 years ago
|
||
Landed: http://hg.mozilla.org/mozilla-central/rev/9e66dd8f036f
Status: ASSIGNED → RESOLVED
Closed: 11 years ago
Keywords: checkin-needed
Resolution: --- → FIXED
Target Milestone: --- → mozilla6
Assignee | ||
Comment 5•11 years ago
|
||
(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•11 years ago
|
||
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
You need to log in
before you can comment on or make changes to this bug.
Description
•