Merge WebKit at r67908: Initial merge by Git

Change-Id: I43a553e7b3299b28cb6ee8aa035ed70fe342b972

12 files changed, 11 insertions, 12 deletions

diff --git a/WebCore/platform/wince/CursorWince.cpp b/WebCore/platform/wince/CursorWinCE.cpp
index d7dcfb4..90ba879 100644
--- a/WebCore/platform/wince/CursorWince.cpp
+++ b/WebCore/platform/wince/CursorWinCE.cpp
@@ -106,4 +106,4 @@ const Cursor& westPanningCursor() { return crossCursor(); }
 const Cursor& grabbingCursor() { return moveCursor(); }
 const Cursor& grabCursor() { return moveCursor(); }
 
-}
+} // namespace WebCore
diff --git a/WebCore/platform/wince/DragDataWince.cpp b/WebCore/platform/wince/DragDataWinCE.cpp
index 73dd8a2..5535ea9 100644
--- a/WebCore/platform/wince/DragDataWince.cpp
+++ b/WebCore/platform/wince/DragDataWinCE.cpp
@@ -80,5 +80,4 @@ Color DragData::asColor() const
     return Color();
 }
 
-}
-
+} // namespace WebCore
diff --git a/WebCore/platform/wince/DragImageWince.cpp b/WebCore/platform/wince/DragImageWinCE.cpp
index 4d60f80..f639b41 100644
--- a/WebCore/platform/wince/DragImageWince.cpp
+++ b/WebCore/platform/wince/DragImageWinCE.cpp
@@ -60,4 +60,4 @@ DragImageRef createDragImageIconForCachedImage(CachedImage*)
     return 0;
 }
 
-}
+} // namespace WebCore
diff --git a/WebCore/platform/wince/EditorWince.cpp b/WebCore/platform/wince/EditorWinCE.cpp
index 71f4db9..eb0ecb4 100644
--- a/WebCore/platform/wince/EditorWince.cpp
+++ b/WebCore/platform/wince/EditorWinCE.cpp
@@ -22,7 +22,7 @@
 
 #include "Editor.h"
 
-#include "ClipboardWince.h"
+#include "ClipboardWinCE.h"
 #include "Document.h"
 #include "EditorClient.h"
 #include "Element.h"
@@ -37,7 +37,7 @@ namespace WebCore {
 
 PassRefPtr<Clipboard> Editor::newGeneralClipboard(ClipboardAccessPolicy policy, Frame*)
 {
-    return adoptRef(new ClipboardWince(policy, false));
+    return adoptRef(new ClipboardWinCE(policy, false));
 }
 
 } // namespace WebCore
diff --git a/WebCore/platform/wince/FileChooserWince.cpp b/WebCore/platform/wince/FileChooserWinCE.cpp
index 07c99b1..955e68a 100644
--- a/WebCore/platform/wince/FileChooserWince.cpp
+++ b/WebCore/platform/wince/FileChooserWinCE.cpp
@@ -57,4 +57,4 @@ String FileChooser::basenameForWidth(const Font& font, int width) const
     return StringTruncator::centerTruncate(string, width, font, false);
 }
 
-}
+} // namespace WebCore
diff --git a/WebCore/platform/wince/FileSystemWince.cpp b/WebCore/platform/wince/FileSystemWinCE.cpp
index cb165a6..2a27089 100644
--- a/WebCore/platform/wince/FileSystemWince.cpp
+++ b/WebCore/platform/wince/FileSystemWinCE.cpp
@@ -281,4 +281,4 @@ Vector<String> listDirectory(const String& path, const String& filter)
     return entries;
 }
 
-}
+} // namespace WebCore
diff --git a/WebCore/platform/wince/KURLWince.cpp b/WebCore/platform/wince/KURLWinCE.cpp
index 5ca1e4b..2bbdfe8 100644
--- a/WebCore/platform/wince/KURLWince.cpp
+++ b/WebCore/platform/wince/KURLWinCE.cpp
@@ -27,4 +27,4 @@ String KURL::fileSystemPath() const
     return path();
 }
 
-}
+} // namespace WebCore
diff --git a/WebCore/platform/wince/KeygenWince.cpp b/WebCore/platform/wince/KeygenWinCE.cpp
index 0c1b3c6..0c1b3c6 100644
--- a/WebCore/platform/wince/KeygenWince.cpp
+++ b/WebCore/platform/wince/KeygenWinCE.cpp
diff --git a/WebCore/platform/wince/MIMETypeRegistryWince.cpp b/WebCore/platform/wince/MIMETypeRegistryWinCE.cpp
index 9e1bece..7534b91 100644
--- a/WebCore/platform/wince/MIMETypeRegistryWince.cpp
+++ b/WebCore/platform/wince/MIMETypeRegistryWinCE.cpp
@@ -138,4 +138,4 @@ bool MIMETypeRegistry::isApplicationPluginMIMEType(const String&)
     return false;
 }
 
-}
+} // namespace WebCore
diff --git a/WebCore/platform/wince/PasteboardWince.cpp b/WebCore/platform/wince/PasteboardWinCE.cpp
index 70b4083..70b4083 100644
--- a/WebCore/platform/wince/PasteboardWince.cpp
+++ b/WebCore/platform/wince/PasteboardWinCE.cpp
diff --git a/WebCore/platform/wince/SearchPopupMenuWince.cpp b/WebCore/platform/wince/SearchPopupMenuWinCE.cpp
index f9d65a6..b2a8442 100644
--- a/WebCore/platform/wince/SearchPopupMenuWince.cpp
+++ b/WebCore/platform/wince/SearchPopupMenuWinCE.cpp
@@ -51,4 +51,4 @@ void SearchPopupMenu::loadRecentSearches(const AtomicString& name, Vector<String
     notImplemented();
 }
 
-}
+} // namespace WebCore
diff --git a/WebCore/platform/wince/SharedTimerWince.cpp b/WebCore/platform/wince/SharedTimerWinCE.cpp
index 2328017..81295e2 100644
--- a/WebCore/platform/wince/SharedTimerWince.cpp
+++ b/WebCore/platform/wince/SharedTimerWinCE.cpp
@@ -128,4 +128,4 @@ void stopSharedTimer()
     timerID = TimerIdNone;
 }
 
-}
+} // namespace WebCore