diff --git a/mozilla/layout/generic/nsImageFrame.cpp b/mozilla/layout/generic/nsImageFrame.cpp
index 1523dff2d60..d39d3088338 100644
--- a/mozilla/layout/generic/nsImageFrame.cpp
+++ b/mozilla/layout/generic/nsImageFrame.cpp
@@ -539,10 +539,10 @@ nsImageFrame::TriggerLink(nsIPresContext& aPresContext,
   aPresContext.GetLinkHandler(&handler);
   if (nsnull != handler) {
     if (aClick) {
-      handler->OnLinkClick(mContent, eLinkVerb_Replace, aURLSpec, aTargetSpec);
+      handler->OnLinkClick(mContent, eLinkVerb_Replace, aURLSpec.GetUnicode(), aTargetSpec.GetUnicode());
     }
     else {
-      handler->OnOverLink(mContent, aURLSpec, aTargetSpec);
+      handler->OnOverLink(mContent, aURLSpec.GetUnicode(), aTargetSpec.GetUnicode());
     }
     NS_RELEASE(handler);
   }
diff --git a/mozilla/layout/generic/nsObjectFrame.cpp b/mozilla/layout/generic/nsObjectFrame.cpp
index 9b70bfc3393..bc51ec4facd 100644
--- a/mozilla/layout/generic/nsObjectFrame.cpp
+++ b/mozilla/layout/generic/nsObjectFrame.cpp
@@ -1079,7 +1079,7 @@ nsObjectFrame::Reflow(nsIPresContext&          aPresContext,
 
 	    // if we didn't find the type, but we do have a src, we can determine the mimetype
 	    // based on the file extension
-      if(!mimeType && src)
+      if(!mimeType && src.GetUnicode())
 	    {
 		    char* extension;
 		    char* cString = src.ToNewCString();
diff --git a/mozilla/layout/html/base/src/nsImageFrame.cpp b/mozilla/layout/html/base/src/nsImageFrame.cpp
index 1523dff2d60..d39d3088338 100644
--- a/mozilla/layout/html/base/src/nsImageFrame.cpp
+++ b/mozilla/layout/html/base/src/nsImageFrame.cpp
@@ -539,10 +539,10 @@ nsImageFrame::TriggerLink(nsIPresContext& aPresContext,
   aPresContext.GetLinkHandler(&handler);
   if (nsnull != handler) {
     if (aClick) {
-      handler->OnLinkClick(mContent, eLinkVerb_Replace, aURLSpec, aTargetSpec);
+      handler->OnLinkClick(mContent, eLinkVerb_Replace, aURLSpec.GetUnicode(), aTargetSpec.GetUnicode());
     }
     else {
-      handler->OnOverLink(mContent, aURLSpec, aTargetSpec);
+      handler->OnOverLink(mContent, aURLSpec.GetUnicode(), aTargetSpec.GetUnicode());
     }
     NS_RELEASE(handler);
   }
diff --git a/mozilla/layout/html/base/src/nsObjectFrame.cpp b/mozilla/layout/html/base/src/nsObjectFrame.cpp
index 9b70bfc3393..bc51ec4facd 100644
--- a/mozilla/layout/html/base/src/nsObjectFrame.cpp
+++ b/mozilla/layout/html/base/src/nsObjectFrame.cpp
@@ -1079,7 +1079,7 @@ nsObjectFrame::Reflow(nsIPresContext&          aPresContext,
 
 	    // if we didn't find the type, but we do have a src, we can determine the mimetype
 	    // based on the file extension
-      if(!mimeType && src)
+      if(!mimeType && src.GetUnicode())
 	    {
 		    char* extension;
 		    char* cString = src.ToNewCString();