Title: [165198] trunk/Source/WebCore
- Revision
- 165198
- Author
- [email protected]
- Date
- 2014-03-06 11:06:25 -0800 (Thu, 06 Mar 2014)
Log Message
Fix the !ENABLE(CSS_STICKY_POSITION) build
https://bugs.webkit.org/show_bug.cgi?id=129793
Patch by Zsolt Borbely <[email protected]> on 2014-03-06
Reviewed by Simon Fraser.
Add missing ENABLE(CSS_STICKY_POSITION) guard to EditingStyle::convertPositionStyle().
* editing/EditingStyle.cpp:
(WebCore::EditingStyle::convertPositionStyle):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (165197 => 165198)
--- trunk/Source/WebCore/ChangeLog 2014-03-06 18:47:57 UTC (rev 165197)
+++ trunk/Source/WebCore/ChangeLog 2014-03-06 19:06:25 UTC (rev 165198)
@@ -1,3 +1,15 @@
+2014-03-06 Zsolt Borbely <[email protected]>
+
+ Fix the !ENABLE(CSS_STICKY_POSITION) build
+ https://bugs.webkit.org/show_bug.cgi?id=129793
+
+ Reviewed by Simon Fraser.
+
+ Add missing ENABLE(CSS_STICKY_POSITION) guard to EditingStyle::convertPositionStyle().
+
+ * editing/EditingStyle.cpp:
+ (WebCore::EditingStyle::convertPositionStyle):
+
2014-03-06 Joseph Pecoraro <[email protected]>
[Mac] Leak: dispatch_semaphore leak allocated in MediaPlayerPrivateAVFoundationObjC::waitForVideoOutputMediaDataWillChange
Modified: trunk/Source/WebCore/editing/EditingStyle.cpp (165197 => 165198)
--- trunk/Source/WebCore/editing/EditingStyle.cpp 2014-03-06 18:47:57 UTC (rev 165197)
+++ trunk/Source/WebCore/editing/EditingStyle.cpp 2014-03-06 19:06:25 UTC (rev 165198)
@@ -1204,11 +1204,13 @@
if (!m_mutableStyle)
return false;
+#if ENABLE(CSS_STICKY_POSITION)
RefPtr<CSSPrimitiveValue> sticky = cssValuePool().createIdentifierValue(CSSValueWebkitSticky);
if (m_mutableStyle->propertyMatches(CSSPropertyPosition, sticky.get())) {
m_mutableStyle->setProperty(CSSPropertyPosition, cssValuePool().createIdentifierValue(CSSValueStatic), m_mutableStyle->propertyIsImportant(CSSPropertyPosition));
return false;
}
+#endif
RefPtr<CSSPrimitiveValue> fixed = cssValuePool().createIdentifierValue(CSSValueFixed);
if (m_mutableStyle->propertyMatches(CSSPropertyPosition, fixed.get())) {
m_mutableStyle->setProperty(CSSPropertyPosition, cssValuePool().createIdentifierValue(CSSValueAbsolute), m_mutableStyle->propertyIsImportant(CSSPropertyPosition));
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
