233457 - nsObjectFrame cleanup

Status: RESOLVED FIXED

(Core :: Layout, defect)

Description

[Christian :Biesinger (don't email me, ping me on IRC)]

mostly decom

Comment 1

[Christian :Biesinger (don't email me, ping me on IRC)]

Attachment: patch

Comment 2

[Christian :Biesinger (don't email me, ping me on IRC)]

Attachment: patch v2

this version no longer addrefs frames..

Comment 3

[Chris Thomas (CTho) [formerly [e-mail] [e-mail]]]

Building deps for
/cygdrive/d/cvs-1.11.5/mozilla/layout/svg/base/src/nsSVGLineFrame.cpp
nsSVGLineFrame.cpp
nsSVGOuterSVGFrame.cpp
Building deps for
/cygdrive/d/cvs-1.11.5/mozilla/layout/svg/base/src/nsSVGOuterSVGFrame.cpp
nsSVGOuterSVGFrame.cpp
d:/cvs-1.11.5/mozilla/layout/svg/base/src/nsSVGOuterSVGFrame.cpp(313) : fatal
error C1189: #error :  "No SVG renderer."



My .mozconfig:

export MOZ_PROFILE=1
export MOZ_INTERNAL_LIBART_LGPL=1
ac_add_options --enable-crypto
ac_add_options --enable-svg
ac_add_options --disable-tests
ac_add_options --disable-debug
ac_add_options --enable-optimize=-O2
ac_add_options
--enable-extensions=cookie,xml-rpc,xmlextras,p3p,pref,transformiix,universalchardet,typeaheadfind,webservices
ac add_options --enable-mathml
#ac_add_options --enable-static
#ac_add_options --disable-shared
mk_add_options MOZ_OBJDIR=../mozbuild

Comment 4

[Boris Zbarsky [:bzbarsky]]

Comment on attachment 140906 [details] [diff] [review]
patch v2

>Index: nsObjectFrame.cpp
>+PRBool nsObjectFrame::IsSupportedDocument(nsIContent* aContent)
>+  if((rv == NS_CONTENT_ATTR_HAS_VALUE) && (!type.IsEmpty())) 

Remove the extra parens.

>+  if((rv == NS_CONTENT_ATTR_HAS_VALUE) && (!data.IsEmpty())) 

Same.

>+    PRBool ret = PR_FALSE;
>     if (NS_SUCCEEDED(rv) && !value.IsEmpty())
>-      *aDoc = PR_TRUE;
>+      ret = PR_TRUE;
> 
>     if (contentType)
>       nsMemory::Free(contentType);
>+
>+    return ret;

How about:

     if (contentType)
       nsMemory::Free(contentType);
     return NS_SUCCEEDED(rv) && !value.IsEmpty();

For that matter, how about switching to nsXPIDLCString for contentType?


>+nsPoint nsObjectFrame::GetWindowOriginInPixels(PRBool aWindowless)

How about doing 

  nsIPresContext* presContext = GetPresContext();

so you don't have to call it twice?

> void nsPluginInstanceOwner::GUItoMacEvent(const nsGUIEvent& anEvent, EventRecord* origEvent, EventRecord& aMacEvent)

Again, have just one GetPresContext() call here?

r+sr=bzbarsky with those changes.

Comment 5

[Chris Thomas (CTho) [formerly [e-mail] [e-mail]]]

After fixing my tree and mozconfig, it compiled and printing
http://macromedia.com/ produced results identical to a standard build on WinXP.

Comment 6

[Christian :Biesinger (don't email me, ping me on IRC)]

checked in, with changes made; I used nsXPIDLCString.