Diff
Modified: trunk/LayoutTests/ChangeLog (118115 => 118116)
--- trunk/LayoutTests/ChangeLog 2012-05-23 04:14:11 UTC (rev 118115)
+++ trunk/LayoutTests/ChangeLog 2012-05-23 04:18:31 UTC (rev 118116)
@@ -1,3 +1,20 @@
+2012-05-22 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r118095.
+ http://trac.webkit.org/changeset/118095
+ https://bugs.webkit.org/show_bug.cgi?id=87201
+
+ "Causing crashes on Mac in
+ WebCore::StyleResolver::adjustRenderStyle (Requested by
+ sundiamonde on #webkit).
+
+ * fast/block/positioning/fixed-position-stacking-context-expected.png: Removed.
+ * fast/block/positioning/fixed-position-stacking-context-expected.txt: Removed.
+ * fast/block/positioning/fixed-position-stacking-context.html: Removed.
+ * fast/block/positioning/fixed-position-stacking-context2-expected.png: Removed.
+ * fast/block/positioning/fixed-position-stacking-context2-expected.txt: Removed.
+ * fast/block/positioning/fixed-position-stacking-context2.html: Removed.
+
2012-05-22 Levi Weintraub <[email protected]>
NULL ptr in WebCore::RenderBlock::layoutRunsAndFloatsInRange
Deleted: trunk/LayoutTests/fast/block/positioning/fixed-position-stacking-context-expected.png
(Binary files differ)
Deleted: trunk/LayoutTests/fast/block/positioning/fixed-position-stacking-context-expected.txt (118115 => 118116)
--- trunk/LayoutTests/fast/block/positioning/fixed-position-stacking-context-expected.txt 2012-05-23 04:14:11 UTC (rev 118115)
+++ trunk/LayoutTests/fast/block/positioning/fixed-position-stacking-context-expected.txt 2012-05-23 04:18:31 UTC (rev 118116)
@@ -1,13 +0,0 @@
-layer at (0,0) size 800x600
- RenderView at (0,0) size 800x600
-layer at (0,0) size 800x8
- RenderBlock {HTML} at (0,0) size 800x8
- RenderBody {BODY} at (8,8) size 784x0
-layer at (0,0) size 100x100
- RenderBlock (positioned) {DIV} at (0,0) size 100x100
-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]
Deleted: trunk/LayoutTests/fast/block/positioning/fixed-position-stacking-context.html (118115 => 118116)
--- trunk/LayoutTests/fast/block/positioning/fixed-position-stacking-context.html 2012-05-23 04:14:11 UTC (rev 118115)
+++ trunk/LayoutTests/fast/block/positioning/fixed-position-stacking-context.html 2012-05-23 04:18:31 UTC (rev 118116)
@@ -1,30 +0,0 @@
-<!DOCTYPE html>
-<title>Fixed position elements do not establish stacking contexts by default</title>
-<style>
-div {
- height: 100px;
- width: 100px;
- margin: 0;
- padding: 0;
- top: 0;
- left: 0;
- position:fixed;
-}
-
-.red {
- position:fixed;
- background: red;
- z-index: 1;
-}
-
-.green {
- position:fixed;
- background: green;
- z-index: 2;
-}
-</style>
-<div class="red"></div>
-<div class="container">
- <div class="red"></div>
- <div class="green"></div>
-</div>
Deleted: trunk/LayoutTests/fast/block/positioning/fixed-position-stacking-context2-expected.png
(Binary files differ)
Deleted: trunk/LayoutTests/fast/block/positioning/fixed-position-stacking-context2-expected.txt (118115 => 118116)
--- trunk/LayoutTests/fast/block/positioning/fixed-position-stacking-context2-expected.txt 2012-05-23 04:14:11 UTC (rev 118115)
+++ trunk/LayoutTests/fast/block/positioning/fixed-position-stacking-context2-expected.txt 2012-05-23 04:18:31 UTC (rev 118116)
@@ -1,13 +0,0 @@
-layer at (0,0) size 800x600
- RenderView at (0,0) size 800x600
-layer at (0,0) size 800x8
- RenderBlock {HTML} at (0,0) size 800x8
- RenderBody {BODY} at (8,8) size 784x0
-layer at (0,0) size 100x100
- RenderBlock (positioned) {DIV} at (0,0) size 100x100
-layer at (0,0) size 100x100
- RenderBlock (positioned) zI: 1 {DIV} at (0,0) size 100x100 [bgcolor=#008000]
-layer at (0,0) size 100x100
- RenderBlock (positioned) zI: 2 {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=#008000]
Deleted: trunk/LayoutTests/fast/block/positioning/fixed-position-stacking-context2.html (118115 => 118116)
--- trunk/LayoutTests/fast/block/positioning/fixed-position-stacking-context2.html 2012-05-23 04:14:11 UTC (rev 118115)
+++ trunk/LayoutTests/fast/block/positioning/fixed-position-stacking-context2.html 2012-05-23 04:18:31 UTC (rev 118116)
@@ -1,37 +0,0 @@
-<!DOCTYPE html>
-<title>Fixed position elements do establish stacking contexts with setting enabled</title>
-<style>
-div {
- height: 100px;
- width: 100px;
- margin: 0;
- padding: 0;
- top: 0;
- left: 0;
- position:fixed;
-}
-
-.green {
- position:fixed;
- background: green;
- z-index: 1;
-}
-
-.red {
- position:fixed;
- background: red;
- z-index: 2;
-}
-</style>
-<script>
-if ("internals" in window) {
- window.internals.settings.setFixedPositionCreatesStackingContext(true);
-} else {
- document.write("This test depends on the FixedPositionCreatesStackingContext setting being true, so run in DumpRenderTree or manually enable it");
-}
-</script>
-<div class="green"></div>
-<div class="container">
- <div class="green"></div>
- <div class="red"></div>
-</div>
Modified: trunk/Source/WebCore/ChangeLog (118115 => 118116)
--- trunk/Source/WebCore/ChangeLog 2012-05-23 04:14:11 UTC (rev 118115)
+++ trunk/Source/WebCore/ChangeLog 2012-05-23 04:18:31 UTC (rev 118116)
@@ -1,3 +1,26 @@
+2012-05-22 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r118095.
+ http://trac.webkit.org/changeset/118095
+ https://bugs.webkit.org/show_bug.cgi?id=87201
+
+ "Causing crashes on Mac in
+ WebCore::StyleResolver::adjustRenderStyle (Requested by
+ sundiamonde on #webkit).
+
+ * css/StyleResolver.cpp:
+ (WebCore::StyleResolver::collectMatchingRulesForList):
+ * page/Settings.cpp:
+ (WebCore::Settings::Settings):
+ * page/Settings.h:
+ (Settings):
+ * testing/InternalSettings.cpp:
+ (WebCore::InternalSettings::InternalSettings):
+ (WebCore::InternalSettings::restoreTo):
+ * testing/InternalSettings.h:
+ (InternalSettings):
+ * testing/InternalSettings.idl:
+
2012-05-22 Levi Weintraub <[email protected]>
NULL ptr in WebCore::RenderBlock::layoutRunsAndFloatsInRange
Modified: trunk/Source/WebCore/css/StyleResolver.cpp (118115 => 118116)
--- trunk/Source/WebCore/css/StyleResolver.cpp 2012-05-23 04:14:11 UTC (rev 118115)
+++ trunk/Source/WebCore/css/StyleResolver.cpp 2012-05-23 04:18:31 UTC (rev 118116)
@@ -2047,8 +2047,6 @@
|| style->hasTransformRelatedProperty() || style->hasMask() || style->boxReflect() || style->hasFilter()
#ifdef FIXED_POSITION_CREATES_STACKING_CONTEXT
|| style->position() == FixedPosition
-#else
- || (style->position() == FixedPosition && e->document()->page()->settings()->fixedPositionCreatesStackingContext())
#endif
#if ENABLE(OVERFLOW_SCROLLING)
// Touch overflow scrolling creates a stacking context.
Modified: trunk/Source/WebCore/page/Settings.cpp (118115 => 118116)
--- trunk/Source/WebCore/page/Settings.cpp 2012-05-23 04:14:11 UTC (rev 118115)
+++ trunk/Source/WebCore/page/Settings.cpp 2012-05-23 04:18:31 UTC (rev 118116)
@@ -268,7 +268,6 @@
, m_wantsBalancedSetDefersLoadingBehavior(false)
, m_requestAnimationFrameEnabled(true)
, m_needsDidFinishLoadOrderQuirk(false)
- , m_fixedPositionCreatesStackingContext(false)
, m_loadsImagesAutomaticallyTimer(this, &Settings::loadsImagesAutomaticallyTimerFired)
, m_incrementalRenderingSuppressionTimeoutInSeconds(defaultIncrementalRenderingSuppressionTimeoutInSeconds)
{
Modified: trunk/Source/WebCore/page/Settings.h (118115 => 118116)
--- trunk/Source/WebCore/page/Settings.h 2012-05-23 04:14:11 UTC (rev 118115)
+++ trunk/Source/WebCore/page/Settings.h 2012-05-23 04:18:31 UTC (rev 118116)
@@ -570,9 +570,6 @@
void setNeedsDidFinishLoadOrderQuirk(bool needsQuirk) { m_needsDidFinishLoadOrderQuirk = needsQuirk; }
bool needsDidFinishLoadOrderQuirk() const { return m_needsDidFinishLoadOrderQuirk; }
- void setFixedPositionCreatesStackingContext(bool creates) { m_fixedPositionCreatesStackingContext = creates; }
- bool fixedPositionCreatesStackingContext() const { return m_fixedPositionCreatesStackingContext; }
-
#if USE(JSC)
static void setShouldRespectPriorityInCSSAttributeSetters(bool);
static bool shouldRespectPriorityInCSSAttributeSetters();
@@ -741,8 +738,6 @@
bool m_requestAnimationFrameEnabled : 1;
bool m_needsDidFinishLoadOrderQuirk : 1;
- bool m_fixedPositionCreatesStackingContext : 1;
-
Timer<Settings> m_loadsImagesAutomaticallyTimer;
void loadsImagesAutomaticallyTimerFired(Timer<Settings>*);
Modified: trunk/Source/WebCore/testing/InternalSettings.cpp (118115 => 118116)
--- trunk/Source/WebCore/testing/InternalSettings.cpp 2012-05-23 04:14:11 UTC (rev 118115)
+++ trunk/Source/WebCore/testing/InternalSettings.cpp 2012-05-23 04:18:31 UTC (rev 118116)
@@ -99,7 +99,6 @@
, m_originalShadowDOMEnabled(RuntimeEnabledFeatures::shadowDOMEnabled())
#endif
, m_originalEditingBehavior(settings()->editingBehaviorType())
- , m_originalFixedPositionCreatesStackingContext(settings()->fixedPositionCreatesStackingContext())
{
}
@@ -112,7 +111,6 @@
RuntimeEnabledFeatures::setShadowDOMEnabled(m_originalShadowDOMEnabled);
#endif
settings->setEditingBehaviorType(m_originalEditingBehavior);
- settings->setFixedPositionCreatesStackingContext(m_originalFixedPositionCreatesStackingContext);
}
Settings* InternalSettings::settings() const
@@ -346,10 +344,4 @@
ec = SYNTAX_ERR;
}
-void InternalSettings::setFixedPositionCreatesStackingContext(bool creates, ExceptionCode& ec)
-{
- InternalSettingsGuardForFrameView();
- settings()->setFixedPositionCreatesStackingContext(creates);
}
-
-}
Modified: trunk/Source/WebCore/testing/InternalSettings.h (118115 => 118116)
--- trunk/Source/WebCore/testing/InternalSettings.h 2012-05-23 04:14:11 UTC (rev 118115)
+++ trunk/Source/WebCore/testing/InternalSettings.h 2012-05-23 04:18:31 UTC (rev 118116)
@@ -76,7 +76,6 @@
void setCSSExclusionsEnabled(bool enabled, ExceptionCode&);
void setMediaPlaybackRequiresUserGesture(bool, ExceptionCode&);
void setEditingBehavior(const String&, ExceptionCode&);
- void setFixedPositionCreatesStackingContext(bool, ExceptionCode&);
void restoreTo(Settings*);
@@ -94,7 +93,6 @@
bool m_originalShadowDOMEnabled;
#endif
EditingBehaviorType m_originalEditingBehavior;
- bool m_originalFixedPositionCreatesStackingContext;
};
} // namespace WebCore
Modified: trunk/Source/WebCore/testing/InternalSettings.idl (118115 => 118116)
--- trunk/Source/WebCore/testing/InternalSettings.idl 2012-05-23 04:14:11 UTC (rev 118115)
+++ trunk/Source/WebCore/testing/InternalSettings.idl 2012-05-23 04:18:31 UTC (rev 118116)
@@ -54,7 +54,6 @@
void setCSSExclusionsEnabled(in boolean enabled) raises(DOMException);
void setMediaPlaybackRequiresUserGesture(in boolean enabled) raises(DOMException);
void setEditingBehavior(in DOMString behavior) raises(DOMException);
- void setFixedPositionCreatesStackingContext(in boolean creates) raises(DOMException);
};
}
Modified: trunk/Source/WebKit/chromium/ChangeLog (118115 => 118116)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-05-23 04:14:11 UTC (rev 118115)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-05-23 04:18:31 UTC (rev 118116)
@@ -1,3 +1,18 @@
+2012-05-22 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r118095.
+ http://trac.webkit.org/changeset/118095
+ https://bugs.webkit.org/show_bug.cgi?id=87201
+
+ "Causing crashes on Mac in
+ WebCore::StyleResolver::adjustRenderStyle (Requested by
+ sundiamonde on #webkit).
+
+ * public/WebSettings.h:
+ * src/WebSettingsImpl.cpp:
+ * src/WebSettingsImpl.h:
+ (WebSettingsImpl):
+
2012-05-22 Xianzhu Wang <[email protected]>
[Chromium-Android] Run DumpRenderTree as an apk (C++ and gyp part)
Modified: trunk/Source/WebKit/chromium/public/WebSettings.h (118115 => 118116)
--- trunk/Source/WebKit/chromium/public/WebSettings.h 2012-05-23 04:14:11 UTC (rev 118115)
+++ trunk/Source/WebKit/chromium/public/WebSettings.h 2012-05-23 04:18:31 UTC (rev 118116)
@@ -151,7 +151,6 @@
virtual bool viewportEnabled() const = 0;
virtual void setDefaultTileSize(WebSize) = 0;
virtual void setMaxUntiledLayerSize(WebSize) = 0;
- virtual void setFixedPositionCreatesStackingContext(bool) = 0;
protected:
Modified: trunk/Source/WebKit/chromium/src/WebSettingsImpl.cpp (118115 => 118116)
--- trunk/Source/WebKit/chromium/src/WebSettingsImpl.cpp 2012-05-23 04:14:11 UTC (rev 118115)
+++ trunk/Source/WebKit/chromium/src/WebSettingsImpl.cpp 2012-05-23 04:18:31 UTC (rev 118116)
@@ -586,11 +586,6 @@
m_settings->setMediaPlaybackRequiresUserGesture(required);
}
-void WebSettingsImpl::setFixedPositionCreatesStackingContext(bool creates)
-{
- m_settings->setFixedPositionCreatesStackingContext(creates);
-}
-
void WebSettingsImpl::setViewportEnabled(bool enabled)
{
m_viewportEnabled = enabled;
Modified: trunk/Source/WebKit/chromium/src/WebSettingsImpl.h (118115 => 118116)
--- trunk/Source/WebKit/chromium/src/WebSettingsImpl.h 2012-05-23 04:14:11 UTC (rev 118115)
+++ trunk/Source/WebKit/chromium/src/WebSettingsImpl.h 2012-05-23 04:18:31 UTC (rev 118116)
@@ -142,7 +142,6 @@
virtual void setPerTilePaintingEnabled(bool);
virtual void setPartialSwapEnabled(bool);
virtual void setThreadedAnimationEnabled(bool);
- virtual void setFixedPositionCreatesStackingContext(bool);
virtual void setViewportEnabled(bool);
virtual void setMediaPlaybackRequiresUserGesture(bool);
virtual bool viewportEnabled() const { return m_viewportEnabled; }
