445625 - compilation of typeaheadfind fails on comm-central due to nsICaret deCOM

Status: RESOLVED FIXED

(SeaMonkey :: Find In Page, defect)

Description

[Robert Kaiser]

Due to bug 419532 (nsICaret deCOMtamination), SeaMonkey's typeaheadfind from CVS trunk (which is being pulled from there into mozilla/extensions/typeaheadfind) fails to compile with comm-central (i.e. the calemaisu-test repo made in preparation for that), which bases on a current mozilla-central.

http://mxr.mozilla.org/mozilla/search?string=nsICaret&find=%2Fextensions%2Ftypeaheadfind%2F suggests we need some changes there to have it build cleanly. We need some patch for that to go into CVS with the switch or we can't have builds right away from that code unless we deactivate typeaheadfind in the builds.

Comment 1

[Justin Wood (:Callek)]

I haven't actually started my calemaisu build yet :/ but is there a special C++ define set when we compile this file from Hg vs CVS.

(can check with a cd to this dir in ObjectDir and running |make echo-variable-DEFINES| iirc)

If so, can you post here, and I'll provide an untested patch that should work in <24 hours.

Comment 2

[[e-mail]]

Hmm... maybe we should import typeaheadfind under suite in comm-central?

Comment 3

[Robert Kaiser]

(In reply to comment #1)
> I haven't actually started my calemaisu build yet :/ but is there a special C++
> define set when we compile this file from Hg vs CVS.

No, we don't have any define. but then, suite can be considered dead on CVS trunk once we do the switch.

(In reply to comment #2)
> Hmm... maybe we should import typeaheadfind under suite in comm-central?

That surely makes sense in the long run, unless we do the even much better thing, which is throwing it away and rebuilding it on top of the toolkit one. This is only a small facet of the typeheadfind problem.

Comment 4

[Justin Wood (:Callek)]

Attachment: Remove nsICaret usage

This patch simply removes the nsICaret usage. We are unable to simply deCOM this files usage of nsCaret as we are not internal to gklayout.

Once this has proper review, can someone commit for me, this blocks comm-central for suite.

Comment 5

[[e-mail]]

Comment on attachment 330264 [details] [diff] [review]
Remove nsICaret usage

> void
> nsTypeAheadFind::SetSelectionLook(nsIPresShell *aPresShell, 
>-                                  PRBool aChangeColor, 
>-                                  PRBool aEnabled)
>+                                  PRBool aChangeColor)
> {
>   if (!aPresShell || !mFocusedDocSelCon)
>     return;
>@@ -2207,35 +2190,6 @@
Nit: you forgot to fix the comment

>   mFocusedDocSelCon->RepaintSelection(nsISelectionController::SELECTION_NORMAL);
> 
Nit: this blank line can go too

Comment 6

[Justin Wood (:Callek)]

Attachment: Patch for checkin

fix nits

Comment 7

[Stefan [:stefanh]]

Landed attachment #330265 [details] [diff] [review] on cvs trunk:

Checking in nsTypeAheadFind.cpp;
/cvsroot/mozilla/extensions/typeaheadfind/src/nsTypeAheadFind.cpp,v  <--  nsTypeAheadFind.cpp
new revision: 1.138; previous revision: 1.137
done
Checking in nsTypeAheadFind.h;
/cvsroot/mozilla/extensions/typeaheadfind/src/nsTypeAheadFind.h,v  <--  nsTypeAheadFind.h
new revision: 1.39; previous revision: 1.38
done