Skip to content

Commit 393cc93

Browse files
masayuki-nakanomasayuki-nakano
committed
Bug 920377 part.18 Get rid of nsTextRangeStyle r=roc
1 parent 3a0b655 commit 393cc93

File tree

13 files changed

+39
-37
lines changed

13 files changed

+39
-37
lines changed

‎content/base/public/nsISelectionPrivate.idl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ template<class T> class nsTArray;
2323

2424
[ptr] native nsIFrame(nsIFrame);
2525
[ptr] native RangeArray(nsTArray<nsRange*>);
26-
[ref] native constTextRangeStyleRef(const nsTextRangeStyle);
26+
[ref] native constTextRangeStyleRef(const mozilla::TextRangeStyle);
2727
[ref] native nsPointRef(nsPoint);
2828
native nsDirection(nsDirection);
2929
native ScrollAxis(nsIPresShell::ScrollAxis);

‎content/events/public/nsIPrivateTextRange.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ class nsIPrivateTextRange : public nsISupports {
3232
NS_IMETHOD GetRangeStart(uint16_t* aRangeStart)=0;
3333
NS_IMETHOD GetRangeEnd(uint16_t* aRangeEnd)=0;
3434
NS_IMETHOD GetRangeType(uint16_t* aRangeType)=0;
35-
NS_IMETHOD GetRangeStyle(nsTextRangeStyle* aTextRangeStyle)=0;
35+
NS_IMETHOD GetRangeStyle(mozilla::TextRangeStyle* aTextRangeStyle)=0;
3636
};
3737

3838
NS_DEFINE_STATIC_IID_ACCESSOR(nsIPrivateTextRange, NS_IPRIVATETEXTRANGE_IID)

‎content/events/src/nsPrivateTextRange.cpp‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
#include "nsPrivateTextRange.h"
77
#include "mozilla/TextEvents.h"
88

9+
using namespace mozilla;
10+
911
nsPrivateTextRange::nsPrivateTextRange(const nsTextRange &aTextRange)
1012
: mRangeStart(uint16_t(aTextRange.mStartOffset)),
1113
mRangeEnd(uint16_t(aTextRange.mEndOffset)),
@@ -38,7 +40,7 @@ NS_METHOD nsPrivateTextRange::GetRangeType(uint16_t* aRangeType)
3840
return NS_OK;
3941
}
4042

41-
NS_METHOD nsPrivateTextRange::GetRangeStyle(nsTextRangeStyle* aTextRangeStyle)
43+
NS_METHOD nsPrivateTextRange::GetRangeStyle(TextRangeStyle* aTextRangeStyle)
4244
{
4345
NS_ENSURE_ARG_POINTER(aTextRangeStyle);
4446
*aTextRangeStyle = mRangeStyle;

‎content/events/src/nsPrivateTextRange.h‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,17 @@ class nsPrivateTextRange MOZ_FINAL : public nsIPrivateTextRange
2020
nsPrivateTextRange(const nsTextRange &aTextRange);
2121
virtual ~nsPrivateTextRange(void);
2222

23-
NS_IMETHOD GetRangeStart(uint16_t* aRangeStart) MOZ_OVERRIDE;
24-
NS_IMETHOD GetRangeEnd(uint16_t* aRangeEnd) MOZ_OVERRIDE;
25-
NS_IMETHOD GetRangeType(uint16_t* aRangeType) MOZ_OVERRIDE;
26-
NS_IMETHOD GetRangeStyle(nsTextRangeStyle* aRangeStyle) MOZ_OVERRIDE;
23+
NS_IMETHOD GetRangeStart(uint16_t* aRangeStart) MOZ_OVERRIDE;
24+
NS_IMETHOD GetRangeEnd(uint16_t* aRangeEnd) MOZ_OVERRIDE;
25+
NS_IMETHOD GetRangeType(uint16_t* aRangeType) MOZ_OVERRIDE;
26+
NS_IMETHOD GetRangeStyle(mozilla::TextRangeStyle* aRangeStyle) MOZ_OVERRIDE;
2727

2828
protected:
2929

3030
uint16_t mRangeStart;
3131
uint16_t mRangeEnd;
3232
uint16_t mRangeType;
33-
nsTextRangeStyle mRangeStyle;
33+
mozilla::TextRangeStyle mRangeStyle;
3434
};
3535

3636
class nsPrivateTextRangeList MOZ_FINAL : public nsIPrivateTextRangeList

