[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
kevino at webkit.org
kevino at webkit.org
Wed Dec 22 11:56:19 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit e23ba4e45a69ba3465ad9cd2d690eac37cf633ff
Author: kevino at webkit.org <kevino at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Aug 11 20:09:26 2010 +0000
[wx, WebDOM] Build fix. Fix handling of callbacks and WebCore::String -> WTF::String fixes.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65180 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 829bf3c..082efc9 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,9 @@
+2010-08-11 Kevin Ollivier <kevino at theolliviers.com>
+
+ [wx] Build fix for wx and WebDOM bindings, add CString classes to the list of forwards.
+
+ * wtf/Forward.h:
+
2010-08-11 Gavin Barraclough <barraclough at apple.com>
Rubber stamps by Darin Adler & Sam Weinig.
diff --git a/JavaScriptCore/wtf/Forward.h b/JavaScriptCore/wtf/Forward.h
index a2cc75b..32435c8 100644
--- a/JavaScriptCore/wtf/Forward.h
+++ b/JavaScriptCore/wtf/Forward.h
@@ -34,6 +34,7 @@ namespace WTF {
class AtomicString;
class AtomicStringImpl;
+ class CString;
class String;
class StringBuffer;
class StringImpl;
@@ -49,6 +50,7 @@ using WTF::Vector;
using WTF::AtomicString;
using WTF::AtomicStringImpl;
+using WTF::CString;
using WTF::String;
using WTF::StringBuffer;
using WTF::StringImpl;
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 6a182b1..630eeb0 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,28 @@
+2010-08-11 Kevin Ollivier <kevino at theolliviers.com>
+
+ [wx, WebDOM] Build fix. Fix callback params and WebCore::String -> WTF::String fixes.
+
+ * bindings/cpp/WebDOMCustomVoidCallback.cpp: Added.
+ (WebDOMCustomVoidCallback::WebDOMCustomVoidCallback):
+ (WebDOMCustomVoidCallback::~WebDOMCustomVoidCallback):
+ (WebDOMCustomVoidCallback::handleEvent):
+ (toWebCore):
+ * bindings/cpp/WebDOMCustomVoidCallback.h: Added.
+ (WebDOMCustomVoidCallback::create):
+ * bindings/cpp/WebDOMHTMLDocumentCustom.cpp:
+ (documentWrite):
+ * bindings/cpp/WebDOMString.cpp:
+ (WebDOMString::equals):
+ * bindings/scripts/CodeGeneratorCPP.pm:
+ * bindings/scripts/test/CPP/WebDOMTestCallback.cpp:
+ (WebDOMTestCallback::callbackWithClass1Param):
+ (WebDOMTestCallback::callbackWithClass2Param):
+ (WebDOMTestCallback::callbackWithNonBoolReturnType):
+ * bindings/scripts/test/CPP/WebDOMTestObj.cpp:
+ * bindings/scripts/test/V8/V8TestInterface.h:
+ * bindings/scripts/test/V8/V8TestObj.h:
+ * wscript:
+
2010-08-11 Gavin Barraclough <barraclough at apple.com>
Rubber stamps by Darin Adler & Sam Weinig.
diff --git a/WebCore/bindings/cpp/WebDOMCustomVoidCallback.cpp b/WebCore/bindings/cpp/WebDOMCustomVoidCallback.cpp
new file mode 100644
index 0000000..d79eaae
--- /dev/null
+++ b/WebCore/bindings/cpp/WebDOMCustomVoidCallback.cpp
@@ -0,0 +1,48 @@
+/*
+ * Copyright (C) 2010 Kevin Ollivier <kevino at theolliviers.com>. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of
+ * its contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "WebDOMCustomVoidCallback.h"
+
+WebDOMCustomVoidCallback::WebDOMCustomVoidCallback()
+{
+}
+
+WebDOMCustomVoidCallback::~WebDOMCustomVoidCallback()
+{
+}
+
+void WebDOMCustomVoidCallback::handleEvent()
+{
+
+}
+
+WebCore::VoidCallback* toWebCore(const WebDOMCustomVoidCallback& callback)
+{
+ return const_cast<WebCore::VoidCallback*>((WebCore::VoidCallback*)&callback);
+}
\ No newline at end of file
diff --git a/WebCore/bindings/cpp/WebDOMCustomVoidCallback.h b/WebCore/bindings/cpp/WebDOMCustomVoidCallback.h
new file mode 100644
index 0000000..0fd8f96
--- /dev/null
+++ b/WebCore/bindings/cpp/WebDOMCustomVoidCallback.h
@@ -0,0 +1,55 @@
+/*
+ * Copyright (C) Kevin Ollivier <kevino at theolliviers.com>. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of
+ * its contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef WebDOMCustomVoidCallback_h
+#define WebDOMCustomVoidCallback_h
+
+#include "VoidCallback.h"
+#include <wtf/PassRefPtr.h>
+
+// FIXME: This is just a stub to keep compilation working. We need to revisit
+// this when we add support for these callbacks to the WebDOM bindings.
+
+class WebDOMCustomVoidCallback : public WebCore::VoidCallback {
+public:
+ static PassRefPtr<WebDOMCustomVoidCallback> create()
+ {
+ return adoptRef(new WebDOMCustomVoidCallback());
+ }
+
+ virtual ~WebDOMCustomVoidCallback();
+
+ virtual void handleEvent();
+
+private:
+ WebDOMCustomVoidCallback();
+};
+
+WebCore::VoidCallback* toWebCore(const WebDOMCustomVoidCallback&);
+
+#endif // WebDOMCustomVoidCallback_h
diff --git a/WebCore/bindings/cpp/WebDOMHTMLDocumentCustom.cpp b/WebCore/bindings/cpp/WebDOMHTMLDocumentCustom.cpp
index 3bab0c1..d608b0f 100644
--- a/WebCore/bindings/cpp/WebDOMHTMLDocumentCustom.cpp
+++ b/WebCore/bindings/cpp/WebDOMHTMLDocumentCustom.cpp
@@ -25,11 +25,13 @@
#include "SegmentedString.h"
#include "WebExceptionHandler.h"
+#include <wtf/Forward.h>
+
static inline void documentWrite(const WebDOMString& text, WebCore::HTMLDocument* document, bool addNewline)
{
WebCore::SegmentedString segmentedString = WTF::String(text);
if (addNewline)
- segmentedString.append(WebCore::SegmentedString(&WebCore::newlineCharacter, 1));
+ segmentedString.append(WebCore::SegmentedString(WTF::String(&WebCore::newlineCharacter)));
document->write(segmentedString);
}
diff --git a/WebCore/bindings/cpp/WebDOMString.cpp b/WebCore/bindings/cpp/WebDOMString.cpp
index 59d98f7..debd4f4 100644
--- a/WebCore/bindings/cpp/WebDOMString.cpp
+++ b/WebCore/bindings/cpp/WebDOMString.cpp
@@ -110,7 +110,7 @@ WebDOMString::operator WTF::AtomicString() const
bool WebDOMString::equals(const char* string) const
{
- return WebCore::equal(m_private, string);
+ return WTF::equal(m_private, string);
}
void WebDOMString::assign(WebDOMStringPrivate* p)
diff --git a/WebCore/bindings/scripts/CodeGeneratorCPP.pm b/WebCore/bindings/scripts/CodeGeneratorCPP.pm
index 98fdfe2..6bafb1e 100644
--- a/WebCore/bindings/scripts/CodeGeneratorCPP.pm
+++ b/WebCore/bindings/scripts/CodeGeneratorCPP.pm
@@ -149,6 +149,7 @@ sub GetClassName
return "WebDOMObject" if $name eq "DOMObject";
return "bool" if $name eq "boolean";
return $name if $codeGenerator->IsPrimitiveType($name);
+ return "WebDOMCustomVoidCallback" if $name eq "VoidCallback";
return "WebDOM$name";
}
@@ -304,6 +305,11 @@ sub AddIncludesForType
$implIncludes{"SerializedScriptValue.h"} = 1;
return;
}
+
+ if ($type eq "VoidCallback") {
+ $implIncludes{"WebDOMCustomVoidCallback.h"} = 1;
+ return;
+ }
$implIncludes{"Node.h"} = 1 if $type eq "NodeList";
$implIncludes{"CSSMutableStyleDeclaration.h"} = 1 if $type eq "CSSStyleDeclaration";
@@ -782,9 +788,6 @@ sub GenerateImplementation
my $parameterIndex = 0;
- # FIXME: Handle Callback support, we're just passing 0 as ScriptExecutionContext for now.
- push(@parameterNames, "0") if ($dataNode->extendedAttributes->{"Callback"});
-
my $functionSig = "$returnType $className\:\:$functionName(";
foreach my $param (@{$function->parameters}) {
my $paramName = $param->name;
diff --git a/WebCore/bindings/scripts/test/CPP/WebDOMTestCallback.cpp b/WebCore/bindings/scripts/test/CPP/WebDOMTestCallback.cpp
index 122971c..a58da40 100644
--- a/WebCore/bindings/scripts/test/CPP/WebDOMTestCallback.cpp
+++ b/WebCore/bindings/scripts/test/CPP/WebDOMTestCallback.cpp
@@ -34,9 +34,9 @@
#include "WebDOMClass3.h"
#include "WebDOMString.h"
#include "WebExceptionHandler.h"
+#include "wtf/text/AtomicString.h"
#include <wtf/GetPtr.h>
#include <wtf/RefPtr.h>
-#include <wtf/text/AtomicString.h>
struct WebDOMTestCallback::WebDOMTestCallbackPrivate {
WebDOMTestCallbackPrivate(WebCore::TestCallback* object = 0)
@@ -88,7 +88,7 @@ bool WebDOMTestCallback::callbackWithClass1Param(const WebDOMClass1& class1Param
if (!impl())
return false;
- return impl()->callbackWithClass1Param(0, toWebCore(class1Param));
+ return impl()->callbackWithClass1Param(toWebCore(class1Param));
}
bool WebDOMTestCallback::callbackWithClass2Param(const WebDOMClass2& class2Param, const WebDOMString& strArg)
@@ -96,7 +96,7 @@ bool WebDOMTestCallback::callbackWithClass2Param(const WebDOMClass2& class2Param
if (!impl())
return false;
- return impl()->callbackWithClass2Param(0, toWebCore(class2Param), strArg);
+ return impl()->callbackWithClass2Param(toWebCore(class2Param), strArg);
}
int WebDOMTestCallback::callbackWithNonBoolReturnType(const WebDOMClass3& class3Param)
@@ -104,7 +104,7 @@ int WebDOMTestCallback::callbackWithNonBoolReturnType(const WebDOMClass3& class3
if (!impl())
return 0;
- return impl()->callbackWithNonBoolReturnType(0, toWebCore(class3Param));
+ return impl()->callbackWithNonBoolReturnType(toWebCore(class3Param));
}
WebCore::TestCallback* toWebCore(const WebDOMTestCallback& wrapper)
diff --git a/WebCore/bindings/scripts/test/CPP/WebDOMTestObj.cpp b/WebCore/bindings/scripts/test/CPP/WebDOMTestObj.cpp
index f1d9fe1..882e633 100644
--- a/WebCore/bindings/scripts/test/CPP/WebDOMTestObj.cpp
+++ b/WebCore/bindings/scripts/test/CPP/WebDOMTestObj.cpp
@@ -30,9 +30,9 @@
#include "WebDOMString.h"
#include "WebExceptionHandler.h"
#include "WebNativeEventListener.h"
+#include "wtf/text/AtomicString.h"
#include <wtf/GetPtr.h>
#include <wtf/RefPtr.h>
-#include <wtf/text/AtomicString.h>
struct WebDOMTestObj::WebDOMTestObjPrivate {
WebDOMTestObjPrivate(WebCore::TestObj* object = 0)
diff --git a/WebCore/bindings/scripts/test/V8/V8TestInterface.h b/WebCore/bindings/scripts/test/V8/V8TestInterface.h
index 05f5b9d..afdf381 100644
--- a/WebCore/bindings/scripts/test/V8/V8TestInterface.h
+++ b/WebCore/bindings/scripts/test/V8/V8TestInterface.h
@@ -25,9 +25,9 @@
#include "TestInterface.h"
#include "WrapperTypeInfo.h"
+#include "wtf/text/StringHash.h"
#include <v8.h>
#include <wtf/HashMap.h>
-#include <wtf/text/StringHash.h>
namespace WebCore {
diff --git a/WebCore/bindings/scripts/test/V8/V8TestObj.h b/WebCore/bindings/scripts/test/V8/V8TestObj.h
index cd5c83e..d9715c9 100644
--- a/WebCore/bindings/scripts/test/V8/V8TestObj.h
+++ b/WebCore/bindings/scripts/test/V8/V8TestObj.h
@@ -23,9 +23,9 @@
#include "TestObj.h"
#include "WrapperTypeInfo.h"
+#include "wtf/text/StringHash.h"
#include <v8.h>
#include <wtf/HashMap.h>
-#include <wtf/text/StringHash.h>
namespace WebCore {
diff --git a/WebCore/wscript b/WebCore/wscript
index 58886aa..817c298 100644
--- a/WebCore/wscript
+++ b/WebCore/wscript
@@ -220,17 +220,12 @@ def build(bld):
excludes.append('WebDOMEventTarget.cpp')
excludes.append('WebDOMAbstractView.cpp')
excludes.append('WebDOMBlobBuilder.cpp')
- excludes.append('WebDOMDatabaseCallback.cpp')
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('WebDOMSQLStatementCallback.cpp')
- excludes.append('WebDOMSQLTransactionErrorCallback.cpp')
- excludes.append('WebDOMSQLTransactionSyncCallback.cpp')
- excludes.append('WebDOMSQLTransactionCallback.cpp')
excludes.append('WebNativeEventListener.cpp')
if building_on_win32:
diff --git a/WebKit/wx/ChangeLog b/WebKit/wx/ChangeLog
index c5bf4f8..2dae2cf 100644
--- a/WebKit/wx/ChangeLog
+++ b/WebKit/wx/ChangeLog
@@ -1,3 +1,10 @@
+2010-08-11 Kevin Ollivier <kevino at theolliviers.com>
+
+ [wx] Build fix. WebCore::String -> WTF::String fixes.
+
+ * WebEdit.cpp:
+ (wxWebEditCommand::SetNodeAttribute):
+
2010-08-10 Gavin Barraclough <barraclough at apple.com>
Rubber stamped by Sam Weinig.
diff --git a/WebKit/wx/WebEdit.cpp b/WebKit/wx/WebEdit.cpp
index 00e5372..503e2ed 100644
--- a/WebKit/wx/WebEdit.cpp
+++ b/WebKit/wx/WebEdit.cpp
@@ -55,7 +55,7 @@ wxWebEditCommand::~wxWebEditCommand()
void wxWebEditCommand::SetNodeAttribute(WebDOMElement* element, const wxString& name, const wxString& value)
{
if (m_impl)
- m_impl->setElementAttribute(element->impl(), WebCore::QualifiedName(WebCore::nullAtom, WTF::String(name), WebCore::nullAtom), WTF::String(value));
+ m_impl->setElementAttribute(element->impl(), WebCore::QualifiedName(WTF::nullAtom, WTF::String(name), WTF::nullAtom), WTF::String(value));
}
void wxWebEditCommand::Apply()
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list