[webkit-changes] cvs commit: WebCore/khtml/ecma kjs_window.cpp
kjs_window.h
Adele
adele at opensource.apple.com
Tue Jul 12 14:59:04 PDT 2005
adele 05/07/12 14:59:03
Modified: . Tag: Safari-1-3-branch ChangeLog
khtml/ecma Tag: Safari-1-3-branch kjs_window.cpp
kjs_window.h
Log:
Merged fix from TOT to Safari-1-3-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.4108.4.29 +20 -0 WebCore/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /cvs/root/WebCore/ChangeLog,v
retrieving revision 1.4108.4.28
retrieving revision 1.4108.4.29
diff -u -r1.4108.4.28 -r1.4108.4.29
--- ChangeLog 12 Jul 2005 21:18:03 -0000 1.4108.4.28
+++ ChangeLog 12 Jul 2005 21:58:57 -0000 1.4108.4.29
@@ -1,5 +1,25 @@
2005-07-12 Adele Peterson <adele at apple.com>
+ Merged fix from TOT to Safari-1-3-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-1-3-branch
<rdar://problem/4164960>
No revision
No revision
1.146.6.4 +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.6.3
retrieving revision 1.146.6.4
diff -u -r1.146.6.3 -r1.146.6.4
--- kjs_window.cpp 12 Jul 2005 00:06:43 -0000 1.146.6.3
+++ kjs_window.cpp 12 Jul 2005 21:59:03 -0000 1.146.6.4
@@ -757,12 +757,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());
@@ -2056,11 +2056,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.6.3 +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.6.2
retrieving revision 1.34.6.3
diff -u -r1.34.6.2 -r1.34.6.3
--- kjs_window.h 12 Jul 2005 00:06:43 -0000 1.34.6.2
+++ kjs_window.h 12 Jul 2005 21:59:03 -0000 1.34.6.3
@@ -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;
More information about the webkit-changes
mailing list