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

[mrowe at apple.com]

The following commit has been merged in the webkit-1.2 branch:
commit 386b8d0c09daed534efd09281b3600ed11295af7
Author: mrowe at apple.com <mrowe at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jan 6 23:20:53 2010 +0000

    Fix the Mac build.
    
    * WebCore.base.exp: Export symbols WebKit would like to use.
    * plugins/PluginWidget.h:
    (WebCore::PluginWidget::PluginWidget): Redeclare a constructor.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52875 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index f67ae75..7f672bb 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,11 @@
+2010-01-06  Mark Rowe  <mrowe at apple.com>
+
+        Fix the Mac build.
+
+        * WebCore.base.exp: Export symbols WebKit would like to use.
+        * plugins/PluginWidget.h:
+        (WebCore::PluginWidget::PluginWidget): Redeclare a constructor.
+
 2010-01-06  Kevin Decker  <kdecker at apple.com>
 
         Reviewed by Eric Carlson.
diff --git a/WebCore/WebCore.base.exp b/WebCore/WebCore.base.exp
index f879bd4..7e854b4 100644
--- a/WebCore/WebCore.base.exp
+++ b/WebCore/WebCore.base.exp
@@ -247,6 +247,7 @@ __ZN7WebCore12IconDatabase27checkIntegrityBeforeOpeningEv
 __ZN7WebCore12IconDatabase4openERKNS_6StringE
 __ZN7WebCore12IconDatabase5closeEv
 __ZN7WebCore12IconDatabase9setClientEPNS_18IconDatabaseClientE
+__ZN7WebCore12PluginWidget14invalidateRectERKNS_7IntRectE
 __ZN7WebCore12RenderObject16repaintRectangleERKNS_7IntRectEb
 __ZN7WebCore12RenderWidget19showSubstituteImageEN3WTF10PassRefPtrINS_5ImageEEE
 __ZN7WebCore12SchedulePairC1EP9NSRunLoopPK10__CFString
@@ -983,6 +984,7 @@ __ZNK7WebCore9PageCache10frameCountEv
 __ZNK7WebCore9PageCache21autoreleasedPageCountEv
 __ZNK7WebCore9TimerBase8isActiveEv
 __ZTVN7WebCore12ChromeClientE
+__ZTVN7WebCore12PluginWidgetE
 __ZTVN7WebCore17FileChooserClientE
 __ZTVN7WebCore17FrameLoaderClientE
 __ZTVN7WebCore25HistoryPropertyListWriterE
@@ -1022,6 +1024,7 @@ _wkInitializeMaximumHTTPConnectionCountPerHost
 _wkIsLatchingWheelEvent
 _wkMeasureMediaUIPart
 _wkMediaControllerThemeAvailable
+_wkNoteOpenPanelFiles
 _wkPopupMenu
 _wkQTIncludeOnlyModernMediaFileTypes
 _wkQTMovieDataRate
@@ -1044,4 +1047,3 @@ _wkSetUpFontCache
 _wkSignalCFReadStreamEnd
 _wkSignalCFReadStreamError
 _wkSignalCFReadStreamHasBytes
-_wkNoteOpenPanelFiles
diff --git a/WebCore/plugins/PluginWidget.h b/WebCore/plugins/PluginWidget.h
index 197d8fe..ef59998 100644
--- a/WebCore/plugins/PluginWidget.h
+++ b/WebCore/plugins/PluginWidget.h
@@ -33,6 +33,8 @@ namespace WebCore {
 // this happens PluginWidget and PluginView can become one class. 
 class PluginWidget : public Widget {
 public:
+    PluginWidget(PlatformWidget widget = 0) : Widget(widget) { }
+
     virtual void invalidateRect(const IntRect&);
     virtual bool isPluginWidget() const { return true; }
 };
diff --git a/WebKit/mac/ChangeLog b/WebKit/mac/ChangeLog
index 891be8f..c279aa1 100644
--- a/WebKit/mac/ChangeLog
+++ b/WebKit/mac/ChangeLog
@@ -1,9 +1,3 @@
-2010-01-06  Sam Weinig  <sam at webkit.org>
-
-        Attempt to fix non-Snow Leopard Mac build.
-
-        * WebCoreSupport/WebFrameLoaderClient.mm:
-
 2010-01-06  Kevin Decker  <kdecker at apple.com>
 
         Reviewed by Eric Carlson.
diff --git a/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm b/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm
index 108ae99..5934d7c 100644
--- a/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm
+++ b/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm
@@ -1479,6 +1479,11 @@ static NSView *pluginView(WebFrame *frame, WebPluginPackage *pluginPackage,
 
 class NetscapePluginWidget : public PluginWidget {
 public:
+    NetscapePluginWidget(WebBaseNetscapePluginView *view)
+        : PluginWidget(view)
+    {
+    }
+    
     virtual void handleEvent(Event*)
     {
         Frame* frame = Frame::frameForWidget(this);

-- 
WebKit Debian packaging