Get rid of custom code for clipboard.clearData()

Source/core/dom/Clipboard.cpp

 /*
  * Copyright (C) 2006, 2007, 2008 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 137 matching lines @@
 
     if (canWriteData())
         m_effectAllowed = effect;
 }
 
 void Clipboard::clearData(const String& type)
 {
     if (!canWriteData())
         return;
 
-    m_dataObject->clearData(normalizeType(type));
-}
-
-void Clipboard::clearAllData()
-{
-    if (!canWriteData())
-        return;
-
-    m_dataObject->clearAll();
+    if (type.isNull())

[haraken, 2013/10/04 22:41:22]

To keep the current behavior, the if(type.isNull()) branch should come before
the if(!canWriteData()) branch.

[do-not-use, 2013/10/08 14:24:42]

Hmm, maybe I am misreading but I don't think so. The custom code was:
if (!args.Length()) {	
  clipboard->clearAllData();	
  return;	
}	
	
and Clipboard::clearAllData() was also calling if (!canWriteData()) first,
before calling m_dataObject->clearAll().

+        m_dataObject->clearAll();
+    else
+        m_dataObject->clearData(normalizeType(type));
 }
 
 String Clipboard::getData(const String& type) const
 {
     if (!canReadData())
         return String();
 
     bool convertToURL = false;
     String data = m_dataObject->getData(normalizeType(type, &convertToURL));
     if (!convertToURL)
@@ skipping 327 matching lines @@
     case DragOperationMove:
         return String("move");
     case DragOperationLink:
         return String("link");
     default:
         return String("copy");
     }
 }
 
 } // namespace WebCore