Changeset 61376 in webkit

Timestamp:

Jun 17, 2010 10:13:19 PM (14 years ago)

Author:

morrita@google.com

Message:

2010-06-15 MORITA Hajime <​morrita@google.com>

Reviewed by Kent Tamura.

<meter> should allow styling for each gauge-level and component
​https://bugs.webkit.org/show_bug.cgi?id=40280

• Updated expectations because both rendering result, render tree structure, html.css was changed.

• fast/dom/HTMLMeterElement/meter-styles-changing-pseudo.html: Added.
• fast/dom/HTMLMeterElement/meter-styles.html: Added.
• platform/chromium/test_expectations.txt:
• platform/gtk/Skipped:
• platform/mac/fast/dom/HTMLMeterElement/meter-appearances-capacity-expected.checksum:
• platform/mac/fast/dom/HTMLMeterElement/meter-element-expected.checksum:
• platform/mac/fast/dom/HTMLMeterElement/meter-element-expected.png:
• platform/mac/fast/dom/HTMLMeterElement/meter-element-expected.txt:
• platform/mac/fast/dom/HTMLMeterElement/meter-optimums-expected.checksum:
• platform/mac/fast/dom/HTMLMeterElement/meter-optimums-expected.png:
• platform/mac/fast/dom/HTMLMeterElement/meter-styles-changing-pseudo-expected.checksum: Added.
• platform/mac/fast/dom/HTMLMeterElement/meter-styles-changing-pseudo-expected.png: Added.
• platform/mac/fast/dom/HTMLMeterElement/meter-styles-changing-pseudo-expected.txt: Added.
• platform/mac/fast/dom/HTMLMeterElement/meter-styles-expected.checksum: Added.
• platform/mac/fast/dom/HTMLMeterElement/meter-styles-expected.png: Added.
• platform/mac/fast/dom/HTMLMeterElement/meter-styles-expected.txt: Added.
• platform/win/Skipped:

2010-06-16 MORITA Hajime <​morrita@google.com>

Reviewed by Kent Tamura.

<meter> should allow styling for each gauge-level and component
​https://bugs.webkit.org/show_bug.cgi?id=40280

• Introduced following new pseudo classes for <meter> element.

• -webkit-meter-horizontal-bar
• -webkit-meter-vertical-bar
• -webkit-meter-horizontal-optimum-value
• -webkit-meter-vertical-optimum-value
• -webkit-meter-horizontal-suboptimal-value
• -webkit-meter-vertical-suboptimal-value
• -webkit-meter-horizontal-even-less-good-value
• -webkit-meter-vertical-even-less-good-value

• Introduced 2 shadow nodes for RenderMeter to handle CSS styling. one for bar part and another for value part.
• Removed RenderTheme::paintMeter() implementation because it can be handled by styled painting without RenderTheme.
• Pulled RenderIndicator up to super class from RenderProgress, then make RenderMeter a subclass of it.
• Moved shadow related methods from RenderProgress to ShadowBlockElement to share it with RenderMeter.
• Added rules for html.css for new pseudo classes.

Tests: fast/dom/HTMLMeterElement/meter-styles-changing-pseudo.html

fast/dom/HTMLMeterElement/meter-styles.html

• CMakeLists.txt:
• GNUmakefile.am:
• WebCore.gypi:
• WebCore.pro:
• WebCore.vcproj/WebCore.vcproj:
• WebCore.xcodeproj/project.pbxproj:
• css/CSSSelector.cpp: (WebCore::CSSSelector::pseudoId): (WebCore::nameToPseudoTypeMap): (WebCore::CSSSelector::extractPseudoType):
• css/CSSSelector.h: (WebCore::CSSSelector::):
• css/html.css: (meter::-webkit-meter-horizontal-bar): (meter::-webkit-meter-vertical-bar): (meter::-webkit-meter-horizontal-optimum-value): (meter::-webkit-meter-horizontal-suboptimal-value): (meter::-webkit-meter-horizontal-even-less-good-value): (meter::-webkit-meter-vertical-optimum-value): (meter::-webkit-meter-vertical-suboptimal-value): (meter::-webkit-meter-vertical-even-less-good-value):
• rendering/RenderIndicator.cpp: Added. (WebCore::RenderIndicator::RenderIndicator): (WebCore::RenderIndicator::~RenderIndicator): (WebCore::RenderIndicator::layout): (WebCore::RenderIndicator::styleDidChange): (WebCore::RenderIndicator::updateFromElement): (WebCore::RenderIndicator::hasParts): (WebCore::RenderIndicator::requestLayoutForParts):
• rendering/RenderIndicator.h: Added. (WebCore::RenderIndicator::requiresForcedStyleRecalcPropagation):
• rendering/RenderMeter.cpp: (WebCore::RenderMeter::RenderMeter): (WebCore::RenderMeter::~RenderMeter): (WebCore::RenderMeter::layoutParts): Added. (WebCore::RenderMeter::shouldHaveParts): Added. (WebCore::RenderMeter::valueRatio): Added. (WebCore::RenderMeter::barPartRect): Added. (WebCore::RenderMeter::valuePartRect): Added. (WebCore::RenderMeter::isHorizontal): Added. (WebCore::RenderMeter::valuePseudoId): Added. (WebCore::RenderMeter::barPseudoId): Added. (WebCore::RenderMeter::updatePartsState): Added.
• rendering/RenderMeter.h:
• rendering/RenderProgress.cpp: (WebCore::RenderProgress::RenderProgress): (WebCore::RenderProgress::updateFromElement): (WebCore::RenderProgress::paint): (WebCore::RenderProgress::layoutParts): Added. (WebCore::RenderProgress::shouldHaveParts): Added. (WebCore::RenderProgress::updatePartsState): (WebCore::RenderProgress::valuePartRect):
• rendering/RenderProgress.h:
• rendering/RenderTheme.cpp: (WebCore::RenderTheme::isControlStyled): (WebCore::RenderTheme::paintMeter):
• rendering/RenderTheme.h: (WebCore::RenderTheme::supportsMeter): Added.
• rendering/RenderThemeMac.h:
• rendering/RenderThemeMac.mm: (WebCore::RenderThemeMac::supportsMeter): Added.
• rendering/ShadowElement.cpp: (WebCore::ShadowBlockElement::layoutAsPart): Added. (WebCore::ShadowBlockElement::updateStyleForPart): Added. (WebCore::ShadowBlockElement::createForPart): Added. (WebCore::ShadowBlockElement::createStyleForPart): Added. (WebCore::ShadowBlockElement::partShouldHaveStyle): Added.
• rendering/ShadowElement.h:
• rendering/style/RenderStyleConstants.h: (WebCore::):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/dom/HTMLMeterElement/meter-styles-changing-pseudo.html (added)
• LayoutTests/fast/dom/HTMLMeterElement/meter-styles.html (added)
• LayoutTests/platform/chromium/test_expectations.txt (modified) (1 diff)
• LayoutTests/platform/gtk/Skipped (modified) (1 diff)
• LayoutTests/platform/mac/fast/dom/HTMLMeterElement/meter-appearances-capacity-expected.checksum (modified) (1 diff)
• LayoutTests/platform/mac/fast/dom/HTMLMeterElement/meter-element-expected.checksum (modified) (1 diff)
• LayoutTests/platform/mac/fast/dom/HTMLMeterElement/meter-element-expected.png (modified) (previous)
• LayoutTests/platform/mac/fast/dom/HTMLMeterElement/meter-element-expected.txt (modified) (1 diff)
• LayoutTests/platform/mac/fast/dom/HTMLMeterElement/meter-optimums-expected.checksum (modified) (1 diff)
• LayoutTests/platform/mac/fast/dom/HTMLMeterElement/meter-optimums-expected.png (modified) (previous)
• LayoutTests/platform/mac/fast/dom/HTMLMeterElement/meter-styles-changing-pseudo-expected.checksum (added)
• LayoutTests/platform/mac/fast/dom/HTMLMeterElement/meter-styles-changing-pseudo-expected.png (added)
• LayoutTests/platform/mac/fast/dom/HTMLMeterElement/meter-styles-changing-pseudo-expected.txt (added)
• LayoutTests/platform/mac/fast/dom/HTMLMeterElement/meter-styles-expected.checksum (added)
• LayoutTests/platform/mac/fast/dom/HTMLMeterElement/meter-styles-expected.png (added)
• LayoutTests/platform/mac/fast/dom/HTMLMeterElement/meter-styles-expected.txt (added)
• LayoutTests/platform/win/Skipped (modified) (1 diff)
• WebCore/CMakeLists.txt (modified) (1 diff)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/GNUmakefile.am (modified) (1 diff)
• WebCore/WebCore.gypi (modified) (1 diff)
• WebCore/WebCore.pro (modified) (2 diffs)
• WebCore/WebCore.vcproj/WebCore.vcproj (modified) (1 diff)
• WebCore/WebCore.xcodeproj/project.pbxproj (modified) (53 diffs)
• WebCore/css/CSSSelector.cpp (modified) (4 diffs)
• WebCore/css/CSSSelector.h (modified) (1 diff)
• WebCore/css/html.css (modified) (1 diff)
• WebCore/rendering/RenderIndicator.cpp (copied) (copied from trunk/WebCore/rendering/RenderMeter.cpp) (2 diffs)
• WebCore/rendering/RenderIndicator.h (copied) (copied from trunk/WebCore/rendering/RenderMeter.h) (2 diffs)
• WebCore/rendering/RenderMeter.cpp (modified) (3 diffs)
• WebCore/rendering/RenderMeter.h (modified) (1 diff)
• WebCore/rendering/RenderProgress.cpp (modified) (7 diffs)
• WebCore/rendering/RenderProgress.h (modified) (3 diffs)
• WebCore/rendering/RenderTheme.cpp (modified) (2 diffs)
• WebCore/rendering/RenderTheme.h (modified) (1 diff)
• WebCore/rendering/RenderThemeMac.h (modified) (1 diff)
• WebCore/rendering/RenderThemeMac.mm (modified) (1 diff)
• WebCore/rendering/ShadowElement.cpp (modified) (2 diffs)
• WebCore/rendering/ShadowElement.h (modified) (1 diff)
• WebCore/rendering/style/RenderStyleConstants.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-06-15  MORITA Hajime  <morrita@google.com>
+
+        Reviewed by Kent Tamura.
+
+        <meter> should allow styling for each gauge-level and component
+        https://bugs.webkit.org/show_bug.cgi?id=40280
+
+        - Updated expectations because both rendering result, render tree structure,
+          html.css was changed.
+
+        * fast/dom/HTMLMeterElement/meter-styles-changing-pseudo.html: Added.
+        * fast/dom/HTMLMeterElement/meter-styles.html: Added.
+        * platform/chromium/test_expectations.txt:
+        * platform/gtk/Skipped:
+        * platform/mac/fast/dom/HTMLMeterElement/meter-appearances-capacity-expected.checksum:
+        * platform/mac/fast/dom/HTMLMeterElement/meter-element-expected.checksum:
+        * platform/mac/fast/dom/HTMLMeterElement/meter-element-expected.png:
+        * platform/mac/fast/dom/HTMLMeterElement/meter-element-expected.txt:
+        * platform/mac/fast/dom/HTMLMeterElement/meter-optimums-expected.checksum:
+        * platform/mac/fast/dom/HTMLMeterElement/meter-optimums-expected.png:
+        * platform/mac/fast/dom/HTMLMeterElement/meter-styles-changing-pseudo-expected.checksum: Added.
+        * platform/mac/fast/dom/HTMLMeterElement/meter-styles-changing-pseudo-expected.png: Added.
+        * platform/mac/fast/dom/HTMLMeterElement/meter-styles-changing-pseudo-expected.txt: Added.
+        * platform/mac/fast/dom/HTMLMeterElement/meter-styles-expected.checksum: Added.
+        * platform/mac/fast/dom/HTMLMeterElement/meter-styles-expected.png: Added.
+        * platform/mac/fast/dom/HTMLMeterElement/meter-styles-expected.txt: Added.
+        * platform/win/Skipped:
+
 2010-06-17  Fumitoshi Ukai  <ukai@chromium.org>
 

trunk/LayoutTests/platform/chromium/test_expectations.txt

@@ -2633 +2633 @@
 
 // HTMLMeterElement related tests deferred due to https://bugs.webkit.org/show_bug.cgi?id=37074.
