Changeset 185461 in webkit

Timestamp:

Jun 11, 2015, 11:01:44 AM (10 years ago)

Author:

Simon Fraser

Message:

Missing content in UIWebView snapshots sometimes
​https://bugs.webkit.org/show_bug.cgi?id=145779
rdar://problem/20744708

Reviewed by Darin Adler.

When expanding collapsed parts of quoted text on iOS, sometimes the "concertina"
images would be blank. This happened because we'd fail to create tiles for regions
outside the LegacyTileCache's visibleRect.

Fix by giving LegacyTileCache an optional override visibleRect, which is set
and cleared during -renderInContext: using the context clip rect.

• platform/ios/LegacyTileCache.h:
• platform/ios/LegacyTileCache.mm:

(WebCore::LegacyTileCache::visibleRectInLayer):
(WebCore::LegacyTileCache::setOverrideVisibleRect):

• platform/ios/LegacyTileLayer.mm:

(-[LegacyTileHostLayer renderInContext:]):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/ios/LegacyTileCache.h (modified) (3 diffs)
• platform/ios/LegacyTileCache.mm (modified) (1 diff)
• platform/ios/LegacyTileLayer.mm (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-06-08  Simon Fraser  <simon.fraser@apple.com>
+
+        Missing content in UIWebView snapshots sometimes
+        https://bugs.webkit.org/show_bug.cgi?id=145779
+        rdar://problem/20744708
+
+        Reviewed by Darin Adler.
+        
+        When expanding collapsed parts of quoted text on iOS, sometimes the "concertina"
+        images would be blank. This happened because we'd fail to create tiles for regions
+        outside the LegacyTileCache's visibleRect.
+        
+        Fix by giving LegacyTileCache an optional override visibleRect, which is set
+        and cleared during -renderInContext: using the context clip rect.
+
+        * platform/ios/LegacyTileCache.h:
+        * platform/ios/LegacyTileCache.mm:
+        (WebCore::LegacyTileCache::visibleRectInLayer):
+        (WebCore::LegacyTileCache::setOverrideVisibleRect):
+        * platform/ios/LegacyTileLayer.mm:
+        (-[LegacyTileHostLayer renderInContext:]):
+
 2015-06-11  Daniel Bates  <dabates@apple.com>
 

trunk/Source/WebCore/platform/ios/LegacyTileCache.h

@@ -35 +35 @@
 #include "Timer.h"
 #include <wtf/Noncopyable.h>
+#include <wtf/Optional.h>
 #include <wtf/PassRefPtr.h>
 #include <wtf/RetainPtr.h>
@@ -140 +141 @@
     unsigned tileCapacityForGrid(LegacyTileGrid*);
     Color colorForGridTileBorder(LegacyTileGrid*) const;
+    void setOverrideVisibleRect(Optional<FloatRect>);
 
     void doPendingRepaints();
@@ -184 +186 @@
     RetainPtr<LegacyTileCacheTombstone> m_tombstone;
 
+    Optional<FloatRect> m_overrideVisibleRect;
+
     TilingMode m_tilingMode;
     TilingDirection m_tilingDirection;

trunk/Source/WebCore/platform/ios/LegacyTileCache.mm

@@ -111 +111 @@
 FloatRect LegacyTileCache::visibleRectInLayer(CALayer *layer) const
 {
+    if (m_overrideVisibleRect)
+        return [layer convertRect:m_overrideVisibleRect.value() fromLayer:hostLayer()];
+
     return [layer convertRect:[m_window extendedVisibleRect] fromLayer:hostLayer()];
+}
+
+void LegacyTileCache::setOverrideVisibleRect(Optional<FloatRect> rect)
+{
+    m_overrideVisibleRect = rect;
 }
 

trunk/Source/WebCore/platform/ios/LegacyTileLayer.mm

@@ -33 +33 @@
 #include "WebCoreThread.h"
 
+using namespace WebCore;
+
 @implementation LegacyTileHostLayer
+
 - (id)initWithTileGrid:(WebCore::LegacyTileGrid*)tileGrid
 {
@@ -55 +58 @@
     if (pthread_main_np())
         WebThreadLock();
+
+    CGRect dirtyRect = CGContextGetClipBoundingBox(context);
+    _tileGrid->tileCache().setOverrideVisibleRect(FloatRect(dirtyRect));
     _tileGrid->tileCache().doLayoutTiles();
+
     [super renderInContext:context];
+
+    _tileGrid->tileCache().setOverrideVisibleRect(Nullopt);
 }
 @end