Merge branch 'bug/26304' into staging
authorphiln@webkit.org <philn@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 17 Dec 2009 19:13:42 +0000 (19:13 +0000)
committerphiln@webkit.org <philn@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 17 Dec 2009 19:13:42 +0000 (19:13 +0000)
commitcd9dc0ac0754f32be15510d631f289c176501340
tree8afd9dadb932422a22e2098b98b628a4ec3e72cf
parentfcc1150dffa29a34af9912671dd1f8c30daed23b
Merge branch 'bug/26304' into staging

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@52266 268f45cc-cd09-0410-ab3c-d52691b4dbfc
15 files changed:
LayoutTests/ChangeLog
LayoutTests/platform/gtk/Skipped
LayoutTests/platform/gtk/media/controls-after-reload-expected.txt [new file with mode: 0644]
LayoutTests/platform/gtk/media/controls-drag-timebar-expected.txt [new file with mode: 0644]
LayoutTests/platform/gtk/media/controls-strict-expected.txt [new file with mode: 0644]
LayoutTests/platform/gtk/media/controls-styling-expected.txt [new file with mode: 0644]
LayoutTests/platform/gtk/media/video-controls-rendering-expected.txt [new file with mode: 0644]
LayoutTests/platform/gtk/media/video-controls-visible-audio-only-expected.txt [new file with mode: 0644]
WebCore/ChangeLog
WebCore/GNUmakefile.am
WebCore/css/mediaControlsGtk.css [new file with mode: 0644]
WebCore/platform/graphics/Image.h
WebCore/platform/graphics/gtk/ImageGtk.cpp
WebCore/platform/gtk/RenderThemeGtk.cpp
WebCore/platform/gtk/RenderThemeGtk.h