Result of running tools/sanitize_source_files.py (which was added in https://codereview.appspot.com/6465078/)
This CL is part III of IV (I broke down the 1280 files into 4 CLs).
Review URL: https://codereview.appspot.com/6475053
git-svn-id: http://skia.googlecode.com/svn/trunk@5264 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/samplecode/SampleTextBox.cpp b/samplecode/SampleTextBox.cpp
index 6a8c50e..d8612db 100644
--- a/samplecode/SampleTextBox.cpp
+++ b/samplecode/SampleTextBox.cpp
@@ -35,27 +35,27 @@
#endif
static const char gText[] =
- "When in the Course of human events it becomes necessary for one people "
- "to dissolve the political bands which have connected them with another "
- "and to assume among the powers of the earth, the separate and equal "
- "station to which the Laws of Nature and of Nature's God entitle them, "
- "a decent respect to the opinions of mankind requires that they should "
- "declare the causes which impel them to the separation.";
+ "When in the Course of human events it becomes necessary for one people "
+ "to dissolve the political bands which have connected them with another "
+ "and to assume among the powers of the earth, the separate and equal "
+ "station to which the Laws of Nature and of Nature's God entitle them, "
+ "a decent respect to the opinions of mankind requires that they should "
+ "declare the causes which impel them to the separation.";
class TextBoxView : public SampleView {
public:
- TextBoxView() {
+ TextBoxView() {
#if defined(SK_BUILD_FOR_WIN) && defined(SK_FONTHOST_WIN_GDI)
- LOGFONT lf;
- sk_bzero(&lf, sizeof(lf));
- lf.lfHeight = 9;
- SkTypeface* tf0 = SkCreateTypefaceFromLOGFONT(lf);
- lf.lfHeight = 12;
- SkTypeface* tf1 = SkCreateTypefaceFromLOGFONT(lf);
- // we assert that different sizes should not affect which face we get
- SkASSERT(tf0 == tf1);
- tf0->unref();
- tf1->unref();
+ LOGFONT lf;
+ sk_bzero(&lf, sizeof(lf));
+ lf.lfHeight = 9;
+ SkTypeface* tf0 = SkCreateTypefaceFromLOGFONT(lf);
+ lf.lfHeight = 12;
+ SkTypeface* tf1 = SkCreateTypefaceFromLOGFONT(lf);
+ // we assert that different sizes should not affect which face we get
+ SkASSERT(tf0 == tf1);
+ tf0->unref();
+ tf1->unref();
#endif
}
@@ -75,24 +75,24 @@
canvas->clipRect(SkRect::MakeWH(w, h));
canvas->drawColor(bg);
- SkScalar margin = 20;
+ SkScalar margin = 20;
SkTextBox tbox;
- tbox.setMode(SkTextBox::kLineBreak_Mode);
- tbox.setBox(margin, margin,
- w - margin, h - margin);
- tbox.setSpacing(SkIntToScalar(3)/3, 0);
+ tbox.setMode(SkTextBox::kLineBreak_Mode);
+ tbox.setBox(margin, margin,
+ w - margin, h - margin);
+ tbox.setSpacing(SkIntToScalar(3)/3, 0);
- SkPaint paint;
- paint.setAntiAlias(true);
+ SkPaint paint;
+ paint.setAntiAlias(true);
paint.setLCDRenderText(true);
paint.setColor(fg);
- tbox.setText(gText, strlen(gText), paint);
+ tbox.setText(gText, strlen(gText), paint);
- for (int i = 9; i < 24; i += 2) {
- paint.setTextSize(SkIntToScalar(i));
- tbox.draw(canvas);
- canvas->translate(0, tbox.getTextHeight() + paint.getFontSpacing());
- }
+ for (int i = 9; i < 24; i += 2) {
+ paint.setTextSize(SkIntToScalar(i));
+ tbox.draw(canvas);
+ canvas->translate(0, tbox.getTextHeight() + paint.getFontSpacing());
+ }
}
virtual void onDrawContent(SkCanvas* canvas) {