[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
commit-queue at webkit.org
commit-queue at webkit.org
Wed Dec 22 15:27:54 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 8f2e6896b57ad35bfc3a1e6690a4845f34679e9c
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Nov 4 02:42:34 2010 +0000
2010-11-03 Vincent Scheib <scheib at chromium.org>
Reviewed by James Robinson.
[chromium] GraphicsContext3D creation attributes include canRecoverFromContextLoss option
https://bugs.webkit.org/show_bug.cgi?id=48850
Implementations of GraphicsContext3D may respect the creation attribute
canRecoverFromContextLoss being false, and then only succeeding initialization if
the context can satisfy that request of never being lost. DX9 on XP can not satisfy
such a request.
Test by use of accelerated canvas 2d in Chromium with ANGLE on XP machines.
* platform/graphics/GraphicsContext3D.h:
(WebCore::GraphicsContext3D::Attributes::Attributes):
* platform/graphics/gpu/SharedGraphicsContext3D.cpp:
(WebCore::SharedGraphicsContext3D::create):
2010-11-03 Vincent Scheib <scheib at chromium.org>
Reviewed by James Robinson.
[chromium] GraphicsContext3D creation attributes include canRecoverFromContextLoss option
https://bugs.webkit.org/show_bug.cgi?id=48850
Implementations of GraphicsContext3D may respect the creation attribute
canRecoverFromContextLoss being false, and then only succeeding initialization if
the context can satisfy that request of never being lost. DX9 on XP can not satisfy
such a request.
Test by use of accelerated canvas 2d in Chromium with ANGLE on XP machines.
* public/WebGraphicsContext3D.h:
(WebKit::WebGraphicsContext3D::Attributes::Attributes):
* src/GraphicsContext3DChromium.cpp:
(WebCore::GraphicsContext3DInternal::initialize):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71299 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 9f93846..5a81a10 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,22 @@
+2010-11-03 Vincent Scheib <scheib at chromium.org>
+
+ Reviewed by James Robinson.
+
+ [chromium] GraphicsContext3D creation attributes include canRecoverFromContextLoss option
+ https://bugs.webkit.org/show_bug.cgi?id=48850
+
+ Implementations of GraphicsContext3D may respect the creation attribute
+ canRecoverFromContextLoss being false, and then only succeeding initialization if
+ the context can satisfy that request of never being lost. DX9 on XP can not satisfy
+ such a request.
+
+ Test by use of accelerated canvas 2d in Chromium with ANGLE on XP machines.
+
+ * platform/graphics/GraphicsContext3D.h:
+ (WebCore::GraphicsContext3D::Attributes::Attributes):
+ * platform/graphics/gpu/SharedGraphicsContext3D.cpp:
+ (WebCore::SharedGraphicsContext3D::create):
+
2010-11-03 Carlos Garcia Campos <cgarcia at igalia.com>
Reviewed by Martin Robinson.
diff --git a/WebCore/platform/graphics/GraphicsContext3D.h b/WebCore/platform/graphics/GraphicsContext3D.h
index 76040f0..c4dbf31 100644
--- a/WebCore/platform/graphics/GraphicsContext3D.h
+++ b/WebCore/platform/graphics/GraphicsContext3D.h
@@ -416,6 +416,7 @@ public:
, stencil(false)
, antialias(true)
, premultipliedAlpha(true)
+ , canRecoverFromContextLoss(true)
{
}
@@ -424,6 +425,7 @@ public:
bool stencil;
bool antialias;
bool premultipliedAlpha;
+ bool canRecoverFromContextLoss;
};
enum RenderStyle {
diff --git a/WebCore/platform/graphics/gpu/SharedGraphicsContext3D.cpp b/WebCore/platform/graphics/gpu/SharedGraphicsContext3D.cpp
index bf29059..a230384 100644
--- a/WebCore/platform/graphics/gpu/SharedGraphicsContext3D.cpp
+++ b/WebCore/platform/graphics/gpu/SharedGraphicsContext3D.cpp
@@ -53,6 +53,7 @@ namespace WebCore {
PassRefPtr<SharedGraphicsContext3D> SharedGraphicsContext3D::create(HostWindow* hostWindow)
{
GraphicsContext3D::Attributes attr;
+ attr.canRecoverFromContextLoss = false; // Canvas contexts can not handle lost contexts.
RefPtr<GraphicsContext3D> context = GraphicsContext3D::create(attr, hostWindow);
if (!context)
return 0;
diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 5e8e4c9..dc3e1e9 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,22 @@
+2010-11-03 Vincent Scheib <scheib at chromium.org>
+
+ Reviewed by James Robinson.
+
+ [chromium] GraphicsContext3D creation attributes include canRecoverFromContextLoss option
+ https://bugs.webkit.org/show_bug.cgi?id=48850
+
+ Implementations of GraphicsContext3D may respect the creation attribute
+ canRecoverFromContextLoss being false, and then only succeeding initialization if
+ the context can satisfy that request of never being lost. DX9 on XP can not satisfy
+ such a request.
+
+ Test by use of accelerated canvas 2d in Chromium with ANGLE on XP machines.
+
+ * public/WebGraphicsContext3D.h:
+ (WebKit::WebGraphicsContext3D::Attributes::Attributes):
+ * src/GraphicsContext3DChromium.cpp:
+ (WebCore::GraphicsContext3DInternal::initialize):
+
2010-11-03 Jenn Braithwaite <jennb at chromium.org>
Reviewed by Dmitry Titov.
diff --git a/WebKit/chromium/public/WebGraphicsContext3D.h b/WebKit/chromium/public/WebGraphicsContext3D.h
index 11dc6bf..9656887 100644
--- a/WebKit/chromium/public/WebGraphicsContext3D.h
+++ b/WebKit/chromium/public/WebGraphicsContext3D.h
@@ -64,6 +64,7 @@ public:
, stencil(true)
, antialias(true)
, premultipliedAlpha(true)
+ , canRecoverFromContextLoss(true)
{
}
@@ -72,6 +73,7 @@ public:
bool stencil;
bool antialias;
bool premultipliedAlpha;
+ bool canRecoverFromContextLoss;
};
// This destructor needs to be public so that using classes can destroy instances if initialization fails.
diff --git a/WebKit/chromium/src/GraphicsContext3DChromium.cpp b/WebKit/chromium/src/GraphicsContext3DChromium.cpp
index c1fae99..4d9e40b 100644
--- a/WebKit/chromium/src/GraphicsContext3DChromium.cpp
+++ b/WebKit/chromium/src/GraphicsContext3DChromium.cpp
@@ -110,6 +110,7 @@ bool GraphicsContext3DInternal::initialize(GraphicsContext3D::Attributes attrs,
webAttributes.stencil = attrs.stencil;
webAttributes.antialias = attrs.antialias;
webAttributes.premultipliedAlpha = attrs.premultipliedAlpha;
+ webAttributes.canRecoverFromContextLoss = attrs.canRecoverFromContextLoss;
WebKit::WebGraphicsContext3D* webContext = WebKit::webKitClient()->createGraphicsContext3D();
if (!webContext)
return false;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list