Commit Graph

690 Commits

Author SHA1 Message Date
Ehsan Akhgari
46cbc36da6 Merge backout of DLBI from mozilla-central 2012-07-03 20:53:08 -04:00
Ehsan Akhgari
3575c71b74 Bug 330868 - Fall back to assuming that we have retrieved HTML data from the clipboard if it lies to us saying that it has returned CF_HTML; r=roc 2012-07-03 20:44:46 -04:00
Ehsan Akhgari
df2fb388c2 Backout changeset e04abde1b323 (bug 539356) because of performance and correctness regressions 2012-07-03 20:21:03 -04:00
Ehsan Akhgari
845df21297 Backed out changeset 0f1a8f17bfdf because the patch was not reviewed! 2012-07-03 18:04:35 -04:00
Ehsan Akhgari
012de7d1d7 Bug 330868 - Fall back to assuming that we have retrieved HTML data from the clipboard if it lies to us saying that it has returned CF_HTML; r=roc 2012-07-03 18:03:22 -04:00
Ed Morley
bb3f6c2bad Merge last PGO-green changeset of mozilla-inbound to mozilla-central 2012-07-02 10:03:16 +01:00
Ms2ger
6529faea6d Bug 770013 - Cleanup NodeIsBlockStatic/IsBlockNode a bit; r=ehsan 2012-07-01 21:53:16 +02:00
David Zbarsky
ae718ee1c0 Bug 763350 - Clean up some includes in content/ and dom/ r=smaug 2012-07-01 16:45:59 -07:00
Aryeh Gregor
a0343acde5 Bug 767169 part 2 - Handle lastCandidate being null in nsContentSubtreeIterator::Init; r=bz 2012-06-28 14:29:56 +03:00
Ehsan Akhgari
cfa33002d7 Bug 769008 - Don't pass a null node to GetBlockNodeParent; r=roc 2012-06-29 18:43:08 -04:00
Matt Woodrow
c96dc0e2ed Bug 539356 - Part 10 - Test changes required for DLBI. r=roc 2012-06-30 15:06:11 +12:00
Ehsan Akhgari
45fe6d3ae2 Bug 722872 - Part 1: Add nsITransferable::Init(nsILoadContext*), enforce that it's called in debug builds, and add nsIDOMDocument* arguments to nsIClipboardHelper methods; r=roc
This patch does the following:

* It adds nsITransferable::Init(nsILoadContext*).  The load context
  might be null, which means that the transferable is non-private, but
  if it's non-null, we extract the boolean value for the privacy mode
  and store it in the transferable.
* It adds checks in debug builds to make sure that Init is always
  called, in form of fatal assertions.
* It adds nsIDOMDocument* agruments to nsIClipboardHelper methods which
  represent the document that the string is coming from.
  nsIClipboardHelper implementation internally gets the nsILoadContext
  from that and passes it on to the transferable upon creation.  The
  reason that I did this was that nsIClipboardHelper is supposed to be a
  high-level helper, and in most of its call sites, we have easy access
  to a document object.
* It modifies all of the call sites of the above interfaces according to
  this change.
* It adds a GetLoadContext helper to nsIDocument to help with changing
  the call sites.
