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

[Timothy]

thatcher    05/12/22 14:36:59

  Modified:    .        Tag: Safari-1-3-branch ChangeLog
               khtml/xml Tag: Safari-1-3-branch dom_elementimpl.cpp
               kwq      Tag: Safari-1-3-branch KWQKHTMLPart.mm
  Log:
          Merged fix from TOT to Safari-1-3-branch
  
      2005-12-20  Adele Peterson  <adele at apple.com>
  
          Reviewed by Darin.
  
          Fix for <rdar://problem/4387630> REGRESSION: <select> element's onClick event doesn't fire @ bugweb.apple.com
  
          * kwq/KWQKHTMLPart.mm:
          (KWQKHTMLPart::passSubframeEventToSubframe): only pass mouse down for khtmlviews.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.18.2.3  +12 -0     WebCore/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebCore/ChangeLog,v
  retrieving revision 1.18.2.2
  retrieving revision 1.18.2.3
  diff -u -r1.18.2.2 -r1.18.2.3
  --- ChangeLog	21 Dec 2005 17:43:18 -0000	1.18.2.2
  +++ ChangeLog	22 Dec 2005 22:36:57 -0000	1.18.2.3
  @@ -1,3 +1,15 @@
  +2005-12-22  Timothy Hatcher  <timothy at apple.com>
  +
  +        Merged fix from TOT to Safari-1-3-branch
  +
  +    2005-12-20  Adele Peterson  <adele at apple.com>
  +
  +        Reviewed by Darin.
  +
  +        Fix for <rdar://problem/4387630> REGRESSION: <select> element's onClick event doesn't fire @ bugweb.apple.com
  +
  +        * kwq/KWQKHTMLPart.mm:
  +        (KWQKHTMLPart::passSubframeEventToSubframe): only pass mouse down for khtmlviews.
   
   == Rolled over to ChangeLog-2005-12-19 ==
   
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.61.4.3  +5 -3      WebCore/khtml/xml/dom_elementimpl.cpp
  
  Index: dom_elementimpl.cpp
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/xml/dom_elementimpl.cpp,v
  retrieving revision 1.61.4.2
  retrieving revision 1.61.4.3
  diff -u -r1.61.4.2 -r1.61.4.3
  --- dom_elementimpl.cpp	13 Dec 2005 00:21:28 -0000	1.61.4.2
  +++ dom_elementimpl.cpp	22 Dec 2005 22:36:57 -0000	1.61.4.3
  @@ -261,10 +261,12 @@
   void ElementImpl::focus()
   {
       DocumentImpl *doc = getDocument();
  -    if (doc)
  +    if (doc) {
           doc->updateLayout();
  -    if (isFocusable() && renderer()) {
  -        renderer()->enclosingLayer()->scrollRectToVisible(getRect());
  +        if (isFocusable() && renderer()) {
  +            doc->setFocusNode(this);
  +            renderer()->enclosingLayer()->scrollRectToVisible(getRect());
  +        }
       }
   }
   
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.628.4.7 +3 -0      WebCore/kwq/KWQKHTMLPart.mm
  
  Index: KWQKHTMLPart.mm
  ===================================================================
  RCS file: /cvs/root/WebCore/kwq/KWQKHTMLPart.mm,v
  retrieving revision 1.628.4.6
  retrieving revision 1.628.4.7
  diff -u -r1.628.4.6 -r1.628.4.7
  --- KWQKHTMLPart.mm	13 Dec 2005 00:21:31 -0000	1.628.4.6
  +++ KWQKHTMLPart.mm	22 Dec 2005 22:36:58 -0000	1.628.4.7
  @@ -2532,6 +2532,9 @@
               if (!renderer || !renderer->isWidget()) {
                   return false;
               }
  +            QWidget *widget = static_cast<RenderWidget *>(renderer)->widget();
  +            if (!widget || !widget->inherits("KHTMLView"))
  +                return false;
               if (!passWidgetMouseDownEventToWidget(static_cast<RenderWidget *>(renderer))) {
                   return false;
               }