- fix Windows build

        * platform/win/ClipboardWin.cpp:
        (WebCore::writeURL): Add a check for empty URL. Remove the check for invalid URL.
        (WebCore::ClipboardWin::setData): Remove the check for invalid URL.
        * plugins/win/PluginViewWin.cpp:
        (WebCore::PluginViewWin::start): Check for empty URL instead of invalid URL.
        (WebCore::PluginViewWin::load): Same here.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@25770 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 911e6e7bce031b27a0261756ab16921364642b39..25511941af71ce18a5cca0ea2584c4ef819b60ff 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2007-09-26  Darin Adler  <darin@apple.com>
+
+        - fix Windows build
+
+        * platform/win/ClipboardWin.cpp:
+        (WebCore::writeURL): Add a check for empty URL. Remove the check for invalid URL.
+        (WebCore::ClipboardWin::setData): Remove the check for invalid URL.
+        * plugins/win/PluginViewWin.cpp:
+        (WebCore::PluginViewWin::start): Check for empty URL instead of invalid URL.
+        (WebCore::PluginViewWin::load): Same here.
+
 2007-09-26  Darin Adler  <darin@apple.com>
 
         Reviewed by John Sullivan.

diff --git a/WebCore/platform/win/ClipboardWin.cpp b/WebCore/platform/win/ClipboardWin.cpp
index 30b9f496e67050e5d21a7881627c1ababff684c2..b1ce001eec412ad7946440c0f7f171348422e82a 100644 (file)
--- a/WebCore/platform/win/ClipboardWin.cpp
+++ b/WebCore/platform/win/ClipboardWin.cpp
@@ -340,11 +340,10 @@ ClipboardWin::~ClipboardWin()
 static bool writeURL(WCDataObject *data, const KURL& url, String title, bool withPlainText, bool withHTML)
 {
     ASSERT(data);
-    ASSERT(!url.isEmpty());
-    
-    if (!url.isValid())
-        return false;
 
+    if (url.isEmpty())
+        return false;
+    
     if (title.isEmpty()) {
         title = url.lastPathComponent();
         if (title.isEmpty())
@@ -431,19 +430,17 @@ String ClipboardWin::getData(const String& type, bool& success) const
 
 bool ClipboardWin::setData(const String &type, const String &data)
 {
-    //FIXME: Need to be able to write to the system clipboard <rdar://problem/5015941>
+    // FIXME: Need to be able to write to the system clipboard <rdar://problem/5015941>
     ASSERT(isForDragging());
     if (policy() != ClipboardWritable || !m_writableDataObject)
         return false;
 
     ClipboardDataType winType = clipboardTypeFromMIMEType(type);
 
-    if (winType == ClipboardDataTypeURL) {
-        KURL url = data.deprecatedString();
-        if (!url.isValid())
-            return false;
-        return WebCore::writeURL(m_writableDataObject.get(), url, String(), false, true);
-    } else if ( winType == ClipboardDataTypeText) {
+    if (winType == ClipboardDataTypeURL)
+        return WebCore::writeURL(m_writableDataObject.get(), data.deprecatedString(), String(), false, true);
+
+    if (winType == ClipboardDataTypeText) {
         STGMEDIUM medium = {0};
         medium.tymed = TYMED_HGLOBAL;
         medium.hGlobal = createGlobalData(data);
@@ -456,6 +453,7 @@ bool ClipboardWin::setData(const String &type, const String &data)
         }
         return true;
     }
+
     return false;
 }
 

diff --git a/WebCore/plugins/win/PluginViewWin.cpp b/WebCore/plugins/win/PluginViewWin.cpp
index 8b67e25c949d7deea67057b8f67901d0947c48ce..db83299b755d1425f6146c791bb3336b4fdfc369 100644 (file)
--- a/WebCore/plugins/win/PluginViewWin.cpp
+++ b/WebCore/plugins/win/PluginViewWin.cpp
@@ -639,7 +639,7 @@ bool PluginViewWin::start()
 
     m_isStarted = true;
 
-    if (m_url.isValid() && !m_loadManually) {
+    if (!m_url.isEmpty() && !m_loadManually) {
         FrameLoadRequest frameLoadRequest;
         frameLoadRequest.resourceRequest().setHTTPMethod("GET");
         frameLoadRequest.resourceRequest().setURL(m_url);
@@ -798,7 +798,7 @@ NPError PluginViewWin::load(const FrameLoadRequest& frameLoadRequest, bool sendN
 
     KURL url = frameLoadRequest.resourceRequest().url();
     
-    if (!url.isValid())
+    if (url.isEmpty())
         return NPERR_INVALID_URL;
 
     String target = frameLoadRequest.frameName();