[webkit-changes] [146694] trunk/Source/WebCore
Title: [146694] trunk/Source/WebCore
Revision 146694
Author z...@google.com
Date 2013-03-22 17:45:21 -0700 (Fri, 22 Mar 2013)
Log Message
Check WEBGL_draw_buffers requirements before exposing the extension
https://bugs.webkit.org/show_bug.cgi?id=112359
Reviewed by Kenneth Russell.
* html/canvas/EXTDrawBuffers.cpp:
(WebCore::EXTDrawBuffers::supported): call satisfies*().
(WebCore::EXTDrawBuffers::drawBuffersEXT):
(WebCore):
(WebCore::EXTDrawBuffers::satisfiesWebGLRequirements): check WebGL requirements.
* html/canvas/EXTDrawBuffers.h:
(EXTDrawBuffers):
* html/canvas/WebGLFramebuffer.cpp:
(WebCore::WebGLFramebuffer::getDrawBuffer):
(WebCore):
* html/canvas/WebGLFramebuffer.h:
(WebGLFramebuffer):
* html/canvas/WebGLRenderingContext.cpp:
(WebCore):
(WebCore::WebGLRenderingContext::initializeNewContext):
(WebCore::WebGLRenderingContext::getExtension):
(WebCore::WebGLRenderingContext::getParameter):
(WebCore::WebGLRenderingContext::getSupportedExtensions):
(WebCore::WebGLRenderingContext::validateFramebufferFuncParameters):
(WebCore::WebGLRenderingContext::getMaxDrawBuffers):
(WebCore::WebGLRenderingContext::getMaxColorAttachments):
(WebCore::WebGLRenderingContext::setBackDrawBuffer):
(WebCore::WebGLRenderingContext::restoreCurrentFramebuffer):
(WebCore::WebGLRenderingContext::restoreCurrentTexture2D):
(WebCore::WebGLRenderingContext::supportsDrawBuffers): a cached version of EXTDrawBuffers::supports()
* html/canvas/WebGLRenderingContext.h:
(WebGLRenderingContext):
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/html/canvas/EXTDrawBuffers.cpp
trunk/Source/WebCore/html/canvas/EXTDrawBuffers.h
trunk/Source/WebCore/html/canvas/WebGLFramebuffer.cpp
trunk/Source/WebCore/html/canvas/WebGLFramebuffer.h
trunk/Source/WebCore/html/canvas/WebGLRenderingContext.cpp
trunk/Source/WebCore/html/canvas/WebGLRenderingContext.h
Diff
Modified: trunk/Source/WebCore/ChangeLog (146693 => 146694)
--- trunk/Source/WebCore/ChangeLog 2013-03-23 00:44:31 UTC (rev 146693)
+++ trunk/Source/WebCore/ChangeLog 2013-03-23 00:45:21 UTC (rev 146694)
@@ -1,3 +1,38 @@
+2013-03-19 Zhenyao Mo
+
+Check WEBGL_draw_buffers requirements before exposing the extension
+https://bugs.webkit.org/show_bug.cgi?id=112359
+
+Reviewed by Kenneth Russell.
+
+* html/canvas/EXTDrawBuffers.cpp:
+(WebCore::EXTDrawBuffers::supported): call satisfies*().
+(WebCore::EXTDrawBuffers::drawBuffersEXT):
+(WebCore):
+(WebCore::EXTDrawBuffers::satisfiesWebGLRequirements): check WebGL requirements.
+* html/canvas/EXTDrawBuffers.h:
+(EXTDrawBuffers):
+* html/canvas/WebGLFramebuffer.cpp:
+(WebCore::WebGLFramebuffer::getDrawBuffer):
+(WebCore):
+* html/canvas/WebGLFramebuffer.h:
+(WebGLFramebuffer):
+* html/canvas/WebGLRenderingContext.cpp:
+(WebCore):
+(WebCore::WebGLRenderingContext::initializeNewContext):
+(WebCore::WebGLRenderingContext::getExtension):
+(WebCore::WebGLRenderingContext::getParameter):
+(WebCore::WebGLRenderingContext::getSupportedExtensions):
+(WebCore::WebGLRenderingContext::validateFramebufferFuncParameters):
+(WebCore::WebGLRenderingContext::getMaxDrawBuffers):
+(WebCore::WebGLRenderingContext::getMaxColorAttachments):
+(WebCore::WebGLRenderingContext::setBackDrawBuffer):
+(WebCore::WebGLRenderingContext::restoreCurrentFramebuffer):
+(WebCore::WebGLRenderingContext::restoreCurrentTexture2D):
+(WebCore::WebGLRenderingContext::supportsDrawBuffers): a cached version of EXTDrawBuffers::supports()
+* html/canvas/WebGLRenderingContext.h:
+(WebGLRenderingContext):
+
2013-03-22 Roger Fong
Unreviewed. Fix AppleWin port following https://bugs.webkit.org/show_bug.cgi?id=113100.
Modified: trunk/Source/WebCore/html/canvas/EXTDrawBuffers.cpp (146693 => 146694)
--- trunk/Source/WebCore/html/canvas/EXTDrawBuffers.cpp 2013-03-23 00:44:31 UTC (rev 146693)
+++ trunk/Source/WebCore/html/canvas/EXTDrawBuffers.cpp 2013-03-23 00:45:21 UTC (rev 146694)
@@ -60,7 +60,8 @@
return false;
#endif
Extensions3D* extensions = context->graphicsContext3D()->getExtensions();
-return extensions->supports("GL_EXT_draw_buffers");
+return (extensions->supports("GL_EXT_draw_buffers")
+&& satisfiesWebGLRequirements(context));
}
void EXTDrawBuffers::drawBuffersEXT(const Vector& buffers)
@@ -81,6 +82,7 @@
// Because the backbuffer is simulated on all current WebKit ports, we need to change BACK to COLOR_ATTACHMENT0.
GC3Denum value = (bufs[0] == GraphicsContext3D::BACK) ? GraphicsContext3D::COLOR_ATTACHMENT0 : GraphicsContext3D::NONE;
m_context->graphicsContext3D()->getExtensions()->drawBuffersEXT(1, &value);
+m_context->setBackDrawBuffer(bufs[0]);
} else {
if (n > m_context->getMaxDrawBuffers()) {
m_context->synthesize
[webkit-changes] [145972] trunk/Source/WebCore
Title: [145972] trunk/Source/WebCore
Revision 145972
Author z...@google.com
Date 2013-03-15 18:11:00 -0700 (Fri, 15 Mar 2013)
Log Message
Disable EXT_draw_buffers WebGL extension on Mac
https://bugs.webkit.org/show_bug.cgi?id=112486
Reviewed by Kenneth Russell.
* html/canvas/EXTDrawBuffers.cpp:
(WebCore::EXTDrawBuffers::supported):
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/html/canvas/EXTDrawBuffers.cpp
Diff
Modified: trunk/Source/WebCore/ChangeLog (145971 => 145972)
--- trunk/Source/WebCore/ChangeLog 2013-03-16 00:54:23 UTC (rev 145971)
+++ trunk/Source/WebCore/ChangeLog 2013-03-16 01:11:00 UTC (rev 145972)
@@ -1,3 +1,13 @@
+2013-03-15 Zhenyao Mo
+
+Disable EXT_draw_buffers WebGL extension on Mac
+https://bugs.webkit.org/show_bug.cgi?id=112486
+
+Reviewed by Kenneth Russell.
+
+* html/canvas/EXTDrawBuffers.cpp:
+(WebCore::EXTDrawBuffers::supported):
+
2013-03-15 Dana Jansens
[chromium] Remove the background filter blur layout tests
Modified: trunk/Source/WebCore/html/canvas/EXTDrawBuffers.cpp (145971 => 145972)
--- trunk/Source/WebCore/html/canvas/EXTDrawBuffers.cpp 2013-03-16 00:54:23 UTC (rev 145971)
+++ trunk/Source/WebCore/html/canvas/EXTDrawBuffers.cpp 2013-03-16 01:11:00 UTC (rev 145972)
@@ -55,6 +55,10 @@
// static
bool EXTDrawBuffers::supported(WebGLRenderingContext* context)
{
+#if OS(DARWIN)
+// https://bugs.webkit.org/show_bug.cgi?id=112486
+return false;
+#endif
Extensions3D* extensions = context->graphicsContext3D()->getExtensions();
return extensions->supports("GL_EXT_draw_buffers");
}
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [143992] branches/chromium/1410/Source/WebCore
Title: [143992] branches/chromium/1410/Source/WebCore
Revision 143992
Author z...@google.com
Date 2013-02-25 17:35:20 -0800 (Mon, 25 Feb 2013)
Log Message
Merge 142545
> WEBGL_compressed_texture_s3tc extension can be enabled even when not supported
> https://bugs.webkit.org/show_bug.cgi?id=109508
>
> Reviewed by Kenneth Russell.
>
> * html/canvas/WebGLRenderingContext.cpp:
> (WebCore):
> (WebCore::WebGLRenderingContext::getExtension): Check whether the extension support is there before returning the extension pointer.
>
TBR=z...@google.com
Review URL: https://codereview.chromium.org/12334083
Modified Paths
branches/chromium/1410/Source/WebCore/ChangeLog
branches/chromium/1410/Source/WebCore/html/canvas/WebGLRenderingContext.cpp
Diff
Modified: branches/chromium/1410/Source/WebCore/ChangeLog (143991 => 143992)
--- branches/chromium/1410/Source/WebCore/ChangeLog 2013-02-26 01:24:02 UTC (rev 143991)
+++ branches/chromium/1410/Source/WebCore/ChangeLog 2013-02-26 01:35:20 UTC (rev 143992)
@@ -1,3 +1,14 @@
+2013-02-11 Zhenyao Mo
+
+WEBGL_compressed_texture_s3tc extension can be enabled even when not supported
+https://bugs.webkit.org/show_bug.cgi?id=109508
+
+Reviewed by Kenneth Russell.
+
+* html/canvas/WebGLRenderingContext.cpp:
+(WebCore):
+(WebCore::WebGLRenderingContext::getExtension): Check whether the extension support is there before returning the extension pointer.
+
2013-02-11 Keishi Hattori
REGRESSION (r140778):Calendar Picker buttons are wrong when rtl
Modified: branches/chromium/1410/Source/WebCore/html/canvas/WebGLRenderingContext.cpp (143991 => 143992)
--- branches/chromium/1410/Source/WebCore/html/canvas/WebGLRenderingContext.cpp 2013-02-26 01:24:02 UTC (rev 143991)
+++ branches/chromium/1410/Source/WebCore/html/canvas/WebGLRenderingContext.cpp 2013-02-26 01:35:20 UTC (rev 143992)
@@ -2405,9 +2405,10 @@
m_webglLoseContext = WebGLLoseContext::create(this);
return m_webglLoseContext.get();
}
-if (equalIgnoringCase(name, "WEBGL_compressed_texture_s3tc")
-// FIXME: remove this after a certain grace period.
-|| equalIgnoringCase(name, "WEBKIT_WEBGL_compressed_texture_s3tc")) {
+if ((equalIgnoringCase(name, "WEBGL_compressed_texture_s3tc")
+ // FIXME: remove this after a certain grace period.
+ || equalIgnoringCase(name, "WEBKIT_WEBGL_compressed_texture_s3tc"))
+&& WebGLCompressedTextureS3TC::supported(this)) {
if (!m_webglCompressedTextureS3TC)
m_webglCompressedTextureS3TC = WebGLCompressedTextureS3TC::create(this);
return m_webglCompressedTextureS3TC.get();
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [142545] trunk/Source/WebCore
Title: [142545] trunk/Source/WebCore
Revision 142545
Author z...@google.com
Date 2013-02-11 16:31:15 -0800 (Mon, 11 Feb 2013)
Log Message
WEBGL_compressed_texture_s3tc extension can be enabled even when not supported
https://bugs.webkit.org/show_bug.cgi?id=109508
Reviewed by Kenneth Russell.
* html/canvas/WebGLRenderingContext.cpp:
(WebCore):
(WebCore::WebGLRenderingContext::getExtension): Check whether the extension support is there before returning the extension pointer.
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/html/canvas/WebGLRenderingContext.cpp
Diff
Modified: trunk/Source/WebCore/ChangeLog (142544 => 142545)
--- trunk/Source/WebCore/ChangeLog 2013-02-12 00:29:20 UTC (rev 142544)
+++ trunk/Source/WebCore/ChangeLog 2013-02-12 00:31:15 UTC (rev 142545)
@@ -1,3 +1,14 @@
+2013-02-11 Zhenyao Mo
+
+WEBGL_compressed_texture_s3tc extension can be enabled even when not supported
+https://bugs.webkit.org/show_bug.cgi?id=109508
+
+Reviewed by Kenneth Russell.
+
+* html/canvas/WebGLRenderingContext.cpp:
+(WebCore):
+(WebCore::WebGLRenderingContext::getExtension): Check whether the extension support is there before returning the extension pointer.
+
2013-02-11 Emil A Eklund
Change RenderFrameSet::paint to use m-rows/m_cols directly.
Modified: trunk/Source/WebCore/html/canvas/WebGLRenderingContext.cpp (142544 => 142545)
--- trunk/Source/WebCore/html/canvas/WebGLRenderingContext.cpp 2013-02-12 00:29:20 UTC (rev 142544)
+++ trunk/Source/WebCore/html/canvas/WebGLRenderingContext.cpp 2013-02-12 00:31:15 UTC (rev 142545)
@@ -2405,9 +2405,10 @@
m_webglLoseContext = WebGLLoseContext::create(this);
return m_webglLoseContext.get();
}
-if (equalIgnoringCase(name, "WEBGL_compressed_texture_s3tc")
-// FIXME: remove this after a certain grace period.
-|| equalIgnoringCase(name, "WEBKIT_WEBGL_compressed_texture_s3tc")) {
+if ((equalIgnoringCase(name, "WEBGL_compressed_texture_s3tc")
+ // FIXME: remove this after a certain grace period.
+ || equalIgnoringCase(name, "WEBKIT_WEBGL_compressed_texture_s3tc"))
+&& WebGLCompressedTextureS3TC::supported(this)) {
if (!m_webglCompressedTextureS3TC)
m_webglCompressedTextureS3TC = WebGLCompressedTextureS3TC::create(this);
return m_webglCompressedTextureS3TC.get();
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [136287] trunk/LayoutTests
Title: [136287] trunk/LayoutTests Revision 136287 Author z...@google.com Date 2012-11-30 15:21:48 -0800 (Fri, 30 Nov 2012) Log Message Unreviewed, webkit gardening, fix webkit lint. * platform/chromium/TestExpectations: Modified Paths trunk/LayoutTests/ChangeLog trunk/LayoutTests/platform/chromium/TestExpectations Diff Modified: trunk/LayoutTests/ChangeLog (136286 => 136287) --- trunk/LayoutTests/ChangeLog 2012-11-30 23:17:14 UTC (rev 136286) +++ trunk/LayoutTests/ChangeLog 2012-11-30 23:21:48 UTC (rev 136287) @@ -1,3 +1,9 @@ +2012-11-30 Zhenyao Mo + +Unreviewed, webkit gardening, fix webkit lint. + +* platform/chromium/TestExpectations: + 2012-11-30 Simon Fraser Use the correct path to a test in TestExpectations. Modified: trunk/LayoutTests/platform/chromium/TestExpectations (136286 => 136287) --- trunk/LayoutTests/platform/chromium/TestExpectations 2012-11-30 23:17:14 UTC (rev 136286) +++ trunk/LayoutTests/platform/chromium/TestExpectations 2012-11-30 23:21:48 UTC (rev 136287) @@ -231,9 +231,6 @@ # Missing support in DRT for Geolocation's Coordinate attributes. webkit.org/b/98212 fast/dom/Geolocation/coordinates-interface-attributes.html [ Failure ] -# Fails in chromium -webkit.org/b/103667 fast/ruby/position-after.html [ Skip ] - # - # WONTFIX TESTS # - ___ webkit-changes mailing list webkit-changes@lists.webkit.org http://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [136176] trunk/Source/WebKit/chromium
Title: [136176] trunk/Source/WebKit/chromium
Revision 136176
Author z...@google.com
Date 2012-11-29 15:37:44 -0800 (Thu, 29 Nov 2012)
Log Message
Unreviewed. Rolled DEPS.
Patch by Sheriff Bot on 2012-11-29
* DEPS:
Modified Paths
trunk/Source/WebKit/chromium/ChangeLog
trunk/Source/WebKit/chromium/DEPS
Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (136175 => 136176)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-11-29 23:30:34 UTC (rev 136175)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-11-29 23:37:44 UTC (rev 136176)
@@ -1,3 +1,9 @@
+2012-11-29 Sheriff Bot
+
+Unreviewed. Rolled DEPS.
+
+* DEPS:
+
2012-11-29 Eugene Klyuchnikov
Web Inspector: Make main-thread monitoring go through InspectorController.
Modified: trunk/Source/WebKit/chromium/DEPS (136175 => 136176)
--- trunk/Source/WebKit/chromium/DEPS 2012-11-29 23:30:34 UTC (rev 136175)
+++ trunk/Source/WebKit/chromium/DEPS 2012-11-29 23:37:44 UTC (rev 136176)
@@ -32,7 +32,7 @@
vars = {
'chromium_svn': 'http://src.chromium.org/svn/trunk/src',
- 'chromium_rev': '169895'
+ 'chromium_rev': '170244'
}
deps = {
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [136165] trunk/LayoutTests
Title: [136165] trunk/LayoutTests Revision 136165 Author z...@google.com Date 2012-11-29 14:26:51 -0800 (Thu, 29 Nov 2012) Log Message Unreviewed, WebKit gardening. * platform/chromium/TestExpectations: Modified Paths trunk/LayoutTests/ChangeLog trunk/LayoutTests/platform/chromium/TestExpectations Diff Modified: trunk/LayoutTests/ChangeLog (136164 => 136165) --- trunk/LayoutTests/ChangeLog 2012-11-29 22:18:32 UTC (rev 136164) +++ trunk/LayoutTests/ChangeLog 2012-11-29 22:26:51 UTC (rev 136165) @@ -1,3 +1,9 @@ +2012-11-29 Zhenyao Mo + +Unreviewed, WebKit gardening. + +* platform/chromium/TestExpectations: + 2012-11-29 John Knottenbelt Use GeolocationController's last geoposition as cached position. Modified: trunk/LayoutTests/platform/chromium/TestExpectations (136164 => 136165) --- trunk/LayoutTests/platform/chromium/TestExpectations 2012-11-29 22:18:32 UTC (rev 136164) +++ trunk/LayoutTests/platform/chromium/TestExpectations 2012-11-29 22:26:51 UTC (rev 136165) @@ -231,6 +231,9 @@ # Missing support in DRT for Geolocation's Coordinate attributes. webkit.org/b/98212 fast/dom/Geolocation/coordinates-interface-attributes.html [ Failure ] +# Fails in chromium +webkit.org/b/103667 fast/ruby/position-after.html [ Skip ] + # - # WONTFIX TESTS # - ___ webkit-changes mailing list webkit-changes@lists.webkit.org http://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [136161] trunk/LayoutTests
Title: [136161] trunk/LayoutTests Revision 136161 Author z...@google.com Date 2012-11-29 13:52:08 -0800 (Thu, 29 Nov 2012) Log Message Unreviewed, WebKit gardening. * platform/chromium/TestExpectations: Modified Paths trunk/LayoutTests/ChangeLog trunk/LayoutTests/platform/chromium/TestExpectations Diff Modified: trunk/LayoutTests/ChangeLog (136160 => 136161) --- trunk/LayoutTests/ChangeLog 2012-11-29 21:35:24 UTC (rev 136160) +++ trunk/LayoutTests/ChangeLog 2012-11-29 21:52:08 UTC (rev 136161) @@ -1,3 +1,9 @@ +2012-11-29 Zhenyao Mo + +Unreviewed, WebKit gardening. + +* platform/chromium/TestExpectations: + 2012-11-29 Stephen Chenney [Chromium] Skia rebaseline after we made kSrc_Mode go faster Modified: trunk/LayoutTests/platform/chromium/TestExpectations (136160 => 136161) --- trunk/LayoutTests/platform/chromium/TestExpectations 2012-11-29 21:35:24 UTC (rev 136160) +++ trunk/LayoutTests/platform/chromium/TestExpectations 2012-11-29 21:52:08 UTC (rev 136161) @@ -2536,7 +2536,7 @@ crbug.com/10370 [ Android Linux Win ] fast/css/font-weight-1.html [ Failure ] # Registering the fonts for this test causes other processes (Adium, Firefox) # to spin and become unresponsive or crash. -webkit.org/b/50709 [ Mac ] fast/css/font-weight-1.html [ Failure ] +webkit.org/b/50709 [ Lion MountainLion ] fast/css/font-weight-1.html [ ImageOnlyFailure ] #/// # End DRT failures ___ webkit-changes mailing list webkit-changes@lists.webkit.org http://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [127033] trunk/LayoutTests
Title: [127033] trunk/LayoutTests Revision 127033 Author z...@google.com Date 2012-08-29 12:53:32 -0700 (Wed, 29 Aug 2012) Log Message Unreviewed, chromium test expectations cleanup. * platform/chromium/TestExpectations: Modified Paths trunk/LayoutTests/ChangeLog trunk/LayoutTests/platform/chromium/TestExpectations Diff Modified: trunk/LayoutTests/ChangeLog (127032 => 127033) --- trunk/LayoutTests/ChangeLog 2012-08-29 19:50:15 UTC (rev 127032) +++ trunk/LayoutTests/ChangeLog 2012-08-29 19:53:32 UTC (rev 127033) @@ -1,3 +1,9 @@ +2012-08-29 Zhenyao Mo + +Unreviewed, chromium test expectations cleanup. + +* platform/chromium/TestExpectations: + 2012-08-29 Kamil Blank [EFL] Add setting API for allow universal/file access from file URLs. Modified: trunk/LayoutTests/platform/chromium/TestExpectations (127032 => 127033) --- trunk/LayoutTests/platform/chromium/TestExpectations 2012-08-29 19:50:15 UTC (rev 127032) +++ trunk/LayoutTests/platform/chromium/TestExpectations 2012-08-29 19:53:32 UTC (rev 127033) @@ -2571,8 +2571,7 @@ BUGWK67915 LINUX ANDROID WIN : fast/borders/borderRadiusDashed06.html = IMAGE -// Introduced in r92298, which might cause another test crashing. -BUGZMO SKIP : fast/loader/reload-zero-byte-plugin.html = PASS +BUGWK95365 SKIP : fast/loader/reload-zero-byte-plugin.html = PASS BUGWK65862 DEBUG SLOW : storage/indexeddb/index-cursor.html = PASS ___ webkit-changes mailing list webkit-changes@lists.webkit.org http://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [123541] trunk/Source/WebCore
Title: [123541] trunk/Source/WebCore
Revision 123541
Author z...@google.com
Date 2012-07-24 15:33:14 -0700 (Tue, 24 Jul 2012)
Log Message
Unreviewed, rolling out r123504.
http://trac.webkit.org/changeset/123504
https://bugs.webkit.org/show_bug.cgi?id=92169
broke a bunch of text-related tests in chromium mac debug
(Requested by zhenyao on #webkit).
Patch by Sheriff Bot on 2012-07-24
* platform/text/cf/StringCF.cpp:
(WTF::String::createCFString):
* platform/text/cf/StringImplCF.cpp:
(WTF::StringImpl::createCFString):
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/text/cf/StringCF.cpp
trunk/Source/WebCore/platform/text/cf/StringImplCF.cpp
Diff
Modified: trunk/Source/WebCore/ChangeLog (123540 => 123541)
--- trunk/Source/WebCore/ChangeLog 2012-07-24 22:26:34 UTC (rev 123540)
+++ trunk/Source/WebCore/ChangeLog 2012-07-24 22:33:14 UTC (rev 123541)
@@ -1,3 +1,17 @@
+2012-07-24 Sheriff Bot
+
+Unreviewed, rolling out r123504.
+http://trac.webkit.org/changeset/123504
+https://bugs.webkit.org/show_bug.cgi?id=92169
+
+broke a bunch of text-related tests in chromium mac debug
+(Requested by zhenyao on #webkit).
+
+* platform/text/cf/StringCF.cpp:
+(WTF::String::createCFString):
+* platform/text/cf/StringImplCF.cpp:
+(WTF::StringImpl::createCFString):
+
2012-07-24 Kwang Yul Seo
Ensure Noah's ark without reading the DOM tree.
Modified: trunk/Source/WebCore/platform/text/cf/StringCF.cpp (123540 => 123541)
--- trunk/Source/WebCore/platform/text/cf/StringCF.cpp 2012-07-24 22:26:34 UTC (rev 123540)
+++ trunk/Source/WebCore/platform/text/cf/StringCF.cpp 2012-07-24 22:33:14 UTC (rev 123541)
@@ -45,7 +45,7 @@
CFStringRef String::createCFString() const
{
if (!m_impl)
-return CFSTR("");
+return static_cast(CFRetain(CFSTR("")));
return m_impl->createCFString();
}
Modified: trunk/Source/WebCore/platform/text/cf/StringImplCF.cpp (123540 => 123541)
--- trunk/Source/WebCore/platform/text/cf/StringImplCF.cpp 2012-07-24 22:26:34 UTC (rev 123540)
+++ trunk/Source/WebCore/platform/text/cf/StringImplCF.cpp 2012-07-24 22:33:14 UTC (rev 123541)
@@ -134,22 +134,15 @@
CFStringRef StringImpl::createCFString()
{
-if (!m_length || !isMainThread()) {
-if (is8Bit())
-return CFStringCreateWithBytes(0, reinterpret_cast(characters8()), m_length, kCFStringEncodingISOLatin1, false);
-return CFStringCreateWithCharacters(0, reinterpret_cast(characters16()), m_length);
-}
-CFAllocatorRef allocator = StringWrapperCFAllocator::allocator();
+CFAllocatorRef allocator = (m_length && isMainThread()) ? StringWrapperCFAllocator::allocator() : 0;
+if (!allocator)
+return CFStringCreateWithCharacters(0, reinterpret_cast(characters()), m_length);
// Put pointer to the StringImpl in a global so the allocator can store it with the CFString.
ASSERT(!StringWrapperCFAllocator::currentString);
StringWrapperCFAllocator::currentString = this;
-CFStringRef string;
-if (is8Bit())
-string = CFStringCreateWithBytesNoCopy(allocator, reinterpret_cast(characters8()), m_length, kCFStringEncodingISOLatin1, false, kCFAllocatorNull);
-else
-string = CFStringCreateWithCharactersNoCopy(allocator, reinterpret_cast(characters16()), m_length, kCFAllocatorNull);
+CFStringRef string = CFStringCreateWithCharactersNoCopy(allocator, reinterpret_cast(characters()), m_length, kCFAllocatorNull);
// The allocator cleared the global when it read it, but also clear it here just in case.
ASSERT(!StringWrapperCFAllocator::currentString);
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [120840] branches/chromium/1180/Source/WebCore/html/canvas
Title: [120840] branches/chromium/1180/Source/WebCore/html/canvas
Revision 120840
Author z...@google.com
Date 2012-06-20 11:22:37 -0700 (Wed, 20 Jun 2012)
Log Message
Merge 120636 - Fix framebuffer-object-attachment.html failures
https://bugs.webkit.org/show_bug.cgi?id=89387
Reviewed by Kenneth Russell.
* html/canvas/WebGLFramebuffer.cpp: fix detachment behavior with depth/stencil/depth_stencil conflicts
(WebCore::WebGLFramebuffer::setAttachmentForBoundFramebuffer):
(WebCore::WebGLFramebuffer::removeAttachmentFromBoundFramebuffer):
* html/canvas/WebGLFramebuffer.h:
(WebGLFramebuffer):
* html/canvas/WebGLRenderingContext.cpp:
(WebCore):
(WebCore::WebGLRenderingContext::framebufferRenderbuffer): move logic to WebGLFramebuffer
(WebCore::WebGLRenderingContext::framebufferTexture2D): Ditto.
(WebCore::WebGLRenderingContext::getParameter): Correct the wrong assumption that it's always checking the drawingbuffer's DEPTH_BITS/STENCIL_BITS
* html/canvas/WebGLRenderingContext.h:
(WebGLRenderingContext):
TBR=z...@google.com
Review URL: https://chromiumcodereview.appspot.com/10584035
Modified Paths
branches/chromium/1180/Source/WebCore/html/canvas/WebGLFramebuffer.cpp
branches/chromium/1180/Source/WebCore/html/canvas/WebGLFramebuffer.h
branches/chromium/1180/Source/WebCore/html/canvas/WebGLRenderingContext.cpp
branches/chromium/1180/Source/WebCore/html/canvas/WebGLRenderingContext.h
Diff
Modified: branches/chromium/1180/Source/WebCore/html/canvas/WebGLFramebuffer.cpp (120839 => 120840)
--- branches/chromium/1180/Source/WebCore/html/canvas/WebGLFramebuffer.cpp 2012-06-20 18:18:47 UTC (rev 120839)
+++ branches/chromium/1180/Source/WebCore/html/canvas/WebGLFramebuffer.cpp 2012-06-20 18:22:37 UTC (rev 120840)
@@ -128,7 +128,7 @@
void WebGLRenderbufferAttachment::unattach(GraphicsContext3D* context, GC3Denum attachment)
{
-if (attachment == GraphicsContext3D::DEPTH_STENCIL) {
+if (attachment == GraphicsContext3D::DEPTH_STENCIL_ATTACHMENT) {
context->framebufferRenderbuffer(GraphicsContext3D::FRAMEBUFFER, GraphicsContext3D::DEPTH_ATTACHMENT, GraphicsContext3D::RENDERBUFFER, 0);
context->framebufferRenderbuffer(GraphicsContext3D::FRAMEBUFFER, GraphicsContext3D::STENCIL_ATTACHMENT, GraphicsContext3D::RENDERBUFFER, 0);
} else
@@ -283,11 +283,10 @@
void WebGLFramebuffer::setAttachmentForBoundFramebuffer(GC3Denum attachment, GC3Denum texTarget, WebGLTexture* texture, GC3Dint level)
{
ASSERT(isBound());
+removeAttachmentFromBoundFramebuffer(attachment);
if (!object())
return;
-removeAttachmentFromBoundFramebuffer(attachment);
if (texture && texture->object()) {
-
m_attachments.add(attachment, WebGLTextureAttachment::create(texture, texTarget, level));
texture->onAttached();
}
@@ -296,9 +295,9 @@
void WebGLFramebuffer::setAttachmentForBoundFramebuffer(GC3Denum attachment, WebGLRenderbuffer* renderbuffer)
{
ASSERT(isBound());
+removeAttachmentFromBoundFramebuffer(attachment);
if (!object())
return;
-removeAttachmentFromBoundFramebuffer(attachment);
if (renderbuffer && renderbuffer->object()) {
m_attachments.add(attachment, WebGLRenderbufferAttachment::create(renderbuffer));
renderbuffer->onAttached();
@@ -337,6 +336,18 @@
if (attachmentObject) {
attachmentObject->onDetached(context()->graphicsContext3D());
m_attachments.remove(attachment);
+switch (attachment) {
+case GraphicsContext3D::DEPTH_STENCIL_ATTACHMENT:
+attach(GraphicsContext3D::DEPTH_ATTACHMENT, GraphicsContext3D::DEPTH_ATTACHMENT);
+attach(GraphicsContext3D::STENCIL_ATTACHMENT, GraphicsContext3D::STENCIL_ATTACHMENT);
+break;
+case GraphicsContext3D::DEPTH_ATTACHMENT:
+attach(GraphicsContext3D::DEPTH_STENCIL_ATTACHMENT, GraphicsContext3D::DEPTH_ATTACHMENT);
+break;
+case GraphicsContext3D::STENCIL_ATTACHMENT:
+attach(GraphicsContext3D::DEPTH_STENCIL_ATTACHMENT, GraphicsContext3D::STENCIL_ATTACHMENT);
+break;
+}
}
}
Modified: branches/chromium/1180/Source/WebCore/html/canvas/WebGLFramebuffer.h (120839 => 120840)
--- branches/chromium/1180/Source/WebCore/html/canvas/WebGLFramebuffer.h 2012-06-20 18:18:47 UTC (rev 120839)
+++ branches/chromium/1180/Source/WebCore/html/canvas/WebGLFramebuffer.h 2012-06-20 18:22:37 UTC (rev 120840)
@@ -71,9 +71,6 @@
void removeAttachmentFromBoundFramebuffer(GC3Denum);
WebGLSharedObject* getAttachmentObject(GC3Denum) const;
-// attach 'attachment' at 'attachmentPoint'.
-void attach(GC3Denum attachment, GC3Denum attachmentPoint);
-
GC3Denum getColorBufferFormat() const;
GC3Dsizei getColorBufferWidth() const;
GC3Dsizei getColorBufferHeight() const;
@@ -114,6 +111,9 @@
// Check if the framebuffer is currently bound.
bool isBound() const;
+// attach 'at
[webkit-changes] [120636] trunk/Source/WebCore
Title: [120636] trunk/Source/WebCore
Revision 120636
Author z...@google.com
Date 2012-06-18 15:37:55 -0700 (Mon, 18 Jun 2012)
Log Message
Fix framebuffer-object-attachment.html failures
https://bugs.webkit.org/show_bug.cgi?id=89387
Reviewed by Kenneth Russell.
* html/canvas/WebGLFramebuffer.cpp: fix detachment behavior with depth/stencil/depth_stencil conflicts
(WebCore::WebGLFramebuffer::setAttachmentForBoundFramebuffer):
(WebCore::WebGLFramebuffer::removeAttachmentFromBoundFramebuffer):
* html/canvas/WebGLFramebuffer.h:
(WebGLFramebuffer):
* html/canvas/WebGLRenderingContext.cpp:
(WebCore):
(WebCore::WebGLRenderingContext::framebufferRenderbuffer): move logic to WebGLFramebuffer
(WebCore::WebGLRenderingContext::framebufferTexture2D): Ditto.
(WebCore::WebGLRenderingContext::getParameter): Correct the wrong assumption that it's always checking the drawingbuffer's DEPTH_BITS/STENCIL_BITS
* html/canvas/WebGLRenderingContext.h:
(WebGLRenderingContext):
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/html/canvas/WebGLFramebuffer.cpp
trunk/Source/WebCore/html/canvas/WebGLFramebuffer.h
trunk/Source/WebCore/html/canvas/WebGLRenderingContext.cpp
trunk/Source/WebCore/html/canvas/WebGLRenderingContext.h
Diff
Modified: trunk/Source/WebCore/ChangeLog (120635 => 120636)
--- trunk/Source/WebCore/ChangeLog 2012-06-18 22:17:44 UTC (rev 120635)
+++ trunk/Source/WebCore/ChangeLog 2012-06-18 22:37:55 UTC (rev 120636)
@@ -1,3 +1,23 @@
+2012-06-18 Zhenyao Mo
+
+Fix framebuffer-object-attachment.html failures
+https://bugs.webkit.org/show_bug.cgi?id=89387
+
+Reviewed by Kenneth Russell.
+
+* html/canvas/WebGLFramebuffer.cpp: fix detachment behavior with depth/stencil/depth_stencil conflicts
+(WebCore::WebGLFramebuffer::setAttachmentForBoundFramebuffer):
+(WebCore::WebGLFramebuffer::removeAttachmentFromBoundFramebuffer):
+* html/canvas/WebGLFramebuffer.h:
+(WebGLFramebuffer):
+* html/canvas/WebGLRenderingContext.cpp:
+(WebCore):
+(WebCore::WebGLRenderingContext::framebufferRenderbuffer): move logic to WebGLFramebuffer
+(WebCore::WebGLRenderingContext::framebufferTexture2D): Ditto.
+(WebCore::WebGLRenderingContext::getParameter): Correct the wrong assumption that it's always checking the drawingbuffer's DEPTH_BITS/STENCIL_BITS
+* html/canvas/WebGLRenderingContext.h:
+(WebGLRenderingContext):
+
2012-06-18 Ian Vollick
[chromium] Ensure that skipping frames during an accelerated animation doesn't cause starvation
Modified: trunk/Source/WebCore/html/canvas/WebGLFramebuffer.cpp (120635 => 120636)
--- trunk/Source/WebCore/html/canvas/WebGLFramebuffer.cpp 2012-06-18 22:17:44 UTC (rev 120635)
+++ trunk/Source/WebCore/html/canvas/WebGLFramebuffer.cpp 2012-06-18 22:37:55 UTC (rev 120636)
@@ -128,7 +128,7 @@
void WebGLRenderbufferAttachment::unattach(GraphicsContext3D* context, GC3Denum attachment)
{
-if (attachment == GraphicsContext3D::DEPTH_STENCIL) {
+if (attachment == GraphicsContext3D::DEPTH_STENCIL_ATTACHMENT) {
context->framebufferRenderbuffer(GraphicsContext3D::FRAMEBUFFER, GraphicsContext3D::DEPTH_ATTACHMENT, GraphicsContext3D::RENDERBUFFER, 0);
context->framebufferRenderbuffer(GraphicsContext3D::FRAMEBUFFER, GraphicsContext3D::STENCIL_ATTACHMENT, GraphicsContext3D::RENDERBUFFER, 0);
} else
@@ -283,11 +283,10 @@
void WebGLFramebuffer::setAttachmentForBoundFramebuffer(GC3Denum attachment, GC3Denum texTarget, WebGLTexture* texture, GC3Dint level)
{
ASSERT(isBound());
+removeAttachmentFromBoundFramebuffer(attachment);
if (!object())
return;
-removeAttachmentFromBoundFramebuffer(attachment);
if (texture && texture->object()) {
-
m_attachments.add(attachment, WebGLTextureAttachment::create(texture, texTarget, level));
texture->onAttached();
}
@@ -296,9 +295,9 @@
void WebGLFramebuffer::setAttachmentForBoundFramebuffer(GC3Denum attachment, WebGLRenderbuffer* renderbuffer)
{
ASSERT(isBound());
+removeAttachmentFromBoundFramebuffer(attachment);
if (!object())
return;
-removeAttachmentFromBoundFramebuffer(attachment);
if (renderbuffer && renderbuffer->object()) {
m_attachments.add(attachment, WebGLRenderbufferAttachment::create(renderbuffer));
renderbuffer->onAttached();
@@ -337,6 +336,18 @@
if (attachmentObject) {
attachmentObject->onDetached(context()->graphicsContext3D());
m_attachments.remove(attachment);
+switch (attachment) {
+case GraphicsContext3D::DEPTH_STENCIL_ATTACHMENT:
+attach(GraphicsContext3D::DEPTH_ATTACHMENT, GraphicsContext3D::DEPTH_ATTACHMENT);
+attach(GraphicsContext3D::STENCIL_ATTACHMENT, GraphicsContext3D::STENCIL_ATTACHMENT);
+break;
+case GraphicsContext3D::DEPTH_ATTACHMENT:
+at
[webkit-changes] [119014] trunk
Title: [119014] trunk
Revision 119014
Author z...@google.com
Date 2012-05-30 18:31:46 -0700 (Wed, 30 May 2012)
Log Message
WebKit incorrectly clears the alpha channel on readPixels, even for Framebuffers
https://bugs.webkit.org/show_bug.cgi?id=87310
Reviewed by Kenneth Russell.
Source/WebCore:
* html/canvas/WebGLRenderingContext.cpp:
(WebCore):
(WebCore::WebGLRenderingContext::getParameter): set DEPTH_BITS/STENCIL_BITS to 0 if related channels are not requested.
(WebCore::WebGLRenderingContext::readPixels): don't do the alpha value fix if the current bound is not the internal drawing buffer.
LayoutTests:
* fast/canvas/webgl/context-attributes-alpha-depth-stencil-antialias-expected.txt:
* fast/canvas/webgl/context-attributes-alpha-depth-stencil-antialias.html: synced with khronos
Modified Paths
trunk/LayoutTests/ChangeLog
trunk/LayoutTests/fast/canvas/webgl/context-attributes-alpha-depth-stencil-antialias-expected.txt
trunk/LayoutTests/fast/canvas/webgl/context-attributes-alpha-depth-stencil-antialias.html
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/html/canvas/WebGLRenderingContext.cpp
Diff
Modified: trunk/LayoutTests/ChangeLog (119013 => 119014)
--- trunk/LayoutTests/ChangeLog 2012-05-31 01:21:39 UTC (rev 119013)
+++ trunk/LayoutTests/ChangeLog 2012-05-31 01:31:46 UTC (rev 119014)
@@ -1,3 +1,13 @@
+2012-05-30 Zhenyao Mo
+
+WebKit incorrectly clears the alpha channel on readPixels, even for Framebuffers
+https://bugs.webkit.org/show_bug.cgi?id=87310
+
+Reviewed by Kenneth Russell.
+
+* fast/canvas/webgl/context-attributes-alpha-depth-stencil-antialias-expected.txt:
+* fast/canvas/webgl/context-attributes-alpha-depth-stencil-antialias.html: synced with khronos
+
2012-05-30 Sheriff Bot
Unreviewed, rolling out r118986.
Modified: trunk/LayoutTests/fast/canvas/webgl/context-attributes-alpha-depth-stencil-antialias-expected.txt (119013 => 119014)
--- trunk/LayoutTests/fast/canvas/webgl/context-attributes-alpha-depth-stencil-antialias-expected.txt 2012-05-31 01:21:39 UTC (rev 119013)
+++ trunk/LayoutTests/fast/canvas/webgl/context-attributes-alpha-depth-stencil-antialias-expected.txt 2012-05-31 01:31:46 UTC (rev 119014)
@@ -3,46 +3,110 @@
On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
Testing alpha = true
-PASS webGL = getWebGL(1, 1, { alpha: true, depth: false, stencil: false, antialias: false }, [ 0, 0, 0, 0 ], 1, 0) is non-null.
-PASS contextAttribs = webGL.getContextAttributes() is non-null.
+PASS getError was expected value: NO_ERROR : should be no errors
+PASS gl = getWebGL(1, 1, { alpha: true, depth: false, stencil: false, antialias: false }, [ 0, 0, 0, 0 ], 1, 0) is non-null.
+PASS gl.getParameter(gl.ALPHA_BITS) >= 8 is true
+PASS gl.getParameter(gl.RED_BITS) >= 8 is true
+PASS gl.getParameter(gl.GREEN_BITS) >= 8 is true
+PASS gl.getParameter(gl.BLUE_BITS) >= 8 is true
+PASS gl.getParameter(gl.DEPTH_BITS) == 0 is true
+PASS gl.getParameter(gl.STENCIL_BITS) == 0 is true
+PASS contextAttribs = gl.getContextAttributes() is non-null.
PASS contextAttribs.alpha == true is true
PASS pixel is correctColor
+PASS Math.abs(pixel[0] - 127) <= 1 && Math.abs(pixel[1] - 127) <= 1 && Math.abs(pixel[2] - 127) <= 1 && Math.abs(pixel[3] - 127) <= 1 is true
Testing alpha = false
-PASS webGL = getWebGL(1, 1, { alpha: false, depth: false, stencil: false, antialias: false }, [ 0, 0, 0, 0 ], 1, 0) is non-null.
-PASS contextAttribs = webGL.getContextAttributes() is non-null.
+PASS getError was expected value: NO_ERROR : should be no errors
+PASS gl = getWebGL(1, 1, { alpha: false, depth: false, stencil: false, antialias: false }, [ 0, 0, 0, 0 ], 1, 0) is non-null.
+PASS gl.getParameter(gl.ALPHA_BITS) == 0 is true
+PASS gl.getParameter(gl.RED_BITS) >= 8 is true
+PASS gl.getParameter(gl.GREEN_BITS) >= 8 is true
+PASS gl.getParameter(gl.BLUE_BITS) >= 8 is true
+PASS gl.getParameter(gl.DEPTH_BITS) == 0 is true
+PASS gl.getParameter(gl.STENCIL_BITS) == 0 is true
+PASS contextAttribs = gl.getContextAttributes() is non-null.
PASS contextAttribs.alpha == false is true
PASS pixel is correctColor
+PASS Math.abs(pixel[0] - 127) <= 1 && Math.abs(pixel[1] - 127) <= 1 && Math.abs(pixel[2] - 127) <= 1 && Math.abs(pixel[3] - 127) <= 1 is true
Testing depth = true
-PASS webGL = getWebGL(1, 1, { stencil: false, antialias: false }, [ 0, 0, 0, 1 ], 1, 0) is non-null.
-PASS contextAttribs = webGL.getContextAttributes() is non-null.
+PASS getError was expected value: NO_ERROR : should be no errors
+PASS gl = getWebGL(1, 1, { stencil: false, antialias: false }, [ 0, 0, 0, 1 ], 1, 0) is non-null.
+PASS gl.getParameter(gl.DEPTH_BITS) >= 16 is true
+PASS gl.getParameter(gl.RED_BITS) >= 8 is true
+PASS gl.getParameter(gl.GREEN_BITS) >= 8 is true
+PASS gl.getParameter(gl.BLUE_BITS) >= 8 is true
+PASS gl.getParameter(gl.ALPHA_BITS) >= 8 is true
+PASS contextAttribs = gl.getContextAttributes() is non-null.
PASS pixel is
[webkit-changes] [117998] branches/chromium/1132/Source/WebCore/platform/graphics/chromium/ DrawingBufferChromium.cpp
Title: [117998] branches/chromium/1132/Source/WebCore/platform/graphics/chromium/DrawingBufferChromium.cpp Revision 117998 Author z...@google.com Date 2012-05-22 10:38:31 -0700 (Tue, 22 May 2012) Log Message Merge 117814 - Restore WebGL's framebuffer binding after DrawingBuffer's prepareBackBuffer() https://bugs.webkit.org/show_bug.cgi?id=87032 Reviewed by James Robinson. * platform/graphics/chromium/DrawingBufferChromium.cpp: (WebCore::DrawingBuffer::prepareBackBuffer): restore the user's framebuffer binding if there is one. TBR=z...@google.com Modified Paths branches/chromium/1132/Source/WebCore/platform/graphics/chromium/DrawingBufferChromium.cpp Diff Modified: branches/chromium/1132/Source/WebCore/platform/graphics/chromium/DrawingBufferChromium.cpp (117997 => 117998) --- branches/chromium/1132/Source/WebCore/platform/graphics/chromium/DrawingBufferChromium.cpp 2012-05-22 17:37:27 UTC (rev 117997) +++ branches/chromium/1132/Source/WebCore/platform/graphics/chromium/DrawingBufferChromium.cpp 2012-05-22 17:38:31 UTC (rev 117998) @@ -132,8 +132,10 @@ m_context->framebufferTexture2D(GraphicsContext3D::FRAMEBUFFER, GraphicsContext3D::COLOR_ATTACHMENT0, GraphicsContext3D::TEXTURE_2D, m_colorBuffer, 0); } -if (multisample()) +if (multisample() && !m_framebufferBinding) bind(); +else +restoreFramebufferBinding(); } bool DrawingBuffer::requiresCopyFromBackToFrontBuffer() const ___ webkit-changes mailing list webkit-changes@lists.webkit.org http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [117814] trunk/Source/WebCore
Title: [117814] trunk/Source/WebCore Revision 117814 Author z...@google.com Date 2012-05-21 14:01:04 -0700 (Mon, 21 May 2012) Log Message Restore WebGL's framebuffer binding after DrawingBuffer's prepareBackBuffer() https://bugs.webkit.org/show_bug.cgi?id=87032 Reviewed by James Robinson. * platform/graphics/chromium/DrawingBufferChromium.cpp: (WebCore::DrawingBuffer::prepareBackBuffer): restore the user's framebuffer binding if there is one. Modified Paths trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/platform/graphics/chromium/DrawingBufferChromium.cpp Diff Modified: trunk/Source/WebCore/ChangeLog (117813 => 117814) --- trunk/Source/WebCore/ChangeLog 2012-05-21 20:52:31 UTC (rev 117813) +++ trunk/Source/WebCore/ChangeLog 2012-05-21 21:01:04 UTC (rev 117814) @@ -1,3 +1,13 @@ +2012-05-21 Zhenyao Mo + +Restore WebGL's framebuffer binding after DrawingBuffer's prepareBackBuffer() +https://bugs.webkit.org/show_bug.cgi?id=87032 + +Reviewed by James Robinson. + +* platform/graphics/chromium/DrawingBufferChromium.cpp: +(WebCore::DrawingBuffer::prepareBackBuffer): restore the user's framebuffer binding if there is one. + 2012-05-21 Ryosuke Niwa isStartOfDocument and isEndOfDocument are poorly named Modified: trunk/Source/WebCore/platform/graphics/chromium/DrawingBufferChromium.cpp (117813 => 117814) --- trunk/Source/WebCore/platform/graphics/chromium/DrawingBufferChromium.cpp 2012-05-21 20:52:31 UTC (rev 117813) +++ trunk/Source/WebCore/platform/graphics/chromium/DrawingBufferChromium.cpp 2012-05-21 21:01:04 UTC (rev 117814) @@ -132,8 +132,10 @@ m_context->framebufferTexture2D(GraphicsContext3D::FRAMEBUFFER, GraphicsContext3D::COLOR_ATTACHMENT0, GraphicsContext3D::TEXTURE_2D, m_colorBuffer, 0); } -if (multisample()) +if (multisample() && !m_framebufferBinding) bind(); +else +restoreFramebufferBinding(); } bool DrawingBuffer::requiresCopyFromBackToFrontBuffer() const ___ webkit-changes mailing list webkit-changes@lists.webkit.org http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [116374] trunk
Title: [116374] trunk
Revision 116374
Author z...@google.com
Date 2012-05-07 16:56:47 -0700 (Mon, 07 May 2012)
Log Message
vertexAttribPointer needs to reject large negative offsets
https://bugs.webkit.org/show_bug.cgi?id=85117
Reviewed by Kenneth Russell.
Source/WebCore:
* html/canvas/WebGLRenderingContext.cpp: Use long long for GLsizeiptr and GLintptr
(WebCore):
(WebCore::WebGLRenderingContext::bufferData):
(WebCore::WebGLRenderingContext::bufferSubData):
(WebCore::WebGLRenderingContext::drawElements):
(WebCore::WebGLRenderingContext::getVertexAttribOffset):
(WebCore::WebGLRenderingContext::vertexAttribPointer):
* html/canvas/WebGLRenderingContext.h: Ditto
(WebGLRenderingContext):
* html/canvas/WebGLRenderingContext.idl: Ditto
LayoutTests:
* fast/canvas/webgl/index-validation-expected.txt:
* fast/canvas/webgl/index-validation.html: Add a test case for large negative offset.
Modified Paths
trunk/LayoutTests/ChangeLog
trunk/LayoutTests/fast/canvas/webgl/index-validation-expected.txt
trunk/LayoutTests/fast/canvas/webgl/index-validation.html
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/html/canvas/WebGLRenderingContext.cpp
trunk/Source/WebCore/html/canvas/WebGLRenderingContext.h
trunk/Source/WebCore/html/canvas/WebGLRenderingContext.idl
Diff
Modified: trunk/LayoutTests/ChangeLog (116373 => 116374)
--- trunk/LayoutTests/ChangeLog 2012-05-07 23:39:40 UTC (rev 116373)
+++ trunk/LayoutTests/ChangeLog 2012-05-07 23:56:47 UTC (rev 116374)
@@ -1,3 +1,13 @@
+2012-05-04 Zhenyao Mo
+
+vertexAttribPointer needs to reject large negative offsets
+https://bugs.webkit.org/show_bug.cgi?id=85117
+
+Reviewed by Kenneth Russell.
+
+* fast/canvas/webgl/index-validation-expected.txt:
+* fast/canvas/webgl/index-validation.html: Add a test case for large negative offset.
+
2012-05-07 Pravin D
:first-line text-decorations are not rendered
Modified: trunk/LayoutTests/fast/canvas/webgl/index-validation-expected.txt (116373 => 116374)
--- trunk/LayoutTests/fast/canvas/webgl/index-validation-expected.txt 2012-05-07 23:39:40 UTC (rev 116373)
+++ trunk/LayoutTests/fast/canvas/webgl/index-validation-expected.txt 2012-05-07 23:56:47 UTC (rev 116374)
@@ -4,27 +4,29 @@
Testing with valid indices
PASS gl.checkFramebufferStatus(gl.FRAMEBUFFER) is gl.FRAMEBUFFER_COMPLETE
-PASS gl.getError() is 0
+PASS getError was expected value: NO_ERROR :
PASS gl.drawElements(gl.TRIANGLES, 3, gl.UNSIGNED_SHORT, 0) is undefined.
-PASS gl.getError() is 0
+PASS getError was expected value: NO_ERROR :
Testing with out-of-range indices
Enable vertices, valid
-PASS gl.getError() is 0
+PASS getError was expected value: NO_ERROR :
PASS gl.drawElements(gl.TRIANGLES, 3, gl.UNSIGNED_SHORT, 0) is undefined.
-PASS gl.getError() is 0
+PASS getError was expected value: NO_ERROR :
Enable normals, out-of-range
-PASS gl.getError() is 0
+PASS getError was expected value: NO_ERROR :
PASS gl.drawElements(gl.TRIANGLES, 3, gl.UNSIGNED_SHORT, 0) is undefined.
-PASS gl.getError() is gl.INVALID_OPERATION
+PASS getError was expected value: INVALID_OPERATION :
Test with enabled attribute that does not belong to current program
Enable an extra attribute with null
-PASS gl.getError() is 0
+PASS getError was expected value: NO_ERROR :
PASS gl.drawElements(gl.TRIANGLES, 3, gl.UNSIGNED_SHORT, 0) is undefined.
-PASS gl.getError() is gl.INVALID_OPERATION
+PASS getError was expected value: INVALID_OPERATION :
Enable an extra attribute with insufficient data buffer
-PASS gl.getError() is 0
+PASS getError was expected value: NO_ERROR :
PASS gl.drawElements(gl.TRIANGLES, 3, gl.UNSIGNED_SHORT, 0) is undefined.
-PASS gl.getError() is 0
+Pass large negative index to vertexAttribPointer
+PASS getError was expected value: INVALID_VALUE :
+PASS gl.drawElements(gl.TRIANGLES, 3, gl.UNSIGNED_SHORT, 0) is undefined.
PASS successfullyParsed is true
TEST COMPLETE
Modified: trunk/LayoutTests/fast/canvas/webgl/index-validation.html (116373 => 116374)
--- trunk/LayoutTests/fast/canvas/webgl/index-validation.html 2012-05-07 23:39:40 UTC (rev 116373)
+++ trunk/LayoutTests/fast/canvas/webgl/index-validation.html 2012-05-07 23:56:47 UTC (rev 116374)
@@ -1,5 +1,8 @@
+
+
+