[webkit-changes] cvs commit: WebCore/khtml/ecma kjs_window.cpp kjs_window.h

[Adele]

adele       05/07/12 15:00:02

  Modified:    .        Tag: Safari-2-0-branch ChangeLog
               khtml/ecma Tag: Safari-2-0-branch kjs_window.cpp
                        kjs_window.h
  Log:
          Merged fix from TOT to Safari-2-0-branch
          <rdar://problem/4164964>
  
      2005-05-05  David Hyatt  <hyatt at apple.com>
  
  	Eliminate the FOUCS on wired.com.  innerWidth and innerHeight on window should not do a layout that ignores
  	pending stylesheets, since even if stylesheets are loading the correct window dimensions can be determined with
  	a normal layout.
  
  	The radar # is 4109888.
  
          Reviewed by rjw
  
          * khtml/ecma/kjs_window.cpp:
          (Window::get):
          (Window::updateLayout):
          * khtml/ecma/kjs_window.h:
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.4104.2.57 +20 -0     WebCore/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebCore/ChangeLog,v
  retrieving revision 1.4104.2.56
  retrieving revision 1.4104.2.57
  diff -u -r1.4104.2.56 -r1.4104.2.57
  --- ChangeLog	12 Jul 2005 21:16:15 -0000	1.4104.2.56
  +++ ChangeLog	12 Jul 2005 21:59:55 -0000	1.4104.2.57
  @@ -1,5 +1,25 @@
   2005-07-12  Adele Peterson  <adele at apple.com>
   
  +        Merged fix from TOT to Safari-2-0-branch
  +        <rdar://problem/4164964>
  +
  +    2005-05-05  David Hyatt  <hyatt at apple.com>
  +
  +	Eliminate the FOUCS on wired.com.  innerWidth and innerHeight on window should not do a layout that ignores
  +	pending stylesheets, since even if stylesheets are loading the correct window dimensions can be determined with
  +	a normal layout.
  +
  +	The radar # is 4109888.
  +	
  +        Reviewed by rjw
  +
  +        * khtml/ecma/kjs_window.cpp:
  +        (Window::get):
  +        (Window::updateLayout):
  +        * khtml/ecma/kjs_window.h:
  +
  +2005-07-12  Adele Peterson  <adele at apple.com>
  +
           Merged for from TOT to Safari-2-0-branch
           <rdar://problem/4164960>
   
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.146.8.7 +7 -4      WebCore/khtml/ecma/kjs_window.cpp
  
  Index: kjs_window.cpp
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/ecma/kjs_window.cpp,v
  retrieving revision 1.146.8.6
  retrieving revision 1.146.8.7
  diff -u -r1.146.8.6 -r1.146.8.7
  --- kjs_window.cpp	12 Jul 2005 00:36:00 -0000	1.146.8.6
  +++ kjs_window.cpp	12 Jul 2005 22:00:01 -0000	1.146.8.7
  @@ -758,12 +758,12 @@
       case InnerHeight:
         if (!m_part->view())
           return Undefined();
  -      updateLayout();
  +      updateLayout(false);
         return Number(m_part->view()->visibleHeight());
       case InnerWidth:
         if (!m_part->view())
           return Undefined();
  -      updateLayout();
  +      updateLayout(false);
         return Number(m_part->view()->visibleWidth());
       case Length:
         return Number(m_part->frames().count());
  @@ -2072,11 +2072,14 @@
     return Undefined();
   }
   
  -void Window::updateLayout() const
  +void Window::updateLayout(bool ignoreStylesheets) const
   {
     DOM::DocumentImpl* docimpl = static_cast<DOM::DocumentImpl *>(m_part->document().handle());
     if (docimpl) {
  -    docimpl->updateLayoutIgnorePendingStylesheets();
  +    if (ignoreStylesheets)
  +      docimpl->updateLayoutIgnorePendingStylesheets();
  +    else
  +      docimpl->updateLayout();
     }
   }
   
  
  
  
  1.34.8.5  +1 -1      WebCore/khtml/ecma/kjs_window.h
  
  Index: kjs_window.h
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/ecma/kjs_window.h,v
  retrieving revision 1.34.8.4
  retrieving revision 1.34.8.5
  diff -u -r1.34.8.4 -r1.34.8.5
  --- kjs_window.h	12 Jul 2005 00:36:00 -0000	1.34.8.4
  +++ kjs_window.h	12 Jul 2005 22:00:01 -0000	1.34.8.5
  @@ -150,7 +150,7 @@
       Value getListener(ExecState *exec, int eventId) const;
       void setListener(ExecState *exec, int eventId, Value func);
     private:
  -    void updateLayout() const;
  +    void updateLayout(bool ignoreStylesheets = true) const;
   
       QGuardedPtr<KHTMLPart> m_part;
       Screen *screen;