Merge http://trac.webkit.org/changeset/93131 : GraphicsContext3D should allow its hostWindow to b...

Source/WebKit/chromium/src/GraphicsContext3DChromium.cpp

 /*
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 33 matching lines @@
 #include "HTMLCanvasElement.h"
 #include "HTMLImageElement.h"
 #include "ImageBuffer.h"
 #include "ImageData.h"
 #include "WebGraphicsContext3D.h"
 #include "WebKit.h"
 #include "WebKitClient.h"
 #include "WebViewImpl.h"
 
 #include <stdio.h>
+#include <wtf/Assertions.h>
 #include <wtf/FastMalloc.h>
 #include <wtf/text/CString.h>
 
 #if USE(CG)
 #include "GraphicsContext.h"
 #include "WebGLRenderingContext.h"
 #include <CoreGraphics/CGContext.h>
 #include <CoreGraphics/CGImage.h>
 #endif
 
@@ skipping 51 matching lines @@
     webAttributes.stencil = attrs.stencil;
     webAttributes.antialias = attrs.antialias;
     webAttributes.premultipliedAlpha = attrs.premultipliedAlpha;
     webAttributes.canRecoverFromContextLoss = attrs.canRecoverFromContextLoss;
     webAttributes.noExtensions = attrs.noExtensions;
     OwnPtr<WebKit::WebGraphicsContext3D> webContext = adoptPtr(WebKit::webKitClient()->createGraphicsContext3D());
     if (!webContext)
         return false;
 
     Chrome* chrome = static_cast<Chrome*>(hostWindow);
-    m_webViewImpl = static_cast<WebKit::WebViewImpl*>(chrome->client()->webView());
+    m_webViewImpl = chrome ? static_cast<WebKit::WebViewImpl*>(chrome->client()->webView()) : 0;
 
-    if (!m_webViewImpl)
-        return false;
     if (!webContext->initialize(webAttributes, m_webViewImpl, renderDirectlyToHostWindow))
         return false;
     m_impl = webContext.release();
 
 #if USE(ACCELERATED_COMPOSITING)
     m_compositingLayer = WebGLLayerChromium::create(0);
 #endif
     return true;
 }
 
 WebKit::WebGraphicsContext3D* GraphicsContext3DInternal::extractWebGraphicsContext3D(GraphicsContext3D* context)
 {
     if (!context)
         return 0;
     return context->m_internal->m_impl.get();
 }
 
 PlatformGraphicsContext3D GraphicsContext3DInternal::platformGraphicsContext3D() const
 {
     return m_impl.get();
 }
 
 Platform3DObject GraphicsContext3DInternal::platformTexture() const
 {
+    ASSERT(m_webViewImpl);
     m_impl->setParentContext(m_webViewImpl->graphicsContext3D());
     return m_impl->getPlatformTextureId();
 }
 
 #if USE(SKIA)
 GrContext* GraphicsContext3DInternal::grContext()
 {
     // Limit the number of textures we hold in the bitmap->texture cache.
     static const int maxTextureCacheCount = 512;
     // Limit the bytes allocated toward textures in the bitmap->texture cache.
@@ skipping 133 matching lines @@
 
     for (size_t i = 0; i < bufferSize; i += 4)
         std::swap(pixels[i], pixels[i + 2]);
 
     return imageData.release();
 }
 
 bool GraphicsContext3DInternal::paintsIntoCanvasBuffer() const
 {
     // If the gpu compositor is on then skip the readback and software rendering path.
+    ASSERT(m_webViewImpl);
     return !m_webViewImpl->isAcceleratedCompositingActive();
 }
 
 void GraphicsContext3DInternal::reshape(int width, int height)
 {
     if (width == m_impl->width() && height == m_impl->height())
         return;
 
     m_impl->reshape(width, height);
 }
@@ skipping 931 matching lines @@
 
 void GraphicsContext3DInternal::setSwapBuffersCompleteCallbackCHROMIUM(PassOwnPtr<Extensions3DChromium::SwapBuffersCompleteCallbackCHROMIUM> cb)
 {
     m_swapBuffersCompleteCallbackAdapter = SwapBuffersCompleteCallbackAdapter::create(cb);
     m_impl->setSwapBuffersCompleteCallbackCHROMIUM(m_swapBuffersCompleteCallbackAdapter.get());
 }
 
 } // namespace WebCore
 
 #endif // ENABLE(WEBGL)