‎editor/libeditor/base/IMETextTxn.cpp‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
#include "IMETextTxn.h"
77
#include "mozilla/mozalloc.h" // for operator new
8-
#include "mozilla/TextEvents.h" // for nsTextRangeStyle
8+
#include "mozilla/TextEvents.h" // for TextRangeStyle
99
#include "nsAString.h" // for nsAString_internal::Length, etc
1010
#include "nsAutoPtr.h" // for nsRefPtr
1111
#include "nsDebug.h" // for NS_ASSERTION, etc
@@ -25,6 +25,8 @@
2525
#include "nsRange.h" // for nsRange
2626
#include "nsString.h" // for nsString
2727

28+
using namespace mozilla;
29+
2830
// #define DEBUG_IMETXN
2931

3032
IMETextTxn::IMETextTxn()
@@ -333,7 +335,7 @@ NS_IMETHODIMP IMETextTxn::CollapseTextSelection(void)
333335
nsCOMPtr<nsISelectionPrivate> imeSelPriv(
334336
do_QueryInterface(imeSel));
335337
if (imeSelPriv) {
336-
nsTextRangeStyle textRangeStyle;
338+
TextRangeStyle textRangeStyle;
337339
result = textRange->GetRangeStyle(&textRangeStyle);
338340
NS_ASSERTION(NS_SUCCEEDED(result),
339341
"nsIPrivateTextRange::GetRangeStyle failed");

‎layout/generic/Selection.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ struct RangeData
3030
{}
3131

3232
nsRefPtr<nsRange> mRange;
33-
nsTextRangeStyle mTextRangeStyle;
33+
mozilla::TextRangeStyle mTextRangeStyle;
3434
};
3535

3636
// Note, the ownership of mozilla::Selection depends on which way the object is

‎layout/generic/nsFrameSelection.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ struct SelectionDetails
4545
int32_t mStart;
4646
int32_t mEnd;
4747
SelectionType mType;
48-
nsTextRangeStyle mTextRangeStyle;
48+
mozilla::TextRangeStyle mTextRangeStyle;
4949
SelectionDetails *mNext;
5050
};
5151

‎layout/generic/nsSelection.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4125,7 +4125,7 @@ Selection::FindRangeData(nsIDOMRange* aRange)
41254125

