[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198
kevino at webkit.org
kevino at webkit.org
Mon Feb 21 00:38:50 UTC 2011
The following commit has been merged in the webkit-1.3 branch:
commit 7991b858bde33d154135549aa25dc1fbe0276d07
Author: kevino at webkit.org <kevino at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Feb 2 19:34:38 2011 +0000
[wx] Build fixes for wxWebKit.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@77392 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/ChangeLog b/ChangeLog
index 21354b3..95148a5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-02-02 Kevin Ollivier <kevino at theolliviers.com>
+
+ [wx] Build fixes for wxWebKit.
+
+ * wscript:
+
2010-01-28 Commit Queue <commit-queue at webkit.org>
Unreviewed. Test commit for commit-queue at webkit.org.
diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
index 56763bf..8747b5c 100644
--- a/Source/JavaScriptCore/ChangeLog
+++ b/Source/JavaScriptCore/ChangeLog
@@ -1,3 +1,10 @@
+2011-02-02 Kevin Ollivier <kevino at theolliviers.com>
+
+ [wx] Build fixes for wxWebKit.
+
+ * wtf/wx/StringWx.cpp:
+ (WTF::String::String):
+
2011-02-01 Geoffrey Garen <ggaren at apple.com>
Reviewed by Sam Weinig.
diff --git a/Source/JavaScriptCore/wtf/wx/StringWx.cpp b/Source/JavaScriptCore/wtf/wx/StringWx.cpp
index 59d500b..fe0fd89 100644
--- a/Source/JavaScriptCore/wtf/wx/StringWx.cpp
+++ b/Source/JavaScriptCore/wtf/wx/StringWx.cpp
@@ -24,10 +24,10 @@
*/
#include "config.h"
-#include "PlatformString.h"
-#include <unicode/ustring.h>
#include <wtf/text/CString.h>
+#include <wtf/text/WTFString.h>
+
#include <wx/defs.h>
#include <wx/string.h>
@@ -39,7 +39,7 @@ String::String(const wxString& wxstr)
#error "This code only works in Unicode build of wxWidgets"
#endif
-#if SIZEOF_WCHAR_T == sizeof(UChar)
+#if SIZEOF_WCHAR_T == U_SIZEOF_UCHAR
m_impl = StringImpl::create(wxstr.wc_str(), wxstr.length());
@@ -61,8 +61,8 @@ String::String(const wxString& wxstr)
UChar* data;
wxMBConvUTF16 conv;
unsigned utf16Length = conv.FromWChar(0, 0, wideString, wideLength);
- m_impl = StringImpl::createUninitialized(utf16Length, data)
- conv.FromWChar(data, utf16Length, wideString, wideLength);
+ m_impl = StringImpl::createUninitialized(utf16Length, data);
+ conv.FromWChar((char*)data, utf16Length, wideString, wideLength);
#endif // SIZEOF_WCHAR_T == 4
}
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 89356bf..410eeeb 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,23 @@
+2011-02-02 Kevin Ollivier <kevino at theolliviers.com>
+
+ [wx] Build fixes for wxWebKit.
+
+ * bindings/cpp/WebDOMHTMLDocumentCustom.cpp:
+ (documentWrite):
+ * bindings/scripts/CodeGeneratorCPP.pm:
+ * page/wx/DragControllerWx.cpp:
+ (WebCore::DragController::dragOperation):
+ * platform/graphics/wx/FontCustomPlatformData.h:
+ * platform/graphics/wx/FontPlatformData.h:
+ (WebCore::FontPlatformData::widthVariant):
+ * platform/graphics/wx/FontPlatformDataWx.cpp:
+ (WebCore::FontPlatformData::computeHash):
+ * platform/graphics/wx/FontWx.cpp:
+ * platform/graphics/wx/GraphicsContextWx.cpp:
+ (WebCore::GraphicsContext::fillPath):
+ (WebCore::GraphicsContext::strokePath):
+ * platform/wx/RenderThemeWx.cpp:
+
2011-02-02 David Hyatt <hyatt at apple.com>
Reviewed by Darin Adler.
diff --git a/Source/WebCore/bindings/cpp/WebDOMHTMLDocumentCustom.cpp b/Source/WebCore/bindings/cpp/WebDOMHTMLDocumentCustom.cpp
index 5d03571..d12f824 100644
--- a/Source/WebCore/bindings/cpp/WebDOMHTMLDocumentCustom.cpp
+++ b/Source/WebCore/bindings/cpp/WebDOMHTMLDocumentCustom.cpp
@@ -30,7 +30,7 @@ static inline void documentWrite(const WebDOMString& text, WebCore::HTMLDocument
{
WebCore::SegmentedString segmentedString = WTF::String(text);
if (addNewline)
- segmentedString.append(WebCore::SegmentedString(WTF::String(&WebCore::newlineCharacter)));
+ segmentedString.append(WebCore::SegmentedString(WTF::String(&WTF::Unicode::newlineCharacter)));
document->write(segmentedString);
}
diff --git a/Source/WebCore/bindings/scripts/CodeGeneratorCPP.pm b/Source/WebCore/bindings/scripts/CodeGeneratorCPP.pm
index 9b3f21e..7d3d613 100644
--- a/Source/WebCore/bindings/scripts/CodeGeneratorCPP.pm
+++ b/Source/WebCore/bindings/scripts/CodeGeneratorCPP.pm
@@ -233,6 +233,7 @@ sub GetCPPType
return "int" if $type eq "long";
return "unsigned" if $name eq "unsigned long";
return "unsigned short" if $type eq "CompareHow";
+ return "double" if $name eq "Date";
if ($codeGenerator->IsStringType($type)) {
if ($useConstReference) {
diff --git a/Source/WebCore/page/wx/DragControllerWx.cpp b/Source/WebCore/page/wx/DragControllerWx.cpp
index 4a4d064..5c19c47 100644
--- a/Source/WebCore/page/wx/DragControllerWx.cpp
+++ b/Source/WebCore/page/wx/DragControllerWx.cpp
@@ -52,7 +52,7 @@ bool DragController::isCopyKeyDown(DragData*)
DragOperation DragController::dragOperation(DragData* dragData)
{
//FIXME: This logic is incomplete
- if (dragData->containsURL())
+ if (dragData->containsURL(0))
return DragOperationCopy;
return DragOperationNone;
diff --git a/Source/WebCore/platform/graphics/wx/FontCustomPlatformData.h b/Source/WebCore/platform/graphics/wx/FontCustomPlatformData.h
index 7ffe89a..c975296 100644
--- a/Source/WebCore/platform/graphics/wx/FontCustomPlatformData.h
+++ b/Source/WebCore/platform/graphics/wx/FontCustomPlatformData.h
@@ -25,6 +25,7 @@
#include "FontRenderingMode.h"
#include "FontWidthVariant.h"
#include <wtf/Forward.h>
+#include <wtf/Noncopyable.h>
namespace WebCore {
diff --git a/Source/WebCore/platform/graphics/wx/FontPlatformData.h b/Source/WebCore/platform/graphics/wx/FontPlatformData.h
index 9ae8b54..3ef0179 100644
--- a/Source/WebCore/platform/graphics/wx/FontPlatformData.h
+++ b/Source/WebCore/platform/graphics/wx/FontPlatformData.h
@@ -30,6 +30,7 @@
#define FontPlatformData_h
#include "FontDescription.h"
+#include "FontWidthVariant.h"
#include "FontOrientation.h"
#include "StringImpl.h"
#include <wtf/Forward.h>
@@ -150,6 +151,9 @@ public:
FontOrientation orientation() const { return Horizontal; } // FIXME: Implement.
+ // We don't support this yet, so just return the default value for now.
+ FontWidthVariant widthVariant() const { return RegularWidth; }
+
#if OS(WINDOWS)
bool useGDI() const;
HFONT hfont() const;
diff --git a/Source/WebCore/platform/graphics/wx/FontPlatformDataWx.cpp b/Source/WebCore/platform/graphics/wx/FontPlatformDataWx.cpp
index d144a2c..c125b7c 100644
--- a/Source/WebCore/platform/graphics/wx/FontPlatformDataWx.cpp
+++ b/Source/WebCore/platform/graphics/wx/FontPlatformDataWx.cpp
@@ -126,7 +126,7 @@ unsigned FontPlatformData::computeHash() const
thisFont->GetStyle(),
thisFont->GetWeight(),
thisFont->GetUnderlined(),
- WTF::StringHasher::createHash(thisFont->GetFaceName().utf8_str())
+ WTF::StringHasher::createHash(thisFont->GetFaceName().utf8_str().data())
};
return WTF::StringHasher::createBlobHash<sizeof(hashCodes)>(hashCodes);
diff --git a/Source/WebCore/platform/graphics/wx/FontWx.cpp b/Source/WebCore/platform/graphics/wx/FontWx.cpp
index 5233d43..c48f3c7 100644
--- a/Source/WebCore/platform/graphics/wx/FontWx.cpp
+++ b/Source/WebCore/platform/graphics/wx/FontWx.cpp
@@ -32,6 +32,7 @@
#include "IntRect.h"
#include "NotImplemented.h"
#include "SimpleFontData.h"
+#include "TextRun.h"
#if OS(WINDOWS)
#include "UniscribeController.h"
diff --git a/Source/WebCore/platform/graphics/wx/GraphicsContextWx.cpp b/Source/WebCore/platform/graphics/wx/GraphicsContextWx.cpp
index f1c09c5..991be79 100644
--- a/Source/WebCore/platform/graphics/wx/GraphicsContextWx.cpp
+++ b/Source/WebCore/platform/graphics/wx/GraphicsContextWx.cpp
@@ -515,7 +515,7 @@ void GraphicsContext::fillPath(const Path& path)
#if USE(WXGC)
wxGraphicsContext* gc = m_data->context->GetGraphicsContext();
if (gc)
- gc->FillPath(path.platformPath());
+ gc->FillPath(*path.platformPath());
#endif
}
@@ -524,7 +524,7 @@ void GraphicsContext::strokePath(const Path& path)
#if USE(WXGC)
wxGraphicsContext* gc = m_data->context->GetGraphicsContext();
if (gc)
- gc->StrokePath(path.platformPath());
+ gc->StrokePath(*path.platformPath());
#endif
}
diff --git a/Source/WebCore/platform/wx/RenderThemeWx.cpp b/Source/WebCore/platform/wx/RenderThemeWx.cpp
index c68bde9..a34e2d4 100644
--- a/Source/WebCore/platform/wx/RenderThemeWx.cpp
+++ b/Source/WebCore/platform/wx/RenderThemeWx.cpp
@@ -31,6 +31,7 @@
#include "GraphicsContext.h"
#include "HostWindow.h"
#include "NotImplemented.h"
+#include "PaintInfo.h"
#include "RenderView.h"
#include <wx/defs.h>
diff --git a/Source/WebKit/wx/ChangeLog b/Source/WebKit/wx/ChangeLog
index e39a686..b38d050 100644
--- a/Source/WebKit/wx/ChangeLog
+++ b/Source/WebKit/wx/ChangeLog
@@ -1,3 +1,9 @@
+2011-02-02 Kevin Ollivier <kevino at theolliviers.com>
+
+ [wx] Build fixes for wxWebKit.
+
+ * bindings/python/wscript:
+
2011-01-28 Dan Bernstein <mitz at apple.com>
Reviewed by Sam Weinig.
diff --git a/Source/WebKit/wx/bindings/python/wscript b/Source/WebKit/wx/bindings/python/wscript
index 0a1df31..5e1dfc1 100644
--- a/Source/WebKit/wx/bindings/python/wscript
+++ b/Source/WebKit/wx/bindings/python/wscript
@@ -33,7 +33,7 @@ include_paths = [
os.path.join(wk_root, 'Source', 'JavaScriptCore'),
os.path.join(wk_root, 'Source', 'WebCore', 'bindings', 'cpp'),
os.path.join(wk_root, 'Source', 'WebCore', 'DerivedSources'),
- os.path.join(wk_root, 'WebKit', 'wx'),
+ os.path.join(wk_root, 'Source', 'WebKit', 'wx'),
os.path.join(wx_root, 'wxPython', 'include'),
os.path.join(wx_root, '..', 'wxPython', 'include'),
]
diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index eec8d95..21d91af 100644
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,13 @@
+2011-02-02 Kevin Ollivier <kevino at theolliviers.com>
+
+ [wx] Build fixes for wxWebKit.
+
+ * DumpRenderTree/wx/LayoutTestControllerWx.cpp:
+ (LayoutTestController::setSerializeHTTPLoads):
+ * wx/browser/wscript:
+ * wx/build/build_utils.py:
+ * wx/build/settings.py:
+
2011-02-01 Dirk Pranke <dpranke at chromium.org>
Reviewed by Mihai Parparita.
diff --git a/Tools/DumpRenderTree/wx/LayoutTestControllerWx.cpp b/Tools/DumpRenderTree/wx/LayoutTestControllerWx.cpp
index 32b5f7e..1befb77 100644
--- a/Tools/DumpRenderTree/wx/LayoutTestControllerWx.cpp
+++ b/Tools/DumpRenderTree/wx/LayoutTestControllerWx.cpp
@@ -544,3 +544,8 @@ bool LayoutTestController::findString(JSContextRef context, JSStringRef target,
// FIXME: Implement
return false;
}
+
+void LayoutTestController::setSerializeHTTPLoads(bool)
+{
+ // FIXME: Implement.
+}
diff --git a/Tools/wx/browser/wscript b/Tools/wx/browser/wscript
index 4fb00b4..7c5aeee 100644
--- a/Tools/wx/browser/wscript
+++ b/Tools/wx/browser/wscript
@@ -30,7 +30,7 @@ import sys
from settings import *
include_paths = [os.path.join(wk_root, 'Source', 'WebCore', 'bindings', 'wx'),
- os.path.join(wk_root, 'WebKit', 'wx')]
+ os.path.join(wk_root, 'Source', 'WebKit', 'wx')]
def set_options(opt):
common_set_options(opt)
diff --git a/Tools/wx/build/build_utils.py b/Tools/wx/build/build_utils.py
index bf440a6..569703d 100644
--- a/Tools/wx/build/build_utils.py
+++ b/Tools/wx/build/build_utils.py
@@ -120,7 +120,7 @@ def update_wx_deps(conf, wk_root, msvc_version='msvc2008'):
sys.exit(1)
# since this module is still experimental
- wxpy_dir = os.path.join(wk_root, 'WebKit', 'wx', 'bindings', 'python')
+ wxpy_dir = os.path.join(wk_root, 'Source', 'WebKit', 'wx', 'bindings', 'python')
swig_module = download_if_newer('http://wxwebkit.wxcommunity.com/downloads/deps/swig.py.txt', wxpy_dir)
if swig_module:
shutil.copy(os.path.join(wxpy_dir, 'swig.py.txt'), os.path.join(wxpy_dir, 'swig.py'))
diff --git a/Tools/wx/build/settings.py b/Tools/wx/build/settings.py
index 64c2693..aa26401 100644
--- a/Tools/wx/build/settings.py
+++ b/Tools/wx/build/settings.py
@@ -102,7 +102,6 @@ webcore_dirs = [
'Source/WebCore/bindings/cpp',
'Source/WebCore/bindings/generic',
'Source/WebCore/bindings/js',
- 'Source/WebCore/bindings/js/specialization',
'Source/WebCore/bridge',
'Source/WebCore/bridge/c',
'Source/WebCore/bridge/jsc',
@@ -116,6 +115,7 @@ webcore_dirs = [
'Source/WebCore/html',
'Source/WebCore/html/canvas',
'Source/WebCore/html/parser',
+ 'Source/WebCore/html/shadow',
'Source/WebCore/inspector',
'Source/WebCore/loader',
'Source/WebCore/loader/appcache',
diff --git a/wscript b/wscript
index d0c1fae..efd1e64 100644
--- a/wscript
+++ b/wscript
@@ -61,8 +61,11 @@ windows_deps = [
webcore_sources = {}
if build_port == "wx":
- webcore_sources['wx'] = ['Source/WebCore/platform/KillRingNone.cpp',
- 'Source/WebCore/bindings/cpp/WebDOMEventTarget.cpp']
+ webcore_sources['wx'] = [
+ 'Source/WebCore/bindings/cpp/WebDOMEventTarget.cpp',
+ 'Source/WebCore/platform/KillRingNone.cpp',
+ 'Source/WebCore/platform/text/LocalizedNumberNone.cpp'
+ ]
if building_on_win32:
# make sure platform/wx comes after this so we get the right
@@ -195,7 +198,7 @@ def build(bld):
global wk_includes
# FIXME: Does this need to be Source/JavaScriptCore?
- bld.add_subdirs('JavaScriptCore')
+ bld.add_subdirs('Source/JavaScriptCore')
if sys.platform.startswith('darwin'):
TaskGen.task_gen.mappings['.mm'] = TaskGen.task_gen.mappings['.cxx']
@@ -223,6 +226,7 @@ def build(bld):
if os.path.isdir(fullpath) and not item == "os-win32" and not item == 'icu':
wk_includes.append(fullpath)
+ wk_includes.append('Source')
wk_includes.append(os.path.join(jscore_dir, 'wtf', 'unicode'))
wk_includes.append(os.path.join(jscore_dir, 'wtf', 'unicode', 'icu'))
wk_includes += common_includes + full_dirs
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list