[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[jamesr at google.com]

The following commit has been merged in the debian/experimental branch:
commit f375526839ba783de9dcb2820029bcfdcb091b2f
Author: jamesr at google.com <jamesr at google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Jul 31 00:18:54 2010 +0000

    2010-07-30  James Robinson  <jamesr at chromium.org>
    
            Compile fix: fix a typo in forward declaration, add EmptyClients impl.
    
            * loader/EmptyClients.h:
            (WebCore::EmptyChromeClient::getOnscreenGLES2Context):
            (WebCore::EmptyChromeClient::getOffscreenGLES2Context):
            * page/ChromeClient.h:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64389 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 4ccf9f2..442643b 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,5 +1,14 @@
 2010-07-30  James Robinson  <jamesr at chromium.org>
 
+        Compile fix: fix a typo in forward declaration, add EmptyClients impl.
+
+        * loader/EmptyClients.h:
+        (WebCore::EmptyChromeClient::getOnscreenGLES2Context):
+        (WebCore::EmptyChromeClient::getOffscreenGLES2Context):
+        * page/ChromeClient.h:
+
+2010-07-30  James Robinson  <jamesr at chromium.org>
+
         Reviewed by Darin Fisher.
 
         Move GLES2 context manipulation to ChromeClient.h and put it behind the right #if guard
diff --git a/WebCore/loader/EmptyClients.h b/WebCore/loader/EmptyClients.h
index 9938bbc..3f2cf19 100644
--- a/WebCore/loader/EmptyClients.h
+++ b/WebCore/loader/EmptyClients.h
@@ -41,6 +41,10 @@
 #include "PluginHalterClient.h"
 #include "ResourceError.h"
 
+#if USE(GLES2_RENDERING)
+#include "GLES2Context.h"
+#endif
+
 /*
  This file holds empty Client stubs for use by WebCore.
  Viewless element needs to create a dummy Page->Frame->FrameView tree for use in parsing or executing JavaScript.
@@ -166,6 +170,11 @@ public:
     virtual void scheduleCompositingLayerSync() {};
 #endif
 
+#if USE(GLES2_RENDERING)
+    virtual PassOwnPtr<GLES2Context> getOnscreenGLES2Context() { return 0; }
+    virtual PassOwnPtr<GLES2Context> getOffscreenGLES2Context() { return 0; }
+#endif
+
 #if PLATFORM(WIN)
     virtual void setLastSetCursorToCurrentCursor() { }
 #endif
diff --git a/WebCore/page/ChromeClient.h b/WebCore/page/ChromeClient.h
index eac5eb3..942610f 100644
--- a/WebCore/page/ChromeClient.h
+++ b/WebCore/page/ChromeClient.h
@@ -65,7 +65,7 @@ namespace WebCore {
 #endif
 
 #if USE(GLES2_RENDERING)
-    class GLES2Contxt;
+    class GLES2Context;
 #endif
 
 #if ENABLE(NOTIFICATIONS)

-- 
WebKit Debian packaging