Title: [248835] branches/safari-608-branch/Source/WebCore
- Revision
- 248835
- Author
- bshaf...@apple.com
- Date
- 2019-08-18 23:03:18 -0700 (Sun, 18 Aug 2019)
Log Message
Cherry-pick r248028. rdar://problem/54454990
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
Modified Paths
Diff
Modified: branches/safari-608-branch/Source/WebCore/ChangeLog (248834 => 248835)
--- branches/safari-608-branch/Source/WebCore/ChangeLog 2019-08-18 22:16:52 UTC (rev 248834)
+++ branches/safari-608-branch/Source/WebCore/ChangeLog 2019-08-19 06:03:18 UTC (rev 248835)
@@ -1,3 +1,24 @@
+2019-08-18 Babak Shafiei <bshaf...@apple.com>
+
+ Cherry-pick r248028. rdar://problem/54454990
+
+ 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_hor...@apple.com>
+
+ ASSERTion failure under takeSnapshot after r247846
+
+ * page/TextIndicator.cpp:
+ (WebCore::takeSnapshots):
+ We now sometimes inflate the scale factor; allow this.
+
2019-08-15 Alan Coon <alanc...@apple.com>
Cherry-pick r248722. rdar://problem/54360866
Modified: branches/safari-608-branch/Source/WebCore/page/TextIndicator.cpp (248834 => 248835)
--- branches/safari-608-branch/Source/WebCore/page/TextIndicator.cpp 2019-08-18 22:16:52 UTC (rev 248834)
+++ branches/safari-608-branch/Source/WebCore/page/TextIndicator.cpp 2019-08-19 06:03:18 UTC (rev 248835)
@@ -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
