[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.18-1-697-g2f78b87
eric at webkit.org
eric at webkit.org
Wed Jan 20 22:25:23 UTC 2010
The following commit has been merged in the debian/unstable branch:
commit e546b973369d59168b7fd936daa9acc1546852bf
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Jan 15 02:44:05 2010 +0000
2010-01-14 Marcus Bulach <bulach at chromium.org>
Reviewed by Dimitri Glazkov.
Adds WebKit::WebSecurityOrigin::createFromDatabaseIdentifier.
https://bugs.webkit.org/show_bug.cgi?id=33648
* public/WebSecurityOrigin.h:
* src/WebSecurityOrigin.cpp:
(WebKit::WebSecurityOrigin::createFromDatabaseIdentifier):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53314 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 3f56683..3673236 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,14 @@
+2010-01-14 Marcus Bulach <bulach at chromium.org>
+
+ Reviewed by Dimitri Glazkov.
+
+ Adds WebKit::WebSecurityOrigin::createFromDatabaseIdentifier.
+ https://bugs.webkit.org/show_bug.cgi?id=33648
+
+ * public/WebSecurityOrigin.h:
+ * src/WebSecurityOrigin.cpp:
+ (WebKit::WebSecurityOrigin::createFromDatabaseIdentifier):
+
2010-01-14 Brian Weinstein <bweinstein at apple.com>
Reviewed by Adam Roben.
diff --git a/WebKit/chromium/public/WebSecurityOrigin.h b/WebKit/chromium/public/WebSecurityOrigin.h
index d04fbc6..7b04aac 100644
--- a/WebKit/chromium/public/WebSecurityOrigin.h
+++ b/WebKit/chromium/public/WebSecurityOrigin.h
@@ -55,6 +55,8 @@ public:
return *this;
}
+ WEBKIT_API static WebSecurityOrigin* createFromDatabaseIdentifier(const WebString& databaseIdentifier);
+
WEBKIT_API void reset();
WEBKIT_API void assign(const WebSecurityOrigin&);
diff --git a/WebKit/chromium/src/WebSecurityOrigin.cpp b/WebKit/chromium/src/WebSecurityOrigin.cpp
index 3cf7364..87916ca 100644
--- a/WebKit/chromium/src/WebSecurityOrigin.cpp
+++ b/WebKit/chromium/src/WebSecurityOrigin.cpp
@@ -42,6 +42,11 @@ namespace WebKit {
class WebSecurityOriginPrivate : public SecurityOrigin {
};
+WebSecurityOrigin* WebSecurityOrigin::createFromDatabaseIdentifier(const WebString& databaseIdentifier)
+{
+ return new WebSecurityOrigin(SecurityOrigin::createFromDatabaseIdentifier(databaseIdentifier));
+}
+
void WebSecurityOrigin::reset()
{
assign(0);
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list