Changeset 124389 in webkit for trunk/Source/WebCore/css/CSSPrimitiveValue.cpp

Timestamp:

Aug 1, 2012, 5:14:28 PM (13 years ago)

Author:

[email protected]

Message:

Add new CSS property "-webkit-widget-region" to expose dashboard region support for other port
​https://bugs.webkit.org/show_bug.cgi?id=90298

Reviewed by Adam Barth.

.:

• configure.ac: Add ENABLE_WIDGET_REGION define.

Source/JavaScriptCore:

• Configurations/FeatureDefines.xcconfig: Add ENABLE_WIDGET_REGION define.

Source/WebCore:

The css property "-webkit-widget-region" is essentially a synonym of
"-webkit-dashboard-region" that allows us to expose dashboard region
support for other port. This patch also adds a new feature define
ENABLE(WIDGET_REGION) such that "-webkit-dashboard-region" is only
provided under ENABLE(DASHBOARD_SUPPORT) as it is now and
"-webkit-widget-region" is only exposed under ENABLE(WIDGET_REGION).

Change almost all the code pieces guarded by ENABLE(DASHBOARD_SUPPORT)
to make them also guarded by ENABLE(WIDGET_REGION), except those
that are specific to Apple/WebKit.

Currently ENABLE(WIDGET_REGION) has been turned on by default for
Mac/WebKit and chromium ports.

Test: fast/css/widget-region-parser.html

• Configurations/FeatureDefines.xcconfig: Add ENABLE_WIDGET_REGION define.
• DerivedSources.make:
• GNUmakefile.am: Add ENABLE_WIDGET_REGION define.
• WebCore.exp.in:
• css/CSSComputedStyleDeclaration.cpp: Handle CSSPropertyWebkitWidgetRegion.

(WebCore):
(WebCore::CSSComputedStyleDeclaration::getPropertyCSSValue):

• css/CSSParser.cpp: Parse "-webkit-widget-region".

(WebCore::CSSParser::parseValue):
(WebCore):
(WebCore::CSSParser::parseDashboardRegions):

• css/CSSProperty.cpp: Handle CSSPropertyWebkitWidgetRegion.

(WebCore::CSSProperty::isInheritedProperty):

• css/CSSPrimitiveValue.cpp:

(WebCore):
(WebCore::CSSPrimitiveValue::customCssText):
(WebCore::CSSPrimitiveValue::cloneForCSSOM):

• css/CSSPropertyNames.in: Add "-webkit-widget-region" property.
• css/DashboardRegion.h:

(DashboardRegion):

• css/StyleResolver.cpp: Handle CSSPropertyWebkitWidgetRegion.
• dom/Document.cpp:

(WebCore::Document::Document):
(WebCore):

• dom/Document.h:

(WebCore):
(Document):

• page/Chrome.cpp:

(WebCore):

• page/ChromeClient.h:

(ChromeClient):

• page/FrameView.cpp:

(WebCore::FrameView::layout):
(WebCore):
(WebCore::FrameView::paintContents):

• page/FrameView.h:

(FrameView):

• rendering/RenderInline.cpp:

(WebCore):

• rendering/RenderInline.h:

(RenderInline):

• rendering/RenderLayer.cpp:

(WebCore::RenderLayer::scrollTo):
(WebCore::RenderLayer::setHasHorizontalScrollbar):
(WebCore::RenderLayer::setHasVerticalScrollbar):
(WebCore::RenderLayer::updateScrollbarsAfterLayout):

• rendering/RenderListBox.cpp:

(WebCore::RenderListBox::setHasVerticalScrollbar):

• rendering/RenderObject.cpp:

(WebCore::RenderObject::styleWillChange):
(WebCore):

• rendering/RenderObject.h:

(RenderObject):

• rendering/style/RenderStyle.cpp:

(WebCore::RenderStyle::diff):
(WebCore):

• rendering/style/RenderStyle.h:
• rendering/style/StyleDashboardRegion.h:
• rendering/style/StyleRareNonInheritedData.cpp:

(WebCore::StyleRareNonInheritedData::operator==):

• rendering/style/StyleRareNonInheritedData.h:

(WebCore):
(StyleRareNonInheritedData):

Source/WebKit/chromium:

• features.gypi: Add ENABLE_WIDGET_REGION define.

Source/WebKit/mac:

• Configurations/FeatureDefines.xcconfig: Add ENABLE_WIDGET_REGION define.

Source/WebKit2:

• Configurations/FeatureDefines.xcconfig: Add ENABLE_WIDGET_REGION define.

LayoutTests:

Added a new test to test the new CSS property.

• fast/css/widget-region-parser-expected.txt: Added.
• fast/css/widget-region-parser.html: Added.
• platform/efl/Skipped: Skip the new test.
• platform/gtk/TestExpectations: Skip the new test.
• platform/qt/Skipped: Skip the new test.
• platform/win/Skipped: Skip the new test.
• platform/wincario/Skipped: Skip the new test.

File:

• trunk/Source/WebCore/css/CSSPrimitiveValue.cpp (modified) (4 diffs)

trunk/Source/WebCore/css/CSSPrimitiveValue.cpp

@@ -44 +44 @@
 #include <wtf/text/StringBuilder.h>
 
-#if ENABLE(DASHBOARD_SUPPORT)
+#if ENABLE(DASHBOARD_SUPPORT) || ENABLE(WIDGET_REGION)
 #include "DashboardRegion.h"
 #endif
@@ -331 +331 @@
 }
 
-#if ENABLE(DASHBOARD_SUPPORT)
+#if ENABLE(DASHBOARD_SUPPORT) || ENABLE(WIDGET_REGION)
 void CSSPrimitiveValue::init(PassRefPtr<DashboardRegion> r)
 {
@@ -1061 +1061 @@
             }
             break;
-#if ENABLE(DASHBOARD_SUPPORT)
+#if ENABLE(DASHBOARD_SUPPORT) || ENABLE(WIDGET_REGION)
         case CSS_DASHBOARD_REGION:
             for (DashboardRegion* region = getDashboardRegionValue(); region; region = region->m_next.get()) {
                 if (!text.isEmpty())
                     text.append(' ');
+#if ENABLE(DASHBOARD_SUPPORT) && ENABLE(WIDGET_REGION)
+                text += region->m_cssFunctionName;
+#elif ENABLE(DASHBOARD_SUPPORT)
                 text += "dashboard-region(";
+#else
+                text += "region(";
+#endif
                 text += region->m_label;
                 if (region->m_isCircle)
@@ -1189 +1195 @@
         result = CSSPrimitiveValue::create(m_value.pair);
         break;
-#if ENABLE(DASHBOARD_SUPPORT)
+#if ENABLE(DASHBOARD_SUPPORT) || ENABLE(WIDGET_REGION)
     case CSS_DASHBOARD_REGION:
         // DashboardRegion is not exposed to the CSSOM, no need for a deep clone.