[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[bdakin at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 6ac708637f4397b7f7d5e3ad6788e6e7d0198437
Author: bdakin at apple.com <bdakin at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Aug 31 23:49:08 2010 +0000

    Variable name change. m_shouldFirePostLayoutTimer is now
    m_hasPendingPostLayoutTasks
    
    Rubber-stamped by Dan Bernstein..
    
    * page/FrameView.cpp:
    (WebCore::FrameView::FrameView):
    (WebCore::FrameView::~FrameView):
    (WebCore::FrameView::reset):
    (WebCore::FrameView::layout):
    (WebCore::FrameView::performPostLayoutTasks):
    * page/FrameView.h:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66555 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 2459842..6d9c53c 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,5 +1,20 @@
 2010-08-31  Beth Dakin  <bdakin at apple.com>
 
+        Rubber-stamped by Dan Bernstein..
+
+        Variable name change. m_shouldFirePostLayoutTimer is now 
+        m_hasPendingPostLayoutTasks
+
+        * page/FrameView.cpp:
+        (WebCore::FrameView::FrameView):
+        (WebCore::FrameView::~FrameView):
+        (WebCore::FrameView::reset):
+        (WebCore::FrameView::layout):
+        (WebCore::FrameView::performPostLayoutTasks):
+        * page/FrameView.h:
+
+2010-08-31  Beth Dakin  <bdakin at apple.com>
+
         Reviewed by Dave Hyatt.
 
         Fix for https://bugs.webkit.org/show_bug.cgi?id=44828 FrameView 
diff --git a/WebCore/page/FrameView.cpp b/WebCore/page/FrameView.cpp
index 5cd2cb8..cada64c 100644
--- a/WebCore/page/FrameView.cpp
+++ b/WebCore/page/FrameView.cpp
@@ -128,7 +128,7 @@ FrameView::FrameView(Frame* frame)
     , m_fixedObjectCount(0)
     , m_layoutTimer(this, &FrameView::layoutTimerFired)
     , m_layoutRoot(0)
-    , m_shouldFirePostLayoutTimer(false)
+    , m_hasPendingPostLayoutTasks(false)
     , m_inSynchronousPostLayout(false)
     , m_postLayoutTasksTimer(this, &FrameView::postLayoutTimerFired)
     , m_isTransparent(false)
@@ -166,7 +166,7 @@ PassRefPtr<FrameView> FrameView::create(Frame* frame, const IntSize& initialSize
 
 FrameView::~FrameView()
 {
-    if (m_shouldFirePostLayoutTimer) {
+    if (m_hasPendingPostLayoutTasks) {
         m_postLayoutTasksTimer.stop();
         m_scheduledEvents.clear();
         m_enqueueEvents = 0;
@@ -207,7 +207,7 @@ void FrameView::reset()
     m_layoutSchedulingEnabled = true;
     m_inLayout = false;
     m_inSynchronousPostLayout = false;
-    m_shouldFirePostLayoutTimer = false;
+    m_hasPendingPostLayoutTasks = false;
     m_layoutCount = 0;
     m_nestedLayoutCount = 0;
     m_postLayoutTasksTimer.stop();
@@ -642,7 +642,7 @@ void FrameView::layout(bool allowSubtree)
 
     m_layoutSchedulingEnabled = false;
 
-    if (!m_nestedLayoutCount && !m_inSynchronousPostLayout && m_shouldFirePostLayoutTimer) {
+    if (!m_nestedLayoutCount && !m_inSynchronousPostLayout && m_hasPendingPostLayoutTasks) {
         // This is a new top-level layout. If there are any remaining tasks from the previous
         // layout, finish them now.
         m_inSynchronousPostLayout = true;
@@ -827,7 +827,7 @@ void FrameView::layout(bool allowSubtree)
         updateOverflowStatus(layoutWidth() < contentsWidth(),
                              layoutHeight() < contentsHeight());
 
-    if (!m_shouldFirePostLayoutTimer) {
+    if (!m_hasPendingPostLayoutTasks) {
         if (!m_inSynchronousPostLayout) {
             m_inSynchronousPostLayout = true;
             // Calls resumeScheduledEvents()
@@ -835,12 +835,12 @@ void FrameView::layout(bool allowSubtree)
             m_inSynchronousPostLayout = false;
         }
 
-        if (!m_shouldFirePostLayoutTimer && (needsLayout() || m_inSynchronousPostLayout)) {
+        if (!m_hasPendingPostLayoutTasks && (needsLayout() || m_inSynchronousPostLayout)) {
             // If we need layout or are already in a synchronous call to postLayoutTasks(), 
             // defer widget updates and event dispatch until after we return. postLayoutTasks()
             // can make us need to update again, and we can get stuck in a nasty cycle unless
             // we call it through the timer here.
-            m_shouldFirePostLayoutTimer = true;
+            m_hasPendingPostLayoutTasks = true;
             m_postLayoutTasksTimer.startOneShot(0);
             if (needsLayout()) {
                 pauseScheduledEvents();
@@ -1611,7 +1611,7 @@ bool FrameView::updateWidgets()
     
 void FrameView::performPostLayoutTasks()
 {
-    m_shouldFirePostLayoutTimer = false;
+    m_hasPendingPostLayoutTasks = false;
 
     if (m_firstLayoutCallbackPending) {
         m_firstLayoutCallbackPending = false;
diff --git a/WebCore/page/FrameView.h b/WebCore/page/FrameView.h
index ec8efde..11b5bac 100644
--- a/WebCore/page/FrameView.h
+++ b/WebCore/page/FrameView.h
@@ -319,7 +319,7 @@ private:
     
     bool m_layoutSchedulingEnabled;
     bool m_inLayout;
-    bool m_shouldFirePostLayoutTimer;
+    bool m_hasPendingPostLayoutTasks;
     bool m_inSynchronousPostLayout;
     int m_layoutCount;
     unsigned m_nestedLayoutCount;

-- 
WebKit Debian packaging