-BUGWK37074 DEFER : fast/dom/HTMLMeterElement/meter-element.html = IMAGE+TEXT
+BUGWK37074 DEFER : fast/dom/HTMLMeterElement/meter-element.html = FAIL
 BUGWK37074 DEFER : fast/dom/HTMLMeterElement/set-meter-properties.html = TEXT
-BUGWK37074 DEFER : fast/dom/HTMLMeterElement/meter-appearances-capacity.html = IMAGE+TEXT
-BUGWK37074 DEFER : fast/dom/HTMLMeterElement/meter-appearances-rating-relevancy.html = IMAGE+TEXT
-BUGWK37074 DEFER : fast/dom/HTMLMeterElement/meter-optimums.html = IMAGE+TEXT
+BUGWK37074 DEFER : fast/dom/HTMLMeterElement/meter-appearances-capacity.html = FAIL
+BUGWK37074 DEFER : fast/dom/HTMLMeterElement/meter-appearances-rating-relevancy.html = FAIL
+BUGWK37074 DEFER : fast/dom/HTMLMeterElement/meter-optimums.html = FAIL
+BUGWK37074 DEFER : fast/dom/HTMLMeterElement/meter-styles.html = MISSING
+BUGWK37074 DEFER : fast/dom/HTMLMeterElement/meter-styles-changing-pseudo.html = MISSING
 
 // WebKit roll 56004 -> 56026

trunk/LayoutTests/platform/gtk/Skipped

@@ -5693 +5693 @@
 fast/dom/HTMLMeterElement/meter-appearances-rating-relevancy.html
 fast/dom/HTMLMeterElement/meter-optimums.html
+fast/dom/HTMLMeterElement/meter-styles.html
+fast/dom/HTMLMeterElement/meter-styles-changing-pseudo.html
 
 # Needs mock support, and build slave Geolocation service

trunk/LayoutTests/platform/mac/fast/dom/HTMLMeterElement/meter-appearances-capacity-expected.checksum

@@ -1 @@
-46e2fa5e215820fcbb9e81907bd5ceae
+82e1e45c173e18f3f49c5ca3df13e498

trunk/LayoutTests/platform/mac/fast/dom/HTMLMeterElement/meter-element-expected.checksum

@@ -1 @@
-ee9e030a1b605ca2c030bfee694bf9f6
+c93f96f488bc2787690a58735a062310

trunk/LayoutTests/platform/mac/fast/dom/HTMLMeterElement/meter-element-expected.txt

