[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.21-584-g1e41756
ossy at webkit.org
ossy at webkit.org
Fri Feb 26 22:17:17 UTC 2010
The following commit has been merged in the webkit-1.1 branch:
commit 4d58a45a6c95e87a6edb163296496e1f7bfba92c
Author: ossy at webkit.org <ossy at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Feb 11 00:05:31 2010 +0000
Unreviewed. Roll out r54626, because it broke GTK and Win build.
https://bugs.webkit.org/show_bug.cgi?id=32717
WebKitTools:
* DumpRenderTree/LayoutTestController.cpp:
(LayoutTestController::staticFunctions):
* DumpRenderTree/LayoutTestController.h:
* DumpRenderTree/mac/DumpRenderTree.mm:
(resetDefaultsToConsistentValues):
* DumpRenderTree/mac/LayoutTestControllerMac.mm:
LayoutTests:
* platform/mac/Skipped:
* platform/mac/fast/frames/flattening: Removed.
* platform/mac/fast/frames/flattening/frameset-flattening-advanced-expected.txt: Removed.
* platform/mac/fast/frames/flattening/frameset-flattening-grid-expected.txt: Removed.
* platform/mac/fast/frames/flattening/frameset-flattening-simple-expected.txt: Removed.
* platform/mac/fast/frames/flattening/frameset-flattening-subframe-resize-expected.txt: Removed.
* platform/mac/fast/frames/flattening/frameset-flattening-subframesets-expected.txt: Removed.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54628 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 273288a..5a22cda 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,16 @@
+2010-02-10 Csaba Osztrogonác <ossy at webkit.org>
+
+ Unreviewed. Roll out r54626, because it broke GTK and Win build.
+ https://bugs.webkit.org/show_bug.cgi?id=32717
+
+ * platform/mac/Skipped:
+ * platform/mac/fast/frames/flattening: Removed.
+ * platform/mac/fast/frames/flattening/frameset-flattening-advanced-expected.txt: Removed.
+ * platform/mac/fast/frames/flattening/frameset-flattening-grid-expected.txt: Removed.
+ * platform/mac/fast/frames/flattening/frameset-flattening-simple-expected.txt: Removed.
+ * platform/mac/fast/frames/flattening/frameset-flattening-subframe-resize-expected.txt: Removed.
+ * platform/mac/fast/frames/flattening/frameset-flattening-subframesets-expected.txt: Removed.
+
2010-02-10 Jesus Sanchez-Palencia <jesus.palencia at openbossa.org>
Reviewed by Kenneth Rohde Christiansen.
diff --git a/LayoutTests/platform/mac/Skipped b/LayoutTests/platform/mac/Skipped
index c4639f8..f5e2e5f 100644
--- a/LayoutTests/platform/mac/Skipped
+++ b/LayoutTests/platform/mac/Skipped
@@ -112,6 +112,10 @@ http/tests/media/video-cookie.html
# https://bugs.webkit.org/show_bug.cgi?id=34331
http/tests/media/video-referer.html
+# Skip frame flattening tests until it can be tested by this DRT
+# https://bugs.webkit.org/show_bug.cgi?id=32717
+fast/frames/flattening/
+
# Fails intermittently on Leopard and Tiger.
# https://bugs.webkit.org/show_bug.cgi?id=29154
storage/database-lock-after-reload.html
diff --git a/LayoutTests/platform/mac/fast/frames/flattening/frameset-flattening-advanced-expected.txt b/LayoutTests/platform/mac/fast/frames/flattening/frameset-flattening-advanced-expected.txt
deleted file mode 100644
index c15a769..0000000
--- a/LayoutTests/platform/mac/fast/frames/flattening/frameset-flattening-advanced-expected.txt
+++ /dev/null
@@ -1,43 +0,0 @@
-layer at (0,0) size 866x607
- RenderView at (0,0) size 785x585
-layer at (0,0) size 866x607
- RenderBlock {HTML} at (0,0) size 785x607
- RenderFrameSet {FRAMESET} at (0,0) size 866x607
- RenderFrameSet {FRAMESET} at (0,0) size 866x207
- RenderFrame {FRAME} at (0,0) size 350x207
- layer at (0,0) size 350x207
- RenderView at (0,0) size 350x207
- layer at (0,0) size 350x207
- RenderBlock {HTML} at (0,0) size 350x207
- RenderBody {BODY} at (8,8) size 334x183 [bgcolor=#008000]
- RenderBlock {P} at (0,0) size 334x36
- RenderText {#text} at (0,0) size 297x36
- text run at (0,0) width 297: "Test for frameset flattening. The flattening only"
- text run at (0,18) width 144: "works inside the DRT."
- layer at (0,0) size 350x50
- RenderBlock (positioned) {DIV} at (0,0) size 350x50
- RenderFrame {FRAME} at (356,0) size 510x207
- layer at (0,0) size 510x207
- RenderView at (0,0) size 510x207
- layer at (0,0) size 510x207
- RenderBlock {HTML} at (0,0) size 510x207
- RenderBody {BODY} at (8,8) size 494x191 [bgcolor=#FF0000]
- layer at (0,0) size 300x100
- RenderBlock (positioned) {DIV} at (0,0) size 300x100
- RenderFrameSet {FRAMESET} at (0,207) size 866x400
- RenderFrame {FRAME} at (0,0) size 200x400
- layer at (0,0) size 200x400
- RenderView at (0,0) size 200x400
- layer at (0,0) size 200x400
- RenderBlock {HTML} at (0,0) size 200x400
- RenderBody {BODY} at (8,8) size 184x384 [bgcolor=#FFFF00]
- layer at (0,0) size 50x200
- RenderBlock (positioned) {DIV} at (0,0) size 50x200
- RenderFrame {FRAME} at (206,0) size 660x400
- layer at (0,0) size 660x400
- RenderView at (0,0) size 660x400
- layer at (0,0) size 660x400
- RenderBlock {HTML} at (0,0) size 660x400
- RenderBody {BODY} at (8,8) size 644x384 [bgcolor=#0000FF]
- layer at (0,0) size 650x400
- RenderBlock (positioned) {DIV} at (0,0) size 650x400
diff --git a/LayoutTests/platform/mac/fast/frames/flattening/frameset-flattening-grid-expected.txt b/LayoutTests/platform/mac/fast/frames/flattening/frameset-flattening-grid-expected.txt
deleted file mode 100644
index f4d332a..0000000
--- a/LayoutTests/platform/mac/fast/frames/flattening/frameset-flattening-grid-expected.txt
+++ /dev/null
@@ -1,58 +0,0 @@
-CONSOLE MESSAGE: line 2: ReferenceError: Can't find variable: test
-layer at (0,0) size 800x600
- RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
- RenderBlock {HTML} at (0,0) size 800x600
- RenderFrameSet {FRAMESET} at (0,0) size 800x600
- RenderFrame {FRAME} at (0,0) size 400x120
- layer at (0,0) size 385x200
- RenderView at (0,0) size 385x120
- layer at (0,0) size 385x120
- RenderBlock {HTML} at (0,0) size 385x120
- RenderBody {BODY} at (8,8) size 369x96 [bgcolor=#008000]
- RenderBlock {P} at (0,0) size 369x36
- RenderText {#text} at (0,0) size 340x36
- text run at (0,0) width 340: "Test for frameset flattening. The flattening only works"
- text run at (0,18) width 101: "inside the DRT."
- RenderBlock {P} at (0,52) size 369x36
- RenderText {#text} at (0,0) size 353x36
- text run at (0,0) width 353: "This frame should be 300px wide, 200px tall and not be"
- text run at (0,18) width 172: "scrollable (have scrollbars)."
- layer at (0,0) size 300x200
- RenderBlock (positioned) {DIV} at (0,0) size 300x200
- RenderFrame {FRAME} at (400,0) size 400x120
- layer at (0,0) size 400x120
- RenderView at (0,0) size 400x120
- layer at (0,0) size 400x120
- RenderBlock {HTML} at (0,0) size 400x120
- RenderBody {BODY} at (8,8) size 384x96 [bgcolor=#FF0000]
- RenderBlock {P} at (0,0) size 384x36
- RenderText {#text} at (0,0) size 353x36
- text run at (0,0) width 353: "This frame should be 300px wide, 200px tall and not be"
- text run at (0,18) width 172: "scrollable (have scrollbars)."
- layer at (0,0) size 300x50
- RenderBlock (positioned) {DIV} at (0,0) size 300x50
- RenderFrame {FRAME} at (0,120) size 400x480
- layer at (0,0) size 600x600
- RenderView at (0,0) size 385x465
- layer at (0,0) size 385x465
- RenderBlock {HTML} at (0,0) size 385x465
- RenderBody {BODY} at (8,8) size 369x441 [bgcolor=#FFFF00]
- RenderBlock {P} at (0,0) size 369x36
- RenderText {#text} at (0,0) size 353x36
- text run at (0,0) width 353: "This frame should be 600px wide, 600px tall and not be"
- text run at (0,18) width 172: "scrollable (have scrollbars)."
- layer at (0,0) size 600x600
- RenderBlock (positioned) {DIV} at (0,0) size 600x600
- RenderFrame {FRAME} at (400,120) size 400x480
- layer at (0,0) size 600x600
- RenderView at (0,0) size 385x465
- layer at (0,0) size 385x465
- RenderBlock {HTML} at (0,0) size 385x465
- RenderBody {BODY} at (8,8) size 369x441 [bgcolor=#0000FF]
- RenderBlock {P} at (0,0) size 369x36
- RenderText {#text} at (0,0) size 353x36
- text run at (0,0) width 353: "This frame should be 600px wide, 600px tall and not be"
- text run at (0,18) width 172: "scrollable (have scrollbars)."
- layer at (0,0) size 600x600
- RenderBlock (positioned) {DIV} at (0,0) size 600x600
diff --git a/LayoutTests/platform/mac/fast/frames/flattening/frameset-flattening-simple-expected.txt b/LayoutTests/platform/mac/fast/frames/flattening/frameset-flattening-simple-expected.txt
deleted file mode 100644
index 27b00a8..0000000
--- a/LayoutTests/platform/mac/fast/frames/flattening/frameset-flattening-simple-expected.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-layer at (0,0) size 1000x600
- RenderView at (0,0) size 800x585
-layer at (0,0) size 1000x600
- RenderBlock {HTML} at (0,0) size 800x600
- RenderFrameSet {FRAMESET} at (0,0) size 1000x600
- RenderFrame {FRAME} at (0,0) size 800x600
- layer at (0,0) size 800x600
- RenderView at (0,0) size 800x600
- layer at (0,0) size 800x600
- RenderBlock {HTML} at (0,0) size 800x600
- RenderBody {BODY} at (8,8) size 784x576 [bgcolor=#008000]
- RenderBlock {P} at (0,0) size 784x18
- RenderText {#text} at (0,0) size 445x18
- text run at (0,0) width 445: "Test for frameset flattening. The flattening only works inside the DRT."
- RenderBlock {P} at (0,34) size 784x18
- RenderText {#text} at (0,0) size 458x18
- text run at (0,0) width 458: "This frame should be 800px wide and not be scrollable (have scrollbars)."
- layer at (0,100) size 800x1
- RenderBlock (positioned) {DIV} at (0,100) size 800x1
- RenderFrame {FRAME} at (800,0) size 200x600
- layer at (0,0) size 200x600
- RenderView at (0,0) size 200x600
- layer at (0,0) size 200x600
- RenderBlock {HTML} at (0,0) size 200x600
- RenderBody {BODY} at (8,8) size 184x584
diff --git a/LayoutTests/platform/mac/fast/frames/flattening/frameset-flattening-subframe-resize-expected.txt b/LayoutTests/platform/mac/fast/frames/flattening/frameset-flattening-subframe-resize-expected.txt
deleted file mode 100644
index 325b240..0000000
--- a/LayoutTests/platform/mac/fast/frames/flattening/frameset-flattening-subframe-resize-expected.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-layer at (0,0) size 1000x650
- RenderView at (0,0) size 785x585
-layer at (0,0) size 1000x650
- RenderBlock {HTML} at (0,0) size 785x650
- RenderFrameSet {FRAMESET} at (0,0) size 1000x650
- RenderFrame {FRAME} at (0,0) size 300x650
- layer at (0,0) size 300x650
- RenderView at (0,0) size 300x650
- layer at (0,0) size 300x650
- RenderBlock {HTML} at (0,0) size 300x650
- RenderBody {BODY} at (8,8) size 284x626 [bgcolor=#008000]
- RenderBlock {P} at (0,0) size 284x36
- RenderText {#text} at (0,0) size 265x36
- text run at (0,0) width 265: "Test for frameset flattening. The flattening"
- text run at (0,18) width 176: "only works inside the DRT."
- RenderBlock {P} at (0,52) size 284x36
- RenderText {#text} at (0,0) size 282x36
- text run at (0,0) width 282: "This frame should be 300px wide and not be"
- text run at (0,18) width 172: "scrollable (have scrollbars)."
- layer at (0,350) size 300x300
- RenderBlock (positioned) {DIV} at (0,350) size 300x300 [bgcolor=#0000FF]
- RenderFrame {FRAME} at (300,0) size 700x650
- layer at (0,0) size 700x650
- RenderView at (0,0) size 700x650
- layer at (0,0) size 700x650
- RenderBlock {HTML} at (0,0) size 700x650
- RenderBody {BODY} at (8,8) size 684x634
diff --git a/LayoutTests/platform/mac/fast/frames/flattening/frameset-flattening-subframesets-expected.txt b/LayoutTests/platform/mac/fast/frames/flattening/frameset-flattening-subframesets-expected.txt
deleted file mode 100644
index 8d6f4e5..0000000
--- a/LayoutTests/platform/mac/fast/frames/flattening/frameset-flattening-subframesets-expected.txt
+++ /dev/null
@@ -1,58 +0,0 @@
-layer at (0,0) size 900x630
- RenderView at (0,0) size 785x585
-layer at (0,0) size 900x630
- RenderBlock {HTML} at (0,0) size 785x630
- RenderFrameSet {FRAMESET} at (0,0) size 900x630
- RenderFrameSet {FRAMESET} at (0,0) size 900x150
- RenderFrame {FRAME} at (0,0) size 450x150
- layer at (0,0) size 450x150
- RenderView at (0,0) size 450x150
- layer at (0,0) size 450x150
- RenderBlock {HTML} at (0,0) size 450x150
- RenderBody {BODY} at (8,8) size 434x126 [bgcolor=#008000]
- RenderBlock {P} at (0,0) size 434x18
- RenderText {#text} at (0,0) size 364x18
- text run at (0,0) width 364: "A frameset flattening test that only works inside the DRT."
- RenderBlock {P} at (0,34) size 434x36
- RenderText {#text} at (0,0) size 414x36
- text run at (0,0) width 414: "This frame is inside frameset 1 and should be at least 450px wide,"
- text run at (0,18) width 201: "150px tall and not be scrollable."
- layer at (0,0) size 450x50
- RenderBlock (positioned) {DIV} at (0,0) size 450x50
- RenderFrame {FRAME} at (450,0) size 450x150
- layer at (0,0) size 450x150
- RenderView at (0,0) size 450x150
- layer at (0,0) size 450x150
- RenderBlock {HTML} at (0,0) size 450x150
- RenderBody {BODY} at (8,8) size 434x126 [bgcolor=#FF0000]
- RenderBlock {P} at (0,0) size 434x36
- RenderText {#text} at (0,0) size 414x36
- text run at (0,0) width 414: "This frame is inside frameset 1 and should be at least 450px wide,"
- text run at (0,18) width 201: "150px tall and not be scrollable."
- layer at (0,0) size 450x150
- RenderBlock (positioned) {DIV} at (0,0) size 450x150
- RenderFrameSet {FRAMESET} at (0,150) size 900x480
- RenderFrame {FRAME} at (0,0) size 450x480
- layer at (0,0) size 450x480
- RenderView at (0,0) size 450x480
- layer at (0,0) size 450x480
- RenderBlock {HTML} at (0,0) size 450x480
- RenderBody {BODY} at (8,8) size 434x456 [bgcolor=#FFFF00]
- RenderBlock {P} at (0,0) size 434x36
- RenderText {#text} at (0,0) size 414x36
- text run at (0,0) width 414: "This frame is inside frameset 2 and should be at least 450px wide,"
- text run at (0,18) width 201: "400px tall and not be scrollable."
- layer at (0,0) size 200x450
- RenderBlock (positioned) {DIV} at (0,0) size 200x450
- RenderFrame {FRAME} at (450,0) size 450x480
- layer at (0,0) size 450x480
- RenderView at (0,0) size 450x480
- layer at (0,0) size 450x480
- RenderBlock {HTML} at (0,0) size 450x480
- RenderBody {BODY} at (8,8) size 434x456 [bgcolor=#0000FF]
- RenderBlock {P} at (0,0) size 434x36
- RenderText {#text} at (0,0) size 414x36
- text run at (0,0) width 414: "This frame is inside frameset 2 and should be at least 450px wide,"
- text run at (0,18) width 201: "400px tall and not be scrollable."
- layer at (0,0) size 450x450
- RenderBlock (positioned) {DIV} at (0,0) size 450x450
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 2e38730..49d2ccf 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,15 @@
+2010-02-10 Csaba Osztrogonác <ossy at webkit.org>
+
+ Unreviewed. Roll out r54626, because it broke GTK and Win build.
+ https://bugs.webkit.org/show_bug.cgi?id=32717
+
+ * DumpRenderTree/LayoutTestController.cpp:
+ (LayoutTestController::staticFunctions):
+ * DumpRenderTree/LayoutTestController.h:
+ * DumpRenderTree/mac/DumpRenderTree.mm:
+ (resetDefaultsToConsistentValues):
+ * DumpRenderTree/mac/LayoutTestControllerMac.mm:
+
2010-02-10 Jesus Sanchez-Palencia <jesus.palencia at openbossa.org>
Reviewed by Kenneth Rohde Christiansen.
diff --git a/WebKitTools/DumpRenderTree/LayoutTestController.cpp b/WebKitTools/DumpRenderTree/LayoutTestController.cpp
index c2393c3..5eb4774 100644
--- a/WebKitTools/DumpRenderTree/LayoutTestController.cpp
+++ b/WebKitTools/DumpRenderTree/LayoutTestController.cpp
@@ -916,18 +916,6 @@ static JSValueRef setXSSAuditorEnabledCallback(JSContextRef context, JSObjectRef
return JSValueMakeUndefined(context);
}
-static JSValueRef setFrameSetFlatteningEnabledCallback(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
-{
- // Has mac & windows implementation
- if (argumentCount < 1)
- return JSValueMakeUndefined(context);
-
- LayoutTestController* controller = static_cast<LayoutTestController*>(JSObjectGetPrivate(thisObject));
- controller->setFrameSetFlatteningEnabled(JSValueToBoolean(context, arguments[0]));
-
- return JSValueMakeUndefined(context);
-}
-
static JSValueRef setAllowUniversalAccessFromFileURLsCallback(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
{
// Has mac & windows implementation
@@ -1405,7 +1393,6 @@ JSStaticFunction* LayoutTestController::staticFunctions()
{ "setPopupBlockingEnabled", setPopupBlockingEnabledCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
{ "setPrivateBrowsingEnabled", setPrivateBrowsingEnabledCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
{ "setXSSAuditorEnabled", setXSSAuditorEnabledCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
- { "setFrameSetFlatteningEnabled", setFrameSetFlatteningEnabledCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
{ "setSelectTrailingWhitespaceEnabled", setSelectTrailingWhitespaceEnabledCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
{ "setSmartInsertDeleteEnabled", setSmartInsertDeleteEnabledCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
{ "setStopProvisionalFrameLoads", setStopProvisionalFrameLoadsCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
diff --git a/WebKitTools/DumpRenderTree/LayoutTestController.h b/WebKitTools/DumpRenderTree/LayoutTestController.h
index 5f9df50..777bc1c 100644
--- a/WebKitTools/DumpRenderTree/LayoutTestController.h
+++ b/WebKitTools/DumpRenderTree/LayoutTestController.h
@@ -90,7 +90,6 @@ public:
void setUserStyleSheetEnabled(bool flag);
void setUserStyleSheetLocation(JSStringRef path);
void setXSSAuditorEnabled(bool flag);
- void setFrameSetFlatteningEnabled(bool enable);
void waitForPolicyDelegate();
size_t webHistoryItemCount();
diff --git a/WebKitTools/DumpRenderTree/mac/DumpRenderTree.mm b/WebKitTools/DumpRenderTree/mac/DumpRenderTree.mm
index bffae91..12e1941 100644
--- a/WebKitTools/DumpRenderTree/mac/DumpRenderTree.mm
+++ b/WebKitTools/DumpRenderTree/mac/DumpRenderTree.mm
@@ -423,7 +423,6 @@ static void resetDefaultsToConsistentValues()
[preferences setDeveloperExtrasEnabled:NO];
[preferences setXSSAuditorEnabled:NO];
[preferences setLoadsImagesAutomatically:YES];
- [preferences setFrameSetFlatteningEnabled:NO];
if (persistentUserStyleSheetLocation) {
[preferences setUserStyleSheetLocation:[NSURL URLWithString:(NSString *)(persistentUserStyleSheetLocation.get())]];
[preferences setUserStyleSheetEnabled:YES];
diff --git a/WebKitTools/DumpRenderTree/mac/LayoutTestControllerMac.mm b/WebKitTools/DumpRenderTree/mac/LayoutTestControllerMac.mm
index b726e72..6c0e3da 100644
--- a/WebKitTools/DumpRenderTree/mac/LayoutTestControllerMac.mm
+++ b/WebKitTools/DumpRenderTree/mac/LayoutTestControllerMac.mm
@@ -324,11 +324,6 @@ void LayoutTestController::setXSSAuditorEnabled(bool enabled)
[[[mainFrame webView] preferences] setXSSAuditorEnabled:enabled];
}
-void LayoutTestController::setFrameSetFlatteningEnabled(bool enabled)
-{
- [[[mainFrame webView] preferences] setFrameSetFlatteningEnabled:enabled];
-}
-
void LayoutTestController::setAllowUniversalAccessFromFileURLs(bool enabled)
{
[[[mainFrame webView] preferences] setAllowUniversalAccessFromFileURLs:enabled];
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list