[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
hyatt
hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 07:10:58 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 5b1f3979b9810f72aedf55146cba6e2d1509c56a
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Dec 4 02:05:08 2002 +0000
Remove the moveWidgetsAside function. This fixes all the
form controls on livepage.apple.com that were getting hosed
by the scrolling marquee.
Reviewed by: darin
* khtml/html/html_tableimpl.cpp:
(HTMLTableRowElementImpl::addChild):
* khtml/misc/loader.cpp:
* khtml/rendering/render_root.cpp:
(RenderRoot::layout):
* kwq/KWQKHTMLPart.h:
* kwq/KWQKHTMLPart.mm:
(KWQKHTMLPart::KWQKHTMLPart):
(KWQKHTMLPart::paint):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2916 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 031ee2c..84959e2 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,21 @@
+2002-12-03 David Hyatt <hyatt at apple.com>
+
+ Remove the moveWidgetsAside function. This fixes all the
+ form controls on livepage.apple.com that were getting hosed
+ by the scrolling marquee.
+
+ Reviewed by: darin
+
+ * khtml/html/html_tableimpl.cpp:
+ (HTMLTableRowElementImpl::addChild):
+ * khtml/misc/loader.cpp:
+ * khtml/rendering/render_root.cpp:
+ (RenderRoot::layout):
+ * kwq/KWQKHTMLPart.h:
+ * kwq/KWQKHTMLPart.mm:
+ (KWQKHTMLPart::KWQKHTMLPart):
+ (KWQKHTMLPart::paint):
+
2002-12-03 Richard Williamson <rjw at apple.com>
Fixed 3019986. Use an array of font families instead of a single
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 031ee2c..84959e2 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,21 @@
+2002-12-03 David Hyatt <hyatt at apple.com>
+
+ Remove the moveWidgetsAside function. This fixes all the
+ form controls on livepage.apple.com that were getting hosed
+ by the scrolling marquee.
+
+ Reviewed by: darin
+
+ * khtml/html/html_tableimpl.cpp:
+ (HTMLTableRowElementImpl::addChild):
+ * khtml/misc/loader.cpp:
+ * khtml/rendering/render_root.cpp:
+ (RenderRoot::layout):
+ * kwq/KWQKHTMLPart.h:
+ * kwq/KWQKHTMLPart.mm:
+ (KWQKHTMLPart::KWQKHTMLPart):
+ (KWQKHTMLPart::paint):
+
2002-12-03 Richard Williamson <rjw at apple.com>
Fixed 3019986. Use an array of font families instead of a single
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 031ee2c..84959e2 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,21 @@
+2002-12-03 David Hyatt <hyatt at apple.com>
+
+ Remove the moveWidgetsAside function. This fixes all the
+ form controls on livepage.apple.com that were getting hosed
+ by the scrolling marquee.
+
+ Reviewed by: darin
+
+ * khtml/html/html_tableimpl.cpp:
+ (HTMLTableRowElementImpl::addChild):
+ * khtml/misc/loader.cpp:
+ * khtml/rendering/render_root.cpp:
+ (RenderRoot::layout):
+ * kwq/KWQKHTMLPart.h:
+ * kwq/KWQKHTMLPart.mm:
+ (KWQKHTMLPart::KWQKHTMLPart):
+ (KWQKHTMLPart::paint):
+
2002-12-03 Richard Williamson <rjw at apple.com>
Fixed 3019986. Use an array of font families instead of a single
diff --git a/WebCore/khtml/html/html_tableimpl.cpp b/WebCore/khtml/html/html_tableimpl.cpp
index d8e9efd..50d0f69 100644
--- a/WebCore/khtml/html/html_tableimpl.cpp
+++ b/WebCore/khtml/html/html_tableimpl.cpp
@@ -627,7 +627,7 @@ NodeImpl::Id HTMLTableRowElementImpl::id() const
NodeImpl *HTMLTableRowElementImpl::addChild(NodeImpl *child)
{
#ifdef DEBUG_LAYOUT
- kdDebug( 6030 ) << nodeName().string() << "(Tbody)::addChild( " << child->nodeName().string() << " )" << endl;
+ kdDebug( 6030 ) << nodeName().string() << "(Trow)::addChild( " << child->nodeName().string() << " )" << endl;
#endif
if (child->id() == ID_FORM) {
diff --git a/WebCore/khtml/misc/loader.cpp b/WebCore/khtml/misc/loader.cpp
index 82e1c62..c10f342 100644
--- a/WebCore/khtml/misc/loader.cpp
+++ b/WebCore/khtml/misc/loader.cpp
@@ -31,7 +31,7 @@
#include "loader.h"
// up to which size is a picture for sure cacheable
-#define MAXCACHEABLE 40*1024
+#define MAXCACHEABLE 16*1024
// default cache size
#define DEFCACHESIZE 4096*1024
diff --git a/WebCore/khtml/rendering/render_root.cpp b/WebCore/khtml/rendering/render_root.cpp
index b2d6282..1a601f6 100644
--- a/WebCore/khtml/rendering/render_root.cpp
+++ b/WebCore/khtml/rendering/render_root.cpp
@@ -121,12 +121,6 @@ void RenderRoot::calcMinMaxWidth()
void RenderRoot::layout()
{
-#if APPLE_CHANGES
- // Let the KWQKHTMLPart know we are doing a layout.
- if (m_view && m_view->part())
- m_view->part()->kwq->layout();
-#endif
-
//kdDebug(6040) << "RenderRoot::layout()" << endl;
if (m_printingMode)
m_minWidth = m_width;
diff --git a/WebCore/kwq/KWQKHTMLPart.h b/WebCore/kwq/KWQKHTMLPart.h
index d86cce6..1c2810a 100644
--- a/WebCore/kwq/KWQKHTMLPart.h
+++ b/WebCore/kwq/KWQKHTMLPart.h
@@ -113,8 +113,6 @@ public:
void jumpToSelection();
- void layout();
-
QString userAgent() const;
void updatePolicyBaseURL();
@@ -182,7 +180,6 @@ private:
KWQSignal _completed;
KWQSignal _completedWithBool;
- bool _needsToSetWidgetsAside;
bool _ownsView;
NSEvent *_currentEvent;
diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index fc1c9cb..451d471 100644
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -99,7 +99,6 @@ KWQKHTMLPart::KWQKHTMLPart(KHTMLPart *p)
, _started(p, SIGNAL(started(KIO::Job *)))
, _completed(p, SIGNAL(completed()))
, _completedWithBool(p, SIGNAL(completed(bool)))
- , _needsToSetWidgetsAside(false)
, _ownsView(false)
, _currentEvent(nil)
{
@@ -284,28 +283,6 @@ void KWQKHTMLPart::redirectionTimerStartedOrStopped()
}
}
-static void moveWidgetsAside(RenderObject *object)
-{
- // Would use dynamic_cast, but a virtual function call is faster.
- if (object->isWidget()) {
- QWidget *widget = static_cast<RenderWidget *>(object)->widget();
- if (widget) {
- widget->move(999999, 0);
- }
- }
-
- for (RenderObject *child = object->firstChild(); child; child = child->nextSibling()) {
- moveWidgetsAside(child);
- }
-}
-
-void KWQKHTMLPart::layout()
-{
- // Since not all widgets will get a print call, it's important to move them away
- // so that they won't linger in an old position left over from a previous print.
- _needsToSetWidgetsAside = true;
-}
-
void KWQKHTMLPart::paint(QPainter *p, const QRect &rect)
{
#ifdef DEBUG_DRAWING
@@ -314,10 +291,6 @@ void KWQKHTMLPart::paint(QPainter *p, const QRect &rect)
#endif
if (renderer()) {
- if (_needsToSetWidgetsAside) {
- moveWidgetsAside(renderer());
- _needsToSetWidgetsAside = false;
- }
renderer()->layer()->paint(p, rect.x(), rect.y(), rect.width(), rect.height());
}
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list