@@ -7 +7 @@
         RenderText {#text} at (0,0) size 0x0
       RenderMeter {METER} at (80,0) size 10x60
-        RenderText {#text} at (0,0) size 0x0
+        RenderBlock (anonymous) at (0,0) size 0x0
+          RenderText {#text} at (0,0) size 0x0
+        RenderBlock {DIV} at (0,0) size 10x60
+        RenderBlock {DIV} at (0,18) size 10x42
       RenderText {#text} at (0,0) size 0x0

trunk/LayoutTests/platform/mac/fast/dom/HTMLMeterElement/meter-optimums-expected.checksum

@@ -1 @@
-851e15761e9707f58957d7cc99012925
+0ff14a0a3109816415cd6312a9f8a898

trunk/LayoutTests/platform/win/Skipped

@@ -841 +841 @@
 fast/dom/HTMLMeterElement/meter-appearances-rating-relevancy.html
 fast/dom/HTMLMeterElement/meter-optimums.html
+fast/dom/HTMLMeterElement/meter-styles.html
+fast/dom/HTMLMeterElement/meter-styles-changing-pseudo.html
 
 # No Widgets 1.0 support

trunk/WebCore/CMakeLists.txt

@@ -1299 +1299 @@
     rendering/RenderImage.cpp
     rendering/RenderImageGeneratedContent.cpp
+    rendering/RenderIndicator.cpp
     rendering/RenderInline.cpp
     rendering/RenderLayer.cpp

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-06-16  MORITA Hajime  <morrita@google.com>
+
+        Reviewed by Kent Tamura.
+
+        <meter> should allow styling for each gauge-level and component
+        https://bugs.webkit.org/show_bug.cgi?id=40280
+
+        - Introduced following new pseudo classes for <meter> element.
+        
+          - -webkit-meter-horizontal-bar
+          - -webkit-meter-vertical-bar
+          - -webkit-meter-horizontal-optimum-value
+          - -webkit-meter-vertical-optimum-value
+          - -webkit-meter-horizontal-suboptimal-value
+          - -webkit-meter-vertical-suboptimal-value
+          - -webkit-meter-horizontal-even-less-good-value
+          - -webkit-meter-vertical-even-less-good-value
+        
+        - Introduced 2 shadow nodes for RenderMeter to handle CSS styling. 
+          one for bar part and another for value part.
+        - Removed RenderTheme::paintMeter() implementation because it can be
+          handled by styled painting without RenderTheme.
+        - Pulled RenderIndicator up to super class from RenderProgress,
+          then make RenderMeter a subclass of it.
+        - Moved shadow related methods from RenderProgress to ShadowBlockElement
+          to share it with RenderMeter.
+        - Added rules for html.css for new pseudo classes.
+        
+        Tests: fast/dom/HTMLMeterElement/meter-styles-changing-pseudo.html
+               fast/dom/HTMLMeterElement/meter-styles.html
+
+        * CMakeLists.txt:
+        * GNUmakefile.am:
+        * WebCore.gypi:
+        * WebCore.pro:
+        * WebCore.vcproj/WebCore.vcproj:
+        * WebCore.xcodeproj/project.pbxproj:
+        * css/CSSSelector.cpp:
+        (WebCore::CSSSelector::pseudoId):
+        (WebCore::nameToPseudoTypeMap):
+        (WebCore::CSSSelector::extractPseudoType):
+        * css/CSSSelector.h:
+        (WebCore::CSSSelector::):
+        * css/html.css:
+        (meter::-webkit-meter-horizontal-bar):
+        (meter::-webkit-meter-vertical-bar):
+        (meter::-webkit-meter-horizontal-optimum-value):
+        (meter::-webkit-meter-horizontal-suboptimal-value):
+        (meter::-webkit-meter-horizontal-even-less-good-value):
+        (meter::-webkit-meter-vertical-optimum-value):
+        (meter::-webkit-meter-vertical-suboptimal-value):
+        (meter::-webkit-meter-vertical-even-less-good-value):
+        * rendering/RenderIndicator.cpp: Added.
+        (WebCore::RenderIndicator::RenderIndicator):
+        (WebCore::RenderIndicator::~RenderIndicator):
+        (WebCore::RenderIndicator::layout):
+        (WebCore::RenderIndicator::styleDidChange):
+        (WebCore::RenderIndicator::updateFromElement):
+        (WebCore::RenderIndicator::hasParts):
+        (WebCore::RenderIndicator::requestLayoutForParts):
+        * rendering/RenderIndicator.h: Added.
+        (WebCore::RenderIndicator::requiresForcedStyleRecalcPropagation):
+        * rendering/RenderMeter.cpp:
+        (WebCore::RenderMeter::RenderMeter):
+        (WebCore::RenderMeter::~RenderMeter):
+        (WebCore::RenderMeter::layoutParts): Added.
+        (WebCore::RenderMeter::shouldHaveParts): Added.
+        (WebCore::RenderMeter::valueRatio): Added.
+        (WebCore::RenderMeter::barPartRect): Added.
+        (WebCore::RenderMeter::valuePartRect): Added.
+        (WebCore::RenderMeter::isHorizontal): Added.
+        (WebCore::RenderMeter::valuePseudoId): Added.
+        (WebCore::RenderMeter::barPseudoId): Added.
+        (WebCore::RenderMeter::updatePartsState): Added.
+        * rendering/RenderMeter.h:
+        * rendering/RenderProgress.cpp:
+        (WebCore::RenderProgress::RenderProgress):
+        (WebCore::RenderProgress::updateFromElement):
+        (WebCore::RenderProgress::paint):
+        (WebCore::RenderProgress::layoutParts): Added.
+        (WebCore::RenderProgress::shouldHaveParts): Added.
+        (WebCore::RenderProgress::updatePartsState):
+        (WebCore::RenderProgress::valuePartRect):
+        * rendering/RenderProgress.h:
+        * rendering/RenderTheme.cpp:
+        (WebCore::RenderTheme::isControlStyled):
+        (WebCore::RenderTheme::paintMeter):
+        * rendering/RenderTheme.h:
+        (WebCore::RenderTheme::supportsMeter): Added.
+        * rendering/RenderThemeMac.h:
+        * rendering/RenderThemeMac.mm:
+        (WebCore::RenderThemeMac::supportsMeter): Added.
+        * rendering/ShadowElement.cpp:
+        (WebCore::ShadowBlockElement::layoutAsPart): Added.
+        (WebCore::ShadowBlockElement::updateStyleForPart): Added.
+        (WebCore::ShadowBlockElement::createForPart): Added.
+        (WebCore::ShadowBlockElement::createStyleForPart): Added.
+        (WebCore::ShadowBlockElement::partShouldHaveStyle): Added.
+        * rendering/ShadowElement.h:
+        * rendering/style/RenderStyleConstants.h:
+        (WebCore::):
+
 2010-06-17  Fumitoshi Ukai  <ukai@chromium.org>
 

trunk/WebCore/GNUmakefile.am

@@ -1934 +1934 @@
         WebCore/rendering/RenderImageGeneratedContent.cpp \
         WebCore/rendering/RenderImageGeneratedContent.h \
+        WebCore/rendering/RenderIndicator.cpp \
+        WebCore/rendering/RenderIndicator.h \
         WebCore/rendering/RenderInline.cpp \
         WebCore/rendering/RenderInline.h \

trunk/WebCore/WebCore.gypi

@@ -3155 +3155 @@
             'rendering/RenderImageGeneratedContent.cpp',
             'rendering/RenderImageGeneratedContent.h',
+            'rendering/RenderIndicator.cpp',
+            'rendering/RenderIndicator.h',
             'rendering/RenderInline.cpp',
             'rendering/RenderInline.h',

trunk/WebCore/WebCore.pro

@@ -950 +950 @@
     rendering/RenderImage.cpp \
     rendering/RenderImageGeneratedContent.cpp \
+    rendering/RenderIndicator.cpp \
     rendering/RenderInline.cpp \
     rendering/RenderLayer.cpp \
@@ -1733 +1734 @@
     rendering/RenderImageGeneratedContent.h \
     rendering/RenderImage.h \
+    rendering/RenderIndicator.h \
     rendering/RenderInline.h \
     rendering/RenderLayer.h \

trunk/WebCore/WebCore.vcproj/WebCore.vcproj

@@ -28166 +28166 @@
                         </File>
                         <File
+                                RelativePath="..\rendering\RenderIndicator.cpp"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\rendering\RenderIndicator.h"
+                                >
+                        </File>
+                        <File
                                 RelativePath="..\rendering\RenderInline.cpp"
                                 >

trunk/WebCore/WebCore.xcodeproj/project.pbxproj

@@ -2621 +2621 @@
                 A795463E0B5C4C80007B438F /* DragDataMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = A795463D0B5C4C80007B438F /* DragDataMac.mm */; };
                 A79546430B5C4CB4007B438F /* DragData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A79546420B5C4CB4007B438F /* DragData.cpp */; };
+                A7AA66D611C5ED6A001D8C8C /* RenderIndicator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A7AA66D411C5ED6A001D8C8C /* RenderIndicator.cpp */; };
+                A7AA66D711C5ED6A001D8C8C /* RenderIndicator.h in Headers */ = {isa = PBXBuildFile; fileRef = A7AA66D511C5ED6A001D8C8C /* RenderIndicator.h */; };
                 A7AD2F870EC89D07008AB002 /* LinkHash.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A7AD2F850EC89D07008AB002 /* LinkHash.cpp */; };
                 A7AD2F880EC89D07008AB002 /* LinkHash.h in Headers */ = {isa = PBXBuildFile; fileRef = A7AD2F860EC89D07008AB002 /* LinkHash.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -8209 +8211 @@
                 A795463D0B5C4C80007B438F /* DragDataMac.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = DragDataMac.mm; sourceTree = "<group>"; };
                 A79546420B5C4CB4007B438F /* DragData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DragData.cpp; sourceTree = "<group>"; };
+                A7AA66D411C5ED6A001D8C8C /* RenderIndicator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RenderIndicator.cpp; sourceTree = "<group>"; };
+                A7AA66D511C5ED6A001D8C8C /* RenderIndicator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RenderIndicator.h; sourceTree = "<group>"; };
                 A7AD2F850EC89D07008AB002 /* LinkHash.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LinkHash.cpp; sourceTree = "<group>"; };
                 A7AD2F860EC89D07008AB002 /* LinkHash.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LinkHash.h; sourceTree = "<group>"; };
@@ -11024 +11028 @@
                         isa = PBXGroup;
                         children = (
-                                81CC114011BEAA9D00D0D856 /* IDBKeyRange.idl */,
-                                816C806611BE887E009A45E9 /* IDBKeyRange.cpp */,
-                                816C806711BE887E009A45E9 /* IDBKeyRange.h */,
-                                B6B0540711B68F10002564C5 /* IDBObjectStoreImpl.cpp */,
-                                B6B0540811B68F10002564C5 /* IDBObjectStoreImpl.h */,
-                                B6693EEF11AD63F6003F2770 /* IDBObjectStoreRequest.idl */,
-                                B6693EE811AD63E6003F2770 /* IDBObjectStore.h */,
-                                B6693EE911AD63E6003F2770 /* IDBObjectStoreRequest.cpp */,
-                                B6693EEA11AD63E6003F2770 /* IDBObjectStoreRequest.h */,
                                 B5B5DC67119BB3D5002A8790 /* AbstractDatabase.cpp */,
                                 B5B5DC68119BB3D5002A8790 /* AbstractDatabase.h */,
@@ -11081 +11076 @@
                                 C51DA9A311AEF2C1009799C5 /* IDBIndexRequest.h */,
                                 C51DA9A411AEF2C1009799C5 /* IDBIndexRequest.idl */,
+                                816C806611BE887E009A45E9 /* IDBKeyRange.cpp */,
+                                816C806711BE887E009A45E9 /* IDBKeyRange.h */,
+                                81CC114011BEAA9D00D0D856 /* IDBKeyRange.idl */,
+                                B6693EE811AD63E6003F2770 /* IDBObjectStore.h */,
                                 B6693EE811AD63E6003F2770 /* IDBObjectStore.h */,
                                 B6B0540711B68F10002564C5 /* IDBObjectStoreImpl.cpp */,
+                                B6B0540711B68F10002564C5 /* IDBObjectStoreImpl.cpp */,
+                                B6B0540811B68F10002564C5 /* IDBObjectStoreImpl.h */,
                                 B6B0540811B68F10002564C5 /* IDBObjectStoreImpl.h */,
                                 B6693EE911AD63E6003F2770 /* IDBObjectStoreRequest.cpp */,
+                                B6693EE911AD63E6003F2770 /* IDBObjectStoreRequest.cpp */,
                                 B6693EEA11AD63E6003F2770 /* IDBObjectStoreRequest.h */,
+                                B6693EEA11AD63E6003F2770 /* IDBObjectStoreRequest.h */,
+                                B6693EEF11AD63F6003F2770 /* IDBObjectStoreRequest.idl */,
                                 B6693EEF11AD63F6003F2770 /* IDBObjectStoreRequest.idl */,
                                 C5198F421192ECFD002B74A6 /* IDBRequest.cpp */,
@@ -11823 +11827 @@
                         isa = PBXGroup;
                         children = (
-                                E41EA0391198374900710BC5 /* CSSValueKeywords.cpp */,
-                                E41EA038119836DB00710BC5 /* CSSPropertyNames.cpp */,
-                                E406F4021198329A009D59D6 /* HTMLEntityNames.cpp */,
+                                656581AC09D14EE6000E61D7 /* CharsetData.cpp */,
                                 E406F3FB1198307D009D59D6 /* ColorData.cpp */,
-                                E406F3FA1198304D009D59D6 /* DocTypeStrings.cpp */,
-                                656581AC09D14EE6000E61D7 /* CharsetData.cpp */,
                                 6565814409D13043000E61D7 /* CSSGrammar.cpp */,
                                 650F53DB09D15DDA00C9B0C8 /* CSSGrammar.h */,
+                                E41EA038119836DB00710BC5 /* CSSPropertyNames.cpp */,
                                 656580EE09D12B20000E61D7 /* CSSPropertyNames.gperf */,
                                 656580EF09D12B20000E61D7 /* CSSPropertyNames.h */,
+                                E41EA0391198374900710BC5 /* CSSValueKeywords.cpp */,
                                 6565814709D13043000E61D7 /* CSSValueKeywords.gperf */,
                                 6565814809D13043000E61D7 /* CSSValueKeywords.h */,
+                                E406F3FA1198304D009D59D6 /* DocTypeStrings.cpp */,
                                 A17C81200F2A5CF7005DAAEB /* HTMLElementFactory.cpp */,
                                 A17C81210F2A5CF7005DAAEB /* HTMLElementFactory.h */,
+                                E406F4021198329A009D59D6 /* HTMLEntityNames.cpp */,
                                 A8D06B380A265DCD005E7203 /* HTMLNames.cpp */,
                                 A8D06B370A265DCD005E7203 /* HTMLNames.h */,
@@ -13390 +13394 @@
                                 93C441EE0F813A1A00C1A634 /* CollectionCache.h */,
                                 93C441FF0F813AE100C1A634 /* CollectionType.h */,
+                                976E2BA511CAE4DE006C56A0 /* CSSPreloadScanner.cpp */,
+                                976E2BA611CAE4DE006C56A0 /* CSSPreloadScanner.h */,
                                 BC77D2380FF298080070887B /* DataGridColumn.cpp */,
                                 BC77CFC10FF175550070887B /* DataGridColumn.h */,
@@ -13404 +13410 @@
                                 2ED609BB1145B07100C8684E /* DOMFormData.h */,
                                 2E0888C3114883A900AF4265 /* DOMFormData.idl */,
-                                976E2BA511CAE4DE006C56A0 /* CSSPreloadScanner.cpp */,
-                                976E2BA611CAE4DE006C56A0 /* CSSPreloadScanner.h */,
                                 BCDBB8CC0E08958400C60FF6 /* File.cpp */,
                                 BCDBB8CB0E08958400C60FF6 /* File.h */,
@@ -13427 +13431 @@
                                 A8136D370973A8E700D74463 /* FormDataList.cpp */,
                                 A8136D360973A8E700D74463 /* FormDataList.h */,
+                                A871038811A2947000DBD50E /* HTML5DocumentParser.cpp */,
+                                A871038911A2947000DBD50E /* HTML5DocumentParser.h */,
                                 976E895E11C0CA3A00EA9CA9 /* HTML5EntityParser.cpp */,
                                 976E895F11C0CA3A00EA9CA9 /* HTML5EntityParser.h */,
@@ -13437 +13443 @@
                                 A87F163411AE841300CBB2E5 /* HTML5ScriptRunnerHost.h */,
                                 97E8B3C211A2890800169409 /* HTML5Token.h */,
-                                A871038811A2947000DBD50E /* HTML5DocumentParser.cpp */,
-                                A871038911A2947000DBD50E /* HTML5DocumentParser.h */,
                                 A879C62311A9D1F70059237A /* HTML5TreeBuilder.cpp */,
                                 A879C62411A9D1F70059237A /* HTML5TreeBuilder.h */,
@@ -13508 +13512 @@
                                 F523D23C02DE4396018635CA /* HTMLDocument.h */,
                                 1A494E290A12354300FDAFC1 /* HTMLDocument.idl */,
+                                F523D25202DE4396018635CA /* HTMLDocumentParser.cpp */,
+                                F523D25302DE4396018635CA /* HTMLDocumentParser.h */,
                                 F523D23E02DE4396018635CA /* HTMLElement.cpp */,
                                 F523D23F02DE4396018635CA /* HTMLElement.h */,
@@ -13623 +13629 @@
                                 A871D44E0A127CBC00B12A68 /* HTMLParamElement.h */,
                                 1AE2AB720A1CE81500B42B25 /* HTMLParamElement.idl */,
-                                F523D25002DE4396018635CA /* LegacyHTMLTreeConstructor.cpp */,
-                                F523D25102DE4396018635CA /* LegacyHTMLTreeConstructor.h */,
                                 BC588B4A0BFA723C00EE679E /* HTMLParserErrorCodes.cpp */,
                                 BC588AEF0BFA6CF900EE679E /* HTMLParserErrorCodes.h */,
@@ -13682 +13686 @@
                                 A871DC1C0A15205700B12A68 /* HTMLTitleElement.h */,
                                 A80E7AAE0A19D1F1007FB8C5 /* HTMLTitleElement.idl */,
-                                F523D25202DE4396018635CA /* HTMLDocumentParser.cpp */,
-                                F523D25302DE4396018635CA /* HTMLDocumentParser.h */,
                                 A8EA79E70A1916DF00A8EF5F /* HTMLUListElement.cpp */,
                                 A8EA79E60A1916DF00A8EF5F /* HTMLUListElement.h */,
@@ -13699 +13701 @@
                                 A456FA2411AD4A830020B420 /* LabelsNodeList.cpp */,
                                 A456FA2511AD4A830020B420 /* LabelsNodeList.h */,
+                                F523D25002DE4396018635CA /* LegacyHTMLTreeConstructor.cpp */,
+                                F523D25102DE4396018635CA /* LegacyHTMLTreeConstructor.h */,
                                 E446139B0CD6331000FADA75 /* MediaError.h */,
                                 E446139C0CD6331000FADA75 /* MediaError.idl */,
@@ -14470 +14474 @@
                                 C5BBC9CE11AEF838007C2BFE /* JSIDBIndexRequest.cpp */,
                                 C5BBC9CF11AEF838007C2BFE /* JSIDBIndexRequest.h */,
+                                816C80B011BE9934009A45E9 /* JSIDBKeyRange.cpp */,
+                                816C80AE11BE990D009A45E9 /* JSIDBKeyRange.h */,
                                 B6693EF011AD6486003F2770 /* JSIDBObjectStoreRequest.cpp */,
                                 B6693EF111AD6486003F2770 /* JSIDBObjectStoreRequest.h */,
@@ -14502 +14508 @@
                                 51E0BAE80DA55D4A00A9E417 /* JSStorageEvent.cpp */,
                                 51E0BAE90DA55D4A00A9E417 /* JSStorageEvent.h */,
-                                816C80AE11BE990D009A45E9 /* JSIDBKeyRange.h */,
-                                816C80B011BE9934009A45E9 /* JSIDBKeyRange.cpp */,
                         );
                         name = Storage;
@@ -16353 +16357 @@
                                 BCB4F8920DB28E530039139B /* RenderImageGeneratedContent.cpp */,
                                 BCB4F88F0DB28DD60039139B /* RenderImageGeneratedContent.h */,
+                                A7AA66D411C5ED6A001D8C8C /* RenderIndicator.cpp */,
+                                A7AA66D511C5ED6A001D8C8C /* RenderIndicator.h */,
                                 BCEA4838097D93020094C9E4 /* RenderInline.cpp */,
                                 BCEA4839097D93020094C9E4 /* RenderInline.h */,
@@ -16607 +16613 @@
                                 1A494ED50A123F1A00FDAFC1 /* DocumentFragment.idl */,
                                 ED2BA83B09A24B91006C0AC4 /* DocumentMarker.h */,
+                                BCCFBAE70B5152ED0001F1D7 /* DocumentParser.h */,
                                 A8185F3209765765005826D9 /* DocumentType.cpp */,
                                 A8185F3109765765005826D9 /* DocumentType.h */,
@@ -16759 +16766 @@
                                 933A142D0B7D188600A53FFD /* TextEvent.h */,
                                 933A142C0B7D188600A53FFD /* TextEvent.idl */,
-                                BCCFBAE70B5152ED0001F1D7 /* DocumentParser.h */,
                                 5DB1BC6810715A6400EFAA49 /* TransformSource.h */,
                                 5DB1BC6910715A6400EFAA49 /* TransformSourceLibxslt.cpp */,
@@ -17030 +17036 @@
                                 BC772B3E0C4EA91E0083285F /* CSSParser.h in Headers */,
                                 BC02A4B70E0997B9004B6D2B /* CSSParserValues.h in Headers */,
+                                976E2BA811CAE4DE006C56A0 /* CSSPreloadScanner.h in Headers */,
                                 A80E6CE60A1989CA007FB8C5 /* CSSPrimitiveValue.h in Headers */,
                                 E1ED8AC30CC49BE000BFC557 /* CSSPrimitiveValueMappings.h in Headers */,
@@ -17094 +17101 @@
                                 656D37360ADBA5DE00A4554D /* DocumentLoader.h in Headers */,
                                 ED2BA83C09A24B91006C0AC4 /* DocumentMarker.h in Headers */,
+                                BCCFBAE80B5152ED0001F1D7 /* DocumentParser.h in Headers */,
                                 0B90561A0F2578BF0095FF6A /* DocumentThreadableLoader.h in Headers */,
                                 A8185F3909765766005826D9 /* DocumentType.h in Headers */,
@@ -17969 +17977 @@
                                 9307F1D80AF2D59000DBA31A /* HitTestResult.h in Headers */,
                                 BC3BC29C0E91AB0F00835588 /* HostWindow.h in Headers */,
+                                A871038B11A2947000DBD50E /* HTML5DocumentParser.h in Headers */,
                                 976E896111C0CA3A00EA9CA9 /* HTML5EntityParser.h in Headers */,
                                 97E8B35711A23CE200169409 /* HTML5Lexer.h in Headers */,
+                                97E7936611C6030900E649BC /* HTML5PreloadScanner.h in Headers */,
                                 A83B3AF111ADEFF500458809 /* HTML5ScriptRunner.h in Headers */,
                                 A87F163511AE841300CBB2E5 /* HTML5ScriptRunnerHost.h in Headers */,
                                 97E8B3C311A2890800169409 /* HTML5Token.h in Headers */,
-                                A871038B11A2947000DBD50E /* HTML5DocumentParser.h in Headers */,
                                 A879C62611A9D1F70059237A /* HTML5TreeBuilder.h in Headers */,
                                 BC97E23A109144950010D361 /* HTMLAllCollection.h in Headers */,
@@ -17998 +18007 @@
                                 A8EA79F70A1916DF00A8EF5F /* HTMLDListElement.h in Headers */,
                                 93F198E508245E59001E9ABC /* HTMLDocument.h in Headers */,
+                                93F198F008245E59001E9ABC /* HTMLDocumentParser.h in Headers */,
                                 93309DE8099E64920056E581 /* htmlediting.h in Headers */,
                                 93F198E608245E59001E9ABC /* HTMLElement.h in Headers */,
@@ -18042 +18052 @@
                                 A8EA7CB50A192B9C00A8EF5F /* HTMLParagraphElement.h in Headers */,
                                 A871D4580A127CBC00B12A68 /* HTMLParamElement.h in Headers */,
-                                93F198EF08245E59001E9ABC /* LegacyHTMLTreeConstructor.h in Headers */,
                                 BC588AF00BFA6CF900EE679E /* HTMLParserErrorCodes.h in Headers */,
                                 449B19F50FA72ECE0015CA4A /* HTMLParserQuirks.h in Headers */,
@@ -18064 +18073 @@
                                 A81369D6097374F600D74463 /* HTMLTextAreaElement.h in Headers */,
                                 A871DC280A15205700B12A68 /* HTMLTitleElement.h in Headers */,
-                                93F198F008245E59001E9ABC /* HTMLDocumentParser.h in Headers */,
                                 A8EA79F20A1916DF00A8EF5F /* HTMLUListElement.h in Headers */,
                                 E44613AB0CD6331000FADA75 /* HTMLVideoElement.h in Headers */,
@@ -18085 +18093 @@
                                 C56C9163119D84E600DE4CD9 /* IDBEvent.h in Headers */,
                                 C51DA9A511AEF2C1009799C5 /* IDBIndex.h in Headers */,
+                                C51DA9A511AEF2C1009799C5 /* IDBIndex.h in Headers */,
+                                C51DA9A711AEF2C1009799C5 /* IDBIndexImpl.h in Headers */,
                                 C51DA9A711AEF2C1009799C5 /* IDBIndexImpl.h in Headers */,
                                 C51DA9A911AEF2C1009799C5 /* IDBIndexRequest.h in Headers */,
+                                C51DA9A911AEF2C1009799C5 /* IDBIndexRequest.h in Headers */,
+                                816C806911BE887E009A45E9 /* IDBKeyRange.h in Headers */,
+                                B6693EEC11AD63E6003F2770 /* IDBObjectStore.h in Headers */,
                                 B6693EEC11AD63E6003F2770 /* IDBObjectStore.h in Headers */,
                                 B6B0540A11B68F10002564C5 /* IDBObjectStoreImpl.h in Headers */,
+                                B6B0540A11B68F10002564C5 /* IDBObjectStoreImpl.h in Headers */,
+                                B6693EEE11AD63E6003F2770 /* IDBObjectStoreRequest.h in Headers */,
                                 B6693EEE11AD63E6003F2770 /* IDBObjectStoreRequest.h in Headers */,
                                 C5198F571192ECFD002B74A6 /* IDBRequest.h in Headers */,
@@ -18326 +18341 @@
                                 C56C91A3119D918100DE4CD9 /* JSIDBEvent.h in Headers */,
                                 C5BBC9D111AEF838007C2BFE /* JSIDBIndexRequest.h in Headers */,
+                                C5BBC9D111AEF838007C2BFE /* JSIDBIndexRequest.h in Headers */,
+                                816C80AF11BE990D009A45E9 /* JSIDBKeyRange.h in Headers */,
+                                B6693EF311AD6486003F2770 /* JSIDBObjectStoreRequest.h in Headers */,
                                 B6693EF311AD6486003F2770 /* JSIDBObjectStoreRequest.h in Headers */,
                                 C5F4F40D119306AC00FDFADD /* JSIDBRequest.h in Headers */,
@@ -18591 +18609 @@
                                 85EC9AFB0A71A2C600EEEAED /* Language.h in Headers */,
                                 2D9066070BE141D400956998 /* LayoutState.h in Headers */,
+                                93F198EF08245E59001E9ABC /* LegacyHTMLTreeConstructor.h in Headers */,
                                 512DD8F50D91E6AF000F89EE /* LegacyWebArchive.h in Headers */,
                                 BCE65BEB0EACDF16007E4533 /* Length.h in Headers */,
@@ -18777 +18796 @@
                                 BCEA4876097D93020094C9E4 /* RenderImage.h in Headers */,
                                 BCB4F8900DB28DD60039139B /* RenderImageGeneratedContent.h in Headers */,
+                                A7AA66D711C5ED6A001D8C8C /* RenderIndicator.h in Headers */,
                                 BCEA4878097D93020094C9E4 /* RenderInline.h in Headers */,
                                 BCEA487A097D93020094C9E4 /* RenderLayer.h in Headers */,
@@ -19190 +19210 @@
                                 B2227ACE0D00BF220071B782 /* SVGTextPathElement.h in Headers */,
                                 B2227AD10D00BF220071B782 /* SVGTextPositioningElement.h in Headers */,
+                                0853D73411C9109000B2FD42 /* SVGTextQuery.h in Headers */,
                                 B2227AD40D00BF220071B782 /* SVGTitleElement.h in Headers */,
                                 B2227AD70D00BF220071B782 /* SVGTransform.h in Headers */,
@@ -19247 +19268 @@
                                 E44613B00CD6331000FADA75 /* TimeRanges.h in Headers */,
                                 49E912AE0EFAC906009D0CAF /* TimingFunction.h in Headers */,
-                                BCCFBAE80B5152ED0001F1D7 /* DocumentParser.h in Headers */,
                                 49E911C40EF86D47009D0CAF /* TransformationMatrix.h in Headers */,
                                 49E911CE0EF86D47009D0CAF /* TransformOperation.h in Headers */,
@@ -19301 +19321 @@
                                 49C7B9CF1042D32F0009D447 /* WebGLFramebuffer.h in Headers */,
                                 6E47E66110B7944B00B186C8 /* WebGLGetInfo.h in Headers */,
+                                49FFBF3F11C93EE3006A7118 /* WebGLLayer.h in Headers */,
                                 49C7B9D71042D32F0009D447 /* WebGLProgram.h in Headers */,
                                 49C7B9DA1042D32F0009D447 /* WebGLRenderbuffer.h in Headers */,
@@ -19385 +19406 @@
                                 93309E24099E64920056E581 /* WrapContentsInDummySpanCommand.h in Headers */,
                                 6565820209D1508D000E61D7 /* XLinkNames.h in Headers */,
+                                93F1992108245E59001E9ABC /* XMLDocumentParser.h in Headers */,
+                                5D15E3AC0F9E6AC1009E0E3F /* XMLDocumentParserScope.h in Headers */,
                                 BC772C470C4EB2C60083285F /* XMLHttpRequest.h in Headers */,
                                 BC60D9C90D2A29E500B9918F /* XMLHttpRequestException.h in Headers */,
@@ -19393 +19416 @@
                                 E15A36D71104572000B7B639 /* XMLNSNames.h in Headers */,
                                 1ACE53EB0A8D18E70022947D /* XMLSerializer.h in Headers */,
-                                93F1992108245E59001E9ABC /* XMLDocumentParser.h in Headers */,
-                                5D15E3AC0F9E6AC1009E0E3F /* XMLDocumentParserScope.h in Headers */,
                                 1AB7FC690A8B92EC00D9D37B /* XPathEvaluator.h in Headers */,
                                 BC60DA5B0D2A31F700B9918F /* XPathException.h in Headers */,
@@ -19419 +19440 @@
                                 97DD4D870FDF4D6E00ECF9A4 /* XSSAuditor.h in Headers */,
                                 CE172E011136E8CE0062A533 /* ZoomMode.h in Headers */,
-                                97E7936611C6030900E649BC /* HTML5PreloadScanner.h in Headers */,
-                                B6693EEC11AD63E6003F2770 /* IDBObjectStore.h in Headers */,
-                                B6693EEE11AD63E6003F2770 /* IDBObjectStoreRequest.h in Headers */,
-                                B6693EF311AD6486003F2770 /* JSIDBObjectStoreRequest.h in Headers */,
-                                C51DA9A511AEF2C1009799C5 /* IDBIndex.h in Headers */,
-                                C51DA9A711AEF2C1009799C5 /* IDBIndexImpl.h in Headers */,
-                                C51DA9A911AEF2C1009799C5 /* IDBIndexRequest.h in Headers */,
-                                C5BBC9D111AEF838007C2BFE /* JSIDBIndexRequest.h in Headers */,
-                                B6B0540A11B68F10002564C5 /* IDBObjectStoreImpl.h in Headers */,
-                                816C806911BE887E009A45E9 /* IDBKeyRange.h in Headers */,
-                                816C80AF11BE990D009A45E9 /* JSIDBKeyRange.h in Headers */,
-                                0853D73411C9109000B2FD42 /* SVGTextQuery.h in Headers */,
-                                49FFBF3F11C93EE3006A7118 /* WebGLLayer.h in Headers */,
-                                976E2BA811CAE4DE006C56A0 /* CSSPreloadScanner.h in Headers */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;
@@ -19851 +19858 @@
                                 BC772B3D0C4EA91E0083285F /* CSSParser.cpp in Sources */,
                                 BC02A5400E099C5A004B6D2B /* CSSParserValues.cpp in Sources */,
+                                976E2BA711CAE4DE006C56A0 /* CSSPreloadScanner.cpp in Sources */,
                                 A80E6D050A1989CA007FB8C5 /* CSSPrimitiveValue.cpp in Sources */,
                                 A80E6CF70A1989CA007FB8C5 /* CSSProperty.cpp in Sources */,
@@ -20286 +20294 @@
                                 6E21C6C01126338500A7BE02 /* GraphicsContext3D.cpp in Sources */,
                                 6E21C6C21126339900A7BE02 /* GraphicsContext3DCG.cpp in Sources */,
+                                49FFBF1D11C8550E006A7118 /* GraphicsContext3DMac.mm in Sources */,
                                 B2ED97710B1F55CE00257D0F /* GraphicsContextCG.cpp in Sources */,
                                 B277B4040B22F37C0004BEC6 /* GraphicsContextMac.mm in Sources */,
@@ -20297 +20306 @@
                                 9363B62C0F8E8FE000803810 /* HistoryPropertyList.cpp in Sources */,
                                 9307F1D70AF2D59000DBA31A /* HitTestResult.cpp in Sources */,
+                                A871038A11A2947000DBD50E /* HTML5DocumentParser.cpp in Sources */,
                                 976E896011C0CA3A00EA9CA9 /* HTML5EntityParser.cpp in Sources */,
                                 97E8B35611A23CE200169409 /* HTML5Lexer.cpp in Sources */,
+                                97E7936511C6030900E649BC /* HTML5PreloadScanner.cpp in Sources */,
                                 A83B3AF011ADEFF500458809 /* HTML5ScriptRunner.cpp in Sources */,
-                                A871038A11A2947000DBD50E /* HTML5DocumentParser.cpp in Sources */,
                                 A879C62511A9D1F70059237A /* HTML5TreeBuilder.cpp in Sources */,
                                 BC97E23B109144950010D361 /* HTMLAllCollection.cpp in Sources */,
@@ -20324 +20334 @@
                                 A8EA79F50A1916DF00A8EF5F /* HTMLDListElement.cpp in Sources */,
                                 93F19A9108245E59001E9ABC /* HTMLDocument.cpp in Sources */,
+                                93F19A9C08245E59001E9ABC /* HTMLDocumentParser.cpp in Sources */,
                                 93309DE7099E64920056E581 /* htmlediting.cpp in Sources */,
                                 93F19A9208245E59001E9ABC /* HTMLElement.cpp in Sources */,
@@ -20369 +20380 @@
                                 A8EA7CB20A192B9C00A8EF5F /* HTMLParagraphElement.cpp in Sources */,
                                 A871D4590A127CBC00B12A68 /* HTMLParamElement.cpp in Sources */,
-                                93F19A9B08245E59001E9ABC /* LegacyHTMLTreeConstructor.cpp in Sources */,
                                 BC588B4B0BFA723C00EE679E /* HTMLParserErrorCodes.cpp in Sources */,
                                 A871D4570A127CBC00B12A68 /* HTMLPlugInElement.cpp in Sources */,
@@ -20390 +20400 @@
                                 A81369D7097374F600D74463 /* HTMLTextAreaElement.cpp in Sources */,
                                 A871DC290A15205700B12A68 /* HTMLTitleElement.cpp in Sources */,
-                                93F19A9C08245E59001E9ABC /* HTMLDocumentParser.cpp in Sources */,
                                 A8EA79F30A1916DF00A8EF5F /* HTMLUListElement.cpp in Sources */,
                                 E44613AA0CD6331000FADA75 /* HTMLVideoElement.cpp in Sources */,
@@ -20404 +20413 @@
                                 C56C9152119D84CB00DE4CD9 /* IDBAny.cpp in Sources */,
                                 B627FB2D11AD743500E97B72 /* IDBDatabaseImpl.cpp in Sources */,
+                                B627FB2D11AD743500E97B72 /* IDBDatabaseImpl.cpp in Sources */,
                                 C5198F531192ECFD002B74A6 /* IDBDatabaseRequest.cpp in Sources */,
                                 C56C915F119D84E600DE4CD9 /* IDBErrorEvent.cpp in Sources */,
                                 C56C9162119D84E600DE4CD9 /* IDBEvent.cpp in Sources */,
                                 C51DA9A611AEF2C1009799C5 /* IDBIndexImpl.cpp in Sources */,
+                                C51DA9A611AEF2C1009799C5 /* IDBIndexImpl.cpp in Sources */,
                                 C51DA9A811AEF2C1009799C5 /* IDBIndexRequest.cpp in Sources */,
+                                C51DA9A811AEF2C1009799C5 /* IDBIndexRequest.cpp in Sources */,
+                                816C806811BE887E009A45E9 /* IDBKeyRange.cpp in Sources */,
                                 B6B0540911B68F10002564C5 /* IDBObjectStoreImpl.cpp in Sources */,
+                                B6B0540911B68F10002564C5 /* IDBObjectStoreImpl.cpp in Sources */,
+                                B6693EED11AD63E6003F2770 /* IDBObjectStoreRequest.cpp in Sources */,
                                 B6693EED11AD63E6003F2770 /* IDBObjectStoreRequest.cpp in Sources */,
                                 C5198F561192ECFD002B74A6 /* IDBRequest.cpp in Sources */,
@@ -20476 +20491 @@
                                 418F88040FF957AE0080F045 /* JSAbstractWorker.cpp in Sources */,
                                 49EECF00105070C400099FAB /* JSArrayBuffer.cpp in Sources */,
+                                BC275CB311C5E85C00C9206C /* JSArrayBufferCustom.cpp in Sources */,
                                 49EECF1B105072F300099FAB /* JSArrayBufferView.cpp in Sources */,
                                 492273A31083B3B100EE5C84 /* JSArrayBufferViewCustom.cpp in Sources */,
@@ -20574 +20590 @@
                                 93B70D6909EB0C7C009D8468 /* JSEventListener.cpp in Sources */,
                                 E0FEF372B47C53EAC1C1FBEE /* JSEventSource.cpp in Sources */,
+                                BC275B8111C5D2B400C9206C /* JSEventSourceCustom.cpp in Sources */,
                                 BC6090200E91B8EC000C68B5 /* JSEventTarget.cpp in Sources */,
                                 3314ACEB10892086000F0E56 /* JSExceptionBase.cpp in Sources */,
@@ -20684 +20701 @@
                                 C56C91A2119D918100DE4CD9 /* JSIDBEvent.cpp in Sources */,
                                 C5BBC9D011AEF838007C2BFE /* JSIDBIndexRequest.cpp in Sources */,
+                                C5BBC9D011AEF838007C2BFE /* JSIDBIndexRequest.cpp in Sources */,
+                                816C80B111BE9934009A45E9 /* JSIDBKeyRange.cpp in Sources */,
+                                B6693EF211AD6486003F2770 /* JSIDBObjectStoreRequest.cpp in Sources */,
                                 B6693EF211AD6486003F2770 /* JSIDBObjectStoreRequest.cpp in Sources */,
                                 C5F4F40C119306AC00FDFADD /* JSIDBRequest.cpp in Sources */,
@@ -20954 +20974 @@
                                 316FE0730E6CCBEE00BF6088 /* JSWebKitCSSKeyframesRule.cpp in Sources */,
                                 4983913F0F1E767500C23782 /* JSWebKitCSSMatrix.cpp in Sources */,
+                                BC275B7D11C5D23500C9206C /* JSWebKitCSSMatrixCustom.cpp in Sources */,
                                 31611E5A0E1C4DE000F6A579 /* JSWebKitCSSTransformValue.cpp in Sources */,
                                 494BD79D0F55C94C00747828 /* JSWebKitPoint.cpp in Sources */,
+                                BC275B7911C5D1C300C9206C /* JSWebKitPointCustom.cpp in Sources */,
                                 31C0FF3F0E4CEFAC007D6FE5 /* JSWebKitTransitionEvent.cpp in Sources */,
                                 5DA5E0FC102B953800088CF9 /* JSWebSocket.cpp in Sources */,
@@ -20995 +21017 @@
                                 9352084509BD43B900F2038D /* Language.mm in Sources */,
                                 2D9066060BE141D400956998 /* LayoutState.cpp in Sources */,
+                                93F19A9B08245E59001E9ABC /* LegacyHTMLTreeConstructor.cpp in Sources */,
                                 512DD8F40D91E6AF000F89EE /* LegacyWebArchive.cpp in Sources */,
                                 51B2417B0D931F3F00E83F5C /* LegacyWebArchiveMac.mm in Sources */,
@@ -21151 +21174 @@
                                 BCEA4875097D93020094C9E4 /* RenderImage.cpp in Sources */,
                                 BCB4F8930DB28E530039139B /* RenderImageGeneratedContent.cpp in Sources */,
+                                A7AA66D611C5ED6A001D8C8C /* RenderIndicator.cpp in Sources */,
                                 BCEA4877097D93020094C9E4 /* RenderInline.cpp in Sources */,
                                 BCEA4879097D93020094C9E4 /* RenderLayer.cpp in Sources */,
@@ -21526 +21550 @@
                                 B2227AC00D00BF220071B782 /* SVGSymbolElement.cpp in Sources */,
                                 B2227AC40D00BF220071B782 /* SVGTests.cpp in Sources */,
+                                0853D73211C9109000B2FD42 /* SVGTextChunkLayoutInfo.cpp in Sources */,
                                 B2227AC70D00BF220071B782 /* SVGTextContentElement.cpp in Sources */,
                                 B2227ACA0D00BF220071B782 /* SVGTextElement.cpp in Sources */,
@@ -21531 +21556 @@
                                 B2227ACD0D00BF220071B782 /* SVGTextPathElement.cpp in Sources */,
                                 B2227AD00D00BF220071B782 /* SVGTextPositioningElement.cpp in Sources */,
+                                0853D73311C9109000B2FD42 /* SVGTextQuery.cpp in Sources */,
                                 B2227AD30D00BF220071B782 /* SVGTitleElement.cpp in Sources */,
                                 B2227AD60D00BF220071B782 /* SVGTransform.cpp in Sources */,
@@ -21614 +21640 @@
                                 49C7B9CE1042D32F0009D447 /* WebGLFramebuffer.cpp in Sources */,
                                 6E47E66010B7944B00B186C8 /* WebGLGetInfo.cpp in Sources */,
+                                49FFBF4011C93EE3006A7118 /* WebGLLayer.mm in Sources */,
                                 49C7B9D61042D32F0009D447 /* WebGLProgram.cpp in Sources */,
                                 49C7B9D91042D32F0009D447 /* WebGLRenderbuffer.cpp in Sources */,
@@ -21690 +21717 @@
                                 93309E23099E64920056E581 /* WrapContentsInDummySpanCommand.cpp in Sources */,
                                 A833C7CC0A2CF07400D57664 /* XLinkNames.cpp in Sources */,
+                                93F19ABC08245E59001E9ABC /* XMLDocumentParser.cpp in Sources */,
+                                54C50F7B0E801DF3009832A0 /* XMLDocumentParserLibxml2.cpp in Sources */,
+                                5D15E3AB0F9E6AC1009E0E3F /* XMLDocumentParserScope.cpp in Sources */,
                                 BC772C460C4EB2C60083285F /* XMLHttpRequest.cpp in Sources */,
                                 A136A00C1134DBD200CC8D50 /* XMLHttpRequestProgressEventThrottle.cpp in Sources */,
@@ -21696 +21726 @@
                                 E15A36D91104572700B7B639 /* XMLNSNames.cpp in Sources */,
                                 1ACE53EA0A8D18E70022947D /* XMLSerializer.cpp in Sources */,
-                                93F19ABC08245E59001E9ABC /* XMLDocumentParser.cpp in Sources */,
-                                54C50F7B0E801DF3009832A0 /* XMLDocumentParserLibxml2.cpp in Sources */,
-                                5D15E3AB0F9E6AC1009E0E3F /* XMLDocumentParserScope.cpp in Sources */,
                                 1AB7FC680A8B92EC00D9D37B /* XPathEvaluator.cpp in Sources */,
                                 1AB7FC6B0A8B92EC00D9D37B /* XPathExpression.cpp in Sources */,
@@ -21722 +21749 @@
                                 E1BE512D0CF6C512002EA959 /* XSLTUnicodeSort.cpp in Sources */,
                                 97DD4D860FDF4D6E00ECF9A4 /* XSSAuditor.cpp in Sources */,
-                                97E7936511C6030900E649BC /* HTML5PreloadScanner.cpp in Sources */,
-                                BC275B7911C5D1C300C9206C /* JSWebKitPointCustom.cpp in Sources */,
-                                BC275B7D11C5D23500C9206C /* JSWebKitCSSMatrixCustom.cpp in Sources */,
-                                BC275B8111C5D2B400C9206C /* JSEventSourceCustom.cpp in Sources */,
-                                BC275CB311C5E85C00C9206C /* JSArrayBufferCustom.cpp in Sources */,
-                                B6693EED11AD63E6003F2770 /* IDBObjectStoreRequest.cpp in Sources */,
-                                B6693EF211AD6486003F2770 /* JSIDBObjectStoreRequest.cpp in Sources */,
-                                B627FB2D11AD743500E97B72 /* IDBDatabaseImpl.cpp in Sources */,
-                                C51DA9A611AEF2C1009799C5 /* IDBIndexImpl.cpp in Sources */,
-                                C51DA9A811AEF2C1009799C5 /* IDBIndexRequest.cpp in Sources */,
-                                C5BBC9D011AEF838007C2BFE /* JSIDBIndexRequest.cpp in Sources */,
-                                B6B0540911B68F10002564C5 /* IDBObjectStoreImpl.cpp in Sources */,
-                                816C806811BE887E009A45E9 /* IDBKeyRange.cpp in Sources */,
-                                816C80B111BE9934009A45E9 /* JSIDBKeyRange.cpp in Sources */,
-                                49FFBF1D11C8550E006A7118 /* GraphicsContext3DMac.mm in Sources */,
-                                0853D73211C9109000B2FD42 /* SVGTextChunkLayoutInfo.cpp in Sources */,
-                                0853D73311C9109000B2FD42 /* SVGTextQuery.cpp in Sources */,
-                                49FFBF4011C93EE3006A7118 /* WebGLLayer.mm in Sources */,
-                                976E2BA711CAE4DE006C56A0 /* CSSPreloadScanner.cpp in Sources */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;

trunk/WebCore/css/CSSSelector.cpp

@@ -175 +175 @@
         return NOPSEUDO;
 #endif
+
+#if ENABLE(METER_TAG)
+    case PseudoMeterHorizontalBar:
+        return METER_HORIZONTAL_BAR;
+    case PseudoMeterHorizontalOptimum:
+        return METER_HORIZONTAL_OPTIMUM;
+    case PseudoMeterHorizontalSuboptimal:
+        return METER_HORIZONTAL_SUBOPTIMAL;
+    case PseudoMeterHorizontalEvenLessGood:
+        return METER_HORIZONTAL_EVEN_LESS_GOOD;
+    case PseudoMeterVerticalBar:
+        return METER_VERTICAL_BAR;
+    case PseudoMeterVerticalOptimum:
+        return METER_VERTICAL_OPTIMUM;
+    case PseudoMeterVerticalSuboptimal:
+        return METER_VERTICAL_SUBOPTIMAL;
+    case PseudoMeterVerticalEvenLessGood:
+        return METER_VERTICAL_EVEN_LESS_GOOD;
+#else
+    case PseudoMeterHorizontalBar:
+    case PseudoMeterHorizontalOptimum:
+    case PseudoMeterHorizontalSuboptimal:
+    case PseudoMeterHorizontalEvenLessGood:
+    case PseudoMeterHorizontalEvenLessGood:
+    case PseudoMeterVerticalBar:
+    case PseudoMeterVerticalOptimum:
+    case PseudoMeterVerticalSuboptimal:
+    case PseudoMeterVerticalEvenLessGood:
+        ASSERT_NOT_REACHED();
+        return NOPSEUDO;
+#endif
+
     case PseudoInputListButton:
 #if ENABLE(DATALIST)
@@ -305 +337 @@
     DEFINE_STATIC_LOCAL(AtomicString, progressBarValue, ("-webkit-progress-bar-value"));
 #endif
+
+#if ENABLE(METER_TAG)
+    DEFINE_STATIC_LOCAL(AtomicString, meterHorizontalBar, ("-webkit-meter-horizontal-bar"));
+    DEFINE_STATIC_LOCAL(AtomicString, meterHorizontalOptimumValue, ("-webkit-meter-horizontal-optimum-value"));
+    DEFINE_STATIC_LOCAL(AtomicString, meterHorizontalSuboptimalValue, ("-webkit-meter-horizontal-suboptimal-value"));
+    DEFINE_STATIC_LOCAL(AtomicString, meterHorizontalEvenLessGoodValue, ("-webkit-meter-horizontal-even-less-good-value"));
+    DEFINE_STATIC_LOCAL(AtomicString, meterVerticalBar, ("-webkit-meter-vertical-bar"));
+    DEFINE_STATIC_LOCAL(AtomicString, meterVerticalOptimumValue, ("-webkit-meter-vertical-optimum-value"));
+    DEFINE_STATIC_LOCAL(AtomicString, meterVerticalSuboptimalValue, ("-webkit-meter-vertical-suboptimal-value"));
+    DEFINE_STATIC_LOCAL(AtomicString, meterVerticalEvenLessGoodValue, ("-webkit-meter-vertical-even-less-good-value"));
+#endif
+
     DEFINE_STATIC_LOCAL(AtomicString, required, ("required"));
     DEFINE_STATIC_LOCAL(AtomicString, resizer, ("-webkit-resizer"));
@@ -402 +446 @@
         nameToPseudoType->set(progressBarValue.impl(), CSSSelector::PseudoProgressBarValue);
 #endif
+#if ENABLE(METER_TAG)
+        nameToPseudoType->set(meterHorizontalBar.impl(), CSSSelector::PseudoMeterHorizontalBar);
+        nameToPseudoType->set(meterHorizontalOptimumValue.impl(), CSSSelector::PseudoMeterHorizontalOptimum);
+        nameToPseudoType->set(meterHorizontalSuboptimalValue.impl(), CSSSelector::PseudoMeterHorizontalSuboptimal);
+        nameToPseudoType->set(meterHorizontalEvenLessGoodValue.impl(), CSSSelector::PseudoMeterHorizontalEvenLessGood);
+        nameToPseudoType->set(meterVerticalBar.impl(), CSSSelector::PseudoMeterVerticalBar);
+        nameToPseudoType->set(meterVerticalOptimumValue.impl(), CSSSelector::PseudoMeterVerticalOptimum);
+        nameToPseudoType->set(meterVerticalSuboptimalValue.impl(), CSSSelector::PseudoMeterVerticalSuboptimal);
+        nameToPseudoType->set(meterVerticalEvenLessGoodValue.impl(), CSSSelector::PseudoMeterVerticalEvenLessGood);
+#endif
         nameToPseudoType->set(root.impl(), CSSSelector::PseudoRoot);
         nameToPseudoType->set(windowInactive.impl(), CSSSelector::PseudoWindowInactive);
@@ -484 +538 @@
     case PseudoMediaControlsTimelineContainer:
     case PseudoMediaControlsVolumeSliderContainer:
+    case PseudoMeterHorizontalBar:
+    case PseudoMeterHorizontalOptimum:
+    case PseudoMeterHorizontalSuboptimal:
+    case PseudoMeterHorizontalEvenLessGood:
+    case PseudoMeterVerticalBar:
+    case PseudoMeterVerticalOptimum:
+    case PseudoMeterVerticalSuboptimal:
+    case PseudoMeterVerticalEvenLessGood:
     case PseudoOuterSpinButton:
     case PseudoProgressBarValue:

trunk/WebCore/css/CSSSelector.h

@@ -188 +188 @@
             PseudoMediaControlsStatusDisplay,
             PseudoMediaControlsFullscreenButton,
+            PseudoMeterHorizontalBar,
+            PseudoMeterVerticalBar,
+            PseudoMeterHorizontalOptimum,
+            PseudoMeterHorizontalSuboptimal,
+            PseudoMeterHorizontalEvenLessGood,
+            PseudoMeterVerticalOptimum,
+            PseudoMeterVerticalSuboptimal,
+            PseudoMeterVerticalEvenLessGood,
             PseudoInputListButton,
             PseudoInnerSpinButton,

trunk/WebCore/css/html.css

@@ -532 +532 @@
 }
 
