[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
tony at chromium.org
tony at chromium.org
Wed Dec 22 13:24:41 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit c3d34612f1041bf7b26b4b01cd780400965591f0
Author: tony at chromium.org <tony at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Sep 14 17:38:17 2010 +0000
2010-09-14 Tony Chang <tony at chromium.org>
Reviewed by Dimitri Glazkov.
[chromium] implement layoutTestController.setDomainRelaxationForbiddenForURLScheme
https://bugs.webkit.org/show_bug.cgi?id=45762
* platform/chromium/test_expectations.txt:
2010-09-14 Tony Chang <tony at chromium.org>
Reviewed by Dimitri Glazkov.
[chromium] implement layoutTestController.setDomainRelaxationForbiddenForURLScheme
https://bugs.webkit.org/show_bug.cgi?id=45762
* public/WebView.h: add WebView::setDomainRelaxationForbidden
* src/WebViewImpl.cpp:
(WebKit::WebViewImpl::setDomainRelaxationForbidden):
* src/WebViewImpl.h:
2010-09-14 Tony Chang <tony at chromium.org>
Reviewed by Dimitri Glazkov.
[chromium] implement layoutTestController.setDomainRelaxationForbiddenForURLScheme
https://bugs.webkit.org/show_bug.cgi?id=45762
* DumpRenderTree/chromium/LayoutTestController.cpp:
(LayoutTestController::LayoutTestController):
(LayoutTestController::setDomainRelaxationForbiddenForURLScheme):
* DumpRenderTree/chromium/LayoutTestController.h:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67479 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 55301da..c6ec399 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,12 @@
+2010-09-14 Tony Chang <tony at chromium.org>
+
+ Reviewed by Dimitri Glazkov.
+
+ [chromium] implement layoutTestController.setDomainRelaxationForbiddenForURLScheme
+ https://bugs.webkit.org/show_bug.cgi?id=45762
+
+ * platform/chromium/test_expectations.txt:
+
2010-09-14 Andrey Kosyakov <caseq at chromium.org>
Reviewed by Yury Semikhatsky.
diff --git a/LayoutTests/platform/chromium/test_expectations.txt b/LayoutTests/platform/chromium/test_expectations.txt
index 55beb89..3bc4bbe 100644
--- a/LayoutTests/platform/chromium/test_expectations.txt
+++ b/LayoutTests/platform/chromium/test_expectations.txt
@@ -635,9 +635,8 @@ BUG8630 LINUX : svg/custom/use-detach.svg = FAIL PASS
// error in the header of the following test.
BUG24197 SKIP : fast/css/disabled-author-styles.html = FAIL
-// Need to implement
-// layoutTestController.setDomainRelaxationForbiddenForURLScheme()
-BUG32674 WIN LINUX MAC : http/tests/security/setDomainRelaxationForbiddenForURLScheme.html = TEXT
+// Passing in DRT, need to fix in test_shell.
+BUG32674 : http/tests/security/setDomainRelaxationForbiddenForURLScheme.html = TEXT PASS
// -----------------------------------------------------------------
// Other
diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 0e75a31..d4ca821 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,15 @@
+2010-09-14 Tony Chang <tony at chromium.org>
+
+ Reviewed by Dimitri Glazkov.
+
+ [chromium] implement layoutTestController.setDomainRelaxationForbiddenForURLScheme
+ https://bugs.webkit.org/show_bug.cgi?id=45762
+
+ * public/WebView.h: add WebView::setDomainRelaxationForbidden
+ * src/WebViewImpl.cpp:
+ (WebKit::WebViewImpl::setDomainRelaxationForbidden):
+ * src/WebViewImpl.h:
+
2010-09-14 Yury Semikhatsky <yurys at chromium.org>
Reviewed by Andreas Kling.
diff --git a/WebKit/chromium/public/WebView.h b/WebKit/chromium/public/WebView.h
index 1b94da2..b975088 100644
--- a/WebKit/chromium/public/WebView.h
+++ b/WebKit/chromium/public/WebView.h
@@ -109,6 +109,9 @@ public:
virtual bool isActive() const = 0;
virtual void setIsActive(bool) = 0;
+ // Allows disabling domain relaxation.
+ virtual void setDomainRelaxationForbidden(bool, const WebString& scheme);
+
// Closing -------------------------------------------------------------
diff --git a/WebKit/chromium/src/WebViewImpl.cpp b/WebKit/chromium/src/WebViewImpl.cpp
index 2bb763e..7480f20 100644
--- a/WebKit/chromium/src/WebViewImpl.cpp
+++ b/WebKit/chromium/src/WebViewImpl.cpp
@@ -1980,6 +1980,11 @@ bool WebViewImpl::isActive() const
return (page() && page()->focusController()) ? page()->focusController()->isActive() : false;
}
+void WebViewImpl::setDomainRelaxationForbidden(bool forbidden, const WebString& scheme)
+{
+ SecurityOrigin::setDomainRelaxationForbiddenForURLScheme(forbidden, String(scheme));
+}
+
void WebViewImpl::setScrollbarColors(unsigned inactiveColor,
unsigned activeColor,
unsigned trackColor) {
diff --git a/WebKit/chromium/src/WebViewImpl.h b/WebKit/chromium/src/WebViewImpl.h
index f2530af..af50505 100644
--- a/WebKit/chromium/src/WebViewImpl.h
+++ b/WebKit/chromium/src/WebViewImpl.h
@@ -123,6 +123,7 @@ public:
virtual void setTabKeyCyclesThroughElements(bool value);
virtual bool isActive() const;
virtual void setIsActive(bool value);
+ virtual void setDomainRelaxationForbidden(bool, const WebString& scheme);
virtual bool dispatchBeforeUnloadEvent();
virtual void dispatchUnloadEvent();
virtual WebFrame* mainFrame();
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 0f316d2..e9517fd 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,15 @@
+2010-09-14 Tony Chang <tony at chromium.org>
+
+ Reviewed by Dimitri Glazkov.
+
+ [chromium] implement layoutTestController.setDomainRelaxationForbiddenForURLScheme
+ https://bugs.webkit.org/show_bug.cgi?id=45762
+
+ * DumpRenderTree/chromium/LayoutTestController.cpp:
+ (LayoutTestController::LayoutTestController):
+ (LayoutTestController::setDomainRelaxationForbiddenForURLScheme):
+ * DumpRenderTree/chromium/LayoutTestController.h:
+
2010-09-14 Csaba Osztrogonác <ossy at webkit.org>
Adding myself as a reviewer.
diff --git a/WebKitTools/DumpRenderTree/chromium/LayoutTestController.cpp b/WebKitTools/DumpRenderTree/chromium/LayoutTestController.cpp
index 0bc12ce..6510e17 100644
--- a/WebKitTools/DumpRenderTree/chromium/LayoutTestController.cpp
+++ b/WebKitTools/DumpRenderTree/chromium/LayoutTestController.cpp
@@ -144,6 +144,7 @@ LayoutTestController::LayoutTestController(TestShell* shell)
bindMethod("dumpSelectionRect", &LayoutTestController::dumpSelectionRect);
bindMethod("grantDesktopNotificationPermission", &LayoutTestController::grantDesktopNotificationPermission);
bindMethod("simulateDesktopNotificationClick", &LayoutTestController::simulateDesktopNotificationClick);
+ bindMethod("setDomainRelaxationForbiddenForURLScheme", &LayoutTestController::setDomainRelaxationForbiddenForURLScheme);
// The following are stubs.
bindMethod("dumpAsWebArchive", &LayoutTestController::dumpAsWebArchive);
@@ -963,6 +964,14 @@ void LayoutTestController::simulateDesktopNotificationClick(const CppArgumentLis
result->set(false);
}
+void LayoutTestController::setDomainRelaxationForbiddenForURLScheme(const CppArgumentList& arguments, CppVariant* result)
+{
+ if (arguments.size() != 2 || !arguments[0].isBool() || !arguments[1].isString())
+ return;
+ m_shell->webView()->setDomainRelaxationForbidden(cppVariantToBool(arguments[0]), cppVariantToWebString(arguments[1]));
+}
+
+
//
// Unimplemented stubs
//
diff --git a/WebKitTools/DumpRenderTree/chromium/LayoutTestController.h b/WebKitTools/DumpRenderTree/chromium/LayoutTestController.h
index bc1bad4..8cfa260 100644
--- a/WebKitTools/DumpRenderTree/chromium/LayoutTestController.h
+++ b/WebKitTools/DumpRenderTree/chromium/LayoutTestController.h
@@ -222,11 +222,8 @@ public:
void numberOfActiveAnimations(const CppArgumentList&, CppVariant*);
void suspendAnimations(const CppArgumentList&, CppVariant*);
void resumeAnimations(const CppArgumentList&, CppVariant*);
-
void disableImageLoading(const CppArgumentList&, CppVariant*);
-
void setIconDatabaseEnabled(const CppArgumentList&, CppVariant*);
-
void dumpSelectionRect(const CppArgumentList&, CppVariant*);
// Grants permission for desktop notifications to an origin
@@ -234,6 +231,7 @@ public:
// Simulates a click on a desktop notification.
void simulateDesktopNotificationClick(const CppArgumentList&, CppVariant*);
+ void setDomainRelaxationForbiddenForURLScheme(const CppArgumentList&, CppVariant*);
void setEditingBehavior(const CppArgumentList&, CppVariant*);
// The following are only stubs. TODO(pamg): Implement any of these that
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list