178790 - separate xpcom wrapper and charset detector

Status: RESOLVED FIXED

(Core :: Internationalization, defect)

Description

[Shanjian Li]

Unlike rest of the universal detector implementation file, nsUniversalDetector.h
and nsUniversalDetector.cpp contains both implementation class (which has no
dependency on XPCOM) and 2 XPCOM wrapper class. Separate those class to
different files will benefit maintenance and future reuse.

Comment 1

[Shanjian Li]

Attachment: patch

Comment 2

[Shanjian Li]

patch

Comment 3

[nhottanscp]

Attachment: Adding the new file to the project.

Comment 4

[Alec Flett]

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

- You don't need to NS_INIT_ISUPPORTS anymore
- Why not make mObserver an nsCOMPtr?

with those changes, sr=alecf

Comment 5

[Alec Flett]

Comment on attachment 107934 [details] [diff] [review]
Adding the new file to the project.

sr=alecf

Comment 6

[Katsuhiko Momoi]

CC'ing jungshik to see what if any we should do about this bug.

Comment 7

[Jean-Marc Desperrier]

Well why not just do the check-in ? There will very little update needed as the
code almost didn't change since the patch was written.

And it would make things easier for independant use of the detector, like for
example what I suggested at the end of bug 135762.

Comment 8

[Jungshik Shin]

Attachment: patch (addressing alecf's comment and changing license to MPL)

attachment 106410 [details] [diff] [review] needs a little update (it didn't get cleanly applied) in
addition to what alecf's pointed out. attachment 107934 [details] [diff] [review] is not needed any more.

Comment 9

[Jungshik Shin]

Comment on attachment 155006 [details] [diff] [review]
patch (addressing alecf's comment and changing license to MPL)

asking for r (just in case).

Jean-Marc, thanks for reminding me of this (somehow I don't remember reading
Kat's comment)

Comment 10

[Simon Montagu :smontagu]

Comment on attachment 155006 [details] [diff] [review]
patch (addressing alecf's comment and changing license to MPL)

>+NS_IMETHODIMP nsUniversalXPCOMDetector::DoIt(
>+  const char* aBuf, PRUint32 aLen, PRBool* oDontFeedMe)
>+{
>+  NS_ASSERTION(mObserver != nsnull , "have not init yet");
>+
>+  if((nsnull == aBuf) || (nsnull == oDontFeedMe))
>+     return NS_ERROR_ILLEGAL_VALUE;
>+
>+  this->HandleData(aBuf, aLen);

Make this:
    nsresult rv = this->HandleData(aBuf, aLen);
    if (NS_FAILED(rv))
      return rv;
(Change from bug 225994)

>+NS_IMETHODIMP nsUniversalXPCOMStringDetector::DoIt(const char* aBuf, PRUint32 aLen, 
>+                     const char** oCharset, nsDetectionConfident &oConf)
>+{
>+   mResult = nsnull;
>+   this->Reset();
>+   this->HandleData(aBuf, aLen); 

Make the corresponding change from bug 225994 here too. Also detabify the new
files and r=smontagu

Comment 11

[Jungshik Shin]

patch checked in with Simon's concerns addressed. I changed the indentation a
bit more.