2012-04-16 22:14:01 -04:00
Jonathan Watt
6380335603 Bug 767388 - Kill NS_DEBUG. r=bz.
--HG--
extra : rebase_source : d045208a26345712dbb4628c973c616cd9504f28
2012-06-25 20:59:42 +01:00
Aryeh Gregor
7c14d74420 Bug 766387 - Make editing commands disabled in more cases; r=ehsan 2012-06-24 17:39:11 +03:00
Aryeh Gregor
8de5177c67 Bug 766360 - Rewrite nsEditor::DeleteSelectionAndPrepareToCreateNode; r=ehsan 2012-06-21 15:54:26 +03:00
Aryeh Gregor
daea0d4fbf Bug 760052 - execCommand() should abort and return false for disabled commands; r=ehsan 2012-06-21 15:05:24 +03:00
Aryeh Gregor
e00ca063fb Back out bac4434b31d2 for test failures 2012-06-24 10:30:34 +03:00
Aryeh Gregor
f4aa9bb43b Back out 66b3801292a0 for test failures 2012-06-24 10:30:13 +03:00
Aryeh Gregor
868bf136db Bug 766795 - Fix asserts when placing cursor in editable detached content; r=roc,ehsan 2012-06-24 09:54:43 +03:00
Aryeh Gregor
7076392170 Bug 766387 - Make editing commands disabled in more cases; r=ehsan 2012-06-24 09:54:43 +03:00
Aryeh Gregor
718762dae4 Bug 766360 - Rewrite nsEditor::DeleteSelectionAndPrepareToCreateNode; r=ehsan 2012-06-21 15:54:26 +03:00
Aryeh Gregor
e8463207f1 Bug 766305 - WSFragment should use PRInt32 for offsets, not PRInt16; r=ehsan 2012-06-24 09:54:42 +03:00
Ms2ger
9a9ef017e3 Bug 761997 - Cleanup nsHTMLEditRules::GetListItemState / nsHTMLEditRules::GetDefinitionListItemTypes; r=ehsan 2012-06-17 10:11:16 +02:00
Henri Sivonen
79e3d21a31 Bug 750096. r=bzbarsky. 2012-06-14 09:14:47 +03:00
Aryeh Gregor
7005254f4f Bug 763283 part 2 - Use nsINode::AsContent() in editor/; r=ehsan 2012-06-10 15:39:21 +03:00
Ed Morley
a73fc227f9 Backout 61fd66629c4f, 7c8121f8d3af & 2a2e9cf8fd41 (bug 539356), e31a5e6545d3 (bug 761884), 85fa80bd9792, a284ccb25b83, 2865904db9fc, 34e07b09c426, e9b3d41e0360, cef00ebcd6c8, f943b729ac14 & 783f298401b6 (bug 539356), 330a086f1570 (bug 741682), d80219c8842c (bug 739671), e8c96b4fd4da, 313af486e68d, 0adc41ff56dc, 0cd288a38085, f1d43208825c, 4859876972f3, eec8ef3ebe48, f7f29fcd1845, 6079b229d306, f23c3a7e7ce0, 9824458a41e2 & 6748b5496059 (bug 539356) for mochitest-4 orange & talos regressions on multiple platforms 2012-06-11 10:08:32 +01:00
Matt Woodrow
d8b05307aa Bug 539356 - Part 10 - Test changes required for DLBI. r=roc 2012-06-11 16:45:38 +12:00
Ryan VanderMeulen
bf2b50270d Merge m-c to inbound 2012-06-10 17:59:00 -04:00
Olli Pettay
ac6b89bfdb Bug 761613 - Merge nsIPrivateDOMEvent to nsIDOMEvent, r=jst 2012-06-10 21:14:30 +03:00
Aryeh Gregor
6865bb0c16 Bug 762862 - Rename nsTypedSelection to mozilla::Selection; r=ehsan
--HG--
rename : layout/generic/nsTypedSelection.h => layout/generic/Selection.h
2012-06-08 17:20:55 +03:00
Ehsan Akhgari
ca80281227 Bug 761051 - Use image/jpeg as the standard internal transferable image type, but continue respecting image/jpg as well; r=roc 2012-06-07 19:27:07 -04:00
Ehsan Akhgari
701213914b Backout changeset 125438dda903 (bug 761051) because of Bq bustage 2012-06-07 19:49:37 -04:00
Ehsan Akhgari
b29a2f9ea8 Bug 761051 - Use image/jpeg as the standard internal transferable image type, but continue respecting image/jpg as well; r=roc 2012-06-07 19:27:07 -04:00
Aryeh Gregor
96d34dcd72 Bug 762430 - Fix uninitialized nsresult in nsHTMLEditor::AbsolutelyPositionElement; r=ehsan 2012-06-07 18:00:58 +03:00
Aryeh Gregor
b36b8ee24e Bug 757771 part 4 - Create new nsContentUtils::GetSelectionInTextControl method; r=ehsan 2012-06-07 18:00:58 +03:00
Aryeh Gregor
816af37647 Bug 757771 part 2 - Change various callers to use nsTypedSelection; r=ehsan 2012-06-05 11:10:26 +03:00
Aryeh Gregor
b3b79e9ccb Bug 761861 - Fix crash in nsHTMLEditor::DeleteSelectionImpl; r=ehsan 2012-06-06 14:19:16 +03:00
Laurent Dulary
09cc80dcb7 Bug 657938 (1/2) - Implement the content part of the meter element. f=mounir r=smaug,mrbkap 2012-05-16 13:18:33 +02:00
Ms2ger
ea2dda7b49 Bug 761313 - Simplify nsHTMLEditRules::RemoveBlockStyle; r=ehsan 2012-06-06 09:41:56 +02:00
Ms2ger
3e9ba4ac53 Bug 756819 - Use dom::Element for the result of GetElementParent; r=ehsan 2012-06-06 09:36:52 +02:00
Ms2ger
4f0c76c829 Bug 756748 - Use nsIAtom and nsINode in nsHTMLEditRules::ConvertListType; r=ehsan 2012-06-06 09:36:46 +02:00
Ms2ger
0d99f62caa Bug 756757 - Use nsINode in nsHTMLEditor::MergeCells; r=ehsan 2012-06-06 09:36:28 +02:00
Ms2ger
8bebfeb3bb Bug 756755 - Cleanup nsHTMLEditor::SetInlinePropertyOnNodeImpl; r=ehsan 2012-06-06 09:36:17 +02:00
Ms2ger
b4027a20e9 Bug 756753 - Simplify nsHTMLEditRules::LookInsideDivBQandList, nsEditor::CountEditableChildren; r=ehsan 2012-06-06 09:36:07 +02:00
Ms2ger
5ed4a1334e Bug 756752 - Remove nsHTMLEditor::IsContainer(nsINode*); r=ehsan 2012-06-06 09:36:00 +02:00
Ms2ger
24cef0b1ea Bug 756754 - Part a: Return dom::Element* from CreateHTMLContent; r=ehsan 2012-06-06 09:35:47 +02:00
Aryeh Gregor
12c360bc6f Bug 760143 - Get rid of useless nsresult in editor/; r=ehsan 2012-06-01 14:03:17 +03:00
Aryeh Gregor
15e1ced83b Bug 757371 part 4 - Do not insert style tags if the style is already applied; r=ehsan 2012-05-23 10:49:29 +03:00
Aryeh Gregor
c986ade870 Bug 757371 part 3 - Reuse existing style elements more aggressively; r=ehsan 2012-05-29 10:12:51 +03:00
Aryeh Gregor
48e8c70512 Bug 757371 part 2 - Improve correctness of nsHTMLCSSUtils::IsCSSEquivalentToHTMLInlineStyleSet; r=ehsan 2012-05-28 14:20:27 +03:00