5 files changed, 29 insertions, 17 deletions
diff --git a/cc/cc.gyp b/cc/cc.gyp
index a66c5cc..11dd0cedc 100644
--- a/cc/cc.gyp
+++ b/cc/cc.gyp
@@ -237,19 +237,23 @@
           ],
           'sources': [
             '<@(cc_source_files)',
-            'stubs/Extensions3DChromium.h',
             'stubs/Extensions3D.h',
+            'stubs/Extensions3DChromium.h',
+            'stubs/FloatPoint.h',
+            'stubs/FloatPoint3D.h',
+            'stubs/FloatQuad.h',
+            'stubs/FloatRect.h',
+            'stubs/FloatSize.h',
             'stubs/GraphicsContext3D.h',
             'stubs/GraphicsTypes3D.h',
+            'stubs/IntPoint.h',
+            'stubs/IntRect.h',
+            'stubs/IntSize.h',
             'stubs/NotImplemented.h',
             'stubs/Region.h',
-            'stubs/ScrollbarThemeClient.h',
-            'stubs/ScrollTypes.h',
-            'stubs/SharedGraphicsContext3D.h',
             'stubs/SkiaUtils.h',
             'stubs/TextStream.h',
             'stubs/TilingData.h',
-            'stubs/Timer.h',
             'stubs/TraceEvent.h',
             'stubs/UnitBezier.h',
           ],
diff --git a/cc/stubs/GraphicsContext3D.h b/cc/stubs/GraphicsContext3D.h
index 41404f2..eff588e 100644
--- a/cc/stubs/GraphicsContext3D.h
+++ b/cc/stubs/GraphicsContext3D.h
@@ -9,17 +9,16 @@
 #include "IntSize.h"
 #include "third_party/khronos/GLES2/gl2.h"
 
+#ifdef NO_ERROR
+#undef NO_ERROR
+#endif
+
 namespace WebCore {
 
 class GraphicsContext3D {
 public:
     enum SourceDataFormat { SourceFormatRGBA8, SourceFormatBGRA8 };
-    static bool computeFormatAndTypeParameters(unsigned, unsigned, unsigned* componentsPerPixel, unsigned* bytesPerComponent)
-    {
-        *componentsPerPixel = 4;
-        *bytesPerComponent = 1;
-        return true;
-    }
+    static bool computeFormatAndTypeParameters(unsigned, unsigned, unsigned* componentsPerPixel, unsigned* bytesPerComponent);
 
     enum {
         ARRAY_BUFFER = GL_ARRAY_BUFFER,
diff --git a/cc/stubs/TextStream.h b/cc/stubs/TextStream.h
index a9d02d6..8ed4fbb 100644
--- a/cc/stubs/TextStream.h
+++ b/cc/stubs/TextStream.h
@@ -9,12 +9,13 @@
 
 namespace WebCore {
 
+// These symbols are all defined inside WebCore.
 class TextStream {
 public:
-    TextStream& operator<<(const String&) { return *this; }
-    TextStream& operator<<(const char*) { return *this; }
-    TextStream& operator<<(int) { return *this; }
-    String release() { return ""; }
+    TextStream& operator<<(const String&);
+    TextStream& operator<<(const char*);
+    TextStream& operator<<(int);
+    String release();
 };
 
 }
diff --git a/webkit/compositor_bindings/compositor_bindings.gyp b/webkit/compositor_bindings/compositor_bindings.gyp
index 77f2705..9c874e9 100644
--- a/webkit/compositor_bindings/compositor_bindings.gyp
+++ b/webkit/compositor_bindings/compositor_bindings.gyp
@@ -108,9 +108,15 @@
           ],
           'sources': [
             '<@(webkit_compositor_bindings_sources)',
-            'stubs/AnimationIdVendor.h',
-            'stubs/public/WebTransformationMatrix',
+            'stubs/public/WebTransformationMatrix.h',
           ],
+          'conditions': [
+            ['component=="shared_library"', {
+              'defines': [
+                'WEBKIT_DLL',
+              ],
+            }],
+          ]
         },
       ],
     }],
diff --git a/webkit/compositor_bindings/stubs/public/WebTransformationMatrix.h b/webkit/compositor_bindings/stubs/public/WebTransformationMatrix.h
index 2c6ed7c..7ad4a30 100644
--- a/webkit/compositor_bindings/stubs/public/WebTransformationMatrix.h
+++ b/webkit/compositor_bindings/stubs/public/WebTransformationMatrix.h
@@ -5,6 +5,8 @@
 #ifndef WEBKIT_COMPOSITOR_STUBS_WEBTRANSFORMATIONMATRIX_H_
 #define WEBKIT_COMPOSITOR_STUBS_WEBTRANSFORMATIONMATRIX_H_
 
+#include <public/WebCommon.h>
+
 #undef WEBKIT_IMPLEMENTATION
 #include "third_party/WebKit/Source/Platform/chromium/public/WebTransformationMatrix.h"
 #undef WEBKIT_IMPLEMENTATION