Diff
Modified: trunk/Source/Platform/ChangeLog (136733 => 136734)
--- trunk/Source/Platform/ChangeLog 2012-12-05 20:24:58 UTC (rev 136733)
+++ trunk/Source/Platform/ChangeLog 2012-12-05 20:28:07 UTC (rev 136734)
@@ -1,3 +1,15 @@
+2012-12-05 Stephen White <[email protected]>
+
+ Unreviewed, rolling out r136609.
+ http://trac.webkit.org/changeset/136609
+ https://bugs.webkit.org/show_bug.cgi?id=103793
+
+ Breaking Chrome/Mac Debug builds.
+
+ * Platform.gyp/Platform.gyp:
+ * chromium/public/WebGraphicsContext3D.h:
+ (Attributes):
+
2012-12-04 Kenneth Russell <[email protected]>
Associate URLs with GraphicsContext3D instances created for WebGL
Modified: trunk/Source/Platform/Platform.gyp/Platform.gyp (136733 => 136734)
--- trunk/Source/Platform/Platform.gyp/Platform.gyp 2012-12-05 20:24:58 UTC (rev 136733)
+++ trunk/Source/Platform/Platform.gyp/Platform.gyp 2012-12-05 20:28:07 UTC (rev 136734)
@@ -40,7 +40,6 @@
'dependencies': [
'../../WTF/WTF.gyp/WTF.gyp:wtf',
'<(DEPTH)/skia/skia.gyp:skia',
- '<(DEPTH)/build/temp_gyp/googleurl.gyp:googleurl',
],
'include_dirs': [
'../chromium',
@@ -77,9 +76,6 @@
'<(output_dir)'
],
},
- 'export_dependent_settings': [
- '<(DEPTH)/build/temp_gyp/googleurl.gyp:googleurl',
- ],
'conditions': [
['inside_chromium_build==1', {
'conditions': [
Modified: trunk/Source/Platform/chromium/public/WebGraphicsContext3D.h (136733 => 136734)
--- trunk/Source/Platform/chromium/public/WebGraphicsContext3D.h 2012-12-05 20:24:58 UTC (rev 136733)
+++ trunk/Source/Platform/chromium/public/WebGraphicsContext3D.h 2012-12-05 20:28:07 UTC (rev 136734)
@@ -36,7 +36,6 @@
#include "WebGraphicsMemoryStats.h"
#include "WebNonCopyable.h"
#include "WebString.h"
-#include "WebURL.h"
#define USE_WGC3D_TYPES
@@ -110,7 +109,6 @@
bool shareResources;
bool preferDiscreteGPU;
bool noAutomaticFlushes;
- WebURL topDocumentURL;
};
class WebGraphicsContextLostCallback {
Modified: trunk/Source/WebCore/ChangeLog (136733 => 136734)
--- trunk/Source/WebCore/ChangeLog 2012-12-05 20:24:58 UTC (rev 136733)
+++ trunk/Source/WebCore/ChangeLog 2012-12-05 20:28:07 UTC (rev 136734)
@@ -1,3 +1,19 @@
+2012-12-05 Stephen White <[email protected]>
+
+ Unreviewed, rolling out r136609.
+ http://trac.webkit.org/changeset/136609
+ https://bugs.webkit.org/show_bug.cgi?id=103793
+
+ Breaking Chrome/Mac Debug builds.
+
+ * html/canvas/WebGLRenderingContext.cpp:
+ (WebCore):
+ (WebCore::WebGLRenderingContext::create):
+ * platform/chromium/support/GraphicsContext3DChromium.cpp:
+ (WebCore::GraphicsContext3D::create):
+ * platform/graphics/GraphicsContext3D.h:
+ (Attributes):
+
2012-12-05 Bear Travis <[email protected]>
[CSS Exclusions] Enable shape-inside for multiple-segment polygons
Modified: trunk/Source/WebCore/html/canvas/WebGLRenderingContext.cpp (136733 => 136734)
--- trunk/Source/WebCore/html/canvas/WebGLRenderingContext.cpp 2012-12-05 20:24:58 UTC (rev 136733)
+++ trunk/Source/WebCore/html/canvas/WebGLRenderingContext.cpp 2012-12-05 20:28:07 UTC (rev 136734)
@@ -425,8 +425,8 @@
attributes.shareResources = false;
#endif
attributes.preferDiscreteGPU = true;
- attributes.topDocumentURL = document->topDocument()->url();
+
RefPtr<GraphicsContext3D> context(GraphicsContext3D::create(attributes, hostWindow));
if (!context || !context->makeContextCurrent()) {
Modified: trunk/Source/WebCore/platform/chromium/support/GraphicsContext3DChromium.cpp (136733 => 136734)
--- trunk/Source/WebCore/platform/chromium/support/GraphicsContext3DChromium.cpp 2012-12-05 20:24:58 UTC (rev 136733)
+++ trunk/Source/WebCore/platform/chromium/support/GraphicsContext3DChromium.cpp 2012-12-05 20:28:07 UTC (rev 136734)
@@ -76,7 +76,6 @@
webAttributes.noExtensions = attrs.noExtensions;
webAttributes.shareResources = attrs.shareResources;
webAttributes.preferDiscreteGPU = attrs.preferDiscreteGPU;
- webAttributes.topDocumentURL = attrs.topDocumentURL;
OwnPtr<WebKit::WebGraphicsContext3D> webContext = adoptPtr(WebKit::Platform::current()->createOffscreenGraphicsContext3D(webAttributes));
if (!webContext)
Modified: trunk/Source/WebCore/platform/graphics/GraphicsContext3D.h (136733 => 136734)
--- trunk/Source/WebCore/platform/graphics/GraphicsContext3D.h 2012-12-05 20:24:58 UTC (rev 136733)
+++ trunk/Source/WebCore/platform/graphics/GraphicsContext3D.h 2012-12-05 20:28:07 UTC (rev 136734)
@@ -26,10 +26,9 @@
#ifndef GraphicsContext3D_h
#define GraphicsContext3D_h
-#include "GraphicsTypes3D.h"
#include "Image.h"
#include "IntRect.h"
-#include "KURL.h"
+#include "GraphicsTypes3D.h"
#include "PlatformLayer.h"
#include <wtf/HashMap.h>
#include <wtf/ListHashSet.h>
@@ -460,7 +459,6 @@
bool noExtensions;
bool shareResources;
bool preferDiscreteGPU;
- KURL topDocumentURL;
};
enum RenderStyle {
Modified: trunk/Source/WebKit/chromium/ChangeLog (136733 => 136734)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-12-05 20:24:58 UTC (rev 136733)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-12-05 20:28:07 UTC (rev 136734)
@@ -1,3 +1,13 @@
+2012-12-05 Stephen White <[email protected]>
+
+ Unreviewed, rolling out r136609.
+ http://trac.webkit.org/changeset/136609
+ https://bugs.webkit.org/show_bug.cgi?id=103793
+
+ Breaking Chrome/Mac Debug builds.
+
+ * WebKit.gyp:
+
2012-12-05 Alec Flett <[email protected]>
IndexedDB: Stub out transaction-backend methods
Modified: trunk/Source/WebKit/chromium/WebKit.gyp (136733 => 136734)
--- trunk/Source/WebKit/chromium/WebKit.gyp 2012-12-05 20:24:58 UTC (rev 136733)
+++ trunk/Source/WebKit/chromium/WebKit.gyp 2012-12-05 20:28:07 UTC (rev 136734)
@@ -874,7 +874,6 @@
'type': 'static_library',
'dependencies': [
'../../WTF/WTF.gyp/WTF.gyp:wtf',
- '<(chromium_src_dir)/build/temp_gyp/googleurl.gyp:googleurl',
],
'defines': [
'WEBKIT_IMPLEMENTATION=1',
