aboutsummaryrefslogtreecommitdiffhomepage
path: root/include/views
diff options
context:
space:
mode:
authorGravatar mtklein <mtklein@chromium.org>2016-03-16 13:53:35 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2016-03-16 13:53:35 -0700
commit18300a3aa7cb6eb55d21bb0450dffa58b6fc062c (patch)
treed1c0f54567937ed7dd44fb17842c6c1b544815d0 /include/views
parent830dfd87a7707f687e13da5be645e75c746a2cf5 (diff)
detach -> release
The C++ standard library uses the name "release" for the operation we call "detach". Rewriting each "detach(" to "release(" brings us a step closer to using standard library types directly (e.g. std::unique_ptr instead of SkAutoTDelete). This was a fairly blind transformation. There may have been unintentional conversions in here, but it's probably for the best to have everything uniformly say "release". BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1809733002 Review URL: https://codereview.chromium.org/1809733002
Diffstat (limited to 'include/views')
-rw-r--r--include/views/SkOSWindow_Android.h2
-rw-r--r--include/views/SkOSWindow_Mac.h2
-rw-r--r--include/views/SkOSWindow_SDL.h2
-rw-r--r--include/views/SkOSWindow_Unix.h2
-rw-r--r--include/views/SkOSWindow_Win.h2
-rw-r--r--include/views/SkOSWindow_iOS.h2
6 files changed, 6 insertions, 6 deletions
diff --git a/include/views/SkOSWindow_Android.h b/include/views/SkOSWindow_Android.h
index 4fc32ce19d..74175bafd1 100644
--- a/include/views/SkOSWindow_Android.h
+++ b/include/views/SkOSWindow_Android.h
@@ -29,7 +29,7 @@ public:
};
bool attach(SkBackEndTypes attachType, int msaaSampleCount, AttachmentInfo* info);
- void detach();
+ void release();
void present();
bool makeFullscreen() { return true; }
void closeWindow();
diff --git a/include/views/SkOSWindow_Mac.h b/include/views/SkOSWindow_Mac.h
index 6ce898321f..efa97bf872 100644
--- a/include/views/SkOSWindow_Mac.h
+++ b/include/views/SkOSWindow_Mac.h
@@ -32,7 +32,7 @@ public:
#endif // SK_COMMAND_BUFFER
};
- void detach();
+ void release();
bool attach(SkBackEndTypes attachType, int msaaSampleCount, AttachmentInfo*);
void present();
diff --git a/include/views/SkOSWindow_SDL.h b/include/views/SkOSWindow_SDL.h
index e08108add4..6823441715 100644
--- a/include/views/SkOSWindow_SDL.h
+++ b/include/views/SkOSWindow_SDL.h
@@ -28,7 +28,7 @@ public:
#endif // SK_COMMAND_BUFFER
};
- void detach();
+ void release();
bool attach(SkBackEndTypes attachType, int msaaSampleCount, AttachmentInfo*);
void present();
bool makeFullscreen();
diff --git a/include/views/SkOSWindow_Unix.h b/include/views/SkOSWindow_Unix.h
index ecd0a14521..30386da183 100644
--- a/include/views/SkOSWindow_Unix.h
+++ b/include/views/SkOSWindow_Unix.h
@@ -45,7 +45,7 @@ public:
};
bool attach(SkBackEndTypes attachType, int msaaSampleCount, AttachmentInfo*);
- void detach();
+ void release();
void present();
int getMSAASampleCount() const { return fMSAASampleCount; }
diff --git a/include/views/SkOSWindow_Win.h b/include/views/SkOSWindow_Win.h
index c1a68c621e..a1b222d7a1 100644
--- a/include/views/SkOSWindow_Win.h
+++ b/include/views/SkOSWindow_Win.h
@@ -48,7 +48,7 @@ public:
};
bool attach(SkBackEndTypes attachType, int msaaSampleCount, AttachmentInfo*);
- void detach();
+ void release();
void present();
bool wndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam);
diff --git a/include/views/SkOSWindow_iOS.h b/include/views/SkOSWindow_iOS.h
index 071d6db18c..5a8b2e3d2f 100644
--- a/include/views/SkOSWindow_iOS.h
+++ b/include/views/SkOSWindow_iOS.h
@@ -21,7 +21,7 @@ public:
kNativeGL_BackEndType,
};
- void detach();
+ void release();
bool attach(SkBackEndTypes attachType, int msaaSampleCount, AttachmentInfo*);
void present();