Merge 129962 - REGRESSION(r122215) - CachedImage::likelyToBeUsedSoon crashes on accessing a deleted…

Source/WebCore/platform/mac/ClipboardMac.mm

 /*
  * Copyright (C) 2004, 2005, 2006, 2008, 2010 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 47 matching lines @@
     : Clipboard(policy, clipboardType)
     , m_pasteboardName(pasteboardName)
     , m_clipboardContents(clipboardContents)
     , m_frame(frame)
 {
     m_changeCount = platformStrategies()->pasteboardStrategy()->changeCount(m_pasteboardName);
 }
 
 ClipboardMac::~ClipboardMac()
 {
+    if (m_dragImage)
+        m_dragImage->removeClient(this);
 }
 
 bool ClipboardMac::hasData()
 {
     Vector<String> types;
     platformStrategies()->pasteboardStrategy()->getTypes(types, m_pasteboardName);
     return !types.isEmpty();
 }
     
 static String cocoaTypeFromHTMLClipboardType(const String& type)
@@ skipping 351 matching lines @@
     } else if (m_dragImage) {
         result = m_dragImage->image()->getNSImage();
         
         loc = m_dragLoc;
         loc.y = [result size].height - loc.y;
     }
     return result;
 }
 
 }