41264126
NS_IMETHODIMP
41274127
Selection::SetTextRangeStyle(nsIDOMRange* aRange,
4128-
const nsTextRangeStyle& aTextRangeStyle)
4128+
const TextRangeStyle& aTextRangeStyle)
41294129
{
41304130
NS_ENSURE_ARG_POINTER(aRange);
41314131
RangeData *rd = FindRangeData(aRange);

‎layout/generic/nsTextFrame.cpp‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5020,7 +5020,7 @@ static void DrawSelectionDecorations(gfxContext* aContext,
50205020
SelectionType aType,
50215021
nsTextFrame* aFrame,
50225022
nsTextPaintStyle& aTextPaintStyle,
5023-
const nsTextRangeStyle &aRangeStyle,
5023+
const TextRangeStyle &aRangeStyle,
50245024
const gfxPoint& aPt, gfxFloat aXInFrame, gfxFloat aWidth,
50255025
gfxFloat aAscent, const gfxFont::Metrics& aFontMetrics,
50265026
nsTextFrame::DrawPathCallbacks* aCallbacks)
@@ -5065,7 +5065,7 @@ static void DrawSelectionDecorations(gfxContext* aContext,
50655065
if (aRangeStyle.IsDefined()) {
50665066
// If IME defines the style, that should override our definition.
50675067
if (aRangeStyle.IsLineStyleDefined()) {
5068-
if (aRangeStyle.mLineStyle == nsTextRangeStyle::LINESTYLE_NONE) {
5068+
if (aRangeStyle.mLineStyle == TextRangeStyle::LINESTYLE_NONE) {
50695069
return;
50705070
}
50715071
style = aRangeStyle.mLineStyle;
@@ -5115,7 +5115,7 @@ static void DrawSelectionDecorations(gfxContext* aContext,
51155115
*/
51165116
static bool GetSelectionTextColors(SelectionType aType,
51175117
nsTextPaintStyle& aTextPaintStyle,
5118-
const nsTextRangeStyle &aRangeStyle,
5118+
const TextRangeStyle &aRangeStyle,
51195119
nscolor* aForeground, nscolor* aBackground)
51205120
{
51215121
switch (aType) {
@@ -5216,7 +5216,7 @@ class SelectionIterator {
52165216
*/
52175217
bool GetNextSegment(gfxFloat* aXOffset, uint32_t* aOffset, uint32_t* aLength,
52185218
gfxFloat* aHyphenWidth, SelectionType* aType,
5219-
nsTextRangeStyle* aStyle);
5219+
TextRangeStyle* aStyle);
52205220
void UpdateWithAdvance(gfxFloat aAdvance) {
52215221
mXOffset += aAdvance*mTextRun->GetDirection();
52225222
}
@@ -5244,7 +5244,7 @@ SelectionIterator::SelectionIterator(SelectionDetails** aSelectionDetails,
52445244

52455245
bool SelectionIterator::GetNextSegment(gfxFloat* aXOffset,
52465246
uint32_t* aOffset, uint32_t* aLength, gfxFloat* aHyphenWidth,
5247-
SelectionType* aType, nsTextRangeStyle* aStyle)
5247+
SelectionType* aType, TextRangeStyle* aStyle)
52485248
{
52495249
if (mIterator.GetOriginalOffset() >= mOriginalEnd)
52505250
return false;
@@ -5256,7 +5256,7 @@ bool SelectionIterator::GetNextSegment(gfxFloat* aXOffset,
52565256
SelectionDetails* sdptr = mSelectionDetails[index];
52575257
SelectionType type =
52585258
sdptr ? sdptr->mType : nsISelectionController::SELECTION_NONE;
5259-
nsTextRangeStyle style;
5259+
TextRangeStyle style;
52605260
if (sdptr) {
52615261
style = sdptr->mTextRangeStyle;
52625262
}
@@ -5430,7 +5430,7 @@ nsTextFrame::PaintTextWithSelectionColors(gfxContext* aCtx,
54305430
gfxFloat xOffset, hyphenWidth;
54315431
uint32_t offset, length; // in transformed string
54325432
SelectionType type;
5433-
nsTextRangeStyle rangeStyle;
5433+
TextRangeStyle rangeStyle;
54345434
// Draw background colors
54355435
if (anyBackgrounds) {
54365436
SelectionIterator iterator(prevailingSelections, aContentOffset, aContentLength,
@@ -5562,7 +5562,7 @@ nsTextFrame::PaintTextSelectionDecorations(gfxContext* aCtx,
55625562
gfxRect dirtyRect(aDirtyRect.x / app, aDirtyRect.y / app,
55635563
aDirtyRect.width / app, aDirtyRect.height / app);
55645564
SelectionType type;
5565-
nsTextRangeStyle selectedStyle;
5565+
TextRangeStyle selectedStyle;
55665566
while (iterator.GetNextSegment(&xOffset, &offset, &length, &hyphenWidth,
55675567
&type, &selectedStyle)) {
55685568
gfxFloat advance = hyphenWidth +
@@ -6250,10 +6250,10 @@ nsTextFrame::CombineSelectionUnderlineRect(nsPresContext* aPresContext,
62506250
}
62516251
} else {
62526252
// IME selections
6253-
nsTextRangeStyle& rangeStyle = sd->mTextRangeStyle;
6253+
TextRangeStyle& rangeStyle = sd->mTextRangeStyle;
62546254
if (rangeStyle.IsDefined()) {
62556255
if (!rangeStyle.IsLineStyleDefined() ||
6256-
rangeStyle.mLineStyle == nsTextRangeStyle::LINESTYLE_NONE) {
6256+
rangeStyle.mLineStyle == TextRangeStyle::LINESTYLE_NONE) {
62576257
continue;
62586258
}
62596259
style = rangeStyle.mLineStyle;

‎widget/EventForwards.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,6 @@ typedef mozilla::WidgetEvent nsEvent;
107107
typedef mozilla::WidgetGUIEvent nsGUIEvent;
108108
typedef mozilla::WidgetInputEvent nsInputEvent;
109109
typedef mozilla::InternalUIEvent nsUIEvent;
110-
typedef mozilla::TextRangeStyle nsTextRangeStyle;
111110
typedef mozilla::TextRange nsTextRange;
112111
typedef mozilla::TextRangeArray nsTextRangeArray;
113112
typedef mozilla::WidgetTextEvent nsTextEvent;

0 commit comments

Comments
 (0)