[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

[sullivan at apple.com]

The following commit has been merged in the webkit-1.3 branch:
commit acb7786e904c55c82503a70fdb339bd6147bcde8
Author: sullivan at apple.com <sullivan at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jan 11 20:05:32 2011 +0000

    [WKView setFrameSize:] derefs _page->drawingArea() without null check
    <https://bugs.webkit.org/show_bug.cgi?id=52231>
    
    Reviewed by Anders Carlsson.
    
    * UIProcess/API/mac/WKView.mm:
    (-[WKView setFrameSize:]):
    Null check drawingArea(). This is OK because if it doesn't exist then it will be
    created later with the correct initial size.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75525 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index ba8152a..6111f66 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,15 @@
+2011-01-11  John Sullivan  <sullivan at apple.com>
+
+        Reviewed by Anders Carlsson.
+
+        [WKView setFrameSize:] derefs _page->drawingArea() without null check
+        <https://bugs.webkit.org/show_bug.cgi?id=52231>
+
+        * UIProcess/API/mac/WKView.mm:
+        (-[WKView setFrameSize:]):
+        Null check drawingArea(). This is OK because if it doesn't exist then it will be
+        created later with the correct initial size.
+
 2011-01-07  Enrica Casucci  <enrica at apple.com>
 
         Reviewed by Alexey Proskuryakov.
diff --git a/WebKit2/UIProcess/API/mac/WKView.mm b/WebKit2/UIProcess/API/mac/WKView.mm
index 0820016..3bcd9f6 100644
--- a/WebKit2/UIProcess/API/mac/WKView.mm
+++ b/WebKit2/UIProcess/API/mac/WKView.mm
@@ -252,6 +252,9 @@ typedef HashMap<String, ValidationVector> ValidationMap;
 {
     [super setFrameSize:size];
 
+    if (!_data->_page->drawingArea())
+        return;
+    
     _data->_page->drawingArea()->setSize(IntSize(size));
 }
 

-- 
WebKit Debian packaging