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

[Adele]

adele       05/08/13 13:23:08

  Modified:    .        Tag: Safari-2-0-branch ChangeLog
               khtml/html Tag: Safari-2-0-branch html_objectimpl.cpp
  Log:
          Merged fix from TOT to Safari-2-0-branch
          This was a regression caused by the acid2 changes, so it needs to be on the branch too.
  
      2005-05-30  Darin Adler  <darin at apple.com>
  
          Reviewed by John.
          Could not figure out how to make an <object> fallback, so for now, no layout test.
  
          - fixed <rdar://problem/4134124> REGRESSION (tip of tree): crash in QWidget::getView handling onunload event (yahoo.com)
  
          * khtml/html/html_objectimpl.cpp: (DOM::HTMLObjectElementImpl::getObjectInstance):
          Check type of RenderObject to be sure it is a RenderWidget before calling widget() on it.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.4104.2.116 +15 -0     WebCore/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebCore/ChangeLog,v
  retrieving revision 1.4104.2.115
  retrieving revision 1.4104.2.116
  diff -u -r1.4104.2.115 -r1.4104.2.116
  --- ChangeLog	13 Aug 2005 17:25:27 -0000	1.4104.2.115
  +++ ChangeLog	13 Aug 2005 20:23:00 -0000	1.4104.2.116
  @@ -2,6 +2,21 @@
   
   2005-08-13  Adele Peterson  <adele at apple.com>
   
  +        Merged fix from TOT to Safari-2-0-branch
  +        This was a regression caused by the acid2 changes, so it needs to be on the branch too.
  +
  +    2005-05-30  Darin Adler  <darin at apple.com>
  +
  +        Reviewed by John.
  +        Could not figure out how to make an <object> fallback, so for now, no layout test.
  +
  +        - fixed <rdar://problem/4134124> REGRESSION (tip of tree): crash in QWidget::getView handling onunload event (yahoo.com)
  +
  +        * khtml/html/html_objectimpl.cpp: (DOM::HTMLObjectElementImpl::getObjectInstance):
  +        Check type of RenderObject to be sure it is a RenderWidget before calling widget() on it.
  +
  +2005-08-13  Adele Peterson  <adele at apple.com>
  +
           Rolled out fix since it doesn't work right on the branch
           <rdar://problem/4202641> Line breaks do not happen inside whitespace:pre; word-wrap: break-word
   
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.60.8.2  +14 -11    WebCore/khtml/html/html_objectimpl.cpp
  
  Index: html_objectimpl.cpp
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/html/html_objectimpl.cpp,v
  retrieving revision 1.60.8.1
  retrieving revision 1.60.8.2
  diff -u -r1.60.8.1 -r1.60.8.2
  --- html_objectimpl.cpp	9 Aug 2005 23:52:13 -0000	1.60.8.1
  +++ html_objectimpl.cpp	13 Aug 2005 20:23:08 -0000	1.60.8.2
  @@ -410,19 +410,22 @@
   
       if (objectInstance)
           return objectInstance;
  -    
  -    RenderPartObject *r = static_cast<RenderPartObject*>(m_render);
  -    if (r) {
  -        if (r->widget()){
  -            // Call into the part (and over the bridge) to pull the Bindings::Instance
  -            // from the guts of the plugin.
  -            void *_view = r->widget()->getView();
  -            objectInstance = KWQ(part)->getObjectInstanceForView((NSView *)_view);
  -            // Applet may specified with <object> tag.
  -            if (!objectInstance)
  -                objectInstance = KWQ(part)->getAppletInstanceForView((NSView *)_view);
  +
  +    if (RenderObject *r = m_render) {
  +        if (r->isWidget()) {
  +            if (QWidget *widget = static_cast<RenderWidget *>(r)->widget()) {
  +                if (NSView *view = widget->getView())  {
  +                    // Call into the part (and over the bridge) to pull the Bindings::Instance
  +                    // from the guts of the plugin.
  +                    objectInstance = KWQ(part)->getObjectInstanceForView(view);
  +                    // Applet may specified with <object> tag.
  +                    if (!objectInstance)
  +                        objectInstance = KWQ(part)->getAppletInstanceForView(view);
  +                }
  +            }
           }
       }
  +
       return objectInstance;
   }
   #endif