[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da
commit-queue at webkit.org
commit-queue at webkit.org
Wed Dec 22 18:24:41 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 1e6a1849bfc959d15c515ae1c87d161d5afc0b20
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Dec 10 17:16:17 2010 +0000
2010-12-10 Joone Hur <joone at kldp.org>
Reviewed by Xan Lopez.
[GTK] Unskipping some test cases in userscripts dependent on addUserStyleSheet
https://bugs.webkit.org/show_bug.cgi?id=50808
Unskipping the following test cases:
userscripts/mixed-case-stylesheet.html
userscripts/simple-stylesheet.html
userscripts/user-style-all-frames.html
* platform/gtk/Skipped:
2010-12-10 Martin Robinson <mrobinson at igalia.com>
Reviewed by Gustavo Noronha Silva.
Remove unnecessary variable names from DumpRenderTreeSupportGtk
https://bugs.webkit.org/show_bug.cgi?id=50815
There were some unnecessary variable names in DumpRenderTreeSupportGtk,
so remove them.
* WebCoreSupport/DumpRenderTreeSupportGtk.h: Do it.
2010-12-10 Eric Seidel <eric at webkit.org>
Reviewed by Ojan Vafai.
webkit-patch: not possible to use build-and-test with local commits
https://bugs.webkit.org/show_bug.cgi?id=33378
Make --no-clean not even check if we have local commits.
It's unclear to me why the code was originally written this way.
I was unable to dig up a reason from svn history.
* Scripts/webkitpy/tool/steps/cleanworkingdirectory.py:
* Scripts/webkitpy/tool/steps/cleanworkingdirectory_unittest.py: Copied from WebKitTools/Scripts/webkitpy/tool/steps/cleanworkingdirectory.py.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73735 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 9015e30..2fe8a49 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,17 @@
+2010-12-10 Joone Hur <joone at kldp.org>
+
+ Reviewed by Xan Lopez.
+
+ [GTK] Unskipping some test cases in userscripts dependent on addUserStyleSheet
+ https://bugs.webkit.org/show_bug.cgi?id=50808
+
+ Unskipping the following test cases:
+ userscripts/mixed-case-stylesheet.html
+ userscripts/simple-stylesheet.html
+ userscripts/user-style-all-frames.html
+
+ * platform/gtk/Skipped:
+
2010-12-10 Mario Sanchez Prada <msanchez at igalia.com>
Reviewed by Martin Robinson.
diff --git a/LayoutTests/platform/gtk/Skipped b/LayoutTests/platform/gtk/Skipped
index bf9359c..c92671c 100644
--- a/LayoutTests/platform/gtk/Skipped
+++ b/LayoutTests/platform/gtk/Skipped
@@ -4701,7 +4701,16 @@ fast/events/ime-composition-events-001.html
fast/dom/tab-in-right-alignment.html
# No User Scripts
-userscripts
+userscripts/script-not-run-for-fragments.html
+userscripts/script-run-at-end.html
+userscripts/script-run-at-start.html
+userscripts/user-script-all-frames.html
+userscripts/user-script-audio-document.html
+userscripts/user-script-image-document.html
+userscripts/user-script-plugin-document.html
+userscripts/user-script-top-frame-only.html
+userscripts/user-script-video-document.html
+userscripts/user-style-top-frame-only.html
# XHR sends sometimes yield null bytes sent instead of 0.
http/tests/xmlhttprequest/workers/shared-worker-methods.html
diff --git a/WebKit/gtk/ChangeLog b/WebKit/gtk/ChangeLog
index aed04aa..e4cbdc3 100644
--- a/WebKit/gtk/ChangeLog
+++ b/WebKit/gtk/ChangeLog
@@ -12,6 +12,22 @@
2010-12-10 Joone Hur <joone at kldp.org>
+ Reviewed by Xan Lopez.
+
+ [GTK] Unskipping some test cases in /userscripts dependent on addUserStyleSheet
+ https://bugs.webkit.org/show_bug.cgi?id=50808
+
+ Unskipping the following test cases:
+ userscripts/mixed-case-stylesheet.html
+ userscripts/simple-stylesheet.html
+ userscripts/user-style-all-frames.html
+
+ * WebCoreSupport/DumpRenderTreeSupportGtk.cpp:
+ (DumpRenderTreeSupportGtk::addUserStyleSheet): Added "bool allFrames" parameter.
+ * WebCoreSupport/DumpRenderTreeSupportGtk.h:
+
+2010-12-10 Joone Hur <joone at kldp.org>
+
Reviewed by Eric Seidel.
[GTK] Add DRT support for pageProperty, isPageBoxVisible, pageSizeAndMarginsInPixels, and addUserStyleSheet
diff --git a/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.cpp b/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.cpp
index 53bef5f..c0241f4 100644
--- a/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.cpp
+++ b/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.cpp
@@ -309,7 +309,7 @@ CString DumpRenderTreeSupportGtk::pageSizeAndMarginsInPixels(WebKitWebFrame* fra
* @sourceCode: code of a user stylesheet
*
*/
-void DumpRenderTreeSupportGtk::addUserStyleSheet(WebKitWebFrame* frame, const char* sourceCode)
+void DumpRenderTreeSupportGtk::addUserStyleSheet(WebKitWebFrame* frame, const char* sourceCode, bool allFrames)
{
g_return_if_fail(WEBKIT_IS_WEB_FRAME(frame));
@@ -319,7 +319,7 @@ void DumpRenderTreeSupportGtk::addUserStyleSheet(WebKitWebFrame* frame, const ch
WebKitWebView* webView = getViewFromFrame(frame);
Page* page = core(webView);
- page->group().addUserStyleSheetToWorld(mainThreadNormalWorld(), sourceCode, KURL(), 0, 0, WebCore::InjectInAllFrames);
+ page->group().addUserStyleSheetToWorld(mainThreadNormalWorld(), sourceCode, KURL(), 0, 0, allFrames ? InjectInAllFrames : InjectInTopFrameOnly);
}
/**
diff --git a/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.h b/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.h
index 1108e7b..4f2bcb2 100644
--- a/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.h
+++ b/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.h
@@ -53,7 +53,7 @@ public:
static WTF::CString pageProperty(WebKitWebFrame*, const char* propertyName, int pageNumber);
static bool isPageBoxVisible(WebKitWebFrame*, int pageNumber);
static WTF::CString pageSizeAndMarginsInPixels(WebKitWebFrame*, int pageNumber, int width, int height, int marginTop, int marginRight, int marginBottom, int marginLeft);
- static void addUserStyleSheet(WebKitWebFrame*, const char* sourceCode);
+ static void addUserStyleSheet(WebKitWebFrame*, const char* sourceCode, bool allFrames);
static guint getPendingUnloadEventCount(WebKitWebFrame*);
static bool pauseAnimation(WebKitWebFrame*, const char* name, double time, const char* element);
static bool pauseTransition(WebKitWebFrame*, const char* name, double time, const char* element);
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 4469f51..404ac4c 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -43,6 +43,21 @@
2010-12-10 Joone Hur <joone at kldp.org>
+ Reviewed by Xan Lopez.
+
+ [GTK] Unskipping some test cases in userscripts dependent on addUserStyleSheet
+ https://bugs.webkit.org/show_bug.cgi?id=50808
+
+ Unskipping the following test cases:
+ userscripts/mixed-case-stylesheet.html
+ userscripts/simple-stylesheet.html
+ userscripts/user-style-all-frames.html
+
+ * DumpRenderTree/gtk/LayoutTestControllerGtk.cpp:
+ (LayoutTestController::addUserStyleSheet):
+
+2010-12-10 Joone Hur <joone at kldp.org>
+
Reviewed by Eric Seidel.
[GTK] Add DRT support for pageProperty, isPageBoxVisible, pageSizeAndMarginsInPixels, and addUserStyleSheet
diff --git a/WebKitTools/DumpRenderTree/gtk/LayoutTestControllerGtk.cpp b/WebKitTools/DumpRenderTree/gtk/LayoutTestControllerGtk.cpp
index 3ecc844..402a865 100644
--- a/WebKitTools/DumpRenderTree/gtk/LayoutTestControllerGtk.cpp
+++ b/WebKitTools/DumpRenderTree/gtk/LayoutTestControllerGtk.cpp
@@ -716,7 +716,9 @@ void LayoutTestController::addUserScript(JSStringRef source, bool runAtStart, bo
void LayoutTestController::addUserStyleSheet(JSStringRef source, bool allFrames)
{
GOwnPtr<gchar> sourceCode(JSStringCopyUTF8CString(source));
- DumpRenderTreeSupportGtk::addUserStyleSheet(mainFrame, sourceCode.get());
+ DumpRenderTreeSupportGtk::addUserStyleSheet(mainFrame, sourceCode.get(), allFrames);
+ // FIXME: needs more investigation why userscripts/user-style-top-frame-only.html fails when allFrames is false.
+
}
void LayoutTestController::setDeveloperExtrasEnabled(bool enabled)
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list