WebKit Merge 40875:41017, Chromium side

R=tc
BUG=NONE

The changes are to account for:

http://trac.webkit.org/changeset/40925 -- Adding MediaPlayerPrivate
http://trac.webkit.org/changeset/40981 -- Converting GKURL constructor arg to CString.

Review URL: http://codereview.chromium.org/20409

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9860 0039d316-1c4b-4281-b951-d872f2087c98

13 files changed, 910 insertions, 419 deletions

diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/css/computed-style-expected.txt b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/css/computed-style-expected.txt
new file mode 100644
index 0000000..a8c70794
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/css/computed-style-expected.txt
@@ -0,0 +1,207 @@
+Attributes that are exposed in the CSS computed style object:

+

+background-attachment: scroll;

+background-color: rgba(0, 0, 0, 0);

+background-image: none;

+background-position: 0% 0%;

+background-repeat: repeat;

+border-bottom-color: rgb(0, 0, 0);

+border-bottom-style: none;

+border-bottom-width: 0px;

+border-collapse: separate;

+border-left-color: rgb(0, 0, 0);

+border-left-style: none;

+border-left-width: 0px;

+border-right-color: rgb(0, 0, 0);

+border-right-style: none;

+border-right-width: 0px;

+border-top-color: rgb(0, 0, 0);

+border-top-style: none;

+border-top-width: 0px;

+bottom: auto;

+caption-side: top;

+clear: none;

+color: rgb(0, 0, 0);

+cursor: auto;

+direction: ltr;

+display: block;

+empty-cells: show;

+float: none;

+font-family: 'times new roman';

+font-size: 16px;

+font-style: normal;

+font-variant: normal;

+font-weight: normal;

+height: 576px;

+left: auto;

+letter-spacing: normal;

+line-height: normal;

+list-style-image: none;

+list-style-position: outside;

+list-style-type: disc;

+margin-bottom: 8px;

+margin-left: 8px;

+margin-right: 8px;

+margin-top: 8px;

+max-height: none;

+max-width: none;

+min-height: 0px;

+min-width: 0px;

+opacity: 1;

+orphans: 2;

+outline-color: rgb(0, 0, 0);

+outline-style: none;

+outline-width: 0px;

+overflow-x: visible;

+overflow-y: visible;

+padding-bottom: 0px;

+padding-left: 0px;

+padding-right: 0px;

+padding-top: 0px;

+page-break-after: auto;

+page-break-before: auto;

+page-break-inside: auto;

+pointer-events: auto;

+position: static;

+resize: none;

+right: auto;

+table-layout: auto;

+text-align: auto;

+text-decoration: none;

+text-indent: 0px;

+text-shadow: none;

+text-transform: none;

+top: auto;

+unicode-bidi: normal;

+vertical-align: baseline;

+visibility: visible;

+white-space: normal;

+widows: 2;

+width: 784px;

+word-spacing: 0px;

+word-wrap: normal;

+z-index: auto;

+zoom: 1;

+-webkit-animation-delay: 0s;

+-webkit-animation-direction: normal;

+-webkit-animation-duration: 0s;

+-webkit-animation-iteration-count: 1;

+-webkit-animation-name: none;

+-webkit-animation-timing-function: cubic-bezier(0.25, 0.1, 0.25, 1);

+-webkit-appearance: none;

+-webkit-backface-visibility: visible;

+-webkit-background-clip: border;

+-webkit-background-composite: source-over;

+-webkit-background-origin: padding;

+-webkit-background-size: auto auto;

+-webkit-border-fit: border;

+-webkit-border-image: none;

+-webkit-border-horizontal-spacing: 0px;

+-webkit-border-vertical-spacing: 0px;

+-webkit-box-align: stretch;

+-webkit-box-direction: normal;

+-webkit-box-flex: 0;

+-webkit-box-flex-group: 1;

+-webkit-box-lines: single;

+-webkit-box-ordinal-group: 1;

+-webkit-box-orient: horizontal;

+-webkit-box-pack: start;

+-webkit-box-reflect: none;

+-webkit-box-shadow: none;

+-webkit-box-sizing: content-box;

+-webkit-column-break-after: auto;

+-webkit-column-break-before: auto;

+-webkit-column-break-inside: auto;

+-webkit-column-count: auto;

+-webkit-column-gap: normal;

+-webkit-column-rule-color: rgb(0, 0, 0);

+-webkit-column-rule-style: none;

+-webkit-column-rule-width: 0px;

+-webkit-column-width: auto;

+-webkit-highlight: none;

+-webkit-line-break: normal;

+-webkit-line-clamp: none;

+-webkit-margin-bottom-collapse: collapse;

+-webkit-margin-top-collapse: collapse;

+-webkit-marquee-direction: auto;

+-webkit-marquee-increment: 6px;

+-webkit-marquee-repetition: infinite;

+-webkit-marquee-style: scroll;

+-webkit-mask-attachment: scroll;

+-webkit-mask-box-image: none;

+-webkit-mask-image: none;

+-webkit-mask-position: 0% 0%;

+-webkit-mask-repeat: repeat;

+-webkit-mask-clip: border;

+-webkit-mask-composite: source-over;

+-webkit-mask-origin: border;

+-webkit-mask-size: auto auto;

+-webkit-nbsp-mode: normal;

+-webkit-perspective: none;

+-webkit-perspective-origin: 392px 288px;

+-webkit-rtl-ordering: logical;

+-webkit-text-decorations-in-effect: none;

+-webkit-text-fill-color: rgb(0, 0, 0);

+-webkit-text-security: none;

+-webkit-text-stroke-color: rgb(0, 0, 0);

+-webkit-text-stroke-width: 0px;

+-webkit-transform: none;

+-webkit-transform-origin: 392px 288px;

+-webkit-transform-style: flat;

+-webkit-transition-delay: 0s;

+-webkit-transition-duration: 0s;

+-webkit-transition-property: all;

+-webkit-transition-timing-function: cubic-bezier(0.25, 0.1, 0.25, 1);

+-webkit-user-drag: auto;

+-webkit-user-modify: read-only;

+-webkit-user-select: text;

+-webkit-border-bottom-left-radius: 0px;

+-webkit-border-bottom-right-radius: 0px;

+-webkit-border-top-left-radius: 0px;

+-webkit-border-top-right-radius: 0px;

+clip-path: none;

+clip-rule: nonzero;

+mask: none;

+filter: none;

+flood-color: rgb(0, 0, 0);

+flood-opacity: 1;

