[webkit-changes] cvs commit: WebCore/kwq KWQKHTMLPart.mm

[Timothy]

thatcher    05/10/11 23:55:40

  Modified:    .        ChangeLog
               kwq      KWQKHTMLPart.mm
  Log:
          Reviewed by Eric.
  
          Crash: Drag element with CSS ::Before absolute positioning applied to it
          http://bugzilla.opendarwin.org/show_bug.cgi?id=4088
  
          * kwq/KWQKHTMLPart.mm:
          (KWQKHTMLPart::khtmlMouseMoveEvent):
  
  Revision  Changes    Path
  1.235     +10 -0     WebCore/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebCore/ChangeLog,v
  retrieving revision 1.234
  retrieving revision 1.235
  diff -u -r1.234 -r1.235
  --- ChangeLog	12 Oct 2005 00:44:50 -0000	1.234
  +++ ChangeLog	12 Oct 2005 06:55:36 -0000	1.235
  @@ -1,3 +1,13 @@
  +2005-10-11  Darin Adler  <darin at apple.com>
  +
  +        Reviewed by Eric.
  +
  +        Crash: Drag element with CSS ::Before absolute positioning applied to it
  +        http://bugzilla.opendarwin.org/show_bug.cgi?id=4088
  +
  +        * kwq/KWQKHTMLPart.mm:
  +        (KWQKHTMLPart::khtmlMouseMoveEvent):
  +
   2005-10-11  Timothy Hatcher  <timothy at apple.com>
   
           Reviewed by Darin.
  
  
  
  1.678     +6 -5      WebCore/kwq/KWQKHTMLPart.mm
  
  Index: KWQKHTMLPart.mm
  ===================================================================
  RCS file: /cvs/root/WebCore/kwq/KWQKHTMLPart.mm,v
  retrieving revision 1.677
  retrieving revision 1.678
  diff -u -r1.677 -r1.678
  --- KWQKHTMLPart.mm	7 Oct 2005 01:21:47 -0000	1.677
  +++ KWQKHTMLPart.mm	12 Oct 2005 06:55:39 -0000	1.678
  @@ -2324,16 +2324,17 @@
               // try to find an element that wants to be dragged
               RenderObject::NodeInfo nodeInfo(true, false);
               renderer()->layer()->hitTest(nodeInfo, _mouseDownX, _mouseDownY);
  -            _dragSrc.reset(nodeInfo.innerNode()->renderer()->draggableNode(_dragSrcMayBeDHTML, _dragSrcMayBeUA, _mouseDownX, _mouseDownY, _dragSrcIsDHTML));
  -            if (_dragSrc.isNull()) {
  +            NodeImpl *node = nodeInfo.innerNode();
  +            _dragSrc = (node && node->renderer()) ? node->renderer()->draggableNode(_dragSrcMayBeDHTML, _dragSrcMayBeUA, _mouseDownX, _mouseDownY, _dragSrcIsDHTML) : 0;
  +            if (!_dragSrc) {
                   _mouseDownMayStartDrag = false;     // no element is draggable
               } else {
                   // remember some facts about this source, while we have a NodeInfo handy
  -                NodeImpl *node = nodeInfo.URLElement();
  -                _dragSrcIsLink = node ? node->isLink() : false;
  +                node = nodeInfo.URLElement();
  +                _dragSrcIsLink = node && node->isLink();
   
                   node = nodeInfo.innerNonSharedNode();
  -                _dragSrcIsImage = (node && node->renderer() && node->renderer()->isImage());
  +                _dragSrcIsImage = node && node->renderer() && node->renderer()->isImage();
   
                   _dragSrcInSelection = isPointInsideSelection(_mouseDownX, _mouseDownY);
               }