Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(962)

Unified Diff: third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.cpp

Issue 1686483002: Oilpan: Remove most WillBe types from the code base (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.cpp
diff --git a/third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.cpp b/third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.cpp
index c2eae60968dbdfe8d3af0f7cc58bd8988b67a3ab..67b09eb9f01effc17d9cfca7b6f1258f8ae1f5c6 100644
--- a/third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.cpp
+++ b/third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.cpp
@@ -111,14 +111,14 @@ const double secondsBetweenRestoreAttempts = 1.0;
const int maxGLErrorsAllowedToConsole = 256;
const unsigned maxGLActiveContexts = 16;
-using WebGLRenderingContextBaseSet = WillBePersistentHeapHashSet<RawPtrWillBeWeakMember<WebGLRenderingContextBase>>;
+using WebGLRenderingContextBaseSet = PersistentHeapHashSet<WeakMember<WebGLRenderingContextBase>>;
WebGLRenderingContextBaseSet& activeContexts()
{
DEFINE_STATIC_LOCAL(WebGLRenderingContextBaseSet, activeContexts, ());
return activeContexts;
}
-using WebGLRenderingContextBaseMap = WillBePersistentHeapHashMap<RawPtrWillBeWeakMember<WebGLRenderingContextBase>, int>;
+using WebGLRenderingContextBaseMap = PersistentHeapHashMap<WeakMember<WebGLRenderingContextBase>, int>;
WebGLRenderingContextBaseMap& forciblyEvictedContexts()
{
DEFINE_STATIC_LOCAL(WebGLRenderingContextBaseMap, forciblyEvictedContexts, ());
@@ -137,7 +137,7 @@ void WebGLRenderingContextBase::forciblyLoseOldestContext(const String& reason)
// been lost. Garbage collection might be triggered in the middle of this function, for
// example, printWarningToConsole() causes an upcall to JavaScript.
// Must make sure that the context is not deleted until the call stack unwinds.
- RefPtrWillBeRawPtr<WebGLRenderingContextBase> protect(candidate);
+ RawPtr<WebGLRenderingContextBase> protect(candidate);
candidate->printWarningToConsole(reason);
InspectorInstrumentation::didFireWebGLWarning(candidate->canvas());
@@ -473,7 +473,7 @@ public:
}
private:
- RawPtrWillBeMember<WebGLRenderingContextBase> m_context;
+ Member<WebGLRenderingContextBase> m_context;
};
class ScopedFramebufferRestorer {
@@ -490,7 +490,7 @@ public:
}
private:
- RawPtrWillBeMember<WebGLRenderingContextBase> m_context;
+ Member<WebGLRenderingContextBase> m_context;
};
class WebGLRenderingContextErrorMessageCallback final : public GarbageCollectedFinalized<WebGLRenderingContextErrorMessageCallback>, public WebGraphicsContext3D::WebGraphicsErrorMessageCallback {
@@ -518,7 +518,7 @@ private:
explicit WebGLRenderingContextErrorMessageCallback(WebGLRenderingContextBase* context)
: m_context(context) { }
- RawPtrWillBeMember<WebGLRenderingContextBase> m_context;
+ Member<WebGLRenderingContextBase> m_context;
};
static void formatWebGLStatusString(const String& glInfo, const String& infostring, String& statusMessage)
@@ -4248,7 +4248,7 @@ void WebGLRenderingContextBase::texImage2D(GLenum target, GLint level, GLint int
}
void WebGLRenderingContextBase::texImage2D(GLenum target, GLint level, GLint internalformat,
- GLenum format, GLenum type, PassRefPtrWillBeRawPtr<ImageBitmap> bitmap, ExceptionState& exceptionState)
+ GLenum format, GLenum type, RawPtr<ImageBitmap> bitmap, ExceptionState& exceptionState)
{
if (isContextLost())
return;
@@ -4514,7 +4514,7 @@ void WebGLRenderingContextBase::texSubImage2D(GLenum target, GLint level, GLint
}
void WebGLRenderingContextBase::texSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset,
- GLenum format, GLenum type, PassRefPtrWillBeRawPtr<ImageBitmap> bitmap, ExceptionState& exceptionState)
+ GLenum format, GLenum type, RawPtr<ImageBitmap> bitmap, ExceptionState& exceptionState)
{
if (isContextLost())
return;
@@ -5963,7 +5963,7 @@ bool WebGLRenderingContextBase::validateDrawElements(const char* functionName, G
void WebGLRenderingContextBase::dispatchContextLostEvent(Timer<WebGLRenderingContextBase>*)
{
- RefPtrWillBeRawPtr<WebGLContextEvent> event = WebGLContextEvent::create(EventTypeNames::webglcontextlost, false, true, "");
+ RawPtr<WebGLContextEvent> event = WebGLContextEvent::create(EventTypeNames::webglcontextlost, false, true, "");
canvas()->dispatchEvent(event);
m_restoreAllowed = event->defaultPrevented();
if (m_restoreAllowed && !m_isHidden) {

Powered by Google App Engine
This is Rietveld 408576698