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

[kevino at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit d1aae6605a1400957b4c292a5801b0566a647636
Author: kevino at webkit.org <kevino at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Dec 1 19:46:19 2010 +0000

    [wx] Build fixes after recent trunk changes.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73051 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 2cba9cf..5c61c26 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2010-12-01  Kevin Ollivier  <kevino at theolliviers.com>
+
+        [wx] Build fixes after recent trunk changes.
+
+        * platform/graphics/wx/ImageBufferWx.cpp:
+        (WebCore::ImageBuffer::ImageBuffer):
+        * platform/wx/LocalizedStringsWx.cpp:
+        (WebCore::platformDefaultLanguage):
+
 2010-12-01  Sheriff Bot  <webkit.review.bot at gmail.com>
 
         Unreviewed, rolling out r73047.
diff --git a/WebCore/platform/graphics/wx/ImageBufferWx.cpp b/WebCore/platform/graphics/wx/ImageBufferWx.cpp
index 2522cbd..dd45f31 100644
--- a/WebCore/platform/graphics/wx/ImageBufferWx.cpp
+++ b/WebCore/platform/graphics/wx/ImageBufferWx.cpp
@@ -37,7 +37,7 @@ ImageBufferData::ImageBufferData(const IntSize&)
 {
 }
 
-ImageBuffer::ImageBuffer(const IntSize&, ImageColorSpace imageColorSpace, bool& success) : 
+ImageBuffer::ImageBuffer(const IntSize&, ColorSpace imageColorSpace, bool& success) : 
     m_data(IntSize())
 {
     notImplemented();
diff --git a/WebCore/platform/wx/LocalizedStringsWx.cpp b/WebCore/platform/wx/LocalizedStringsWx.cpp
index 3c90f6b..4b56394 100644
--- a/WebCore/platform/wx/LocalizedStringsWx.cpp
+++ b/WebCore/platform/wx/LocalizedStringsWx.cpp
@@ -47,7 +47,7 @@ String resetButtonDefaultLabel()
     return String("Reset"); 
 }
 
-String defaultLanguage() 
+String platformDefaultLanguage() 
 { 
     return String("en"); 
 }
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 7e3b475..5966923 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,11 @@
+2010-12-01  Kevin Ollivier  <kevino at theolliviers.com>
+
+        [wx] Build fixes after recent trunk changes.
+
+        * DumpRenderTree/wx/LayoutTestControllerWx.cpp:
+        (LayoutTestController::findString):
+        * wx/build/settings.py:
+
 2010-12-01  Dan Bernstein  <mitz at apple.com>
 
         Reviewed by Darin Adler.
diff --git a/WebKitTools/DumpRenderTree/wx/LayoutTestControllerWx.cpp b/WebKitTools/DumpRenderTree/wx/LayoutTestControllerWx.cpp
index 8587fea..120a1b6 100644
--- a/WebKitTools/DumpRenderTree/wx/LayoutTestControllerWx.cpp
+++ b/WebKitTools/DumpRenderTree/wx/LayoutTestControllerWx.cpp
@@ -528,3 +528,9 @@ JSRetainPtr<JSStringRef> LayoutTestController::pageSizeAndMarginsInPixels(int pa
     // FIXME: Implement
     return 0;
 }
+
+bool LayoutTestController::findString(JSContextRef context, JSStringRef target, JSObjectRef optionsArray)
+{
+    // FIXME: Implement
+    return false;
+}
diff --git a/WebKitTools/wx/build/settings.py b/WebKitTools/wx/build/settings.py
index cd3358c..03c0880 100644
--- a/WebKitTools/wx/build/settings.py
+++ b/WebKitTools/wx/build/settings.py
@@ -118,8 +118,9 @@ webcore_dirs = [
     'WebCore/html/parser',
     'WebCore/inspector', 
     'WebCore/loader', 
-    'WebCore/loader/appcache', 
-    'WebCore/loader/archive', 
+    'WebCore/loader/appcache',
+    'WebCore/loader/archive',
+    'WebCore/loader/cache',
     'WebCore/loader/icon',
     'WebCore/notifications',
     'WebCore/page',
@@ -135,6 +136,7 @@ webcore_dirs = [
     'WebCore/platform/image-decoders/ico', 
     'WebCore/platform/image-decoders/jpeg', 
     'WebCore/platform/image-decoders/png',
+    'WebCore/platform/image-decoders/webp',
     'WebCore/platform/mock',
     'WebCore/platform/network', 
     'WebCore/platform/sql', 
@@ -149,7 +151,7 @@ webcore_dirs = [
     'WebCore/svg/animation',
     'WebCore/svg/graphics',
     'WebCore/svg/graphics/filters',
-    
+    'WebCore/svg/properties',
     'WebCore/websockets', 
     'WebCore/xml'
 ]

-- 
WebKit Debian packaging