[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.17-1283-gcf603cf

[mitz at apple.com]

The following commit has been merged in the webkit-1.1 branch:
commit 12e87cb4ba68af02552c50a13d65ae8546ba342e
Author: mitz at apple.com <mitz at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Jan 4 22:09:23 2010 +0000

    Windows build fix
    
    * page/FrameView.cpp:
    (WebCore::FrameView::layout):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52759 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 52f996c..1766b22 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,10 @@
+2010-01-04  Dan Bernstein  <mitz at apple.com>
+
+        Windows build fix
+
+        * page/FrameView.cpp:
+        (WebCore::FrameView::layout):
+
 2010-01-04  Gavin Barraclough  <barraclough at apple.com>
 
         Reviewed by Sam Weinig.
diff --git a/WebCore/page/FrameView.cpp b/WebCore/page/FrameView.cpp
index 7d0935e..a6ffcc5 100644
--- a/WebCore/page/FrameView.cpp
+++ b/WebCore/page/FrameView.cpp
@@ -658,7 +658,7 @@ void FrameView::layout(bool allowSubtree)
 
     pauseScheduledEvents();
 
-    bool disableLayoutState;
+    bool disableLayoutState = false;
     if (subtree) {
         RenderView* view = root->view();
         disableLayoutState = view->shouldDisableLayoutStateForSubtree(root);

-- 
WebKit Debian packaging