+meter::-webkit-meter-horizontal-bar {
+    -webkit-appearance: meter;
+    background: -webkit-gradient(linear, left top, left bottom, from(#ddd), to(#ddd), color-stop(0.20, #eee), color-stop(0.45, #ccc), color-stop(0.55, #ccc));
+}
+
+meter::-webkit-meter-vertical-bar {
+    -webkit-appearance: meter;
+    background: -webkit-gradient(linear, left top, right top, from(#ddd), to(#ddd), color-stop(0.20, #eee), color-stop(0.45, #ccc), color-stop(0.55, #ccc));
+}
+
+meter::-webkit-meter-horizontal-optimum-value {
+    -webkit-appearance: meter;
+    background: -webkit-gradient(linear, left top, left bottom, from(#ad7), to(#ad7), color-stop(0.20, #cea), color-stop(0.45, #7a3), color-stop(0.55, #7a3));
+}
+
+meter::-webkit-meter-horizontal-suboptimal-value {
+    -webkit-appearance: meter;
+    background: -webkit-gradient(linear, left top, left bottom, from(#fe7), to(#fe7), color-stop(0.20, #ffc), color-stop(0.45, #db3), color-stop(0.55, #db3));
+}
+
+meter::-webkit-meter-horizontal-even-less-good-value {
+    -webkit-appearance: meter;
+    background: -webkit-gradient(linear, left top, left bottom, from(#f77), to(#f77), color-stop(0.20, #fcc), color-stop(0.45, #d44), color-stop(0.55, #d44));
+}
+
+meter::-webkit-meter-vertical-optimum-value {
+    -webkit-appearance: meter;
+    background: -webkit-gradient(linear, left top, right top, from(#ad7), to(#ad7), color-stop(0.20, #cea), color-stop(0.45, #7a3), color-stop(0.55, #7a3));
+}
+
+meter::-webkit-meter-vertical-suboptimal-value {
+    -webkit-appearance: meter;
+    background: -webkit-gradient(linear, left top, right top, from(#fe7), to(#fe7), color-stop(0.20, #ffc), color-stop(0.45, #db3), color-stop(0.55, #db3));
+}
+ 
+meter::-webkit-meter-vertical-even-less-good-value {
+    -webkit-appearance: meter;
+    background: -webkit-gradient(linear, left top, right top, from(#f77), to(#f77), color-stop(0.20, #fcc), color-stop(0.45, #d44), color-stop(0.55, #d44));
+}
+
 /* progress */
 

trunk/WebCore/rendering/RenderIndicator.cpp

@@ -21 +21 @@
 #include "config.h"
 
-#if ENABLE(METER_TAG)
+#if ENABLE(PROGRESS_TAG) || ENABLE(METER_TAG)
 
-#include "RenderMeter.h"
+#include "RenderIndicator.h"
 
-#include "HTMLMeterElement.h"
-#include "HTMLNames.h"
 #include "RenderTheme.h"
 
@@ -33 +31 @@
 namespace WebCore {
 
-using namespace HTMLNames;
-
-RenderMeter::RenderMeter(HTMLMeterElement* element)
-    : RenderBlock(element)
+RenderIndicator::RenderIndicator(Node* node)
+    : RenderBlock(node)
 {
 }
 
-void RenderMeter::calcWidth()
+RenderIndicator::~RenderIndicator()
 {
-    RenderBox::calcWidth();
-    setWidth(theme()->meterSizeForBounds(this, frameRect()).width());
 }
 
-void RenderMeter::calcHeight()
-{
-    RenderBox::calcHeight();
-    setHeight(theme()->meterSizeForBounds(this, frameRect()).height());
-}
-
-void RenderMeter::layout()
+void RenderIndicator::layout()
 {
     ASSERT(needsLayout());
 
     LayoutRepainter repainter(*this, checkForRepaintDuringLayout());
-
     calcWidth();
     calcHeight();
-
-    m_overflow.clear();
-
+    layoutParts();
     repainter.repaintAfterLayout();
-
     setNeedsLayout(false);
 }
 
-void RenderMeter::updateFromElement()
+void RenderIndicator::styleDidChange(StyleDifference diff, const RenderStyle* oldStyle)
 {
+    RenderBlock::styleDidChange(diff, oldStyle);
+    requestLayoutForParts();
+}
+
+void RenderIndicator::updateFromElement()
+{
+    requestLayoutForParts();
     repaint();
+}
+
+bool RenderIndicator::hasParts() const
+{
+    if (RenderObject* last = lastChild())
+        return last->isRenderBlock();
+    return false;
+}
+
+void RenderIndicator::requestLayoutForParts()
+{
+    if (shouldHaveParts() || hasParts())
+        setNeedsLayout(true);
 }
 

trunk/WebCore/rendering/RenderIndicator.h

@@ -19 +19 @@
  */
 
-#ifndef RenderMeter_h
-#define RenderMeter_h
+#ifndef RenderIndicator_h
+#define RenderIndicator_h
 
-#if ENABLE(METER_TAG)
+#if ENABLE(PROGRESS_TAG) || ENABLE(METER_TAG)
 #include "RenderBlock.h"
-#include "RenderWidget.h"
 
 namespace WebCore {
 
-class HTMLMeterElement;
+class RenderIndicator : public RenderBlock {
+public:
+    RenderIndicator(Node*);
+    virtual ~RenderIndicator();
 
-class RenderMeter : public RenderBlock {
-public:
-    RenderMeter(HTMLMeterElement*);
+protected:
+    virtual void layout();
+    virtual void updateFromElement();
+    virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle);
+    virtual bool requiresForcedStyleRecalcPropagation() const { return true; }
+
+    virtual void layoutParts() = 0;
+    virtual bool shouldHaveParts() const = 0;
 
 private:
-    virtual const char* renderName() const { return "RenderMeter"; }
-    virtual bool isMeter() const { return true; }
-    virtual void layout();
-    virtual void updateFromElement();
-    virtual void calcWidth();
-    virtual void calcHeight();
+    void requestLayoutForParts();
+    bool hasParts() const;
 };
-
-inline RenderMeter* toRenderMeter(RenderObject* object)
-{
-    ASSERT(!object || object->isMeter());
-    return static_cast<RenderMeter*>(object);
-}
-
-// This will catch anyone doing an unnecessary cast.
-void toRenderMeter(const RenderMeter*);
 
 } // namespace WebCore
@@ -56 +50 @@
 #endif
 
-#endif // RenderMeter_h
+#endif // RenderIndicator_h
 

trunk/WebCore/rendering/RenderMeter.cpp

@@ -28 +28 @@
 #include "HTMLNames.h"
 #include "RenderTheme.h"
+#include "ShadowElement.h"
 
 using namespace std;
@@ -36 +37 @@
 
 RenderMeter::RenderMeter(HTMLMeterElement* element)
-    : RenderBlock(element)
+    : RenderIndicator(element)
 {
+}
+
+RenderMeter::~RenderMeter()
+{
+    if (m_valuePart)
+        m_valuePart->detach();
+    if (m_barPart)
+        m_barPart->detach();
 }
 
@@ -52 +61 @@
 }
 
-void RenderMeter::layout()
+void RenderMeter::layoutParts()
 {
-    ASSERT(needsLayout());
-
-    LayoutRepainter repainter(*this, checkForRepaintDuringLayout());
-
-    calcWidth();
-    calcHeight();
-
-    m_overflow.clear();
-
-    repainter.repaintAfterLayout();
-
-    setNeedsLayout(false);
+    // We refresh shadow node here because the state can depend
+    // on the frame size of this render object.
+    updatePartsState();
+    if (m_valuePart)
+        m_valuePart->layoutAsPart(valuePartRect());
+    if (m_barPart)
+        m_barPart->layoutAsPart(barPartRect());
 }
 
-void RenderMeter::updateFromElement()
+bool RenderMeter::shouldHaveParts() const
 {
-    repaint();
+    bool hasTheme = theme()->supportsMeter(style()->appearance(), isHorizontal());
+    if (!hasTheme)
+        return true;
+    bool shadowsHaveStyle = ShadowBlockElement::partShouldHaveStyle(this, barPseudoId()) || ShadowBlockElement::partShouldHaveStyle(this, valuePseudoId());
+    if (shadowsHaveStyle)
+        return true;
+    return false;
+}
+
+double RenderMeter::valueRatio() const
+{
+    HTMLMeterElement* element = static_cast<HTMLMeterElement*>(node());
+    double min = element->min();
+    double max = element->max();
+    double value = element->value();
+
+    if (max <= min)
+        return 0;
+    return (value - min) / (max - min);
+}
+
+IntRect RenderMeter::barPartRect() const
+{
+    return IntRect(borderLeft() + paddingLeft(), borderTop() + paddingTop(), lround(width() - borderLeft() - paddingLeft() - borderRight() - paddingRight()), height()  - borderTop() - paddingTop() - borderBottom() - paddingBottom());
+}
+
+IntRect RenderMeter::valuePartRect() const
+{
+    IntRect rect = barPartRect();
+    
+    if (rect.height() <= rect.width()) {
+        int width = static_cast<int>(rect.width()*valueRatio());
+        if (style()->direction() == RTL) {
+            rect.setX(rect.x() + (rect.width() - width));
+            rect.setWidth(width);
+        } else
+            rect.setWidth(width);
+    } else {
+        int height = static_cast<int>(rect.height()*valueRatio());
+        rect.setY(rect.y() + (rect.height() - height));
+        rect.setHeight(height);
+    }
+
+    return rect;
+}
+
+bool RenderMeter::isHorizontal() const
+{
+    IntRect rect = barPartRect();
+    return rect.height() <= rect.width();
+}
+
+PseudoId RenderMeter::valuePseudoId() const
+{
+    HTMLMeterElement* element = static_cast<HTMLMeterElement*>(node());
+
+    if (isHorizontal()) {
+        switch (element->gaugeRegion()) {
+        case HTMLMeterElement::GaugeRegionOptimum:
+            return METER_HORIZONTAL_OPTIMUM;
+        case HTMLMeterElement::GaugeRegionSuboptimal:
+            return METER_HORIZONTAL_SUBOPTIMAL;
+        case HTMLMeterElement::GaugeRegionEvenLessGood:
+            return METER_HORIZONTAL_EVEN_LESS_GOOD;
+        }
+    } else {
+        switch (element->gaugeRegion()) {
+        case HTMLMeterElement::GaugeRegionOptimum:
+            return METER_VERTICAL_OPTIMUM;
+        case HTMLMeterElement::GaugeRegionSuboptimal:
+            return METER_VERTICAL_SUBOPTIMAL;
+        case HTMLMeterElement::GaugeRegionEvenLessGood:
+            return METER_VERTICAL_EVEN_LESS_GOOD;
+        }
+    }
+
+    ASSERT_NOT_REACHED();
+    return NOPSEUDO;
+}
+
+PseudoId RenderMeter::barPseudoId() const
+{
+    return isHorizontal() ? METER_HORIZONTAL_BAR : METER_VERTICAL_BAR;
+}
+
+void RenderMeter::updatePartsState()
+{
+    if (shouldHaveParts() && !m_barPart) {
+        ASSERT(!m_valuePart);
+        m_barPart = ShadowBlockElement::createForPart(this->node(), barPseudoId());
+        addChild(m_barPart->renderer());
+        m_valuePart = ShadowBlockElement::createForPart(this->node(), valuePseudoId());
+        addChild(m_valuePart->renderer());
+    } else if (!shouldHaveParts() && m_barPart) {
+        ASSERT(m_valuePart);
+        m_barPart->detach();
+        m_barPart = 0;
+        m_valuePart->detach();
+        m_valuePart = 0;
+    }
+
+    if (m_barPart) {
+        ASSERT(m_valuePart);
+        m_barPart->updateStyleForPart(barPseudoId());
+        m_valuePart->updateStyleForPart(valuePseudoId());
+    }
 }
 

trunk/WebCore/rendering/RenderMeter.h

@@ -24 +24 @@
 #if ENABLE(METER_TAG)
 #include "RenderBlock.h"
+#include "RenderProgress.h" 
 #include "RenderWidget.h"
+
 
 namespace WebCore {
 
 class HTMLMeterElement;
+class ShadowBlockElement;
 
-class RenderMeter : public RenderBlock {
+class RenderMeter : public RenderIndicator {
 public:
     RenderMeter(HTMLMeterElement*);
+    virtual ~RenderMeter();
 
 private:
     virtual const char* renderName() const { return "RenderMeter"; }
     virtual bool isMeter() const { return true; }
-    virtual void layout();
-    virtual void updateFromElement();
     virtual void calcWidth();
     virtual void calcHeight();
+
+    virtual void layoutParts();
+    virtual bool shouldHaveParts() const;
+
+    bool isHorizontal() const;
+    void updatePartsState();    
+    IntRect valuePartRect() const;
+    PseudoId valuePseudoId() const;
+    IntRect barPartRect() const;    
+    PseudoId barPseudoId() const;
+    double valueRatio() const;
+
+    RefPtr<ShadowBlockElement> m_barPart;
+    RefPtr<ShadowBlockElement> m_valuePart;
 };
 

trunk/WebCore/rendering/RenderProgress.cpp

@@ -25 +25 @@
 #include "RenderProgress.h"
 
+#include "HTMLNames.h"
 #include "HTMLProgressElement.h"
 #include "RenderTheme.h"
-#include "RenderView.h"
 #include "ShadowElement.h"
 #include <wtf/CurrentTime.h>
@@ -37 +37 @@
 
 RenderProgress::RenderProgress(HTMLProgressElement* element)
-    : RenderBlock(element)
+    : RenderIndicator(element)
     , m_position(-1)
     , m_animationStartTime(0)
@@ -44 +44 @@
     , m_animating(false)
     , m_animationTimer(this, &RenderProgress::animationTimerFired)
-    , m_valuePart(0)
 {
 }
@@ -54 +53 @@
 }
 
-void RenderProgress::layout()
-{
-    ASSERT(needsLayout());
-
-    LayoutRepainter repainter(*this, checkForRepaintDuringLayout());
-
-    IntSize oldSize = size();
-
-    calcWidth();
-    calcHeight();
-    if (m_valuePart) {
-        IntRect valuePartRect(borderLeft() + paddingLeft(), borderTop() + paddingTop(), lround((width() - borderLeft() - paddingLeft() - borderRight() - paddingRight()) * position()), height()  - borderTop() - paddingTop() - borderBottom() - paddingBottom());
-        if (style()->direction() == RTL)
-            valuePartRect.setX(width() - borderRight() - paddingRight() - valuePartRect.width());
-        toRenderBox(m_valuePart->renderer())->setFrameRect(valuePartRect);
-
-        if (oldSize != size())
-            m_valuePart->renderer()->setChildNeedsLayout(true, false);
-        
-        LayoutStateMaintainer statePusher(view(), this, size());
-        
-        IntRect oldRect = toRenderBox(m_valuePart->renderer())->frameRect();
-        
-        m_valuePart->renderer()->layoutIfNeeded();
-
-        toRenderBox(m_valuePart->renderer())->setFrameRect(valuePartRect);
-        if (m_valuePart->renderer()->checkForRepaintDuringLayout())
-            m_valuePart->renderer()->repaintDuringLayoutIfMoved(oldRect);
-        
-        statePusher.pop();
-        addOverflowFromChild(toRenderBox(m_valuePart->renderer()));
-    }
-
-    updateAnimationState();
-
-    repainter.repaintAfterLayout();
-
-    setNeedsLayout(false);
-}
-
-void RenderProgress::styleDidChange(StyleDifference diff, const RenderStyle* oldStyle)
-{
-    RenderBlock::styleDidChange(diff, oldStyle);
-
-    updateValuePartState();
-}
-    
 void RenderProgress::updateFromElement()
 {
@@ -109 +61 @@
 
     updateAnimationState();
-
-    updateValuePartState();
-    
-    repaint();
-}
-
-void RenderProgress::updateValuePartState()
-{
-    bool needLayout = !style()->hasAppearance() || m_valuePart;
-    if (!style()->hasAppearance() && !m_valuePart) {
-        m_valuePart = ShadowBlockElement::create(node());
-        RefPtr<RenderStyle> styleForValuePart = createStyleForValuePart(style());
-        m_valuePart->setRenderer(m_valuePart->createRenderer(renderArena(), styleForValuePart.get()));
-        m_valuePart->renderer()->setStyle(styleForValuePart.release());
-        m_valuePart->setAttached();
-        m_valuePart->setInDocument();
-        addChild(m_valuePart->renderer());
-    } else if (style()->hasAppearance() && m_valuePart) {
-        m_valuePart->detach();
-        m_valuePart = 0;
-    }
-    if (needLayout)
-        setNeedsLayout(true);
-}
-
-PassRefPtr<RenderStyle> RenderProgress::createStyleForValuePart(RenderStyle* parentStyle)
-{
-    RefPtr<RenderStyle> styleForValuePart;
-    RenderStyle* pseudoStyle = getCachedPseudoStyle(PROGRESS_BAR_VALUE);
-    if (pseudoStyle)
-        styleForValuePart = RenderStyle::clone(pseudoStyle);
-    else
-        styleForValuePart = RenderStyle::create();
-    
-    if (parentStyle)
-        styleForValuePart->inheritFrom(parentStyle);
-    styleForValuePart->setDisplay(BLOCK);
-    styleForValuePart->setAppearance(ProgressBarValuePart);
-    return styleForValuePart.release();
+    RenderIndicator::updateFromElement();
 }
 
@@ -172 +86 @@
     }
 
-    RenderBlock::paint(paintInfo, tx, ty);
+    RenderIndicator::paint(paintInfo, tx, ty);
+}
+
+void RenderProgress::layoutParts()
+{
+    updatePartsState();
+    if (m_valuePart)
+        m_valuePart->layoutAsPart(valuePartRect());
+    updateAnimationState();
+}
+
+bool RenderProgress::shouldHaveParts() const
+{
+    return !style()->hasAppearance();
+}
+
+void RenderProgress::updatePartsState()
+{
+    if (shouldHaveParts() && !m_valuePart) {
+        m_valuePart = ShadowBlockElement::createForPart(this->node(), PROGRESS_BAR_VALUE);
+        addChild(m_valuePart->renderer());
+    } else if (!shouldHaveParts() && m_valuePart) {
+        m_valuePart->detach();
+        m_valuePart = 0;
+    }
 }
 
@@ -192 +130 @@
 }
 
+IntRect RenderProgress::valuePartRect() const
+{
+    IntRect rect(borderLeft() + paddingLeft(), borderTop() + paddingTop(), lround((width() - borderLeft() - paddingLeft() - borderRight() - paddingRight()) * position()), height()  - borderTop() - paddingTop() - borderBottom() - paddingBottom());
+    if (style()->direction() == RTL)
+        rect.setX(width() - borderRight() - paddingRight() - rect.width());
+    return rect;
+}
+
 HTMLProgressElement* RenderProgress::progressElement() const
 {

trunk/WebCore/rendering/RenderProgress.h

@@ -24 +24 @@
 #if ENABLE(PROGRESS_TAG)
 #include "RenderBlock.h"
+#include "RenderIndicator.h"
 
 namespace WebCore {
@@ -30 +31 @@
 class ShadowBlockElement;
 
-class RenderProgress : public RenderBlock {
+class RenderProgress : public RenderIndicator {
 public:
     RenderProgress(HTMLProgressElement*);
@@ -46 +47 @@
     virtual const char* renderName() const { return "RenderProgress"; }
     virtual bool isProgress() const { return true; }
-    virtual void layout();
     virtual void updateFromElement();
     virtual void paint(PaintInfo&, int tx, int ty);
-    virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle);
 
-    virtual bool requiresForcedStyleRecalcPropagation() const { return true; }
+    virtual void layoutParts();
+    virtual bool shouldHaveParts() const;
+
+    IntRect valuePartRect() const;
 
     void animationTimerFired(Timer<RenderProgress>*);
     void updateAnimationState();
-    void updateValuePartState();
-    PassRefPtr<RenderStyle> createStyleForValuePart(RenderStyle*);
+    void updatePartsState();
 
     double m_position;

trunk/WebCore/rendering/RenderTheme.cpp

@@ -652 +652 @@
         case MenulistPart:
         case ProgressBarPart:
+        case MeterPart:
+        case RelevancyLevelIndicatorPart:
+        case ContinuousCapacityLevelIndicatorPart:
+        case DiscreteCapacityLevelIndicatorPart:
+        case RatingLevelIndicatorPart:
         // FIXME: Uncomment this when making search fields style-able.
         // case SearchFieldPart:
@@ -915 +920 @@
 }
 
-bool RenderTheme::paintMeter(RenderObject* renderObject, const RenderObject::PaintInfo& paintInfo, const IntRect& rect)
-{
-    if (!renderObject->isMeter())
-        return true;
-
-    // Some platforms do not have a native gauge widget, so we draw here a default implementation.
-    RenderMeter* renderMeter = toRenderMeter(renderObject);
-    RenderStyle* style = renderObject->style();
-    int left = style->borderLeft().width() + style->paddingLeft().value();
-    int top = style->borderTop().width() + style->paddingTop().value();
-    int right = style->borderRight().width() + style->paddingRight().value();
-    int bottom = style->borderBottom().width() + style->paddingBottom().value();
-    FloatRect innerRect(rect.x() + left, rect.y() + top, rect.width() - left - right, rect.height() - top - bottom);
-
-    HTMLMeterElement* element = static_cast<HTMLMeterElement*>(renderMeter->node());
-    double min = element->min();
-    double max = element->max();
-    double value = element->value();
-
-    if (min >= max) {
-        paintInfo.context->fillRect(innerRect, Color::black, style->colorSpace());
-        return false;
-    }
-
-    // Paint the background first
-    paintInfo.context->fillRect(innerRect, Color::lightGray, style->colorSpace());
-
-    FloatRect valueRect;
-
-    if (rect.width() < rect.height()) {
-        // Vertical gauge
-        double scale = innerRect.height() / (max - min);
-        valueRect.setLocation(FloatPoint(innerRect.x(), innerRect.y() + narrowPrecisionToFloat((max - value) * scale)));
-        valueRect.setSize(FloatSize(innerRect.width(), narrowPrecisionToFloat((value - min) * scale)));
-    } else if (renderMeter->style()->direction() == RTL) {
-        // right to left horizontal gauge
-        double scale = innerRect.width() / (max - min);
-        valueRect.setLocation(FloatPoint(innerRect.x() + narrowPrecisionToFloat((max - value) * scale), innerRect.y()));
-        valueRect.setSize(FloatSize(narrowPrecisionToFloat((value - min) * scale), innerRect.height()));
-    } else {
-        // left to right horizontal gauge
-        double scale = innerRect.width() / (max - min);
-        valueRect.setLocation(innerRect.location());
-        valueRect.setSize(FloatSize(narrowPrecisionToFloat((value - min) * scale), innerRect.height()));
-    }
-    if (!valueRect.isEmpty())
-        paintInfo.context->fillRect(valueRect, Color::black, style->colorSpace());
-
+bool RenderTheme::supportsMeter(ControlPart, bool) const
+{
     return false;
 }
+
+bool RenderTheme::paintMeter(RenderObject*, const RenderObject::PaintInfo&, const IntRect&)
+{
+    return true;
+}
+
 #endif
 

trunk/WebCore/rendering/RenderTheme.h

@@ -196 +196 @@
 #if ENABLE(METER_TAG)
     virtual IntSize meterSizeForBounds(const RenderMeter*, const IntRect&) const;
+    virtual bool supportsMeter(ControlPart, bool isHorizontal) const;
 #endif
 

trunk/WebCore/rendering/RenderThemeMac.h

@@ -84 +84 @@
     virtual IntSize meterSizeForBounds(const RenderMeter*, const IntRect&) const;
     virtual bool paintMeter(RenderObject*, const RenderObject::PaintInfo&, const IntRect&);
+    virtual bool supportsMeter(ControlPart, bool isHorizontal) const;
 #endif
 

trunk/WebCore/rendering/RenderThemeMac.mm

@@ -840 +840 @@
 }
 
+bool RenderThemeMac::supportsMeter(ControlPart part, bool isHorizontal) const
+{
+    switch (part) {
+    case RelevancyLevelIndicatorPart:
+    case DiscreteCapacityLevelIndicatorPart:
+    case RatingLevelIndicatorPart:
+    case MeterPart:
+    case ContinuousCapacityLevelIndicatorPart:
+        return isHorizontal;
+    default:
+        return false;
+    }
+}
+
 NSLevelIndicatorStyle RenderThemeMac::levelIndicatorStyleFor(ControlPart part) const
 {

trunk/WebCore/rendering/ShadowElement.cpp

@@ -23 +23 @@
 
 #include "HTMLNames.h"
+#include "RenderTheme.h"
+#include "RenderView.h"
 
 namespace WebCore {
@@ -38 +40 @@
 }
 
+void ShadowBlockElement::layoutAsPart(const IntRect& partRect)
+{
+    RenderBox* parentRenderer = toRenderBox(renderer()->parent());
+    RenderBox* selfRenderer = toRenderBox(renderer());
+    IntRect oldRect = selfRenderer->frameRect();
+
+    LayoutStateMaintainer statePusher(parentRenderer->view(), parentRenderer, parentRenderer->size());
+
+    if (oldRect.size() != partRect.size())
+        selfRenderer->setChildNeedsLayout(true, false);
+
+    selfRenderer->layoutIfNeeded();
+    selfRenderer->setFrameRect(partRect);
+
+    if (selfRenderer->checkForRepaintDuringLayout())
+        selfRenderer->repaintDuringLayoutIfMoved(oldRect);
+        
+    statePusher.pop();
+    parentRenderer->addOverflowFromChild(selfRenderer);
+}
+
+void ShadowBlockElement::updateStyleForPart(PseudoId pseudoId)
+{
+    if (renderer()->style()->styleType() != pseudoId)
+        renderer()->setStyle(createStyleForPart(renderer()->parent(), pseudoId));
+}
+
+PassRefPtr<ShadowBlockElement> ShadowBlockElement::createForPart(Node* shadowParent, PseudoId pseudoId)
+{
+    RenderObject* parentRenderer = shadowParent->renderer();
+    RefPtr<RenderStyle> styleForPart = createStyleForPart(parentRenderer, pseudoId);
+    RefPtr<ShadowBlockElement> part = create(shadowParent);
+    part->setRenderer(part->createRenderer(parentRenderer->renderArena(), styleForPart.get()));
+    part->renderer()->setStyle(styleForPart.release());
+    part->setAttached();
+    part->setInDocument();
+    return part.release();
+}
+
+PassRefPtr<RenderStyle> ShadowBlockElement::createStyleForPart(RenderObject* parentRenderer, PseudoId pseudoId)
+{
+    RefPtr<RenderStyle> styleForPart;
+    RenderStyle* pseudoStyle = parentRenderer->getCachedPseudoStyle(pseudoId);
+    if (pseudoStyle)
+        styleForPart = RenderStyle::clone(pseudoStyle);
+    else
+        styleForPart = RenderStyle::create();
+    
+    styleForPart->inheritFrom(parentRenderer->style());
+    styleForPart->setDisplay(BLOCK);
+    styleForPart->setAppearance(NoControlPart);
+    return styleForPart.release();
+}
+
+bool ShadowBlockElement::partShouldHaveStyle(const RenderObject* parentRenderer, PseudoId pseudoId)
+{
+    // We have some -webkit-appearance values for default styles of parts and
+    // that appearance get turned off during RenderStyle creation 
+    // if they have background styles specified.
+    // So !hasAppearance() implies that there are something to be styled.
+    RenderStyle* pseudoStyle = parentRenderer->getCachedPseudoStyle(pseudoId);
+    return !(pseudoStyle && pseudoStyle->hasAppearance());
+}
+
 PassRefPtr<ShadowInputElement> ShadowInputElement::create(Node* shadowParent)
 {

trunk/WebCore/rendering/ShadowElement.h

@@ -56 +56 @@
 public:
     static PassRefPtr<ShadowBlockElement> create(Node*);
+    static PassRefPtr<ShadowBlockElement> createForPart(Node*, PseudoId);
+    static bool partShouldHaveStyle(const RenderObject* parentRenderer, PseudoId pseudoId);
+    void layoutAsPart(const IntRect& partRect);
+    void updateStyleForPart(PseudoId);
+
 protected:
     ShadowBlockElement(Node*);
+
+private:
+    static PassRefPtr<RenderStyle> createStyleForPart(RenderObject*, PseudoId);
 };
 

trunk/WebCore/rendering/style/RenderStyleConstants.h

@@ -76 +76 @@
     MEDIA_CONTROLS_STATUS_DISPLAY, SCROLLBAR_THUMB, SCROLLBAR_BUTTON, SCROLLBAR_TRACK, SCROLLBAR_TRACK_PIECE, SCROLLBAR_CORNER, RESIZER,
     INPUT_LIST_BUTTON, INNER_SPIN_BUTTON, OUTER_SPIN_BUTTON, VISITED_LINK, PROGRESS_BAR_VALUE,
-
+    METER_HORIZONTAL_BAR, METER_HORIZONTAL_OPTIMUM, METER_HORIZONTAL_SUBOPTIMAL, METER_HORIZONTAL_EVEN_LESS_GOOD,
+    METER_VERTICAL_BAR, METER_VERTICAL_OPTIMUM, METER_VERTICAL_SUBOPTIMAL, METER_VERTICAL_EVEN_LESS_GOOD, 
     AFTER_LAST_INTERNAL_PSEUDOID,
     FIRST_PUBLIC_PSEUDOID = FIRST_LINE,