161668 - sync up with newer point along 1.0 branch

Status: RESOLVED FIXED

(Camino Graveyard :: General, defect)

Description

[Kathleen :Brade]

sync up with newer point along 1.0 branch

Comment 1

[Kathleen :Brade]

Attachment: patch 1 of 2 to land

This is 1 of 2 diffs that need to land.

Comment 2

[Kathleen :Brade]

Attachment: patch 2 of 2 to land

This is 2 of 2 diffs that need to land.

Comment 3

[Greg K.]

patch keyword? brade, do you not have check-in privs?

Comment 4

[Brian Ryner (not reading)]

Attachment: chimera diff against current 1.0 branch (part 1)

Comment 5

[Brian Ryner (not reading)]

Attachment: chimera patch against current 1.0 branch (part 2)

Comment 6

[Kathleen :Brade]

bryner: what commands did you use to generate this diff?  It looks like it's
missing some files (such as nsIPlaintextEditor.idl).

Comment 7

[Brian Ryner (not reading)]

cvs diff -N from the mozilla directory.

Comment 8

[Brian Ryner (not reading)]

I think you're referring to some of the files checked in as a fix for bug
141900.  I talked to kin about this; only attachment 87306 [details] [diff] [review] has been checked in
on the 1.0 branch.  He said that the async reflow/paint/scroll patch was causing
some problems with the caret jumping back to the beginning of the text field, so
I wasn't sure if we wanted to re-land this fix or not.  It sounds like maybe we
want to re-land it anyway.  (native textfields, anyone?)

Comment 9

[Brian Ryner (not reading)]

Attachment: diff of CHIMERA_M1_0_BRANCH against CHIMERA_M1_0_BASE (gzipped)

Comment 10

[Brian Ryner (not reading)]

bnesse, would you be able to sanity-check the plugin parts of this patch?  There
were a few places where merge conflicts happened and I'm not 100% sure I merged
correctly.  Thanks.

Comment 11

[Kathleen :Brade]

Comment on attachment 95300 [details]
diff of CHIMERA_M1_0_BRANCH against CHIMERA_M1_0_BASE (gzipped)

obsoleting

Comment 12

[Kathleen :Brade]

I'm ok with the current (non-obsolete) patches to be landed on the branch
assuming the configure files are also checked in as well as the patches from bug
141900 which were inadvertently removed from the diffs.

We need to coordinate the landing with mcafee so he can get a tinderbox working
on the CHIMERA_M1_0_1_BRANCH before we land the rest; Chris--can you get that
started?

The only other issue is that these diffs are now out-of-date with regards to the
current tip of the chimera branch; we'll need to do another round of diffs
before we can actually have everyone use it.

Comment 13

[Brian Ryner (not reading)]

Attachment: new diff, part 1

Comment 14

[Brian Ryner (not reading)]

Attachment: new diff, part 2

This diff includes the two additional patches from bug 141900.

Comment 15

[Kathleen :Brade]

I've looked over the above diffs.  They look much the same as the diffs I have
generated except I used -u3 or -u4 so I can't directly compare them as easily
that way.  r=brade

Comment 16

[Kathleen :Brade]

this is done