+lighting-color: rgb(255, 255, 255);

+stop-color: rgb(0, 0, 0);

+stop-opacity: 1;

+color-interpolation: srgb;

+color-interpolation-filters: linearrgb;

+color-rendering: auto;

+fill: #000000;

+fill-opacity: 1;

+fill-rule: nonzero;

+image-rendering: auto;

+marker-end: none;

+marker-mid: none;

+marker-start: none;

+shape-rendering: auto;

+stroke: none;

+stroke-dasharray: ;

+stroke-dashoffset: ;

+stroke-linecap: butt;

+stroke-linejoin: miter;

+stroke-miterlimit: 4;

+stroke-opacity: 1;

+stroke-width: ;

+text-rendering: auto;

+alignment-baseline: auto;

+baseline-shift: baseline;

+dominant-baseline: auto;

+kerning: ;

+text-anchor: start;

+writing-mode: lr-tb;

+glyph-orientation-horizontal: 0deg;

+glyph-orientation-vertical: auto;

+

+Other attributes that the computed style class supports:

+

+background-position: 0% 0%;

+border-spacing: 0px 0px;

+overflow: visible;

+-webkit-match-nearest-mail-blockquote-color: normal;

+-webkit-text-size-adjust: auto;

+

diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/css/computed-style-without-renderer-expected.txt b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/css/computed-style-without-renderer-expected.txt
new file mode 100644
index 0000000..fd118c6
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/css/computed-style-without-renderer-expected.txt
@@ -0,0 +1,218 @@
+Computed style of an element whose parent's 'display' value is 'none':

+    background-attachment: scroll

+    background-color: rgb(0, 128, 0)

+    background-image: none

+    background-position: 0% 0%

+    background-repeat: repeat

+    border-bottom-color: rgb(0, 0, 0)

+    border-bottom-style: none

+    border-bottom-width: 0px

+    border-collapse: separate

+    border-left-color: rgb(0, 0, 0)

+    border-left-style: none

+    border-left-width: 0px

+    border-right-color: rgb(0, 0, 0)

+    border-right-style: none

+    border-right-width: 0px

+    border-top-color: rgb(0, 0, 0)

+    border-top-style: solid

+    border-top-width: 16px

+    bottom: auto

+    caption-side: top

+    clear: none

+    color: rgb(0, 0, 0)

+    cursor: auto

+    direction: ltr

+    display: block

+    empty-cells: show

+    float: none

+    font-family: 'times new roman'

+    font-size: 16px

+    font-style: normal

+    font-variant: normal

+    font-weight: normal

+    height: 100px

+    left: auto

+    letter-spacing: normal

+    line-height: normal

+    list-style-image: none

+    list-style-position: outside

+    list-style-type: disc

+    margin-bottom: 0px

+    margin-left: auto

+    margin-right: 0px

+    margin-top: 0px

+    max-height: none

+    max-width: none

+    min-height: 0px

+    min-width: 0px

+    opacity: 1

+    orphans: 2

+    outline-color: rgb(0, 0, 0)

+    outline-style: none

+    outline-width: 0px

+    overflow-x: visible

+    overflow-y: visible

+    padding-bottom: 0px

+    padding-left: 0px

+    padding-right: 0px

+    padding-top: 0px

+    page-break-after: auto

+    page-break-before: auto

+    page-break-inside: auto

+    pointer-events: auto

+    position: static

+    resize: none

+    right: auto

+    table-layout: auto

+    text-align: auto

+    text-decoration: none

+    text-indent: 0px

+    text-shadow: none

+    text-transform: none

+    top: auto

+    unicode-bidi: normal

+    vertical-align: baseline

+    visibility: visible

+    white-space: normal

+    widows: 2

+    width: 50%

+    word-spacing: 0px

+    word-wrap: normal

+    z-index: auto

+    zoom: 1

+    -webkit-animation-delay: 0s

+    -webkit-animation-direction: normal

+    -webkit-animation-duration: 0s

+    -webkit-animation-iteration-count: 1

+    -webkit-animation-name: none

+    -webkit-animation-timing-function: cubic-bezier(0.25, 0.1, 0.25, 1)

+    -webkit-appearance: none

+    -webkit-backface-visibility: visible

+    -webkit-background-clip: border

+    -webkit-background-composite: source-over

+    -webkit-background-origin: padding

+    -webkit-background-size: auto auto

+    -webkit-border-fit: border

+    -webkit-border-image: none

+    -webkit-border-horizontal-spacing: 0px

+    -webkit-border-vertical-spacing: 0px

+    -webkit-box-align: stretch

+    -webkit-box-direction: normal

+    -webkit-box-flex: 0

+    -webkit-box-flex-group: 1

+    -webkit-box-lines: single

+    -webkit-box-ordinal-group: 1

+    -webkit-box-orient: horizontal

+    -webkit-box-pack: start

+    -webkit-box-reflect: none

+    -webkit-box-shadow: none

+    -webkit-box-sizing: content-box

+    -webkit-column-break-after: auto

+    -webkit-column-break-before: auto

+    -webkit-column-break-inside: auto

+    -webkit-column-count: auto

+    -webkit-column-gap: normal

+    -webkit-column-rule-color: rgb(0, 0, 0)

+    -webkit-column-rule-style: none

+    -webkit-column-rule-width: 0px

+    -webkit-column-width: auto

+    -webkit-highlight: none

+    -webkit-line-break: normal

+    -webkit-line-clamp: none

+    -webkit-margin-bottom-collapse: collapse

+    -webkit-margin-top-collapse: collapse

+    -webkit-marquee-direction: auto

+    -webkit-marquee-increment: 6px

+    -webkit-marquee-repetition: infinite

+    -webkit-marquee-style: scroll

+    -webkit-mask-attachment: scroll

+    -webkit-mask-box-image: none

+    -webkit-mask-image: none

+    -webkit-mask-position: 0% 0%

+    -webkit-mask-repeat: repeat

+    -webkit-mask-clip: border

+    -webkit-mask-composite: source-over

+    -webkit-mask-origin: border

+    -webkit-mask-size: auto auto

+    -webkit-nbsp-mode: normal

+    -webkit-perspective: none

+    -webkit-perspective-origin: 50% 50%

+    -webkit-rtl-ordering: logical

+    -webkit-text-decorations-in-effect: none

+    -webkit-text-fill-color: rgb(0, 0, 0)

+    -webkit-text-security: none

+    -webkit-text-stroke-color: rgb(0, 0, 0)

+    -webkit-text-stroke-width: 0px

