[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e

darin at apple.com darin at apple.com
Fri Jan 21 14:39:07 UTC 2011


The following commit has been merged in the debian/experimental branch:
commit 4c3ca31339f39f29938d6fb85d8a5c33db1b076f
Author: darin at apple.com <darin at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Dec 23 23:42:11 2010 +0000

    Try to fix crash seen on GTK bot.
    
    * editing/EditorCommand.cpp:
    (WebCore::internalCommand): Add back empty string check I accidentally deleted in r74580.
    
    * WebCore.xcodeproj/project.pbxproj: Let Xcode edit the file.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74589 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index ff86d0c..f521dba 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2010-12-23  Darin Adler  <darin at apple.com>
+
+        Try to fix crash seen on GTK bot.
+
+        * editing/EditorCommand.cpp:
+        (WebCore::internalCommand): Add back empty string check I accidentally deleted in r74580.
+
+        * WebCore.xcodeproj/project.pbxproj: Let Xcode edit the file.
+
 2010-12-23  Sheriff Bot  <webkit.review.bot at gmail.com>
 
         Unreviewed, rolling out r74561.
diff --git a/WebCore/WebCore.xcodeproj/project.pbxproj b/WebCore/WebCore.xcodeproj/project.pbxproj
index de983f3..11d6f67 100644
--- a/WebCore/WebCore.xcodeproj/project.pbxproj
+++ b/WebCore/WebCore.xcodeproj/project.pbxproj
@@ -22281,6 +22281,7 @@
 			isa = PBXProject;
 			buildConfigurationList = 149C284308902B11008A9EFC /* Build configuration list for PBXProject "WebCore" */;
 			compatibilityVersion = "Xcode 2.4";
+			developmentRegion = English;
 			hasScannedForEncodings = 1;
 			knownRegions = (
 				English,
diff --git a/WebCore/editing/EditorCommand.cpp b/WebCore/editing/EditorCommand.cpp
index e460602..0b1380d 100644
--- a/WebCore/editing/EditorCommand.cpp
+++ b/WebCore/editing/EditorCommand.cpp
@@ -1569,7 +1569,7 @@ static const CommandMap& createCommandMap()
 static const EditorInternalCommand* internalCommand(const String& commandName)
 {
     static const CommandMap& commandMap = createCommandMap();
-    return commandMap.get(commandName);
+    return commandName.isEmpty() ? 0 : commandMap.get(commandName);
 }
 
 Editor::Command Editor::command(const String& commandName)

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list