[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.21-584-g1e41756
eric at webkit.org
eric at webkit.org
Fri Feb 26 22:18:41 UTC 2010
The following commit has been merged in the webkit-1.1 branch:
commit ce660719fa8175177fa85abe0b0461bbdc1988a5
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Feb 12 12:55:54 2010 +0000
2010-02-12 Jesus Sanchez-Palencia <jesus.palencia at openbossa.org>
Reviewed by Kenneth Rohde Christiansen.
Support frameset flattening
https://bugs.webkit.org/show_bug.cgi?id=32717
Add expected results of the FrameSet Flattening tests.
* platform/mac/fast/frames/flattening/frameset-flattening-advanced-expected.txt: Added.
* platform/mac/fast/frames/flattening/frameset-flattening-grid-expected.txt: Added.
* platform/mac/fast/frames/flattening/frameset-flattening-simple-expected.txt: Added.
* platform/mac/fast/frames/flattening/frameset-flattening-subframe-resize-expected.txt: Added.
* platform/mac/fast/frames/flattening/frameset-flattening-subframesets-expected.txt: Added.
* platform/mac/Skipped:
2010-02-12 Jesus Sanchez-Palencia <jesus.palencia at openbossa.org>
Reviewed by Kenneth Rohde Christiansen.
Support frameset flattening
https://bugs.webkit.org/show_bug.cgi?id=32717
Add FrameSet Flattening support to Mac DRT.
* DumpRenderTree/gtk/LayoutTestControllerGtk.cpp:
(LayoutTestController::setFrameSetFlatteningEnabled):
* DumpRenderTree/win/DumpRenderTree.cpp:
(resetDefaultsToConsistentValues):
* DumpRenderTree/win/LayoutTestControllerWin.cpp:
(LayoutTestController::setXSSAuditorEnabled):
* DumpRenderTree/wx/LayoutTestControllerWx.cpp:
(LayoutTestController::setFrameSetFlatteningEnabled):
* DumpRenderTree/LayoutTestController.cpp:
(setFrameSetFlatteningEnabledCallback):
(LayoutTestController::staticFunctions):
* DumpRenderTree/LayoutTestController.h:
* DumpRenderTree/mac/DumpRenderTree.mm:
(resetDefaultsToConsistentValues):
* DumpRenderTree/mac/LayoutTestControllerMac.mm:
(LayoutTestController::setFrameSetFlatteningEnabled):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54719 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 543857c..e3d9394 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,19 @@
+2010-02-12 Jesus Sanchez-Palencia <jesus.palencia at openbossa.org>
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ Support frameset flattening
+ https://bugs.webkit.org/show_bug.cgi?id=32717
+
+ Add expected results of the FrameSet Flattening tests.
+
+ * platform/mac/fast/frames/flattening/frameset-flattening-advanced-expected.txt: Added.
+ * platform/mac/fast/frames/flattening/frameset-flattening-grid-expected.txt: Added.
+ * platform/mac/fast/frames/flattening/frameset-flattening-simple-expected.txt: Added.
+ * platform/mac/fast/frames/flattening/frameset-flattening-subframe-resize-expected.txt: Added.
+ * platform/mac/fast/frames/flattening/frameset-flattening-subframesets-expected.txt: Added.
+ * platform/mac/Skipped:
+
2010-02-12 Csaba Osztrogonác <ossy at webkit.org>
[Qt] perl websocket test(s) time out
diff --git a/LayoutTests/platform/mac/Skipped b/LayoutTests/platform/mac/Skipped
index f5e2e5f..c4639f8 100644
--- a/LayoutTests/platform/mac/Skipped
+++ b/LayoutTests/platform/mac/Skipped
@@ -112,10 +112,6 @@ 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
new file mode 100644
index 0000000..c15a769
--- /dev/null
+++ b/LayoutTests/platform/mac/fast/frames/flattening/frameset-flattening-advanced-expected.txt
@@ -0,0 +1,43 @@
+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
new file mode 100644
index 0000000..f4d332a
--- /dev/null
+++ b/LayoutTests/platform/mac/fast/frames/flattening/frameset-flattening-grid-expected.txt
@@ -0,0 +1,58 @@
+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
new file mode 100644
index 0000000..27b00a8
--- /dev/null
+++ b/LayoutTests/platform/mac/fast/frames/flattening/frameset-flattening-simple-expected.txt
@@ -0,0 +1,25 @@
+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
new file mode 100644
index 0000000..325b240
--- /dev/null
+++ b/LayoutTests/platform/mac/fast/frames/flattening/frameset-flattening-subframe-resize-expected.txt
@@ -0,0 +1,27 @@
+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
new file mode 100644
index 0000000..8d6f4e5
--- /dev/null
+++ b/LayoutTests/platform/mac/fast/frames/flattening/frameset-flattening-subframesets-expected.txt
@@ -0,0 +1,58 @@
+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 0842c80..14bf83b 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,29 @@
+2010-02-12 Jesus Sanchez-Palencia <jesus.palencia at openbossa.org>
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ Support frameset flattening
+ https://bugs.webkit.org/show_bug.cgi?id=32717
+
+ Add FrameSet Flattening support to Mac DRT.
+
+ * DumpRenderTree/gtk/LayoutTestControllerGtk.cpp:
+ (LayoutTestController::setFrameSetFlatteningEnabled):
+ * DumpRenderTree/win/DumpRenderTree.cpp:
+ (resetDefaultsToConsistentValues):
+ * DumpRenderTree/win/LayoutTestControllerWin.cpp:
+ (LayoutTestController::setXSSAuditorEnabled):
+ * DumpRenderTree/wx/LayoutTestControllerWx.cpp:
+ (LayoutTestController::setFrameSetFlatteningEnabled):
+ * DumpRenderTree/LayoutTestController.cpp:
+ (setFrameSetFlatteningEnabledCallback):
+ (LayoutTestController::staticFunctions):
+ * DumpRenderTree/LayoutTestController.h:
+ * DumpRenderTree/mac/DumpRenderTree.mm:
+ (resetDefaultsToConsistentValues):
+ * DumpRenderTree/mac/LayoutTestControllerMac.mm:
+ (LayoutTestController::setFrameSetFlatteningEnabled):
+
2010-02-12 Dirk Pranke <dpranke at chromium.org>
Reviewed by Eric Seidel.
diff --git a/WebKitTools/DumpRenderTree/LayoutTestController.cpp b/WebKitTools/DumpRenderTree/LayoutTestController.cpp
index 5eb4774..c2393c3 100644
--- a/WebKitTools/DumpRenderTree/LayoutTestController.cpp
+++ b/WebKitTools/DumpRenderTree/LayoutTestController.cpp
@@ -916,6 +916,18 @@ 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
@@ -1393,6 +1405,7 @@ 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 777bc1c..5f9df50 100644
--- a/WebKitTools/DumpRenderTree/LayoutTestController.h
+++ b/WebKitTools/DumpRenderTree/LayoutTestController.h
@@ -90,6 +90,7 @@ 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/gtk/LayoutTestControllerGtk.cpp b/WebKitTools/DumpRenderTree/gtk/LayoutTestControllerGtk.cpp
index 8af46d3..422e2c2 100644
--- a/WebKitTools/DumpRenderTree/gtk/LayoutTestControllerGtk.cpp
+++ b/WebKitTools/DumpRenderTree/gtk/LayoutTestControllerGtk.cpp
@@ -334,6 +334,11 @@ void LayoutTestController::setXSSAuditorEnabled(bool flag)
g_object_set(G_OBJECT(settings), "enable-xss-auditor", flag, NULL);
}
+void LayoutTestController::setFrameSetFlatteningEnabled(bool flag)
+{
+ // FIXME: implement
+}
+
void LayoutTestController::setAllowUniversalAccessFromFileURLs(bool flag)
{
WebKitWebView* view = webkit_web_frame_get_web_view(mainFrame);
diff --git a/WebKitTools/DumpRenderTree/mac/DumpRenderTree.mm b/WebKitTools/DumpRenderTree/mac/DumpRenderTree.mm
index e85f880..7a4429b 100644
--- a/WebKitTools/DumpRenderTree/mac/DumpRenderTree.mm
+++ b/WebKitTools/DumpRenderTree/mac/DumpRenderTree.mm
@@ -422,6 +422,7 @@ static void resetDefaultsToConsistentValues()
[preferences setOfflineWebApplicationCacheEnabled:YES];
[preferences setDeveloperExtrasEnabled: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 6c0e3da..b726e72 100644
--- a/WebKitTools/DumpRenderTree/mac/LayoutTestControllerMac.mm
+++ b/WebKitTools/DumpRenderTree/mac/LayoutTestControllerMac.mm
@@ -324,6 +324,11 @@ 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];
diff --git a/WebKitTools/DumpRenderTree/win/DumpRenderTree.cpp b/WebKitTools/DumpRenderTree/win/DumpRenderTree.cpp
index 1315f9e..261b9e6 100644
--- a/WebKitTools/DumpRenderTree/win/DumpRenderTree.cpp
+++ b/WebKitTools/DumpRenderTree/win/DumpRenderTree.cpp
@@ -792,6 +792,7 @@ static void resetDefaultsToConsistentValues(IWebPreferences* preferences)
prefsPrivate->setExperimentalNotificationsEnabled(TRUE);
prefsPrivate->setShouldPaintNativeControls(FALSE); // FIXME - need to make DRT pass with Windows native controls <http://bugs.webkit.org/show_bug.cgi?id=25592>
prefsPrivate->setXSSAuditorEnabled(FALSE);
+ prefsPrivate->setFrameSetFlatteningEnabled(FALSE);
prefsPrivate->setOfflineWebApplicationCacheEnabled(TRUE);
}
setAlwaysAcceptCookies(false);
diff --git a/WebKitTools/DumpRenderTree/win/LayoutTestControllerWin.cpp b/WebKitTools/DumpRenderTree/win/LayoutTestControllerWin.cpp
index c86d7f5..34fd2e6 100644
--- a/WebKitTools/DumpRenderTree/win/LayoutTestControllerWin.cpp
+++ b/WebKitTools/DumpRenderTree/win/LayoutTestControllerWin.cpp
@@ -372,6 +372,23 @@ void LayoutTestController::setXSSAuditorEnabled(bool enabled)
prefsPrivate->setXSSAuditorEnabled(enabled);
}
+void LayoutTestController::setFrameSetFlatteningEnabled(bool enabled)
+{
+ COMPtr<IWebView> webView;
+ if (FAILED(frame->webView(&webView)))
+ return;
+
+ COMPtr<IWebPreferences> preferences;
+ if (FAILED(webView->preferences(&preferences)))
+ return;
+
+ COMPtr<IWebPreferencesPrivate> prefsPrivate(Query, preferences);
+ if (!prefsPrivate)
+ return;
+
+ prefsPrivate->setFrameSetFlatteningEnabled(enabled);
+}
+
void LayoutTestController::setAllowUniversalAccessFromFileURLs(bool enabled)
{
COMPtr<IWebView> webView;
diff --git a/WebKitTools/DumpRenderTree/wx/LayoutTestControllerWx.cpp b/WebKitTools/DumpRenderTree/wx/LayoutTestControllerWx.cpp
index 875b7ab..3bc84cd 100644
--- a/WebKitTools/DumpRenderTree/wx/LayoutTestControllerWx.cpp
+++ b/WebKitTools/DumpRenderTree/wx/LayoutTestControllerWx.cpp
@@ -170,6 +170,11 @@ void LayoutTestController::setXSSAuditorEnabled(bool enabled)
// FIXME: implement
}
+void LayoutTestController::setFrameSetFlatteningEnabled(bool enabled)
+{
+ // FIXME: implement
+}
+
void LayoutTestController::setAllowUniversalAccessFromFileURLs(bool enabled)
{
// FIXME: implement
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list