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

[weinig at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 7c218563201d860361bada164ce039a7abc5c789
Author: weinig at apple.com <weinig at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Aug 7 22:25:14 2010 +0000

    Fix windows build.
    
    * WebProcess/Plugins/PluginView.cpp:
    (WebKit::PluginView::platformLayer):
    * WebProcess/Plugins/PluginView.h:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64922 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 5f36921..5ca8d49 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,5 +1,13 @@
 2010-08-07  Sam Weinig  <sam at webkit.org>
 
+        Fix windows build.
+
+        * WebProcess/Plugins/PluginView.cpp:
+        (WebKit::PluginView::platformLayer):
+        * WebProcess/Plugins/PluginView.h:
+
+2010-08-07  Sam Weinig  <sam at webkit.org>
+
         Reviewed by Anders Carlsson.
 
         WebKitTestRunner needs GCController
diff --git a/WebKit2/WebProcess/Plugins/PluginView.cpp b/WebKit2/WebProcess/Plugins/PluginView.cpp
index 1eaeb20..73f5ae5 100644
--- a/WebKit2/WebProcess/Plugins/PluginView.cpp
+++ b/WebKit2/WebProcess/Plugins/PluginView.cpp
@@ -341,14 +341,12 @@ void PluginView::initializePlugin()
 #endif
 }
 
+#if PLATFORM(MAC)
 PlatformLayer* PluginView::platformLayer() const
 {
-#if PLATFORM(MAC)
     return m_plugin->pluginLayer();
-#endif
-
-    return 0;
 }
+#endif
 
 JSObject* PluginView::scriptObject(JSGlobalObject* globalObject)
 {
diff --git a/WebKit2/WebProcess/Plugins/PluginView.h b/WebKit2/WebProcess/Plugins/PluginView.h
index 6a4a460..3ef118f 100644
--- a/WebKit2/WebProcess/Plugins/PluginView.h
+++ b/WebKit2/WebProcess/Plugins/PluginView.h
@@ -88,7 +88,9 @@ private:
     void cancelAllStreams();
 
     // WebCore::PluginViewBase
+#if PLATFORM(MAC)
     virtual PlatformLayer* platformLayer() const;
+#endif
     virtual JSC::JSObject* scriptObject(JSC::JSGlobalObject*);
     
     // WebCore::Widget

-- 
WebKit Debian packaging