[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373
cmarrin at apple.com
cmarrin at apple.com
Thu Apr 8 00:33:32 UTC 2010
The following commit has been merged in the webkit-1.2 branch:
commit 2dd572b80391a8e765f5b8a3a869917935ed5068
Author: cmarrin at apple.com <cmarrin at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Sat Dec 12 00:39:30 2009 +0000
Added icons for full-screen video on Windows
https://bugs.webkit.org/show_bug.cgi?id=31318
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52030 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/win/ChangeLog b/WebKit/win/ChangeLog
index 6904aa8..14aa2b6 100644
--- a/WebKit/win/ChangeLog
+++ b/WebKit/win/ChangeLog
@@ -1,5 +1,21 @@
2009-12-11 Chris Marrin <cmarrin at apple.com>
+ Reviewed by Jon Honeycutt.
+
+ Added icons for full-screen video on Windows
+ https://bugs.webkit.org/show_bug.cgi?id=31318
+
+ * WebKit.vcproj/WebKit.rc:
+ * WebKit.vcproj/WebKit.vcproj:
+ * WebKit.vcproj/fsVideoAudioVolumeHigh.png: Added.
+ * WebKit.vcproj/fsVideoAudioVolumeLow.png: Added.
+ * WebKit.vcproj/fsVideoExitFullscreen.png: Added.
+ * WebKit.vcproj/fsVideoPause.png: Added.
+ * WebKit.vcproj/fsVideoPlay.png: Added.
+ * WebKit.vcproj/resource.h:
+
+2009-12-11 Chris Marrin <cmarrin at apple.com>
+
Reviewed by Adam Roben.
Delay load DLLs for accelerated compositing
diff --git a/WebKit/win/WebKit.vcproj/WebKit.rc b/WebKit/win/WebKit.vcproj/WebKit.rc
index 3d00011..c4b269e 100644
--- a/WebKit/win/WebKit.vcproj/WebKit.rc
+++ b/WebKit/win/WebKit.vcproj/WebKit.rc
@@ -81,4 +81,9 @@ IDR_SEARCH_CANCEL PNG "searchCancel.png"
IDR_SEARCH_CANCEL_PRESSED PNG "searchCancelPressed.png"
IDR_SEARCH_MAGNIFIER PNG "searchMagnifier.png"
IDR_SEARCH_MAGNIFIER_RESULTS PNG "searchMagnifierResults.png"
+IDR_FS_VIDEO_AUDIO_VOLUME_HIGH PNG "fsVideoAudioVolumeHigh.png"
+IDR_FS_VIDEO_AUDIO_VOLUME_LOW PNG "fsVideoAudioVolumeLow.png"
+IDR_FS_VIDEO_EXIT_FULLSCREEN PNG "fsVideoExitFullscreen.png"
+IDR_FS_VIDEO_PAUSE PNG "fsVideoPause.png"
+IDR_FS_VIDEO_PLAY PNG "fsVideoPlay.png"
diff --git a/WebKit/win/WebKit.vcproj/WebKit.vcproj b/WebKit/win/WebKit.vcproj/WebKit.vcproj
index 5846813..2f2f50b 100644
--- a/WebKit/win/WebKit.vcproj/WebKit.vcproj
+++ b/WebKit/win/WebKit.vcproj/WebKit.vcproj
@@ -722,14 +722,6 @@
>
</File>
<File
- RelativePath="..\WebScriptWorld.h"
- >
- </File>
- <File
- RelativePath="..\WebSerializedJSValue.h"
- >
- </File>
- <File
RelativePath="..\WebKitStatistics.h"
>
</File>
@@ -802,6 +794,10 @@
>
</File>
<File
+ RelativePath="..\WebScriptWorld.h"
+ >
+ </File>
+ <File
RelativePath="..\WebScrollBar.h"
>
</File>
@@ -810,6 +806,10 @@
>
</File>
<File
+ RelativePath="..\WebSerializedJSValue.h"
+ >
+ </File>
+ <File
RelativePath="..\WebTextRenderer.h"
>
</File>
@@ -1102,14 +1102,6 @@
>
</File>
<File
- RelativePath="..\WebScriptWorld.cpp"
- >
- </File>
- <File
- RelativePath="..\WebSerializedJSValue.cpp"
- >
- </File>
- <File
RelativePath="..\WebKitStatistics.cpp"
>
</File>
@@ -1146,6 +1138,10 @@
>
</File>
<File
+ RelativePath="..\WebScriptWorld.cpp"
+ >
+ </File>
+ <File
RelativePath="..\WebScrollBar.cpp"
>
</File>
@@ -1154,6 +1150,10 @@
>
</File>
<File
+ RelativePath="..\WebSerializedJSValue.cpp"
+ >
+ </File>
+ <File
RelativePath="..\WebTextRenderer.cpp"
>
</File>
@@ -1246,6 +1246,26 @@
Name="Resources"
>
<File
+ RelativePath=".\fsVideoAudioVolumeHigh.png"
+ >
+ </File>
+ <File
+ RelativePath=".\fsVideoAudioVolumeLow.png"
+ >
+ </File>
+ <File
+ RelativePath=".\fsVideoExitFullscreen.png"
+ >
+ </File>
+ <File
+ RelativePath=".\fsVideoPause.png"
+ >
+ </File>
+ <File
+ RelativePath=".\fsVideoPlay.png"
+ >
+ </File>
+ <File
RelativePath=".\missingImage.png"
>
</File>
diff --git a/WebKit/win/WebKit.vcproj/fsVideoAudioVolumeHigh.png b/WebKit/win/WebKit.vcproj/fsVideoAudioVolumeHigh.png
new file mode 100755
index 0000000..713669e
Binary files /dev/null and b/WebKit/win/WebKit.vcproj/fsVideoAudioVolumeHigh.png differ
diff --git a/WebKit/win/WebKit.vcproj/fsVideoAudioVolumeLow.png b/WebKit/win/WebKit.vcproj/fsVideoAudioVolumeLow.png
new file mode 100755
index 0000000..3b0c70e
Binary files /dev/null and b/WebKit/win/WebKit.vcproj/fsVideoAudioVolumeLow.png differ
diff --git a/WebKit/win/WebKit.vcproj/fsVideoExitFullscreen.png b/WebKit/win/WebKit.vcproj/fsVideoExitFullscreen.png
new file mode 100755
index 0000000..b6e0df6
Binary files /dev/null and b/WebKit/win/WebKit.vcproj/fsVideoExitFullscreen.png differ
diff --git a/WebKit/win/WebKit.vcproj/fsVideoPause.png b/WebKit/win/WebKit.vcproj/fsVideoPause.png
new file mode 100755
index 0000000..004520d
Binary files /dev/null and b/WebKit/win/WebKit.vcproj/fsVideoPause.png differ
diff --git a/WebKit/win/WebKit.vcproj/fsVideoPlay.png b/WebKit/win/WebKit.vcproj/fsVideoPlay.png
new file mode 100755
index 0000000..fb44f87
Binary files /dev/null and b/WebKit/win/WebKit.vcproj/fsVideoPlay.png differ
diff --git a/WebKit/win/WebKit.vcproj/resource.h b/WebKit/win/WebKit.vcproj/resource.h
index 028cb3c..b999de6 100644
--- a/WebKit/win/WebKit.vcproj/resource.h
+++ b/WebKit/win/WebKit.vcproj/resource.h
@@ -23,6 +23,11 @@
#define IDR_SEARCH_CANCEL_PRESSED 19
#define IDR_SEARCH_MAGNIFIER 20
#define IDR_SEARCH_MAGNIFIER_RESULTS 21
+#define IDR_FS_VIDEO_AUDIO_VOLUME_HIGH 22
+#define IDR_FS_VIDEO_AUDIO_VOLUME_LOW 23
+#define IDR_FS_VIDEO_EXIT_FULLSCREEN 24
+#define IDR_FS_VIDEO_PAUSE 25
+#define IDR_FS_VIDEO_PLAY 26
#define IDC_STATIC -1
#define BUILD_NUMBER 1
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list