Title: [248028] trunk/Source/WebCore
Revision
248028
Author
timothy_hor...@apple.com
Date
2019-07-30 22:01:42 -0700 (Tue, 30 Jul 2019)

Log Message

ASSERTion failure under takeSnapshot after r247846

* page/TextIndicator.cpp:
(WebCore::takeSnapshots):
We now sometimes inflate the scale factor; allow this.

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (248027 => 248028)


--- trunk/Source/WebCore/ChangeLog	2019-07-31 01:35:40 UTC (rev 248027)
+++ trunk/Source/WebCore/ChangeLog	2019-07-31 05:01:42 UTC (rev 248028)
@@ -1,3 +1,11 @@
+2019-07-30  Tim Horton  <timothy_hor...@apple.com>
+
+        ASSERTion failure under takeSnapshot after r247846
+
+        * page/TextIndicator.cpp:
+        (WebCore::takeSnapshots):
+        We now sometimes inflate the scale factor; allow this.
+
 2019-07-30  Saam Barati  <sbar...@apple.com>
 
         [WHLSL] Add a fast path for TypeNamer::insert where we've already seen the type

Modified: trunk/Source/WebCore/page/TextIndicator.cpp (248027 => 248028)


--- trunk/Source/WebCore/page/TextIndicator.cpp	2019-07-31 01:35:40 UTC (rev 248027)
+++ trunk/Source/WebCore/page/TextIndicator.cpp	2019-07-31 05:01:42 UTC (rev 248028)
@@ -169,7 +169,7 @@
     if (data.options & TextIndicatorOptionIncludeSnapshotWithSelectionHighlight) {
         float snapshotScaleFactor;
         data.contentImageWithHighlight = takeSnapshot(frame, snapshotRect, SnapshotOptionsNone, snapshotScaleFactor, clipRectsInDocumentCoordinates);
-        ASSERT(!data.contentImageWithHighlight || data.contentImageScaleFactor == snapshotScaleFactor);
+        ASSERT(!data.contentImageWithHighlight || data.contentImageScaleFactor >= snapshotScaleFactor);
     }
 
     if (data.options & TextIndicatorOptionIncludeSnapshotOfAllVisibleContentWithoutSelection) {
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to