Title: [124941] trunk/Source/WebCore
- Revision
- 124941
- Author
- jam...@google.com
- Date
- 2012-08-07 16:44:36 -0700 (Tue, 07 Aug 2012)
Log Message
[chromium] Avoid dependending on implicit WebString -> String conversion in compositor
https://bugs.webkit.org/show_bug.cgi?id=93408
Reviewed by Adrienne Walker.
* platform/graphics/chromium/LayerRendererChromium.cpp:
(WebCore::LayerRendererChromium::initialize):
* platform/graphics/chromium/cc/CCResourceProvider.cpp:
(WebCore::CCResourceProvider::initialize):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (124940 => 124941)
--- trunk/Source/WebCore/ChangeLog 2012-08-07 23:38:25 UTC (rev 124940)
+++ trunk/Source/WebCore/ChangeLog 2012-08-07 23:44:36 UTC (rev 124941)
@@ -1,3 +1,15 @@
+2012-08-07 James Robinson <jam...@chromium.org>
+
+ [chromium] Avoid dependending on implicit WebString -> String conversion in compositor
+ https://bugs.webkit.org/show_bug.cgi?id=93408
+
+ Reviewed by Adrienne Walker.
+
+ * platform/graphics/chromium/LayerRendererChromium.cpp:
+ (WebCore::LayerRendererChromium::initialize):
+ * platform/graphics/chromium/cc/CCResourceProvider.cpp:
+ (WebCore::CCResourceProvider::initialize):
+
2012-08-07 Kentaro Hara <hara...@chromium.org>
[V8] Factor out V8Binding methods that configures DOM attributes and methods
Modified: trunk/Source/WebCore/platform/graphics/chromium/LayerRendererChromium.cpp (124940 => 124941)
--- trunk/Source/WebCore/platform/graphics/chromium/LayerRendererChromium.cpp 2012-08-07 23:38:25 UTC (rev 124940)
+++ trunk/Source/WebCore/platform/graphics/chromium/LayerRendererChromium.cpp 2012-08-07 23:44:36 UTC (rev 124941)
@@ -187,7 +187,8 @@
m_context->setContextLostCallback(this);
- String extensionsString = m_context->getString(GraphicsContext3D::EXTENSIONS);
+ WebKit::WebString extensionsWebString = m_context->getString(GraphicsContext3D::EXTENSIONS);
+ String extensionsString(extensionsWebString.data(), extensionsWebString.length());
Vector<String> extensionsList;
extensionsString.split(' ', extensionsList);
HashSet<String> extensions;
Modified: trunk/Source/WebCore/platform/graphics/chromium/cc/CCResourceProvider.cpp (124940 => 124941)
--- trunk/Source/WebCore/platform/graphics/chromium/cc/CCResourceProvider.cpp 2012-08-07 23:38:25 UTC (rev 124940)
+++ trunk/Source/WebCore/platform/graphics/chromium/cc/CCResourceProvider.cpp 2012-08-07 23:44:36 UTC (rev 124941)
@@ -244,7 +244,8 @@
// FIXME: Implement this path for software compositing.
return false;
}
- String extensionsString = context3d->getString(GraphicsContext3D::EXTENSIONS);
+ WebKit::WebString extensionsWebString = context3d->getString(GraphicsContext3D::EXTENSIONS);
+ String extensionsString(extensionsWebString.data(), extensionsWebString.length());
Vector<String> extensions;
extensionsString.split(' ', extensions);
bool useMapSub = false;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
