[chromium] Avoid dependending on implicit WebString -> String conversion in compositor
authorjamesr@google.com <jamesr@google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 7 Aug 2012 23:44:36 +0000 (23:44 +0000)
committerjamesr@google.com <jamesr@google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 7 Aug 2012 23:44:36 +0000 (23:44 +0000)
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):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@124941 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/platform/graphics/chromium/LayerRendererChromium.cpp
Source/WebCore/platform/graphics/chromium/cc/CCResourceProvider.cpp

index 6630ecb..6cfe382 100644 (file)
@@ -1,3 +1,15 @@
+2012-08-07  James Robinson  <jamesr@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  <haraken@chromium.org>
 
         [V8] Factor out V8Binding methods that configures DOM attributes and methods
index 649e610..7ea1c4b 100644 (file)
@@ -187,7 +187,8 @@ bool LayerRendererChromium::initialize()
 
     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;
index 49c3b24..2c78751 100644 (file)
@@ -244,7 +244,8 @@ bool CCResourceProvider::initialize()
         // 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;