[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.20-204-g221d8e8

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit f0e42c44478196f2671859e6700fe58eef12490b
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Feb 5 00:19:45 2010 +0000

    2010-02-04  Stephan Aßmus  <superstippi at gmx.de>
    
            Reviewed by David Levin.
    
            Misc coding style fixes in Haiku port code.
            https://bugs.webkit.org/show_bug.cgi?id=34527
    
            No tests needed.
    
            * platform/haiku/ContextMenuItemHaiku.cpp: Trailing white space, NULL -> 0
            * platform/haiku/DragImageHaiku.cpp: Trailing white space.
            * platform/haiku/FileChooserHaiku.cpp: Sorted headers.
            * platform/haiku/LocalizedStringsHaiku.cpp: Needed to include NotImplemented.h
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54383 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 9cd3b0b..81f7582 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2010-02-04  Stephan Aßmus  <superstippi at gmx.de>
+
+        Reviewed by David Levin.
+
+        Misc coding style fixes in Haiku port code.
+        https://bugs.webkit.org/show_bug.cgi?id=34527
+
+        No tests needed.
+
+        * platform/haiku/ContextMenuItemHaiku.cpp: Trailing white space, NULL -> 0
+        * platform/haiku/DragImageHaiku.cpp: Trailing white space.
+        * platform/haiku/FileChooserHaiku.cpp: Sorted headers.
+        * platform/haiku/LocalizedStringsHaiku.cpp: Needed to include NotImplemented.h
+
 2010-02-04  Enrica Casucci  <enrica at apple.com>
 
         Reviewed by Csaba Osztrogonac.
diff --git a/WebCore/platform/haiku/ContextMenuItemHaiku.cpp b/WebCore/platform/haiku/ContextMenuItemHaiku.cpp
index cd5abaf..469590d 100644
--- a/WebCore/platform/haiku/ContextMenuItemHaiku.cpp
+++ b/WebCore/platform/haiku/ContextMenuItemHaiku.cpp
@@ -70,7 +70,7 @@ ContextMenuItem::~ContextMenuItem()
 PlatformMenuItemDescription ContextMenuItem::releasePlatformDescription()
 {
     BMenuItem* item = m_platformDescription;
-    m_platformDescription = NULL;
+    m_platformDescription = 0;
     return item;
 }
 
@@ -116,7 +116,7 @@ void ContextMenuItem::setAction(ContextMenuAction action)
         m_platformDescription->Message()->what = action;
 }
 
-String ContextMenuItem::title() const 
+String ContextMenuItem::title() const
 {
     if (m_platformDescription)
         return "";
diff --git a/WebCore/platform/haiku/DragImageHaiku.cpp b/WebCore/platform/haiku/DragImageHaiku.cpp
index 17a79f4..87f780a 100644
--- a/WebCore/platform/haiku/DragImageHaiku.cpp
+++ b/WebCore/platform/haiku/DragImageHaiku.cpp
@@ -67,7 +67,7 @@ DragImageRef createDragImageFromImage(Image*)
 DragImageRef createDragImageIconForCachedImage(CachedImage*)
 {
     notImplemented();
-    return 0;     
+    return 0;
 }
 
 } // namespace WebCore
diff --git a/WebCore/platform/haiku/FileChooserHaiku.cpp b/WebCore/platform/haiku/FileChooserHaiku.cpp
index f56e02b..3a44de8 100644
--- a/WebCore/platform/haiku/FileChooserHaiku.cpp
+++ b/WebCore/platform/haiku/FileChooserHaiku.cpp
@@ -22,8 +22,8 @@
 #include "config.h"
 #include "FileChooser.h"
 
-#include "NotImplemented.h"
 #include "Icon.h"
+#include "NotImplemented.h"
 
 
 namespace WebCore {
diff --git a/WebCore/platform/haiku/LocalizedStringsHaiku.cpp b/WebCore/platform/haiku/LocalizedStringsHaiku.cpp
index 3b94bcb..5321792 100644
--- a/WebCore/platform/haiku/LocalizedStringsHaiku.cpp
+++ b/WebCore/platform/haiku/LocalizedStringsHaiku.cpp
@@ -28,6 +28,7 @@
 #include "config.h"
 #include "LocalizedStrings.h"
 
+#include "NotImplemented.h"
 #include "PlatformString.h"
 
 

-- 
WebKit Debian packaging