[webkit-changes] cvs commit: WebCore/khtml/rendering render_image.cpp

[David]

harrison    05/10/27 15:36:00

  Modified:    .        ChangeLog
               khtml/rendering render_image.cpp
  Log:
          Reviewed by Tim Omerick.
  
          <rdar://problem/4251172> AX: Safari crashes on www.mozilla.org with Voice Over - khtml::RenderImage::imageMap
  
          Test cases added: None.  Manual testing is way to awkward, and automated testing
          is not possible.  See following bug...
          <rdar://problem/4256882> Need automated testing support for accessibility APIs
  
          * ChangeLog:
          * khtml/rendering/render_image.cpp:
          (RenderImage::RenderImage):
          (RenderImage::imageMap):
          (RenderImage::updateAltText):
  
  Revision  Changes    Path
  1.305     +16 -0     WebCore/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebCore/ChangeLog,v
  retrieving revision 1.304
  retrieving revision 1.305
  diff -u -r1.304 -r1.305
  --- ChangeLog	27 Oct 2005 22:34:37 -0000	1.304
  +++ ChangeLog	27 Oct 2005 22:35:50 -0000	1.305
  @@ -1,3 +1,19 @@
  +2005-10-27  David Harrison  <harrison at apple.com>
  +
  +        Reviewed by Tim Omerick.
  +
  +        <rdar://problem/4251172> AX: Safari crashes on www.mozilla.org with Voice Over - khtml::RenderImage::imageMap
  +
  +        Test cases added: None.  Manual testing is way to awkward, and automated testing
  +        is not possible.  See following bug...
  +        <rdar://problem/4256882> Need automated testing support for accessibility APIs
  +
  +        * ChangeLog:
  +        * khtml/rendering/render_image.cpp:
  +        (RenderImage::RenderImage):
  +        (RenderImage::imageMap):
  +        (RenderImage::updateAltText):
  +
   2005-10-27  Eric Seidel  <eseidel at apple.com>
   
           Reviewed by hyatt.
  
  
  
  1.88      +5 -4      WebCore/khtml/rendering/render_image.cpp
  
  Index: render_image.cpp
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/rendering/render_image.cpp,v
  retrieving revision 1.87
  retrieving revision 1.88
  diff -u -r1.87 -r1.88
  --- render_image.cpp	3 Oct 2005 21:12:39 -0000	1.87
  +++ render_image.cpp	27 Oct 2005 22:35:57 -0000	1.88
  @@ -61,11 +61,9 @@
       image = 0;
       berrorPic = false;
       m_selectionState = SelectionNone;
  -
       setIntrinsicWidth( 0 );
       setIntrinsicHeight( 0 );
  -    if (element())
  -        updateAltText();
  +    updateAltText();
   }
   
   RenderImage::~RenderImage()
  @@ -491,7 +489,7 @@
   
   HTMLMapElementImpl* RenderImage::imageMap()
   {
  -    HTMLImageElementImpl* i = element()->hasTagName(imgTag) ? static_cast<HTMLImageElementImpl*>(element()) : 0;
  +    HTMLImageElementImpl* i = element() && element()->hasTagName(imgTag) ? static_cast<HTMLImageElementImpl*>(element()) : 0;
       return i ? i->getDocument()->getImageMap(i->imageMap()) : 0;
   }
   
  @@ -517,6 +515,9 @@
   
   void RenderImage::updateAltText()
   {
  +    if (!element())
  +        return;
  +        
       if (element()->hasTagName(inputTag))
           alt = static_cast<HTMLInputElementImpl*>(element())->altText();
       else if (element()->hasTagName(imgTag))