Changeset 84698 in webkit

Timestamp:

Apr 22, 2011 4:01:04 PM (13 years ago)

Author:

jer.noble@apple.com

Message:

2011-04-22 Dan Bernstein <​mitz@apple.com>

Reviewed by Sam Weinig.

Paint the bounding rect of the dirty region instead of individual rectangles when the region
covers at least 3/4 of its bounds.

• WebProcess/WebPage/DrawingAreaImpl.cpp: (WebKit::shouldPaintBoundsRect): Use floating point math so that the logic that was supposed to achieve this actually works.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/FullScreen/mac/WebFullScreenManagerMac.mm (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ -9 +9 @@
         (WebKit::shouldPaintBoundsRect): Use floating point math so that the logic that was supposed to
         achieve this actually works.
+
+2011-04-22  Jer Noble  <jer.noble@apple.com>
+
+        Reviewed by Maciej Stachowiak.
+
+        Crash at WebKit::WebFullScreenManagerMac::beginExitFullScreenAnimation + 79
+        https://bugs.webkit.org/show_bug.cgi?id=59225
+
+        * WebProcess/FullScreen/mac/WebFullScreenManagerMac.mm:
+        (WebKit::WebFullScreenManagerMac::beginEnterFullScreenAnimation): Guard against 
+            m_fullScreenRootLayer being NULL.
+        (WebKit::WebFullScreenManagerMac::beginExitFullScreenAnimation): Ditto.
 
 2011-04-22  Jer Noble  <jer.noble@apple.com>

trunk/Source/WebKit2/WebProcess/FullScreen/mac/WebFullScreenManagerMac.mm

@@ -174 +174 @@
 {
     ASSERT(m_element);
-    ASSERT(m_fullScreenRootLayer);
+    
+    if (!m_fullScreenRootLayer) {
+        // If we don't have a root layer, we can't animate in and out of full screen
+        this->beganEnterFullScreenAnimation();
+        this->finishedEnterFullScreenAnimation(true);
+        return;
+    }
 
     IntRect destinationFrame = getFullScreenRect();
@@ -223 +229 @@
 {
     ASSERT(m_element);
-    ASSERT(m_fullScreenRootLayer);
+    
+    if (!m_fullScreenRootLayer) {
+        // If we don't have a root layer, we can't animate in and out of full screen
+        this->beganExitFullScreenAnimation();
+        this->finishedExitFullScreenAnimation(true);
+        return;
+    }
 
     IntRect destinationFrame = getFullScreenRect();