+2011-02-02 Kevin Ollivier <kevino@theolliviers.com>
+
+ [wx] Build fixes for wxWebKit.
+
+ * wscript:
+
2010-01-28 Commit Queue <commit-queue@webkit.org>
Unreviewed. Test commit for commit-queue@webkit.org.
+2011-02-02 Kevin Ollivier <kevino@theolliviers.com>
+
+ [wx] Build fixes for wxWebKit.
+
+ * wtf/wx/StringWx.cpp:
+ (WTF::String::String):
+
2011-02-01 Geoffrey Garen <ggaren@apple.com>
Reviewed by Sam Weinig.
*/
#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>
#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());
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
}
+2011-02-02 Kevin Ollivier <kevino@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@apple.com>
Reviewed by Darin Adler.
{
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);
}
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) {
DragOperation DragController::dragOperation(DragData* dragData)
{
//FIXME: This logic is incomplete
- if (dragData->containsURL())
+ if (dragData->containsURL(0))
return DragOperationCopy;
return DragOperationNone;
#include "FontRenderingMode.h"
#include "FontWidthVariant.h"
#include <wtf/Forward.h>
+#include <wtf/Noncopyable.h>
namespace WebCore {
#define FontPlatformData_h
#include "FontDescription.h"
+#include "FontWidthVariant.h"
#include "FontOrientation.h"
#include "StringImpl.h"
#include <wtf/Forward.h>
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;
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);
#include "IntRect.h"
#include "NotImplemented.h"
#include "SimpleFontData.h"
+#include "TextRun.h"
#if OS(WINDOWS)
#include "UniscribeController.h"
#if USE(WXGC)
wxGraphicsContext* gc = m_data->context->GetGraphicsContext();
if (gc)
- gc->FillPath(path.platformPath());
+ gc->FillPath(*path.platformPath());
#endif
}
#if USE(WXGC)
wxGraphicsContext* gc = m_data->context->GetGraphicsContext();
if (gc)
- gc->StrokePath(path.platformPath());
+ gc->StrokePath(*path.platformPath());
#endif
}
#include "GraphicsContext.h"
#include "HostWindow.h"
#include "NotImplemented.h"
+#include "PaintInfo.h"
#include "RenderView.h"
#include <wx/defs.h>
+2011-02-02 Kevin Ollivier <kevino@theolliviers.com>
+
+ [wx] Build fixes for wxWebKit.
+
+ * bindings/python/wscript:
+
2011-01-28 Dan Bernstein <mitz@apple.com>
Reviewed by Sam Weinig.
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'),
]
+2011-02-02 Kevin Ollivier <kevino@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@chromium.org>
Reviewed by Mihai Parparita.
// FIXME: Implement
return false;
}
+
+void LayoutTestController::setSerializeHTTPLoads(bool)
+{
+ // FIXME: Implement.
+}
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)
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'))
'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',
'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',
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
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']
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