Changeset 248356 in webkit

Timestamp:

Aug 6, 2019, 11:52:55 PM (7 years ago)

Author:

Kocsen Chung

Message:

Cherry-pick r248028. rdar://problem/54017896

ASSERTion failure under takeSnapshot after r247846

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

git-svn-id: ​https://svn.webkit.org/repository/webkit/trunk@248028 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Location:

branches/safari-608.1-branch/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/TextIndicator.cpp (modified) (1 diff)

branches/safari-608.1-branch/Source/WebCore/ChangeLog

@@ +1 @@
+2019-08-06  Kocsen Chung  <kocsen_chung@apple.com>
+
+        Cherry-pick r248028. rdar://problem/54017896
+
+    ASSERTion failure under takeSnapshot after r247846
+    
+    * page/TextIndicator.cpp:
+    (WebCore::takeSnapshots):
+    We now sometimes inflate the scale factor; allow this.
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@248028 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2019-07-30  Tim Horton  <timothy_horton@apple.com>
+
+            ASSERTion failure under takeSnapshot after r247846
+
+            * page/TextIndicator.cpp:
+            (WebCore::takeSnapshots):
+            We now sometimes inflate the scale factor; allow this.
+
 2019-08-06  Kocsen Chung  <kocsen_chung@apple.com>
 

branches/safari-608.1-branch/Source/WebCore/page/TextIndicator.cpp

@@ -170 +170 @@
         float snapshotScaleFactor;
         data.contentImageWithHighlight = takeSnapshot(frame, snapshotRect, SnapshotOptionsNone, snapshotScaleFactor, clipRectsInDocumentCoordinates);
-        ASSERT(!data.contentImageWithHighlight || data.contentImageScaleFactor == snapshotScaleFactor);
+        ASSERT(!data.contentImageWithHighlight || data.contentImageScaleFactor >= snapshotScaleFactor);
     }