[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[aroben at apple.com]

The following commit has been merged in the webkit-1.2 branch:
commit 83b5b5a0e6d558757b32b642f66861449ef87766
Author: aroben at apple.com <aroben at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jan 12 13:55:31 2010 +0000

    Windows accelerated compositing build fix after r53110
    
    * plugins/PluginWidget.h:
    (WebCore::PluginWidget::platformLayer): Define platformLayer() for
    non-Mac platforms that have accelerated compositing turned on. It
    would probably be better to make PluginWidget not be used at all on
    non-Mac platforms, but this fix is much simpler.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53139 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index edfe4dd..aa1e3d8 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2010-01-12  Adam Roben  <aroben at apple.com>
+
+        Windows accelerated compositing build fix after r53110
+
+        * plugins/PluginWidget.h:
+        (WebCore::PluginWidget::platformLayer): Define platformLayer() for
+        non-Mac platforms that have accelerated compositing turned on. It
+        would probably be better to make PluginWidget not be used at all on
+        non-Mac platforms, but this fix is much simpler.
+
 2010-01-12  Yury Semikhatsky  <yurys at chromium.org>
 
         Reviewed by Pavel Feldman.
diff --git a/WebCore/plugins/PluginWidget.h b/WebCore/plugins/PluginWidget.h
index e7619f8..7a76fc1 100644
--- a/WebCore/plugins/PluginWidget.h
+++ b/WebCore/plugins/PluginWidget.h
@@ -43,6 +43,13 @@ private:
     virtual bool isPluginWidget() const { return true; }
 };
 
+#if USE(ACCELERATED_COMPOSITING) && !PLATFORM(MAC)
+inline PlatformLayer* PluginWidget::platformLayer() const
+{
+    return 0;
+}
+#endif
+
 } // namespace WebCore
 
 #endif // PluginWidget_h

-- 
WebKit Debian packaging