Diff
Modified: trunk/LayoutTests/ChangeLog (118397 => 118398)
--- trunk/LayoutTests/ChangeLog 2012-05-24 18:42:58 UTC (rev 118397)
+++ trunk/LayoutTests/ChangeLog 2012-05-24 18:54:16 UTC (rev 118398)
@@ -1,3 +1,15 @@
+2012-05-24 Yael Aharon <yael.aha...@nokia.com>
+
+ [Qt] Stop using the flag FIXED_POSITION_CREATES_STACKING_CONTEXT
+ https://bugs.webkit.org/show_bug.cgi?id=87392
+
+ Reviewed by Antonio Gomes.
+
+ Update test expectations, since now don't turn on the setting when running layout tests.
+
+ * platform/qt/fast/block/positioning/016-expected.txt:
+ * platform/qt/fast/block/positioning/025-expected.txt:
+
2012-05-24 Robert Hogan <rob...@webkit.org>
Negative margin block doesn't properly clear a float enclosed by a previous sibling
Modified: trunk/LayoutTests/platform/qt/fast/block/positioning/016-expected.txt (118397 => 118398)
--- trunk/LayoutTests/platform/qt/fast/block/positioning/016-expected.txt 2012-05-24 18:42:58 UTC (rev 118397)
+++ trunk/LayoutTests/platform/qt/fast/block/positioning/016-expected.txt 2012-05-24 18:54:16 UTC (rev 118398)
@@ -8,6 +8,6 @@
layer at (0,0) size 100x100
RenderBlock (positioned) zI: 1 {DIV} at (0,0) size 100x100 [bgcolor=#FF0000]
layer at (0,0) size 100x100
+ RenderBlock (positioned) zI: 1 {DIV} at (0,0) size 100x100 [bgcolor=#FF0000]
+layer at (0,0) size 100x100
RenderBlock (positioned) zI: 2 {DIV} at (0,0) size 100x100 [bgcolor=#008000]
-layer at (0,0) size 100x100
- RenderBlock (positioned) zI: 1 {DIV} at (0,0) size 100x100 [bgcolor=#FF0000]
Modified: trunk/LayoutTests/platform/qt/fast/block/positioning/025-expected.txt (118397 => 118398)
--- trunk/LayoutTests/platform/qt/fast/block/positioning/025-expected.txt 2012-05-24 18:42:58 UTC (rev 118397)
+++ trunk/LayoutTests/platform/qt/fast/block/positioning/025-expected.txt 2012-05-24 18:54:16 UTC (rev 118398)
@@ -1,10 +1,10 @@
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
-layer at (0,0) size 800x8
+layer at (0,0) size 800x8 layerType: background only
+layer at (0,0) size 100x100
+ RenderBlock (positioned) zI: -1 {DIV} at (0,0) size 100x100 [bgcolor=#FF0000]
+layer at (0,0) size 800x8 layerType: foreground only
RenderBlock {HTML} at (0,0) size 800x8
RenderBody {BODY} at (8,8) size 784x0
-layer at (0,0) size 100x100 layerType: background only
layer at (0,0) size 100x100
- RenderBlock (positioned) zI: -1 {DIV} at (0,0) size 100x100 [bgcolor=#FF0000]
-layer at (0,0) size 100x100 layerType: foreground only
RenderBlock (positioned) {DIV} at (0,0) size 100x100 [bgcolor=#008000]
Modified: trunk/Source/WebCore/ChangeLog (118397 => 118398)
--- trunk/Source/WebCore/ChangeLog 2012-05-24 18:42:58 UTC (rev 118397)
+++ trunk/Source/WebCore/ChangeLog 2012-05-24 18:54:16 UTC (rev 118398)
@@ -1,3 +1,16 @@
+2012-05-24 Yael Aharon <yael.aha...@nokia.com>
+
+ [Qt] Stop using the flag FIXED_POSITION_CREATES_STACKING_CONTEXT
+ https://bugs.webkit.org/show_bug.cgi?id=87392
+
+ Reviewed by Antonio Gomes.
+
+ Remove our dependency on a build flag and use the new setting.
+
+ No new tests.
+
+ * css/StyleResolver.cpp:
+
2012-05-24 Alexey Proskuryakov <a...@apple.com>
[WK2] Let the client give local files universal access on a case by case basis
Modified: trunk/Source/WebCore/css/StyleResolver.cpp (118397 => 118398)
--- trunk/Source/WebCore/css/StyleResolver.cpp 2012-05-24 18:42:58 UTC (rev 118397)
+++ trunk/Source/WebCore/css/StyleResolver.cpp 2012-05-24 18:54:16 UTC (rev 118398)
@@ -150,7 +150,7 @@
#include "StyleCachedImageSet.h"
#endif
-#if PLATFORM(QT) || PLATFORM(BLACKBERRY)
+#if PLATFORM(BLACKBERRY)
#define FIXED_POSITION_CREATES_STACKING_CONTEXT 1
#endif
Modified: trunk/Source/WebKit2/ChangeLog (118397 => 118398)
--- trunk/Source/WebKit2/ChangeLog 2012-05-24 18:42:58 UTC (rev 118397)
+++ trunk/Source/WebKit2/ChangeLog 2012-05-24 18:54:16 UTC (rev 118398)
@@ -1,3 +1,15 @@
+2012-05-24 Yael Aharon <yael.aha...@nokia.com>
+
+ [Qt] Stop using the flag FIXED_POSITION_CREATES_STACKING_CONTEXT
+ https://bugs.webkit.org/show_bug.cgi?id=87392
+
+ Reviewed by Antonio Gomes.
+
+ Turn on the setting setFixedPositionCreatesStackingContext.
+
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::setResizesToContentsUsingLayoutSize):
+
2012-05-24 Alexey Proskuryakov <a...@apple.com>
[WK2] Let the client give local files universal access on a case by case basis
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (118397 => 118398)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2012-05-24 18:42:58 UTC (rev 118397)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2012-05-24 18:54:16 UTC (rev 118398)
@@ -857,6 +857,7 @@
m_page->settings()->setAcceleratedCompositingForFixedPositionEnabled(true);
m_page->settings()->setFixedElementsLayoutRelativeToFrame(true);
+ m_page->settings()->setFixedPositionCreatesStackingContext(true);
// Schedule a layout to use the new target size.
if (!view->layoutPending()) {
