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

Unified Diff: Source/core/html/canvas/WebGLRenderingContext.cpp

Issue 23819007: Have Node::document() return a reference instead of a pointer (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebase on master Created 7 years, 4 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
« no previous file with comments | « Source/core/html/canvas/CanvasStyle.cpp ('k') | Source/core/html/ime/InputMethodContext.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/html/canvas/WebGLRenderingContext.cpp
diff --git a/Source/core/html/canvas/WebGLRenderingContext.cpp b/Source/core/html/canvas/WebGLRenderingContext.cpp
index 97b2d6d6600c2f96b29ddd684e1e390589251731..4910f7d30c9496e4e19e56fd538af0af154ecfc5 100644
--- a/Source/core/html/canvas/WebGLRenderingContext.cpp
+++ b/Source/core/html/canvas/WebGLRenderingContext.cpp
@@ -494,8 +494,8 @@ private:
PassOwnPtr<WebGLRenderingContext> WebGLRenderingContext::create(HTMLCanvasElement* canvas, WebGLContextAttributes* attrs)
{
- Document* document = canvas->document();
- Frame* frame = document->frame();
+ Document& document = canvas->document();
+ Frame* frame = document.frame();
if (!frame)
return nullptr;
Settings* settings = frame->settings();
@@ -511,7 +511,7 @@ PassOwnPtr<WebGLRenderingContext> WebGLRenderingContext::create(HTMLCanvasElemen
requestedAttributes.noExtensions = true;
requestedAttributes.shareResources = true;
requestedAttributes.preferDiscreteGPU = true;
- requestedAttributes.topDocumentURL = document->topDocument()->url();
+ requestedAttributes.topDocumentURL = document.topDocument()->url();
GraphicsContext3D::Attributes attributes = adjustAttributes(requestedAttributes, settings);
@@ -539,7 +539,7 @@ PassOwnPtr<WebGLRenderingContext> WebGLRenderingContext::create(HTMLCanvasElemen
WebGLRenderingContext::WebGLRenderingContext(HTMLCanvasElement* passedCanvas, PassRefPtr<GraphicsContext3D> context, GraphicsContext3D::Attributes attributes, GraphicsContext3D::Attributes requestedAttributes)
: CanvasRenderingContext(passedCanvas)
- , ActiveDOMObject(passedCanvas->document())
+ , ActiveDOMObject(&passedCanvas->document())
, m_context(context)
, m_drawingBuffer(0)
, m_dispatchContextLostEventTimer(this, &WebGLRenderingContext::dispatchContextLostEvent)
@@ -685,7 +685,7 @@ void WebGLRenderingContext::initializeNewContext()
void WebGLRenderingContext::setupFlags()
{
ASSERT(m_context);
- if (Page* p = canvas()->document()->page()) {
+ if (Page* p = canvas()->document().page()) {
m_synthesizedErrorsToConsole = p->settings().webGLErrorsToConsoleEnabled();
if (!m_multisamplingObserverRegistered && m_requestedAttributes.antialias) {
@@ -701,7 +701,7 @@ void WebGLRenderingContext::setupFlags()
bool WebGLRenderingContext::allowPrivilegedExtensions() const
{
- if (Page* p = canvas()->document()->page())
+ if (Page* p = canvas()->document().page())
return p->settings().privilegedWebGLExtensionsEnabled();
return false;
}
@@ -750,7 +750,7 @@ WebGLRenderingContext::~WebGLRenderingContext()
destroyGraphicsContext3D();
if (m_multisamplingObserverRegistered) {
- Page* page = canvas()->document()->page();
+ Page* page = canvas()->document().page();
if (page)
page->removeMultisamplingChangedObserver(this);
}
@@ -875,7 +875,7 @@ void WebGLRenderingContext::paintRenderingResultsToCanvas()
return;
}
- if (canvas()->document()->printing())
+ if (canvas()->document().printing())
canvas()->clearPresentationCopy();
// Until the canvas is written to by the application, the clear that
@@ -4110,10 +4110,8 @@ void WebGLRenderingContext::loseContextImpl(WebGLRenderingContext::LostContextMo
if (mode == RealLostContext) {
// Inform the embedder that a lost context was received. In response, the embedder might
// decide to take action such as asking the user for permission to use WebGL again.
- if (Document* document = canvas()->document()) {
- if (Frame* frame = document->frame())
- frame->loader()->client()->didLoseWebGLContext(m_context->getExtensions()->getGraphicsResetStatusARB());
- }
+ if (Frame* frame = canvas()->document().frame())
+ frame->loader()->client()->didLoseWebGLContext(m_context->getExtensions()->getGraphicsResetStatusARB());
}
// Make absolutely sure we do not refer to an already-deleted texture or framebuffer.
@@ -4939,10 +4937,7 @@ void WebGLRenderingContext::printWarningToConsole(const String& message)
{
if (!canvas())
return;
- Document* document = canvas()->document();
- if (!document)
- return;
- document->addConsoleMessage(RenderingMessageSource, WarningMessageLevel, message);
+ canvas()->document().addConsoleMessage(RenderingMessageSource, WarningMessageLevel, message);
}
bool WebGLRenderingContext::validateFramebufferFuncParameters(const char* functionName, GC3Denum target, GC3Denum attachment)
@@ -5342,10 +5337,7 @@ void WebGLRenderingContext::maybeRestoreContext(Timer<WebGLRenderingContext>*)
if (!m_restoreAllowed)
return;
- Document* document = canvas()->document();
- if (!document)
- return;
- Frame* frame = document->frame();
+ Frame* frame = canvas()->document().frame();
if (!frame)
return;
« no previous file with comments | « Source/core/html/canvas/CanvasStyle.cpp ('k') | Source/core/html/ime/InputMethodContext.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698