[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373
eric.carlson at apple.com
eric.carlson at apple.com
Thu Apr 8 00:34:15 UTC 2010
The following commit has been merged in the webkit-1.2 branch:
commit ef43ae4a66c363073623d45d1ea81fdf36c92918
Author: eric.carlson at apple.com <eric.carlson at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Sat Dec 12 21:29:36 2009 +0000
2009-12-12 Eric Carlson <eric.carlson at apple.com>
Reviewed by Darin Adler.
<rdar://problem/7453726> Pull shared UI code into WebKit
* WebKitSystemInterface.h:
* libWebKitSystemInterfaceLeopard.a:
* libWebKitSystemInterfaceSnowLeopard.a:
* libWebKitSystemInterfaceTiger.a:
2009-12-12 Eric Carlson <eric.carlson at apple.com>
Reviewed by Darin Adler.
<rdar://problem/7453726> Pull shared UI code into WebKit
Update media tests for small change in timeline slider thumb position
* platform/mac/media/audio-controls-rendering-expected.txt:
* platform/mac/media/controls-after-reload-expected.txt:
* platform/mac/media/controls-styling-expected.txt:
* platform/mac/media/video-no-audio-expected.txt:
* platform/mac/media/video-zoom-controls-expected.txt:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52055 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index f145d7d..ab773cc 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,17 @@
+2009-12-12 Eric Carlson <eric.carlson at apple.com>
+
+ Reviewed by Darin Adler.
+
+ <rdar://problem/7453726> Pull shared UI code into WebKit
+
+ Update media tests for small change in timeline slider thumb position
+
+ * platform/mac/media/audio-controls-rendering-expected.txt:
+ * platform/mac/media/controls-after-reload-expected.txt:
+ * platform/mac/media/controls-styling-expected.txt:
+ * platform/mac/media/video-no-audio-expected.txt:
+ * platform/mac/media/video-zoom-controls-expected.txt:
+
2009-12-12 Csaba Osztrogonác <ossy at webkit.org>
[Qt] Missing forward entries when dumping back/forward list
diff --git a/LayoutTests/platform/mac/media/audio-controls-rendering-expected.txt b/LayoutTests/platform/mac/media/audio-controls-rendering-expected.txt
index 9ff6c9a..d7ab43a 100644
--- a/LayoutTests/platform/mac/media/audio-controls-rendering-expected.txt
+++ b/LayoutTests/platform/mac/media/audio-controls-rendering-expected.txt
@@ -22,7 +22,7 @@ layer at (8,42) size 200x25
RenderButton {INPUT} at (32,4) size 16x16
RenderFlexibleBox {DIV} at (49,1) size 126x22
RenderSlider {INPUT} at (0,5) size 126x13
- RenderBlock {DIV} at (0,1) size 12x10
+ RenderBlock {DIV} at (0,2) size 10x8
RenderButton {INPUT} at (177,5) size 15x14
layer at (8,85) size 320x25
RenderBlock (relative positioned) {DIV} at (0,0) size 320x25
@@ -32,7 +32,7 @@ layer at (8,85) size 320x25
RenderButton {INPUT} at (32,4) size 16x16
RenderFlexibleBox {DIV} at (49,5) size 246x15
RenderSlider {INPUT} at (45,2) size 156x13
- RenderBlock {DIV} at (0,1) size 12x10
+ RenderBlock {DIV} at (0,2) size 10x8
RenderButton {INPUT} at (297,5) size 15x14
layer at (57,92) size 45x11
RenderFlexibleBox {DIV} at (0,2) size 45x11 [color=#FFFFFF]
@@ -54,7 +54,7 @@ layer at (8,203) size 320x25
RenderButton {INPUT} at (32,4) size 16x16
RenderFlexibleBox {DIV} at (49,5) size 246x15
RenderSlider {INPUT} at (45,2) size 156x13
- RenderBlock {DIV} at (0,1) size 12x10
+ RenderBlock {DIV} at (0,2) size 10x8
RenderButton {INPUT} at (297,5) size 15x14
layer at (57,210) size 45x11
RenderFlexibleBox {DIV} at (0,2) size 45x11 [color=#FFFFFF]
diff --git a/LayoutTests/platform/mac/media/controls-after-reload-expected.txt b/LayoutTests/platform/mac/media/controls-after-reload-expected.txt
index bcc1c3b..717e616 100644
--- a/LayoutTests/platform/mac/media/controls-after-reload-expected.txt
+++ b/LayoutTests/platform/mac/media/controls-after-reload-expected.txt
@@ -20,7 +20,7 @@ layer at (8,257) size 320x25
RenderButton {INPUT} at (32,4) size 16x16
RenderFlexibleBox {DIV} at (49,5) size 216x15
RenderSlider {INPUT} at (45,2) size 126x13
- RenderBlock {DIV} at (0,1) size 12x10
+ RenderBlock {DIV} at (0,2) size 10x8
RenderButton {INPUT} at (297,4) size 16x16
RenderButton {INPUT} at (267,5) size 15x14
layer at (57,264) size 45x11
diff --git a/LayoutTests/platform/mac/media/controls-styling-expected.txt b/LayoutTests/platform/mac/media/controls-styling-expected.txt
index 1ad70e2..d96a02e 100644
--- a/LayoutTests/platform/mac/media/controls-styling-expected.txt
+++ b/LayoutTests/platform/mac/media/controls-styling-expected.txt
@@ -24,7 +24,7 @@ layer at (18,257) size 320x25
RenderButton {INPUT} at (32,4) size 16x16
RenderFlexibleBox {DIV} at (49,5) size 216x15
RenderSlider {INPUT} at (45,2) size 126x13
- RenderBlock {DIV} at (0,1) size 12x10
+ RenderBlock {DIV} at (0,2) size 10x8
RenderButton {INPUT} at (297,4) size 16x16
RenderButton {INPUT} at (267,5) size 15x14
layer at (67,264) size 45x11
@@ -45,7 +45,7 @@ layer at (8,497) size 320x25
RenderButton {INPUT} at (32,4) size 16x16
RenderFlexibleBox {DIV} at (49,5) size 216x15
RenderSlider {INPUT} at (45,2) size 126x13
- RenderBlock {DIV} at (0,1) size 12x10
+ RenderBlock {DIV} at (0,2) size 10x8
RenderButton {INPUT} at (297,4) size 16x16
RenderButton {INPUT} at (267,5) size 15x14
layer at (57,504) size 45x11
diff --git a/LayoutTests/platform/mac/media/video-no-audio-expected.txt b/LayoutTests/platform/mac/media/video-no-audio-expected.txt
index f4a469a..d7e4e71 100644
--- a/LayoutTests/platform/mac/media/video-no-audio-expected.txt
+++ b/LayoutTests/platform/mac/media/video-no-audio-expected.txt
@@ -20,7 +20,7 @@ layer at (8,497) size 640x25
RenderButton {INPUT} at (32,4) size 16x16
RenderFlexibleBox {DIV} at (49,5) size 561x15
RenderSlider {INPUT} at (45,2) size 471x13
- RenderBlock {DIV} at (0,1) size 12x10
+ RenderBlock {DIV} at (0,2) size 10x8
RenderButton {INPUT} at (617,4) size 16x16
layer at (57,504) size 45x11
RenderFlexibleBox {DIV} at (0,2) size 45x11 [color=#FFFFFF]
diff --git a/LayoutTests/platform/mac/media/video-zoom-controls-expected.txt b/LayoutTests/platform/mac/media/video-zoom-controls-expected.txt
index 6791903..a6da37e 100644
--- a/LayoutTests/platform/mac/media/video-zoom-controls-expected.txt
+++ b/LayoutTests/platform/mac/media/video-zoom-controls-expected.txt
@@ -16,7 +16,7 @@ layer at (57,228) size 240x37
RenderButton {INPUT} at (48,6) size 24x24
RenderFlexibleBox {DIV} at (73,1) size 86x34
RenderSlider {INPUT} at (0,9) size 86x19
- RenderBlock {DIV} at (0,2) size 18x15
+ RenderBlock {DIV} at (0,3) size 15x12
RenderButton {INPUT} at (206,6) size 24x24
RenderButton {INPUT} at (162,8) size 22x21
layer at (57,310) size 240x180
@@ -29,6 +29,6 @@ layer at (57,453) size 240x37
RenderButton {INPUT} at (48,6) size 24x24
RenderFlexibleBox {DIV} at (73,1) size 86x34
RenderSlider {INPUT} at (0,9) size 86x19
- RenderBlock {DIV} at (0,2) size 18x15
+ RenderBlock {DIV} at (0,3) size 15x12
RenderButton {INPUT} at (206,6) size 24x24
RenderButton {INPUT} at (162,8) size 22x21
diff --git a/WebKitLibraries/ChangeLog b/WebKitLibraries/ChangeLog
index dce8322..541c401 100644
--- a/WebKitLibraries/ChangeLog
+++ b/WebKitLibraries/ChangeLog
@@ -1,3 +1,14 @@
+2009-12-12 Eric Carlson <eric.carlson at apple.com>
+
+ Reviewed by Darin Adler.
+
+ <rdar://problem/7453726> Pull shared UI code into WebKit
+
+ * WebKitSystemInterface.h:
+ * libWebKitSystemInterfaceLeopard.a:
+ * libWebKitSystemInterfaceSnowLeopard.a:
+ * libWebKitSystemInterfaceTiger.a:
+
2009-12-11 Chris Marrin <cmarrin at apple.com>
Reviewed by Adam Roben.
diff --git a/WebKitLibraries/WebKitSystemInterface.h b/WebKitLibraries/WebKitSystemInterface.h
index f6234fe..e943cb1 100644
--- a/WebKitLibraries/WebKitSystemInterface.h
+++ b/WebKitLibraries/WebKitSystemInterface.h
@@ -228,6 +228,7 @@ typedef enum {
WKMediaControllerFlagDisabled = 1 << 0,
WKMediaControllerFlagPressed = 1 << 1,
WKMediaControllerFlagDrawEndCaps = 1 << 3,
+ WKMediaControllerFlagFocused = 1 << 4
} WKMediaControllerThemeState;
BOOL WKMediaControllerThemeAvailable(int themeStyle);
diff --git a/WebKitLibraries/libWebKitSystemInterfaceLeopard.a b/WebKitLibraries/libWebKitSystemInterfaceLeopard.a
index 71f4659..e2353b9 100644
Binary files a/WebKitLibraries/libWebKitSystemInterfaceLeopard.a and b/WebKitLibraries/libWebKitSystemInterfaceLeopard.a differ
diff --git a/WebKitLibraries/libWebKitSystemInterfaceSnowLeopard.a b/WebKitLibraries/libWebKitSystemInterfaceSnowLeopard.a
index 6ecfb8b..7311ca9 100644
Binary files a/WebKitLibraries/libWebKitSystemInterfaceSnowLeopard.a and b/WebKitLibraries/libWebKitSystemInterfaceSnowLeopard.a differ
diff --git a/WebKitLibraries/libWebKitSystemInterfaceTiger.a b/WebKitLibraries/libWebKitSystemInterfaceTiger.a
index bd780bd..c3a7399 100644
Binary files a/WebKitLibraries/libWebKitSystemInterfaceTiger.a and b/WebKitLibraries/libWebKitSystemInterfaceTiger.a differ
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list