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

[Timothy]

thatcher    05/10/03 17:56:36

  Modified:    .        Tag: Safari-2-0-branch ChangeLog
               khtml    Tag: Safari-2-0-branch khtml_part.cpp
  Log:
          Merged fix from TOT to Safari-2-0-branch
  
      2005-10-03  Justin Garcia  <justin.garcia at apple.com>
  
  		Fixes <rdar://problem/4275492> REGRESSION (SuTiDenver): EMBED tag with bogus type attribute downloads .wmv file twice (gorillamask.net)
  
          Reviewed by geoff, darin
  
          * khtml/khtml_part.cpp:
          (KHTMLPart::handleFallbackContent):
          Don't handle fallback content for <embed> tags.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.33  +14 -0     WebCore/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebCore/ChangeLog,v
  retrieving revision 1.1.2.32
  retrieving revision 1.1.2.33
  diff -u -r1.1.2.32 -r1.1.2.33
  --- ChangeLog	30 Sep 2005 05:06:16 -0000	1.1.2.32
  +++ ChangeLog	4 Oct 2005 00:56:27 -0000	1.1.2.33
  @@ -1,3 +1,17 @@
  +2005-10-03  Timothy Hatcher  <timothy at apple.com>
  +
  +        Merged fix from TOT to Safari-2-0-branch
  +
  +    2005-10-03  Justin Garcia  <justin.garcia at apple.com>
  +
  +		Fixes <rdar://problem/4275492> REGRESSION (SuTiDenver): EMBED tag with bogus type attribute downloads .wmv file twice (gorillamask.net)
  +
  +        Reviewed by geoff, darin
  +
  +        * khtml/khtml_part.cpp:
  +        (KHTMLPart::handleFallbackContent):
  +        Don't handle fallback content for <embed> tags.
  +
   === WebCore-417.2 ===
   
   2005-09-29  Timothy Hatcher  <timothy at apple.com>
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.311.8.13 +3 -3      WebCore/khtml/khtml_part.cpp
  
  Index: khtml_part.cpp
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/khtml_part.cpp,v
  retrieving revision 1.311.8.12
  retrieving revision 1.311.8.13
  diff -u -r1.311.8.12 -r1.311.8.13
  --- khtml_part.cpp	9 Aug 2005 23:52:10 -0000	1.311.8.12
  +++ khtml_part.cpp	4 Oct 2005 00:56:33 -0000	1.311.8.13
  @@ -5945,10 +5945,10 @@
       khtml::RenderPart *renderPart = childFrame->m_frame;
       if (!renderPart)
           return;
  -    HTMLObjectElementImpl* elt = static_cast<HTMLObjectElementImpl *>(renderPart->element());
  -    if (!elt)
  +    NodeImpl *node = renderPart->element();
  +    if (!node || node->id() != ID_OBJECT)
           return;
  -    elt->renderFallbackContent();
  +    static_cast<HTMLObjectElementImpl *>(node)->renderFallbackContent();
   }
   
   using namespace KParts;