+    -webkit-transform: none

+    -webkit-transform-origin: 50% 50%

+    -webkit-transform-style: flat

+    -webkit-transition-delay: 0s

+    -webkit-transition-duration: 0s

+    -webkit-transition-property: all

+    -webkit-transition-timing-function: cubic-bezier(0.25, 0.1, 0.25, 1)

+    -webkit-user-drag: auto

+    -webkit-user-modify: read-only

+    -webkit-user-select: text

+    -webkit-border-bottom-left-radius: 0px

+    -webkit-border-bottom-right-radius: 0px

+    -webkit-border-top-left-radius: 0px

+    -webkit-border-top-right-radius: 0px

+    clip-path: none

+    clip-rule: nonzero

+    mask: none

+    filter: none

+    flood-color: rgb(0, 0, 0)

+    flood-opacity: 1

+    lighting-color: rgb(255, 255, 255)

+    stop-color: rgb(0, 0, 0)

+    stop-opacity: 1

+    color-interpolation: srgb

+    color-interpolation-filters: linearrgb

+    color-rendering: auto

+    fill: #000000

+    fill-opacity: 1

+    fill-rule: nonzero

+    image-rendering: auto

+    marker-end: none

+    marker-mid: none

+    marker-start: none

+    shape-rendering: auto

+    stroke: none

+    stroke-dasharray: 

+    stroke-dashoffset: 

+    stroke-linecap: butt

+    stroke-linejoin: miter

+    stroke-miterlimit: 4

+    stroke-opacity: 1

+    stroke-width: 

+    text-rendering: auto

+    alignment-baseline: auto

+    baseline-shift: baseline

+    dominant-baseline: auto

+    kerning: 

+    text-anchor: start

+    writing-mode: lr-tb

+    glyph-orientation-horizontal: 0deg

+    glyph-orientation-vertical: auto

+    background-position: 0% 0%

+    border-spacing: 0px 0px

+    overflow: visible

+    -webkit-match-nearest-mail-blockquote-color: normal

+    -webkit-text-size-adjust: auto

+

+After changing grandparent's 'color' and the parent's 'font-size' inherited properties:

+    border-top-width: 18px

+    color: rgb(0, 0, 255)

+

+After changing the parent's 'display' property to 'block', so that the child gets a renderer:

+    height: 100px

+    margin-left: 385px

+    width: 384px

+

+After changing the parent's 'display' property back to 'none':

+    height: 100px

+    margin-left: auto

+    width: 50%

+

+

diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css-generated-content/beforeAfter-interdocument-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css-generated-content/beforeAfter-interdocument-expected.checksum
new file mode 100644
index 0000000..8eb8c68
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css-generated-content/beforeAfter-interdocument-expected.checksum
@@ -0,0 +1 @@
+91b80f4170b84d60c07db1a5d53a8962
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css-generated-content/beforeAfter-interdocument-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css-generated-content/beforeAfter-interdocument-expected.png
new file mode 100644
index 0000000..a1ddc4a
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css-generated-content/beforeAfter-interdocument-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css-generated-content/beforeAfter-interdocument-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css-generated-content/beforeAfter-interdocument-expected.txt
new file mode 100644
index 0000000..000f3aa
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css-generated-content/beforeAfter-interdocument-expected.txt
@@ -0,0 +1,33 @@
+layer at (0,0) size 800x600

+  RenderView at (0,0) size 800x600

+layer at (0,0) size 800x600

+  RenderBlock {HTML} at (0,0) size 800x600

+    RenderBody {BODY} at (8,8) size 784x584

+      RenderBlock {P} at (0,0) size 784x20

