Remove more unnamed namespace usages.
Skia prefers 'static' over 'unnamed' namespaces.
BUG=None
TEST=skgpu and tools
R=robertphillips@google.com, bsalomon@google.com
Review URL: https://codereview.chromium.org/139743010
git-svn-id: http://skia.googlecode.com/svn/trunk@13146 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/experimental/StrokePathRenderer/GrStrokePathRenderer.cpp b/experimental/StrokePathRenderer/GrStrokePathRenderer.cpp
index fbfc765..4b41dba 100644
--- a/experimental/StrokePathRenderer/GrStrokePathRenderer.cpp
+++ b/experimental/StrokePathRenderer/GrStrokePathRenderer.cpp
@@ -11,9 +11,7 @@
#include "SkPath.h"
#include "SkStrokeRec.h"
-namespace {
-
-bool is_clockwise(const SkVector& before, const SkVector& after) {
+static bool is_clockwise(const SkVector& before, const SkVector& after) {
return before.cross(after) > 0;
}
@@ -23,9 +21,9 @@
kOut_IntersectionType
};
-IntersectionType intersection(const SkPoint& p1, const SkPoint& p2,
- const SkPoint& p3, const SkPoint& p4,
- SkPoint& res) {
+static IntersectionType intersection(const SkPoint& p1, const SkPoint& p2,
+ const SkPoint& p3, const SkPoint& p4,
+ SkPoint& res) {
// Store the values for fast access and easy
// equations-to-code conversion
SkScalar x1 = p1.x(), x2 = p2.x(), x3 = p3.x(), x4 = p4.x();
@@ -52,8 +50,6 @@
kOut_IntersectionType : kIn_IntersectionType;
}
-} // namespace
-
GrStrokePathRenderer::GrStrokePathRenderer() {
}
diff --git a/tools/picture_utils.cpp b/tools/picture_utils.cpp
index 7a5e156..ee189ad 100644
--- a/tools/picture_utils.cpp
+++ b/tools/picture_utils.cpp
@@ -12,6 +12,14 @@
#include "SkString.h"
#include "SkStream.h"
+static bool is_path_seperator(const char chr) {
+#if defined(SK_BUILD_FOR_WIN)
+ return chr == '\\' || chr == '/';
+#else
+ return chr == '/';
+#endif
+}
+
namespace sk_tools {
void force_all_opaque(const SkBitmap& bitmap) {
SkASSERT(NULL == bitmap.getTexture());
@@ -37,16 +45,6 @@
path->append(name);
}
- namespace {
- bool is_path_seperator(const char chr) {
-#if defined(SK_BUILD_FOR_WIN)
- return chr == '\\' || chr == '/';
-#else
- return chr == '/';
-#endif
- }
- }
-
void get_basename(SkString* basename, const SkString& path) {
if (path.size() == 0) {
basename->reset();
diff --git a/tools/render_pictures_main.cpp b/tools/render_pictures_main.cpp
index b067a65..bc765f7 100644
--- a/tools/render_pictures_main.cpp
+++ b/tools/render_pictures_main.cpp
@@ -219,7 +219,6 @@
SkMax32(abs(getByte(v1, 2) - getByte(v2, 2)), abs(getByte(v1, 3) - getByte(v2, 3))));
}
-namespace {
class AutoRestoreBbhType {
public:
AutoRestoreBbhType() {
@@ -244,7 +243,6 @@
sk_tools::PictureRenderer* fRenderer;
sk_tools::PictureRenderer::BBoxHierarchyType fSavedBbhType;
};
-}
/**
* Render the SKP file(s) within inputPath, writing their bitmap images into outputDir.