rpms/firefox/devel firefox-1.0-pango-bidi-justify.patch,1.1,1.2
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Tue May 3 20:57:10 UTC 2005
Author: blizzard
Update of /cvs/dist/rpms/firefox/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12788
Modified Files:
firefox-1.0-pango-bidi-justify.patch
Log Message:
fix build problems with bidi patch
firefox-1.0-pango-bidi-justify.patch:
gfx/public/nsIRenderingContext.h | 8 +++
gfx/src/gtk/nsFontMetricsPango.cpp | 3 -
layout/html/base/src/nsTextFrame.cpp | 86 ++++++++++++++++++++++++++---------
3 files changed, 75 insertions(+), 22 deletions(-)
Index: firefox-1.0-pango-bidi-justify.patch
===================================================================
RCS file: /cvs/dist/rpms/firefox/devel/firefox-1.0-pango-bidi-justify.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- firefox-1.0-pango-bidi-justify.patch 3 May 2005 15:50:58 -0000 1.1
+++ firefox-1.0-pango-bidi-justify.patch 3 May 2005 20:57:07 -0000 1.2
@@ -1,50 +1,6 @@
-Index: gfx/public/nsIRenderingContext.h
-===================================================================
-RCS file: /cvsroot/mozilla/gfx/public/nsIRenderingContext.h,v
-retrieving revision 1.62
-diff -u -r1.62 nsIRenderingContext.h
---- gfx/public/nsIRenderingContext.h 27 Nov 2004 08:22:21 -0000 1.62
-+++ gfx/public/nsIRenderingContext.h 14 Apr 2005 07:12:39 -0000
-@@ -835,6 +835,14 @@
- */
- #define NS_RENDERING_HINT_FAST_MEASURE 0x10
-
-+/**
-+ * This bit, when set, indicates that gfx performs glyph reordering of complex
-+ * text after applying character or word spacing, and so expects to be passed
-+ * text in logical order. When this bit is not set, gfx must be passed text in
-+ * visual order if characters and word spacing are to be applied.
-+ */
-+#define NS_RENDERING_HINT_REORDER_SPACED_TEXT 0x40
-+
- //flags for copy CopyOffScreenBits
-
- //when performing the blit, use the region, if any,
-Index: gfx/src/gtk/nsFontMetricsPango.cpp
-===================================================================
-RCS file: /cvsroot/mozilla/gfx/src/gtk/nsFontMetricsPango.cpp,v
-retrieving revision 1.13
-diff -u -r1.13 nsFontMetricsPango.cpp
---- gfx/src/gtk/nsFontMetricsPango.cpp 23 Jan 2005 23:58:30 -0000 1.13
-+++ gfx/src/gtk/nsFontMetricsPango.cpp 14 Apr 2005 07:12:40 -0000
-@@ -1138,7 +1138,8 @@
- return (NS_RENDERING_HINT_BIDI_REORDERING |
- NS_RENDERING_HINT_ARABIC_SHAPING |
- NS_RENDERING_HINT_FAST_MEASURE |
-- NS_RENDERING_HINT_TEXT_CLUSTERS);
-+ NS_RENDERING_HINT_TEXT_CLUSTERS |
-+ NS_RENDERING_HINT_REORDER_SPACED_TEXT);
- }
-
- /* static */
-Index: layout/html/base/src/nsTextFrame.cpp
-===================================================================
-RCS file: /cvsroot/mozilla/layout/html/base/src/Attic/nsTextFrame.cpp,v
-retrieving revision 1.455.6.2
-diff -d -u -p -r1.455.6.2 nsTextFrame.cpp
---- layout/html/base/src/nsTextFrame.cpp 24 Nov 2004 18:39:34 -0000 1.455.6.2
-+++ layout/html/base/src/nsTextFrame.cpp 20 Apr 2005 19:21:11 -0000
-@@ -2931,12 +2931,21 @@ nsTextFrame::PaintTextSlowly(nsIPresCont
+--- ./layout/html/base/src/nsTextFrame.cpp.SCREW 2005-05-03 15:53:09.000000000 -0400
++++ ./layout/html/base/src/nsTextFrame.cpp 2005-05-03 16:45:25.000000000 -0400
+@@ -2967,12 +2967,21 @@
if (0 != textLength) {
#ifdef IBMBIDI
@@ -66,7 +22,7 @@
nsBidiPresUtils* bidiUtils;
aPresContext->GetBidiUtils(&bidiUtils);
-@@ -2949,8 +2958,19 @@ nsTextFrame::PaintTextSlowly(nsIPresCont
+@@ -2985,8 +2994,19 @@
PRInt32 rememberTextLength = textLength;
#endif
// Since we paint char by char, handle the text like on non-bidi platform
@@ -83,22 +39,22 @@
+ // If we will be painting char by char, handle the text like on non-bidi platform
bidiUtils->ReorderUnicodeText(text, textLength, charType,
- level & 1, PR_FALSE);
-+ isOddLevel, (paintCharByChar) ? PR_FALSE : isBidiSystem);
++ level & 1, (paintCharByChar) ? PR_FALSE : isBidiSystem);
NS_ASSERTION(rememberTextLength == textLength, "Bidi formatting changed text length");
}
}
-@@ -2992,7 +3012,9 @@ nsTextFrame::PaintTextSlowly(nsIPresCont
+@@ -3028,7 +3048,9 @@
sdptr->mStart = ip[sdptr->mStart] - mContentOffset;
sdptr->mEnd = ip[sdptr->mEnd] - mContentOffset;
#ifdef IBMBIDI
- AdjustSelectionPointsForBidi(sdptr, textLength, CHARTYPE_IS_RTL(charType), level & 1, PR_FALSE);
+ AdjustSelectionPointsForBidi(sdptr, textLength,
-+ CHARTYPE_IS_RTL(charType), isOddLevel,
++ CHARTYPE_IS_RTL(charType), level & 1,
+ (paintCharByChar) ? PR_FALSE : isBidiSystem);
#endif
sdptr = sdptr->mNext;
}
-@@ -3000,19 +3022,32 @@ nsTextFrame::PaintTextSlowly(nsIPresCont
+@@ -3036,19 +3058,32 @@
DrawSelectionIterator iter(content, details,text,(PRUint32)textLength,aTextStyle, selectionValue, aPresContext, mStyleContext);
if (!iter.IsDone() && iter.First())
{
@@ -122,7 +78,7 @@
+ {
+ nsTextDimensions frameDimensions;
+ GetTextDimensions(aRenderingContext, aTextStyle, text,
-+ (PRInt32)textLength, iter.IsLast(), &frameDimensions);
++ (PRInt32)textLength, &frameDimensions);
+ currentX = dx + frameDimensions.width;
+ }
+#endif
@@ -144,7 +100,7 @@
if (iter.CurrentBackGroundColor(currentBKColor, &isCurrentBKColorTransparent))
{//DRAW RECT HERE!!!
if (!isCurrentBKColorTransparent) {
-@@ -3021,7 +3056,7 @@ nsTextFrame::PaintTextSlowly(nsIPresCont
+@@ -3057,7 +3092,7 @@
}
currentFGColor = EnsureDifferentColors(currentFGColor, currentBKColor);
}
@@ -153,7 +109,7 @@
if (isPaginated && !iter.IsBeforeOrAfter()) {
aRenderingContext.SetColor(nsCSSRendering::TransformColor(aTextStyle.mColor->mColor,canDarkenColor));
-@@ -3035,11 +3070,13 @@ nsTextFrame::PaintTextSlowly(nsIPresCont
+@@ -3071,11 +3106,13 @@
dy, width, details);
}
@@ -171,7 +127,7 @@
}
else if (!isPaginated)
{
-@@ -3057,8 +3094,15 @@ nsTextFrame::PaintTextSlowly(nsIPresCont
+@@ -3093,8 +3130,15 @@
delete details;
}
}
@@ -188,3 +144,32 @@
void
nsTextFrame::PaintAsciiText(nsIPresContext* aPresContext,
+--- ./gfx/public/nsIRenderingContext.h.SCREW 2005-05-03 15:53:09.000000000 -0400
++++ ./gfx/public/nsIRenderingContext.h 2005-05-03 15:53:09.000000000 -0400
+@@ -932,6 +932,14 @@
+ */
+ #define NS_RENDERING_HINT_TEXT_CLUSTERS 0x20
+
++/**
++ * This bit, when set, indicates that gfx performs glyph reordering of complex
++ * text after applying character or word spacing, and so expects to be passed
++ * text in logical order. When this bit is not set, gfx must be passed text in
++ * visual order if characters and word spacing are to be applied.
++ */
++#define NS_RENDERING_HINT_REORDER_SPACED_TEXT 0x40
++
+ //flags for copy CopyOffScreenBits
+
+ //when performing the blit, use the region, if any,
+--- ./gfx/src/gtk/nsFontMetricsPango.cpp.SCREW 2005-05-03 15:53:09.000000000 -0400
++++ ./gfx/src/gtk/nsFontMetricsPango.cpp 2005-05-03 15:53:09.000000000 -0400
+@@ -1138,7 +1138,8 @@
+ return (NS_RENDERING_HINT_BIDI_REORDERING |
+ NS_RENDERING_HINT_ARABIC_SHAPING |
+ NS_RENDERING_HINT_FAST_MEASURE |
+- NS_RENDERING_HINT_TEXT_CLUSTERS);
++ NS_RENDERING_HINT_TEXT_CLUSTERS |
++ NS_RENDERING_HINT_REORDER_SPACED_TEXT);
+ }
+
+ /* static */
More information about the fedora-cvs-commits
mailing list