+        RenderText {#text} at (0,0) size 28x19

+          text run at (0,0) width 28: "Bug "

+        RenderInline {A} at (0,0) size 44x19 [color=#0000EE]

+          RenderText {#text} at (28,0) size 44x19

+            text run at (28,0) width 44: "23826 "

+        RenderText {#text} at (72,0) size 532x19

+          text run at (72,0) width 532: ": Potential bug with before/after rule while moving element from one document to another"

+      RenderBlock {P} at (0,36) size 784x20

+        RenderText {#text} at (0,0) size 509x19

+          text run at (0,0) width 509: "This test that moving a quote element sets the before / after flag in the final document."

+      RenderBlock {DIV} at (0,72) size 784x56

+        RenderBlock (anonymous) at (0,0) size 784x20

+          RenderInline {Q} at (0,0) size 149x19

+            RenderInline (generated) at (0,0) size 5x19

+              RenderText at (0,0) size 5x19

+                text run at (0,0) width 5: "\""

+            RenderText {#text} at (5,0) size 144x19

+              text run at (5,0) width 144: "Quotes should surround"

+        RenderBlock (anonymous) at (0,36) size 784x0

+          RenderBlock {P} at (0,0) size 784x0

+        RenderBlock (anonymous) at (0,36) size 784x20

+          RenderInline {Q} at (0,0) size 55x19

+            RenderText {#text} at (0,0) size 50x19

+              text run at (0,0) width 50: "this text."

+            RenderInline (generated) at (0,0) size 5x19

+              RenderText at (50,0) size 5x19

+                text run at (50,0) width 5: "\""

diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/computed-style-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/computed-style-expected.txt
index 68828eb..a8c70794 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/computed-style-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/computed-style-expected.txt
@@ -1,202 +1,207 @@
-Attributes that are exposed in the CSS computed style object:
-
-background-attachment: scroll;
-background-color: rgba(0, 0, 0, 0);
-background-image: none;
-background-position: 0% 0%;
-background-repeat: repeat;
-border-bottom-color: rgb(0, 0, 0);
-border-bottom-style: none;
-border-bottom-width: 0px;
-border-collapse: separate;
-border-left-color: rgb(0, 0, 0);
-border-left-style: none;
-border-left-width: 0px;
-border-right-color: rgb(0, 0, 0);
-border-right-style: none;
-border-right-width: 0px;
-border-top-color: rgb(0, 0, 0);
-border-top-style: none;
-border-top-width: 0px;
-bottom: auto;
-caption-side: top;
-clear: none;
-color: rgb(0, 0, 0);
-cursor: auto;
-direction: ltr;
-display: block;
-empty-cells: show;
-float: none;
-font-family: 'times new roman';
-font-size: 16px;
-font-style: normal;
-font-variant: normal;
-font-weight: normal;
-height: 576px;
-left: auto;
-letter-spacing: normal;
-line-height: normal;
-list-style-image: none;
-list-style-position: outside;
-list-style-type: disc;
-margin-bottom: 8px;
-margin-left: 8px;
-margin-right: 8px;
-margin-top: 8px;
-max-height: none;
-max-width: none;
-min-height: 0px;
-min-width: 0px;
-opacity: 1;
-orphans: 2;
-outline-color: rgb(0, 0, 0);
-outline-style: none;
-outline-width: 0px;
-overflow-x: visible;
-overflow-y: visible;
-padding-bottom: 0px;
-padding-left: 0px;
-padding-right: 0px;
-padding-top: 0px;
-page-break-after: auto;
-page-break-before: auto;
-page-break-inside: auto;
-pointer-events: auto;
-position: static;
-resize: none;
-right: auto;
-table-layout: auto;
-text-align: auto;
-text-decoration: none;
-text-indent: 0px;
-text-shadow: none;
-text-transform: none;
-top: auto;
-unicode-bidi: normal;
-vertical-align: baseline;
-visibility: visible;
-white-space: normal;
-widows: 2;
-width: 784px;
-word-spacing: 0px;
-word-wrap: normal;
-z-index: auto;
-zoom: 1;
--webkit-animation-delay: 0s;
--webkit-animation-direction: normal;
--webkit-animation-duration: 0s;
--webkit-animation-iteration-count: 1;
--webkit-animation-name: none;
--webkit-animation-timing-function: cubic-bezier(0.25, 0.1, 0.25, 1);
--webkit-appearance: none;
--webkit-background-clip: border;
--webkit-background-composite: source-over;
--webkit-background-origin: padding;
--webkit-background-size: auto auto;
--webkit-border-fit: border;
--webkit-border-image: none;
--webkit-border-horizontal-spacing: 0px;
--webkit-border-vertical-spacing: 0px;
--webkit-box-align: stretch;
--webkit-box-direction: normal;
--webkit-box-flex: 0;
--webkit-box-flex-group: 1;
--webkit-box-lines: single;
--webkit-box-ordinal-group: 1;
--webkit-box-orient: horizontal;
--webkit-box-pack: start;
--webkit-box-reflect: none;
--webkit-box-shadow: none;
--webkit-box-sizing: content-box;
--webkit-column-break-after: auto;
--webkit-column-break-before: auto;
--webkit-column-break-inside: auto;
--webkit-column-count: auto;
--webkit-column-gap: normal;
--webkit-column-rule-color: rgb(0, 0, 0);
--webkit-column-rule-style: none;
--webkit-column-rule-width: 0px;
--webkit-column-width: auto;
--webkit-highlight: none;
--webkit-line-break: normal;
--webkit-line-clamp: none;
--webkit-margin-bottom-collapse: collapse;
--webkit-margin-top-collapse: collapse;
--webkit-marquee-direction: auto;
--webkit-marquee-increment: 6px;
--webkit-marquee-repetition: infinite;
--webkit-marquee-style: scroll;
--webkit-mask-attachment: scroll;
--webkit-mask-box-image: none;
--webkit-mask-image: none;
--webkit-mask-position: 0% 0%;
--webkit-mask-repeat: repeat;
--webkit-mask-clip: border;
--webkit-mask-composite: source-over;
--webkit-mask-origin: border;
--webkit-mask-size: auto auto;
--webkit-nbsp-mode: normal;
--webkit-rtl-ordering: logical;
--webkit-text-decorations-in-effect: none;
--webkit-text-fill-color: rgb(0, 0, 0);
--webkit-text-security: none;
--webkit-text-stroke-color: rgb(0, 0, 0);
--webkit-text-stroke-width: 0px;
--webkit-transform: none;
--webkit-transform-origin: 392px 288px;
--webkit-transition-delay: 0s;
--webkit-transition-duration: 0s;
--webkit-transition-property: all;
--webkit-transition-timing-function: cubic-bezier(0.25, 0.1, 0.25, 1);
--webkit-user-drag: auto;
--webkit-user-modify: read-only;
--webkit-user-select: text;
--webkit-border-bottom-left-radius: 0px;
--webkit-border-bottom-right-radius: 0px;
--webkit-border-top-left-radius: 0px;
--webkit-border-top-right-radius: 0px;
-clip-path: none;
-clip-rule: nonzero;
-mask: none;
-filter: none;
-flood-color: rgb(0, 0, 0);
-flood-opacity: 1;
-lighting-color: rgb(255, 255, 255);
-stop-color: rgb(0, 0, 0);
-stop-opacity: 1;
-color-interpolation: srgb;
-color-interpolation-filters: linearrgb;
-color-rendering: auto;
-fill: #000000;
-fill-opacity: 1;
-fill-rule: nonzero;
-image-rendering: auto;
-marker-end: none;
-marker-mid: none;
-marker-start: none;
-shape-rendering: auto;
-stroke: none;
-stroke-dasharray: ;
-stroke-dashoffset: ;
-stroke-linecap: butt;
-stroke-linejoin: miter;
-stroke-miterlimit: 4;
-stroke-opacity: 1;
-stroke-width: ;
-text-rendering: auto;
-alignment-baseline: auto;
-baseline-shift: baseline;
-dominant-baseline: auto;
-kerning: ;
-text-anchor: start;
-writing-mode: lr-tb;
-glyph-orientation-horizontal: 0deg;
-glyph-orientation-vertical: auto;
-
-Other attributes that the computed style class supports:
-
-background-position: 0% 0%;
-border-spacing: 0px 0px;
-overflow: visible;
--webkit-match-nearest-mail-blockquote-color: normal;
--webkit-text-size-adjust: auto;
+Attributes that are exposed in the CSS computed style object:

+

+background-attachment: scroll;

+background-color: rgba(0, 0, 0, 0);

+background-image: none;

+background-position: 0% 0%;

+background-repeat: repeat;

+border-bottom-color: rgb(0, 0, 0);

+border-bottom-style: none;

+border-bottom-width: 0px;

+border-collapse: separate;

+border-left-color: rgb(0, 0, 0);

+border-left-style: none;

+border-left-width: 0px;

+border-right-color: rgb(0, 0, 0);

+border-right-style: none;

+border-right-width: 0px;

+border-top-color: rgb(0, 0, 0);

+border-top-style: none;

+border-top-width: 0px;

+bottom: auto;

+caption-side: top;

+clear: none;

+color: rgb(0, 0, 0);

+cursor: auto;

+direction: ltr;

+display: block;

+empty-cells: show;

+float: none;

+font-family: 'times new roman';

+font-size: 16px;

+font-style: normal;

+font-variant: normal;

+font-weight: normal;

+height: 576px;

+left: auto;

+letter-spacing: normal;

+line-height: normal;

+list-style-image: none;

+list-style-position: outside;

+list-style-type: disc;

+margin-bottom: 8px;

+margin-left: 8px;

+margin-right: 8px;

+margin-top: 8px;

+max-height: none;

+max-width: none;

+min-height: 0px;

+min-width: 0px;

+opacity: 1;

+orphans: 2;

+outline-color: rgb(0, 0, 0);

+outline-style: none;

+outline-width: 0px;

+overflow-x: visible;

+overflow-y: visible;

+padding-bottom: 0px;

+padding-left: 0px;

+padding-right: 0px;

+padding-top: 0px;

+page-break-after: auto;

+page-break-before: auto;

+page-break-inside: auto;

+pointer-events: auto;

+position: static;

+resize: none;

+right: auto;

+table-layout: auto;

+text-align: auto;

+text-decoration: none;

+text-indent: 0px;

+text-shadow: none;

+text-transform: none;

+top: auto;

+unicode-bidi: normal;

+vertical-align: baseline;

+visibility: visible;

+white-space: normal;

+widows: 2;

+width: 784px;

+word-spacing: 0px;

+word-wrap: normal;

+z-index: auto;

+zoom: 1;

+-webkit-animation-delay: 0s;

+-webkit-animation-direction: normal;

+-webkit-animation-duration: 0s;

+-webkit-animation-iteration-count: 1;

+-webkit-animation-name: none;

+-webkit-animation-timing-function: cubic-bezier(0.25, 0.1, 0.25, 1);

+-webkit-appearance: none;

+-webkit-backface-visibility: visible;

+-webkit-background-clip: border;

+-webkit-background-composite: source-over;

+-webkit-background-origin: padding;

+-webkit-background-size: auto auto;

+-webkit-border-fit: border;

+-webkit-border-image: none;

+-webkit-border-horizontal-spacing: 0px;

+-webkit-border-vertical-spacing: 0px;

+-webkit-box-align: stretch;

+-webkit-box-direction: normal;

+-webkit-box-flex: 0;

+-webkit-box-flex-group: 1;

+-webkit-box-lines: single;

+-webkit-box-ordinal-group: 1;

+-webkit-box-orient: horizontal;

+-webkit-box-pack: start;

+-webkit-box-reflect: none;

+-webkit-box-shadow: none;

+-webkit-box-sizing: content-box;

+-webkit-column-break-after: auto;

+-webkit-column-break-before: auto;

+-webkit-column-break-inside: auto;

+-webkit-column-count: auto;

+-webkit-column-gap: normal;

+-webkit-column-rule-color: rgb(0, 0, 0);

+-webkit-column-rule-style: none;

+-webkit-column-rule-width: 0px;

+-webkit-column-width: auto;

+-webkit-highlight: none;

+-webkit-line-break: normal;

+-webkit-line-clamp: none;

+-webkit-margin-bottom-collapse: collapse;

+-webkit-margin-top-collapse: collapse;

+-webkit-marquee-direction: auto;

+-webkit-marquee-increment: 6px;

+-webkit-marquee-repetition: infinite;

+-webkit-marquee-style: scroll;

+-webkit-mask-attachment: scroll;

+-webkit-mask-box-image: none;

+-webkit-mask-image: none;

+-webkit-mask-position: 0% 0%;

+-webkit-mask-repeat: repeat;

+-webkit-mask-clip: border;

+-webkit-mask-composite: source-over;

+-webkit-mask-origin: border;

+-webkit-mask-size: auto auto;

+-webkit-nbsp-mode: normal;

+-webkit-perspective: none;

+-webkit-perspective-origin: 392px 288px;

+-webkit-rtl-ordering: logical;

+-webkit-text-decorations-in-effect: none;

+-webkit-text-fill-color: rgb(0, 0, 0);

+-webkit-text-security: none;

+-webkit-text-stroke-color: rgb(0, 0, 0);

+-webkit-text-stroke-width: 0px;

+-webkit-transform: none;

+-webkit-transform-origin: 392px 288px;

+-webkit-transform-style: flat;

+-webkit-transition-delay: 0s;

+-webkit-transition-duration: 0s;

+-webkit-transition-property: all;

+-webkit-transition-timing-function: cubic-bezier(0.25, 0.1, 0.25, 1);

+-webkit-user-drag: auto;

+-webkit-user-modify: read-only;

+-webkit-user-select: text;

+-webkit-border-bottom-left-radius: 0px;

+-webkit-border-bottom-right-radius: 0px;

+-webkit-border-top-left-radius: 0px;

+-webkit-border-top-right-radius: 0px;

+clip-path: none;

+clip-rule: nonzero;

+mask: none;

+filter: none;

+flood-color: rgb(0, 0, 0);

+flood-opacity: 1;

+lighting-color: rgb(255, 255, 255);

+stop-color: rgb(0, 0, 0);

+stop-opacity: 1;

+color-interpolation: srgb;

+color-interpolation-filters: linearrgb;

+color-rendering: auto;

+fill: #000000;

+fill-opacity: 1;

+fill-rule: nonzero;

+image-rendering: auto;

+marker-end: none;

+marker-mid: none;

+marker-start: none;

+shape-rendering: auto;

+stroke: none;

+stroke-dasharray: ;

+stroke-dashoffset: ;

+stroke-linecap: butt;

+stroke-linejoin: miter;

+stroke-miterlimit: 4;

+stroke-opacity: 1;

+stroke-width: ;

+text-rendering: auto;

+alignment-baseline: auto;

+baseline-shift: baseline;

+dominant-baseline: auto;

+kerning: ;

+text-anchor: start;

+writing-mode: lr-tb;

+glyph-orientation-horizontal: 0deg;

+glyph-orientation-vertical: auto;

+

+Other attributes that the computed style class supports:

+

+background-position: 0% 0%;

+border-spacing: 0px 0px;

+overflow: visible;

+-webkit-match-nearest-mail-blockquote-color: normal;

+-webkit-text-size-adjust: auto;

+

diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/computed-style-without-renderer-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/computed-style-without-renderer-expected.txt
index 251db48..fd118c6 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/computed-style-without-renderer-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/computed-style-without-renderer-expected.txt
@@ -1,212 +1,218 @@
-Computed style of an element whose parent's 'display' value is 'none':
-    background-attachment: scroll
-    background-color: rgb(0, 128, 0)
-    background-image: none
-    background-position: 0% 0%
-    background-repeat: repeat
-    border-bottom-color: rgb(0, 0, 0)
-    border-bottom-style: none
-    border-bottom-width: 0px
-    border-collapse: separate
-    border-left-color: rgb(0, 0, 0)
-    border-left-style: none
-    border-left-width: 0px
-    border-right-color: rgb(0, 0, 0)
-    border-right-style: none
-    border-right-width: 0px
-    border-top-color: rgb(0, 0, 0)
-    border-top-style: solid
-    border-top-width: 16px
-    bottom: auto
-    caption-side: top
-    clear: none
-    color: rgb(0, 0, 0)
-    cursor: auto
-    direction: ltr
-    display: block
-    empty-cells: show
-    float: none
-    font-family: 'times new roman'
-    font-size: 16px
-    font-style: normal
-    font-variant: normal
-    font-weight: normal
-    height: 100px
-    left: auto
-    letter-spacing: normal
-    line-height: normal
-    list-style-image: none
-    list-style-position: outside
-    list-style-type: disc
-    margin-bottom: 0px
-    margin-left: auto
-    margin-right: 0px
-    margin-top: 0px
-    max-height: none
-    max-width: none
-    min-height: 0px
-    min-width: 0px
-    opacity: 1
-    orphans: 2
-    outline-color: rgb(0, 0, 0)
-    outline-style: none
-    outline-width: 0px
-    overflow-x: visible
-    overflow-y: visible
-    padding-bottom: 0px
-    padding-left: 0px
-    padding-right: 0px
-    padding-top: 0px
-    page-break-after: auto
-    page-break-before: auto
-    page-break-inside: auto
-    pointer-events: auto
-    position: static
-    resize: none
-    right: auto
-    table-layout: auto
-    text-align: auto
-    text-decoration: none
-    text-indent: 0px
-    text-shadow: none
-    text-transform: none
-    top: auto
-    unicode-bidi: normal
-    vertical-align: baseline
-    visibility: visible
-    white-space: normal
-    widows: 2
-    width: 50%
-    word-spacing: 0px
-    word-wrap: normal
-    z-index: auto
-    zoom: 1
-    -webkit-animation-delay: 0s
-    -webkit-animation-direction: normal
-    -webkit-animation-duration: 0s
-    -webkit-animation-iteration-count: 1
-    -webkit-animation-name: none
-    -webkit-animation-timing-function: cubic-bezier(0.25, 0.1, 0.25, 1)
-    -webkit-appearance: none
-    -webkit-background-clip: border
-    -webkit-background-composite: source-over
-    -webkit-background-origin: padding
-    -webkit-background-size: auto auto
-    -webkit-border-fit: border
-    -webkit-border-image: none
-    -webkit-border-horizontal-spacing: 0px
-    -webkit-border-vertical-spacing: 0px
-    -webkit-box-align: stretch
-    -webkit-box-direction: normal
-    -webkit-box-flex: 0
-    -webkit-box-flex-group: 1
-    -webkit-box-lines: single
-    -webkit-box-ordinal-group: 1
-    -webkit-box-orient: horizontal
-    -webkit-box-pack: start
-    -webkit-box-reflect: none
-    -webkit-box-shadow: none
-    -webkit-box-sizing: content-box
-    -webkit-column-break-after: auto
-    -webkit-column-break-before: auto
-    -webkit-column-break-inside: auto
-    -webkit-column-count: auto
-    -webkit-column-gap: normal
-    -webkit-column-rule-color: rgb(0, 0, 0)
-    -webkit-column-rule-style: none
-    -webkit-column-rule-width: 0px
-    -webkit-column-width: auto
-    -webkit-highlight: none
-    -webkit-line-break: normal
-    -webkit-line-clamp: none
-    -webkit-margin-bottom-collapse: collapse
-    -webkit-margin-top-collapse: collapse
-    -webkit-marquee-direction: auto
-    -webkit-marquee-increment: 6px
-    -webkit-marquee-repetition: infinite
-    -webkit-marquee-style: scroll
-    -webkit-mask-attachment: scroll
-    -webkit-mask-box-image: none
-    -webkit-mask-image: none
-    -webkit-mask-position: 0% 0%
-    -webkit-mask-repeat: repeat
-    -webkit-mask-clip: border
-    -webkit-mask-composite: source-over
-    -webkit-mask-origin: border
-    -webkit-mask-size: auto auto
-    -webkit-nbsp-mode: normal
-    -webkit-rtl-ordering: logical
-    -webkit-text-decorations-in-effect: none
-    -webkit-text-fill-color: rgb(0, 0, 0)
-    -webkit-text-security: none
-    -webkit-text-stroke-color: rgb(0, 0, 0)
-    -webkit-text-stroke-width: 0px
-    -webkit-transform: none
-    -webkit-transform-origin: 50% 50%
-    -webkit-transition-delay: 0s
-    -webkit-transition-duration: 0s
-    -webkit-transition-property: all
-    -webkit-transition-timing-function: cubic-bezier(0.25, 0.1, 0.25, 1)
-    -webkit-user-drag: auto
-    -webkit-user-modify: read-only
-    -webkit-user-select: text
-    -webkit-border-bottom-left-radius: 0px
-    -webkit-border-bottom-right-radius: 0px
-    -webkit-border-top-left-radius: 0px
-    -webkit-border-top-right-radius: 0px
-    clip-path: none
-    clip-rule: nonzero
-    mask: none
-    filter: none
-    flood-color: rgb(0, 0, 0)
-    flood-opacity: 1
-    lighting-color: rgb(255, 255, 255)
-    stop-color: rgb(0, 0, 0)
-    stop-opacity: 1
-    color-interpolation: srgb
-    color-interpolation-filters: linearrgb
-    color-rendering: auto
-    fill: #000000
-    fill-opacity: 1
-    fill-rule: nonzero
-    image-rendering: auto
-    marker-end: none
-    marker-mid: none
-    marker-start: none
-    shape-rendering: auto
-    stroke: none
-    stroke-dasharray: 
-    stroke-dashoffset: 
-    stroke-linecap: butt
-    stroke-linejoin: miter
-    stroke-miterlimit: 4
-    stroke-opacity: 1
-    stroke-width: 
-    text-rendering: auto
-    alignment-baseline: auto
-    baseline-shift: baseline
-    dominant-baseline: auto
-    kerning: 
-    text-anchor: start
-    writing-mode: lr-tb
-    glyph-orientation-horizontal: 0deg
-    glyph-orientation-vertical: auto
-    background-position: 0% 0%
-    border-spacing: 0px 0px
-    overflow: visible
-    -webkit-match-nearest-mail-blockquote-color: normal
-    -webkit-text-size-adjust: auto
-
-After changing grandparent's 'color' and the parent's 'font-size' inherited properties:
-    border-top-width: 18px
-    color: rgb(0, 0, 255)
-
-After changing the parent's 'display' property to 'block', so that the child gets a renderer:
-    height: 100px
-    margin-left: 385px
-    width: 384px
-
-After changing the parent's 'display' property back to 'none':
-    height: 100px
-    margin-left: auto
-    width: 50%
+Computed style of an element whose parent's 'display' value is 'none':

+    background-attachment: scroll

+    background-color: rgb(0, 128, 0)

+    background-image: none

+    background-position: 0% 0%

+    background-repeat: repeat

+    border-bottom-color: rgb(0, 0, 0)

+    border-bottom-style: none

+    border-bottom-width: 0px

+    border-collapse: separate

+    border-left-color: rgb(0, 0, 0)

+    border-left-style: none

+    border-left-width: 0px

+    border-right-color: rgb(0, 0, 0)

+    border-right-style: none

+    border-right-width: 0px

+    border-top-color: rgb(0, 0, 0)

+    border-top-style: solid

+    border-top-width: 16px

+    bottom: auto

+    caption-side: top

+    clear: none

+    color: rgb(0, 0, 0)

+    cursor: auto

+    direction: ltr

+    display: block

+    empty-cells: show

+    float: none

+    font-family: 'times new roman'

+    font-size: 16px

+    font-style: normal

+    font-variant: normal

+    font-weight: normal

+    height: 100px

+    left: auto

+    letter-spacing: normal

+    line-height: normal

+    list-style-image: none

+    list-style-position: outside

+    list-style-type: disc

+    margin-bottom: 0px

+    margin-left: auto

+    margin-right: 0px

+    margin-top: 0px

+    max-height: none

+    max-width: none

+    min-height: 0px

+    min-width: 0px

+    opacity: 1

+    orphans: 2

+    outline-color: rgb(0, 0, 0)

+    outline-style: none

+    outline-width: 0px

+    overflow-x: visible

+    overflow-y: visible

+    padding-bottom: 0px

+    padding-left: 0px

+    padding-right: 0px

+    padding-top: 0px

+    page-break-after: auto

+    page-break-before: auto

+    page-break-inside: auto

+    pointer-events: auto

+    position: static

+    resize: none

+    right: auto

+    table-layout: auto

+    text-align: auto

+    text-decoration: none

+    text-indent: 0px

+    text-shadow: none

+    text-transform: none

+    top: auto

+    unicode-bidi: normal

+    vertical-align: baseline

+    visibility: visible

+    white-space: normal

+    widows: 2

+    width: 50%

+    word-spacing: 0px

+    word-wrap: normal

+    z-index: auto

+    zoom: 1

+    -webkit-animation-delay: 0s

+    -webkit-animation-direction: normal

+    -webkit-animation-duration: 0s

+    -webkit-animation-iteration-count: 1

+    -webkit-animation-name: none

+    -webkit-animation-timing-function: cubic-bezier(0.25, 0.1, 0.25, 1)

+    -webkit-appearance: none

+    -webkit-backface-visibility: visible

+    -webkit-background-clip: border

+    -webkit-background-composite: source-over

+    -webkit-background-origin: padding

+    -webkit-background-size: auto auto

+    -webkit-border-fit: border

+    -webkit-border-image: none

+    -webkit-border-horizontal-spacing: 0px

+    -webkit-border-vertical-spacing: 0px

+    -webkit-box-align: stretch

+    -webkit-box-direction: normal

+    -webkit-box-flex: 0

+    -webkit-box-flex-group: 1

+    -webkit-box-lines: single

+    -webkit-box-ordinal-group: 1

+    -webkit-box-orient: horizontal

+    -webkit-box-pack: start

+    -webkit-box-reflect: none

+    -webkit-box-shadow: none

+    -webkit-box-sizing: content-box

+    -webkit-column-break-after: auto

+    -webkit-column-break-before: auto

+    -webkit-column-break-inside: auto

+    -webkit-column-count: auto

+    -webkit-column-gap: normal

+    -webkit-column-rule-color: rgb(0, 0, 0)

+    -webkit-column-rule-style: none

+    -webkit-column-rule-width: 0px

+    -webkit-column-width: auto

+    -webkit-highlight: none

+    -webkit-line-break: normal

+    -webkit-line-clamp: none

+    -webkit-margin-bottom-collapse: collapse

+    -webkit-margin-top-collapse: collapse

+    -webkit-marquee-direction: auto

+    -webkit-marquee-increment: 6px

+    -webkit-marquee-repetition: infinite

+    -webkit-marquee-style: scroll

+    -webkit-mask-attachment: scroll

+    -webkit-mask-box-image: none

+    -webkit-mask-image: none

+    -webkit-mask-position: 0% 0%

+    -webkit-mask-repeat: repeat

+    -webkit-mask-clip: border

+    -webkit-mask-composite: source-over

+    -webkit-mask-origin: border

+    -webkit-mask-size: auto auto

+    -webkit-nbsp-mode: normal

+    -webkit-perspective: none

+    -webkit-perspective-origin: 50% 50%

+    -webkit-rtl-ordering: logical

+    -webkit-text-decorations-in-effect: none

+    -webkit-text-fill-color: rgb(0, 0, 0)

+    -webkit-text-security: none

+    -webkit-text-stroke-color: rgb(0, 0, 0)

+    -webkit-text-stroke-width: 0px

+    -webkit-transform: none

+    -webkit-transform-origin: 50% 50%

+    -webkit-transform-style: flat

+    -webkit-transition-delay: 0s

+    -webkit-transition-duration: 0s

+    -webkit-transition-property: all

+    -webkit-transition-timing-function: cubic-bezier(0.25, 0.1, 0.25, 1)

+    -webkit-user-drag: auto

+    -webkit-user-modify: read-only

+    -webkit-user-select: text

+    -webkit-border-bottom-left-radius: 0px

+    -webkit-border-bottom-right-radius: 0px

+    -webkit-border-top-left-radius: 0px

+    -webkit-border-top-right-radius: 0px

+    clip-path: none

+    clip-rule: nonzero

+    mask: none

+    filter: none

+    flood-color: rgb(0, 0, 0)

+    flood-opacity: 1

+    lighting-color: rgb(255, 255, 255)

+    stop-color: rgb(0, 0, 0)

+    stop-opacity: 1

+    color-interpolation: srgb

+    color-interpolation-filters: linearrgb

+    color-rendering: auto

+    fill: #000000

+    fill-opacity: 1

+    fill-rule: nonzero

+    image-rendering: auto

+    marker-end: none

+    marker-mid: none

+    marker-start: none

+    shape-rendering: auto

+    stroke: none

+    stroke-dasharray: 

+    stroke-dashoffset: 

+    stroke-linecap: butt

+    stroke-linejoin: miter

+    stroke-miterlimit: 4

+    stroke-opacity: 1

+    stroke-width: 

+    text-rendering: auto

+    alignment-baseline: auto

+    baseline-shift: baseline

+    dominant-baseline: auto

+    kerning: 

+    text-anchor: start

+    writing-mode: lr-tb

+    glyph-orientation-horizontal: 0deg

+    glyph-orientation-vertical: auto

+    background-position: 0% 0%

+    border-spacing: 0px 0px

+    overflow: visible

+    -webkit-match-nearest-mail-blockquote-color: normal

+    -webkit-text-size-adjust: auto

+

+After changing grandparent's 'color' and the parent's 'font-size' inherited properties:

+    border-top-width: 18px

+    color: rgb(0, 0, 255)

+

+After changing the parent's 'display' property to 'block', so that the child gets a renderer:

+    height: 100px

+    margin-left: 385px

+    width: 384px

+

+After changing the parent's 'display' property back to 'none':

+    height: 100px

+    margin-left: auto

+    width: 50%

+

+

diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/lists/drag-into-marker-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/lists/drag-into-marker-expected.checksum
index e95f793..133374e 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/lists/drag-into-marker-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/lists/drag-into-marker-expected.checksum
@@ -1 +1 @@
-c65f8697a968f1c2c406d2b7f0086521
\ No newline at end of file
+1ab16dc757a64677ef0a5b7666761d13
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/lists/drag-into-marker-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/lists/drag-into-marker-expected.png
index 40800d9..0ec5c8b 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/lists/drag-into-marker-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/lists/drag-into-marker-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/lists/drag-into-marker-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/lists/drag-into-marker-expected.txt
index 364db2f..6e09ad4 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/lists/drag-into-marker-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/lists/drag-into-marker-expected.txt
@@ -5,7 +5,7 @@ layer at (0,0) size 800x600
     RenderBody {BODY} at (8,16) size 784x568
       RenderBlock {UL} at (16,0) size 752x59 [border: (1px solid #000000)]
         RenderListItem {LI} at (41,1) size 710x57
-          RenderListMarker at (-36,1) size 16x55: black square
+          RenderListMarker at (-36,0) size 16x55: black square
           RenderText {#text} at (0,1) size 122x55
             text run at (0,1) width 122: "world "
           RenderText {#text} at (122,1) size 91x55
diff --git a/webkit/glue/glue_util.cc b/webkit/glue/glue_util.cc
index 41b3364..a81da6b 100644
--- a/webkit/glue/glue_util.cc
+++ b/webkit/glue/glue_util.cc
@@ -110,7 +110,8 @@ WebCore::KURL GURLToKURL(const GURL& url) {
   const std::string& spec = url.possibly_invalid_spec();
 #if USE(GOOGLEURL)
   // Convert using the internal structures to avoid re-parsing.
-  return WebCore::KURL(spec.c_str(), static_cast<int>(spec.length()),
+  return WebCore::KURL(WebCore::CString(spec.c_str(),
+                                        static_cast<unsigned>(spec.length())),
                        url.parsed_for_possibly_invalid_spec(), url.is_valid());
 #else
   return WebCore::KURL(StdWStringToString(UTF8ToWide(spec)));
diff --git a/webkit/glue/media_player_private_impl.cc b/webkit/glue/media_player_private_impl.cc
index 8e0060d..8fbef04 100644
--- a/webkit/glue/media_player_private_impl.cc
+++ b/webkit/glue/media_player_private_impl.cc
@@ -9,6 +9,7 @@
 #include "GraphicsContext.h"
 #include "IntRect.h"
 #include "MediaPlayerPrivateChromium.h"
+#include "NotImplemented.h"
 #include "PlatformContextSkia.h"
 #undef LOG
 
@@ -84,6 +85,25 @@ IntSize MediaPlayerPrivate::naturalSize() const {
   }
 }
 
+MediaPlayerPrivateInterface* MediaPlayerPrivate::create(MediaPlayer* player)
+{
+    return new MediaPlayerPrivate(player);
+}
+
+void MediaPlayerPrivate::registerMediaEngine(MediaEngineRegistrar registrar)
+{
+    if (isAvailable())
+        registrar(create, getSupportedTypes, supportsType);
+}
+
+MediaPlayer::SupportsType MediaPlayerPrivate::supportsType(const String &type, const String &codecs)
+{
+    // FIXME: Do the real thing
+    notImplemented();
+
+    return MediaPlayer::IsSupported;
+}
+
 bool MediaPlayerPrivate::hasVideo() const {
   if (m_data) {
     return AsDelegate(m_data)->IsVideo();
@@ -271,7 +291,7 @@ void MediaPlayerPrivate::paint(GraphicsContext* p, const IntRect& r) {
 
 // Called from WebMediaPlayer -------------------------------------------------
 FrameView* MediaPlayerPrivate::frameView() {
-  return m_player->m_frameView;
+  return m_player->frameView();
 }
 
 void MediaPlayerPrivate::networkStateChanged() {
diff --git a/webkit/tools/layout_tests/test_lists/tests_ignored.txt b/webkit/tools/layout_tests/test_lists/tests_ignored.txt
index 430f173..0960d9d 100644
--- a/webkit/tools/layout_tests/test_lists/tests_ignored.txt
+++ b/webkit/tools/layout_tests/test_lists/tests_ignored.txt
@@ -220,7 +220,7 @@ SKIP : LayoutTests/plugins/get-url-with-blank-target.html = FAIL
 SKIP : chrome/http/tests/plugins/get-file-url.html = FAIL PASS TIMEOUT
 
 // Dashboard-related test
-SKIP : LayoutTests/fast/css/dashboard-region-parser.html = FAIL
+SKIP : LayoutTests/platform/mac/fast/css/dashboard-region-parser.html = FAIL
 
 // Not a test?
 SKIP : LayoutTests/http/tests/incremental/pause-in-script-element.pl = FAIL