4 files changed, 42 insertions, 1 deletions
diff --git a/Source/Platform/ChangeLog b/Source/Platform/ChangeLog
index 76c17133f..9eefd2bb3 100644
--- a/Source/Platform/ChangeLog
+++ b/Source/Platform/ChangeLog
@@ -1,3 +1,39 @@
+2012-07-23  Dave Tu  <dtu@chromium.org>
+
+        [chromium] Add droppedFrameCount to renderingStats.
+        https://bugs.webkit.org/show_bug.cgi?id=91694
+
+        Reviewed by Adrienne Walker.
+
+        * chromium/public/WebRenderingStats.h:
+        (WebRenderingStats):
+        (WebKit::WebRenderingStats::WebRenderingStats):
+
+2012-07-23  Brian Anderson  <brianderson@chromium.org>
+
+        [chromium] Use shallow flushes that don't glFlush
+        https://bugs.webkit.org/show_bug.cgi?id=90325
+
+        Reviewed by Kenneth Russell.
+
+        Adds shallowFlushCHROMIUM to WebGraphicsContext3D.
+
+        * chromium/public/WebGraphicsContext3D.h:
+        (WebGraphicsContext3D):
+        (WebKit::WebGraphicsContext3D::shallowFlushCHROMIUM):
+
+2012-07-23  Tommy Widenflycht  <tommyw@google.com>
+
+        [chromium] MediaStream API: Clean up the MockWebKitPlatformSupport object at shutdown
+        https://bugs.webkit.org/show_bug.cgi?id=91857
+
+        Reviewed by Adam Barth.
+
+        Made Platforms destructor virtual.
+
+        * chromium/public/Platform.h:
+        (WebKit::Platform::~Platform):
+
 2012-07-18  Antoine Labour  <piman@chromium.org>
 
         [chromium] Introduce CCResourceProvider, replacing TextureAllocator and hiding textures from clients to allow transport
diff --git a/Source/Platform/chromium/public/Platform.h b/Source/Platform/chromium/public/Platform.h
index b0b0e6ed2..64df3ba89 100644
--- a/Source/Platform/chromium/public/Platform.h
+++ b/Source/Platform/chromium/public/Platform.h
@@ -424,7 +424,7 @@ public:
     virtual void didStopWorkerRunLoop(const WebWorkerRunLoop&) { }
 
 protected:
-    ~Platform() { }
+    virtual ~Platform() { }
 };
 
 } // namespace WebKit
diff --git a/Source/Platform/chromium/public/WebGraphicsContext3D.h b/Source/Platform/chromium/public/WebGraphicsContext3D.h
index 44c206719..e7d7a64b4 100644
--- a/Source/Platform/chromium/public/WebGraphicsContext3D.h
+++ b/Source/Platform/chromium/public/WebGraphicsContext3D.h
@@ -421,6 +421,9 @@ public:
     virtual void copyTextureCHROMIUM(WGC3Denum target, WGC3Duint sourceId,
                                      WGC3Duint destId, WGC3Dint level, WGC3Denum internalFormat) { }
 
+    // GL_CHROMIUM_shallow_flush
+    virtual void shallowFlushCHROMIUM() { }
+
     GrGLInterface* createGrGLInterface();
 
 protected:
diff --git a/Source/Platform/chromium/public/WebRenderingStats.h b/Source/Platform/chromium/public/WebRenderingStats.h
index f1769855b..e24af2b69 100644
--- a/Source/Platform/chromium/public/WebRenderingStats.h
+++ b/Source/Platform/chromium/public/WebRenderingStats.h
@@ -31,10 +31,12 @@ namespace WebKit {
 struct WebRenderingStats {
     int numAnimationFrames;
     int numFramesSentToScreen;
+    int droppedFrameCount;
 
     WebRenderingStats()
         : numAnimationFrames(0)
         , numFramesSentToScreen(0)
+        , droppedFrameCount(0)
     {
     }
 };