[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e

[mihaip at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit 4f91e73be6c867355ff252010b1084ab0841d530
Author: mihaip at chromium.org <mihaip at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jan 5 20:03:01 2011 +0000

    2011-01-05  Mihai Parparita  <mihaip at chromium.org>
    
            Reviewed by Nate Chapin.
    
            [Chromium] Crash when drawing PDF plug-in scrollbars
            https://bugs.webkit.org/show_bug.cgi?id=51942
    
            Pepper plug-in scrollbars don't have a parent, guard against that before
            seeing if the parent is a FrameView.
    
            Not testable via layout tests, verified fix by hand.
    
            * platform/chromium/ScrollbarThemeChromiumMac.mm:
            (WebCore::ScrollbarThemeChromiumMac::paint):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75092 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 812ed9e..4b41cb0 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,18 @@
+2011-01-05  Mihai Parparita  <mihaip at chromium.org>
+
+        Reviewed by Nate Chapin.
+
+        [Chromium] Crash when drawing PDF plug-in scrollbars
+        https://bugs.webkit.org/show_bug.cgi?id=51942
+
+        Pepper plug-in scrollbars don't have a parent, guard against that before
+        seeing if the parent is a FrameView.
+
+        Not testable via layout tests, verified fix by hand.
+        
+        * platform/chromium/ScrollbarThemeChromiumMac.mm:
+        (WebCore::ScrollbarThemeChromiumMac::paint):
+
 2011-01-05  Abhishek Arya  <inferno at chromium.org>
 
         Unreviewed.
diff --git a/WebCore/platform/chromium/ScrollbarThemeChromiumMac.mm b/WebCore/platform/chromium/ScrollbarThemeChromiumMac.mm
index 2215775..d13d41e 100644
--- a/WebCore/platform/chromium/ScrollbarThemeChromiumMac.mm
+++ b/WebCore/platform/chromium/ScrollbarThemeChromiumMac.mm
@@ -472,7 +472,7 @@ bool ScrollbarThemeChromiumMac::paint(Scrollbar* scrollbar, GraphicsContext* con
 #if USE_WEB_THEME_ENGINE_TO_PAINT_THUMB
         ChromiumBridge::ThemePaintScrollbarInfo scrollbarInfo;
         scrollbarInfo.orientation = scrollbar->orientation() == HorizontalScrollbar ? ChromiumBridge::ScrollbarOrientationHorizontal : ChromiumBridge::ScrollbarOrientationVertical;
-        scrollbarInfo.parent = scrollbar->parent()->isFrameView() && static_cast<FrameView*>(scrollbar->parent())->isScrollViewScrollbar(scrollbar) ? ChromiumBridge::ScrollbarParentScrollView : ChromiumBridge::ScrollbarParentRenderLayer;
+        scrollbarInfo.parent = scrollbar->parent() && scrollbar->parent()->isFrameView() && static_cast<FrameView*>(scrollbar->parent())->isScrollViewScrollbar(scrollbar) ? ChromiumBridge::ScrollbarParentScrollView : ChromiumBridge::ScrollbarParentRenderLayer;
         scrollbarInfo.maxValue = scrollbar->maximum();
         scrollbarInfo.currentValue = scrollbar->currentPos();
         scrollbarInfo.visibleSize = scrollbar->visibleSize();

-- 
WebKit Debian packaging