aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar skia.committer@gmail.com <skia.committer@gmail.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2012-11-20 02:01:23 +0000
committerGravatar skia.committer@gmail.com <skia.committer@gmail.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2012-11-20 02:01:23 +0000
commit3458716b52aa25dcd1b270141c7628c380696e35 (patch)
tree2d5be71f83fcbf3f12ead60297adac65dd9224d4
parent866ff8787a9823d05363e6f95ea4d599c6fca8fd (diff)
Sanitizing source files in Skia_Periodic_House_Keeping
git-svn-id: http://skia.googlecode.com/svn/trunk@6500 2bbb7eff-a529-9590-31e7-b0007b416f81
-rw-r--r--debugger/QT/SkDebuggerGUI.cpp6
-rw-r--r--debugger/QT/SkDebuggerGUI.h4
-rw-r--r--debugger/QT/qrc_SkIcons.cpp8
-rw-r--r--gm/blurrect.cpp14
-rw-r--r--include/core/SkPath.h2
-rw-r--r--src/effects/SkBlurMaskFilter.cpp4
-rw-r--r--src/gpu/gl/mac/GrGLCreateNativeInterface_mac.cpp2
-rw-r--r--tests/PathTest.cpp2
8 files changed, 21 insertions, 21 deletions
diff --git a/debugger/QT/SkDebuggerGUI.cpp b/debugger/QT/SkDebuggerGUI.cpp
index 3b9b8aaefb..710791ace1 100644
--- a/debugger/QT/SkDebuggerGUI.cpp
+++ b/debugger/QT/SkDebuggerGUI.cpp
@@ -278,8 +278,8 @@ private:
// This is a simplification of PictureBenchmark's run with the addition of
// clearing of the times after the first pass (in resetTimes)
-void SkDebuggerGUI::run(SkTimedPicture* pict,
- sk_tools::PictureRenderer* renderer,
+void SkDebuggerGUI::run(SkTimedPicture* pict,
+ sk_tools::PictureRenderer* renderer,
int repeats) {
SkASSERT(pict);
if (NULL == pict) {
@@ -1064,7 +1064,7 @@ void SkDebuggerGUI::setupComboBox(SkTArray<SkString>* command) {
map[(*command)[i].c_str()]++;
}
- for (std::map<std::string, int>::iterator it = map.begin(); it != map.end();
+ for (std::map<std::string, int>::iterator it = map.begin(); it != map.end();
++it) {
fFilter.addItem((it->first).c_str());
}
diff --git a/debugger/QT/SkDebuggerGUI.h b/debugger/QT/SkDebuggerGUI.h
index 09e7f70216..c74ed80859 100644
--- a/debugger/QT/SkDebuggerGUI.h
+++ b/debugger/QT/SkDebuggerGUI.h
@@ -313,8 +313,8 @@ private:
Render the supplied picture several times tracking the time consumed
by each command.
*/
- void run(SkTimedPicture* pict,
- sk_tools::PictureRenderer* renderer,
+ void run(SkTimedPicture* pict,
+ sk_tools::PictureRenderer* renderer,
int repeats);
};
diff --git a/debugger/QT/qrc_SkIcons.cpp b/debugger/QT/qrc_SkIcons.cpp
index 1f93efebe9..0f33e52ea4 100644
--- a/debugger/QT/qrc_SkIcons.cpp
+++ b/debugger/QT/qrc_SkIcons.cpp
@@ -783,7 +783,7 @@ static const unsigned char qt_resource_data[] = {
0x96,0x1b,0xaa,0x3c,0xb0,0xd,0x98,0x7,0xfe,0x5a,0xe7,0x6c,0x6,0x68,0x3,0x5a,
0x81,0x65,0x60,0x1a,0x77,0xf9,0x37,0xea,0x7f,0x5e,0x7f,0x3,0x6e,0xb2,0xc3,0xf0,
0x1c,0xaa,0x77,0x3f,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82,
-
+
// D:/src/skia.1/trunk/debugger/QT/Icons/pause.png
0x0,0x0,0x4,0x9d,
0x89,
@@ -933,7 +933,7 @@ static const unsigned char qt_resource_data[] = {
0xa0,0x17,0xb8,0xc5,0x2e,0xee,0x84,0xc9,0x6d,0x62,0xf,0xb6,0x24,0x7a,0xb,0xf0,
0xd8,0x1c,0x6c,0x6,0x3,0x76,0x71,0x2d,0xbf,0x6f,0xff,0x1,0x15,0x13,0xb7,0x7f,
0x67,0x24,0x89,0x36,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82,
-
+
// D:/src/skia.1/trunk/debugger/QT/Icons/profile.png
0x0,0x0,0x0,0xf3,
0x89,
@@ -1015,7 +1015,7 @@ static const unsigned char qt_resource_data[] = {
0x2a,0x15,0xd6,0xc6,0x2f,0x71,0x6,0x9b,0x95,0x25,0x6b,0x29,0x37,0x99,0x4,0x36,
0x60,0xe1,0x6f,0x2d,0x17,0x60,0x55,0xab,0xfa,0x7,0x42,0xae,0x87,0xb8,0x50,0x72,
0xc9,0x52,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82,
-
+
};
static const unsigned char qt_resource_name[] = {
@@ -1085,7 +1085,7 @@ static const unsigned char qt_resource_name[] = {
0x8,0x37,0xcd,0x47,
0x0,0x70,
0x0,0x72,0x0,0x65,0x0,0x76,0x0,0x69,0x0,0x6f,0x0,0x75,0x0,0x73,0x0,0x2e,0x0,0x70,0x0,0x6e,0x0,0x67,
-
+
};
static const unsigned char qt_resource_struct[] = {
diff --git a/gm/blurrect.cpp b/gm/blurrect.cpp
index 5a0dab6388..36e59ead88 100644
--- a/gm/blurrect.cpp
+++ b/gm/blurrect.cpp
@@ -28,34 +28,34 @@ static void stroke_rect(SkCanvas* canvas, const SkRect& r, const SkPaint& p) {
static void draw_donut(SkCanvas* canvas, const SkRect& r, const SkPaint& p) {
SkRect rect;
SkPath path;
-
+
rect = r;
rect.outset(STROKE_WIDTH/2, STROKE_WIDTH/2);
path.addRect(rect);
rect = r;
rect.inset(STROKE_WIDTH/2, STROKE_WIDTH/2);
-
+
path.addRect(rect);
path.setFillType(SkPath::kEvenOdd_FillType);
-
+
canvas->drawPath(path, p);
}
static void draw_donut_skewed(SkCanvas* canvas, const SkRect& r, const SkPaint& p) {
SkRect rect;
SkPath path;
-
+
rect = r;
rect.outset(STROKE_WIDTH/2, STROKE_WIDTH/2);
path.addRect(rect);
rect = r;
rect.inset(STROKE_WIDTH/2, STROKE_WIDTH/2);
-
+
rect.offset(7, -7);
-
+
path.addRect(rect);
path.setFillType(SkPath::kEvenOdd_FillType);
-
+
canvas->drawPath(path, p);
}
diff --git a/include/core/SkPath.h b/include/core/SkPath.h
index a162c1e07e..b2a034f2a4 100644
--- a/include/core/SkPath.h
+++ b/include/core/SkPath.h
@@ -916,7 +916,7 @@ private:
inline bool hasOnlyMoveTos() const;
Convexity internalGetConvexity() const;
-
+
bool isRectContour(bool allowPartial, int* currVerb, const SkPoint** pts) const;
friend class SkAutoPathBoundsUpdate;
diff --git a/src/effects/SkBlurMaskFilter.cpp b/src/effects/SkBlurMaskFilter.cpp
index 94b7fa90a1..6cc19c16ab 100644
--- a/src/effects/SkBlurMaskFilter.cpp
+++ b/src/effects/SkBlurMaskFilter.cpp
@@ -152,13 +152,13 @@ SkBlurMaskFilterImpl::filterRectsToNine(const SkRect rects[], int count,
if (count < 1 || count > 2) {
return kUnimplemented_FilterReturn;
}
-
+
// TODO: take clipBounds into account to limit our coordinates up front
// for now, just skip too-large src rects (to take the old code path).
if (rect_coordinates_exceed(rects[0], SkIntToScalar(32767))) {
return kUnimplemented_FilterReturn;
}
-
+
SkIPoint margin;
SkMask srcM, dstM;
rects[0].roundOut(&srcM.fBounds);
diff --git a/src/gpu/gl/mac/GrGLCreateNativeInterface_mac.cpp b/src/gpu/gl/mac/GrGLCreateNativeInterface_mac.cpp
index 17bfaebab9..fce96f4cc5 100644
--- a/src/gpu/gl/mac/GrGLCreateNativeInterface_mac.cpp
+++ b/src/gpu/gl/mac/GrGLCreateNativeInterface_mac.cpp
@@ -109,7 +109,7 @@ const GrGLInterface* GrGLCreateNativeInterface() {
interface->fReadBuffer = glReadBuffer;
interface->fReadPixels = glReadPixels;
interface->fScissor = glScissor;
- // The new OpenGLES2 header has an extra "const" in it. :(
+ // The new OpenGLES2 header has an extra "const" in it. :(
#if GR_USE_NEW_GL_SHADER_SOURCE_SIGNATURE
interface->fShaderSource = (GrGLShaderSourceProc) glShaderSource;
#else
diff --git a/tests/PathTest.cpp b/tests/PathTest.cpp
index 0d4e1255ab..823fda64b7 100644
--- a/tests/PathTest.cpp
+++ b/tests/PathTest.cpp
@@ -1289,7 +1289,7 @@ static void test_isNestedRects(skiatest::Reporter* reporter) {
path1.addRect(-1, -1, 2, 2, SkPath::kCCW_Direction);
}
REPORTER_ASSERT(reporter, fail ^ path1.isNestedRects(0));
-
+
// fail, not nested
path1.reset();
path1.addRect(1, 1, 3, 3, SkPath::kCW_Direction);