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

[kevino at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 74ce9f6a23e745b84f3fad17c47e61427e020e5c
Author: kevino at webkit.org <kevino at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Aug 3 03:22:28 2010 +0000

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

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index aafb0aa..186bf86 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,9 @@
+2010-08-02  Kevin Ollivier  <kevino at theolliviers.com>
+
+        [wx] Build fix after removal of need to compile ExecutableAllocatorPosix.cpp
+
+        * wscript:
+
 2010-08-02  Mahesh Kulkarni  <mahesh.kulkarni at nokia.com>
 
         Reviewed by Simon Hausmann.
diff --git a/JavaScriptCore/wscript b/JavaScriptCore/wscript
index 4f9d868..8f62349 100644
--- a/JavaScriptCore/wscript
+++ b/JavaScriptCore/wscript
@@ -29,7 +29,7 @@ import commands
 
 from settings import *
 
-jscore_excludes = ['jsc.cpp', 'ucptable.cpp','ProfilerServer.mm']
+jscore_excludes = ['jsc.cpp', 'ucptable.cpp','ProfilerServer.mm', 'ExecutableAllocatorPosix.cpp']
 jscore_excludes.extend(get_excludes(jscore_dir, ['*Brew.cpp', '*CF.cpp', '*Symbian.cpp']))
 
 sources = []
@@ -37,7 +37,7 @@ sources = []
 jscore_excludes.extend(get_excludes(jscore_dir, ['*None.cpp']))
 
 if building_on_win32:
-    jscore_excludes += ['ExecutableAllocatorPosix.cpp', 'MarkStackPosix.cpp', 'ThreadingPthreads.cpp']
+    jscore_excludes += ['MarkStackPosix.cpp', 'ThreadingPthreads.cpp']
     sources += ['runtime/MarkStackWin.cpp']
 else:
     jscore_excludes.append('JSStringRefBSTR.cpp')
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 40ab4c0..db216c5 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2010-08-02  Kevin Ollivier  <kevino at theolliviers.com>
+
+        [wx] Build fix, add stubs for FontCustomPlatformData to compile code that uses them.
+
+        * css/CSSFontFaceSource.cpp:
+        * platform/graphics/wx/FontCustomPlatformData.cpp: Added.
+        (WebCore::FontCustomPlatformData::~FontCustomPlatformData):
+        (WebCore::FontCustomPlatformData::fontPlatformData):
+        (WebCore::createFontCustomPlatformData):
+        (WebCore::FontCustomPlatformData::supportsFormat):
+        * platform/graphics/wx/FontCustomPlatformData.h: Added.
+        (WebCore::FontCustomPlatformData::FontCustomPlatformData):
+        * wscript:
+
 2010-08-02  Brady Eidson  <beidson at apple.com>
 
         Reviewed by NOBODY (Build fix, forgot to svn add this file)
diff --git a/WebCore/css/CSSFontFaceSource.cpp b/WebCore/css/CSSFontFaceSource.cpp
index 00dfcba..16602c1 100644
--- a/WebCore/css/CSSFontFaceSource.cpp
+++ b/WebCore/css/CSSFontFaceSource.cpp
@@ -36,9 +36,7 @@
 #include "SimpleFontData.h"
 
 #if ENABLE(SVG_FONTS)
-#if !PLATFORM(WX)
 #include "FontCustomPlatformData.h"
-#endif
 #include "HTMLNames.h"
 #include "SVGFontData.h"
 #include "SVGFontElement.h"
diff --git a/WebCore/platform/graphics/wx/FontCustomPlatformData.cpp b/WebCore/platform/graphics/wx/FontCustomPlatformData.cpp
new file mode 100644
index 0000000..4cebe43
--- /dev/null
+++ b/WebCore/platform/graphics/wx/FontCustomPlatformData.cpp
@@ -0,0 +1,49 @@
+/*
+ * Copyright (C) 2008 Alp Toker <alp at atoker.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB.  If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "config.h"
+#include "FontCustomPlatformData.h"
+
+#include "SharedBuffer.h"
+#include "FontPlatformData.h"
+
+
+namespace WebCore {
+
+FontCustomPlatformData::~FontCustomPlatformData()
+{
+}
+
+FontPlatformData FontCustomPlatformData::fontPlatformData(int size, bool bold, bool italic, FontRenderingMode)
+{
+    return FontPlatformData(size, bold, italic);
+}
+
+FontCustomPlatformData* createFontCustomPlatformData(SharedBuffer* buffer)
+{
+    return 0;
+}
+
+bool FontCustomPlatformData::supportsFormat(const String& /* format */)
+{
+    return false;
+}
+
+}
diff --git a/WebCore/platform/graphics/haiku/FontCustomPlatformData.h b/WebCore/platform/graphics/wx/FontCustomPlatformData.h
similarity index 100%
copy from WebCore/platform/graphics/haiku/FontCustomPlatformData.h
copy to WebCore/platform/graphics/wx/FontCustomPlatformData.h
diff --git a/WebCore/wscript b/WebCore/wscript
index bd058e4..9e63167 100644
--- a/WebCore/wscript
+++ b/WebCore/wscript
@@ -227,6 +227,7 @@ def build(bld):
         excludes.append('WebDOMEventListenerCustom.cpp')
         excludes.append('WebDOMElementTimeControl.cpp')
         excludes.append('WebDOMImageData.cpp')
+        excludes.append('WebDOMInspectorBackend.cpp')
         excludes.append('WebDOMScriptProfile.cpp')
         excludes.append('WebDOMScriptProfileNode.cpp')
         excludes.append('WebNativeEventListener.cpp')

-- 
WebKit Debian packaging