[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[mitz at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 69812572cb77ad341aa476c12b38967a7a902720
Author: mitz at apple.com <mitz at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Sep 16 17:52:13 2010 +0000

    Reverted the previous change because r67628 has been reverted.
    
    WebKit:
    
    * English.lproj/Localizable.strings:
    
    WebKit/mac:
    
    * WebCoreSupport/WebPlatformStrategies.h:
    * WebCoreSupport/WebPlatformStrategies.mm:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67639 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index c987fdf..8830c6b 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,11 @@
 2010-09-16  Dan Bernstein  <mitz at apple.com>
 
+        Reverted the previous change because r67628 has been reverted.
+
+        * English.lproj/Localizable.strings:
+
+2010-09-16  Dan Bernstein  <mitz at apple.com>
+
         Updated localizable strings.
 
         * English.lproj/Localizable.strings:
diff --git a/WebKit/English.lproj/Localizable.strings b/WebKit/English.lproj/Localizable.strings
index 8bdefc7..615dc9a 100644
Binary files a/WebKit/English.lproj/Localizable.strings and b/WebKit/English.lproj/Localizable.strings differ
diff --git a/WebKit/mac/ChangeLog b/WebKit/mac/ChangeLog
index bdfb9e0..67ac0ca 100644
--- a/WebKit/mac/ChangeLog
+++ b/WebKit/mac/ChangeLog
@@ -1,5 +1,12 @@
 2010-09-16  Dan Bernstein  <mitz at apple.com>
 
+        Reverted the previous change because r67628 has been reverted.
+
+        * WebCoreSupport/WebPlatformStrategies.h:
+        * WebCoreSupport/WebPlatformStrategies.mm:
+
+2010-09-16  Dan Bernstein  <mitz at apple.com>
+
         Build fix after r67628. Added context menu item localizable strings for the items
         added in r67628, following equivalent menu items in Mac OS X when possible. However,
         this set of menu items does not make much sense for Mac OS X, and this should be
diff --git a/WebKit/mac/WebCoreSupport/WebPlatformStrategies.h b/WebKit/mac/WebCoreSupport/WebPlatformStrategies.h
index 680f9ab..53f39f8 100644
--- a/WebKit/mac/WebCoreSupport/WebPlatformStrategies.h
+++ b/WebKit/mac/WebCoreSupport/WebPlatformStrategies.h
@@ -113,15 +113,6 @@ private:
     virtual WTF::String contextMenuItemTagCapitalize();
     virtual WTF::String contextMenuItemTagChangeBack(const WTF::String& replacedString);
     virtual WTF::String contextMenuItemTagInspectElement();
-    virtual WTF::String contextMenuItemTagOpenMediaInNewWindow();
-    virtual WTF::String contextMenuItemTagCopyMediaLinkToClipboard();
-    virtual WTF::String contextMenuItemTagToggleMediaControls();
-    virtual WTF::String contextMenuItemTagToggleMediaLoop();
-    virtual WTF::String contextMenuItemTagEnterVideoFullscreen();
-    virtual WTF::String contextMenuItemTagMediaPlay();
-    virtual WTF::String contextMenuItemTagMediaPause();
-    virtual WTF::String contextMenuItemTagMediaMute();
-    virtual WTF::String contextMenuItemTagMediaUnMute();
 #endif // ENABLE(CONTEXT_MENUS)
     virtual WTF::String searchMenuNoRecentSearchesText();
     virtual WTF::String searchMenuRecentSearchesText();
diff --git a/WebKit/mac/WebCoreSupport/WebPlatformStrategies.mm b/WebKit/mac/WebCoreSupport/WebPlatformStrategies.mm
index a74829c..2900ccf 100644
--- a/WebKit/mac/WebCoreSupport/WebPlatformStrategies.mm
+++ b/WebKit/mac/WebCoreSupport/WebPlatformStrategies.mm
@@ -449,51 +449,6 @@ String WebPlatformStrategies::contextMenuItemTagInspectElement()
     return UI_STRING("Inspect Element", "Inspect Element context menu item");
 }
 
-String WebPlatformStrategies::contextMenuItemTagOpenMediaInNewWindow()
-{
-    return UI_STRING("Open Media in New Window", "Open Media in New Window context menu item");
-}
-
-String WebPlatformStrategies::contextMenuItemTagCopyMediaLinkToClipboard()
-{
-    return UI_STRING("Copy Media Address", "Copy Media Address context menu item");
-}
-
-String WebPlatformStrategies::contextMenuItemTagToggleMediaControls()
-{
-    return UI_STRING("Toggle Media Controls", "Toggle Media Controls context menu item");
-}
-
-String WebPlatformStrategies::contextMenuItemTagToggleMediaLoop()
-{
-    return UI_STRING("Toggle Media Loop Playback", "Toggle Media Loop Playback context menu item");
-}
-
-String WebPlatformStrategies::contextMenuItemTagEnterVideoFullscreen()
-{
-    return UI_STRING("Fullscreen", "Fullscreen context menu item");
-}
-
-String WebPlatformStrategies::contextMenuItemTagMediaPlay()
-{
-    return UI_STRING("Play", "Play context menu item");
-}
-
-String WebPlatformStrategies::contextMenuItemTagMediaPause()
-{
-    return UI_STRING("Pause", "Pause context menu item");
-}
-
-String WebPlatformStrategies::contextMenuItemTagMediaMute()
-{
-    return UI_STRING("Mute", "Mute context menu item");
-}
-
-String WebPlatformStrategies::contextMenuItemTagMediaUnMute()
-{
-    return UI_STRING("Unmute", "Unmute context menu item");
-}
-
 #endif // ENABLE(CONTEXT_MENUS)
 
 String WebPlatformStrategies::searchMenuNoRecentSearchesText()

-- 
WebKit Debian packaging