Title: [248356] branches/safari-608.1-branch/Source/WebCore
- Revision
- 248356
- Author
- [email protected]
- Date
- 2019-08-06 23:52:55 -0700 (Tue, 06 Aug 2019)
Log 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
Modified Paths
Diff
Modified: branches/safari-608.1-branch/Source/WebCore/ChangeLog (248355 => 248356)
--- branches/safari-608.1-branch/Source/WebCore/ChangeLog 2019-08-07 06:52:53 UTC (rev 248355)
+++ branches/safari-608.1-branch/Source/WebCore/ChangeLog 2019-08-07 06:52:55 UTC (rev 248356)
@@ -1,5 +1,26 @@
2019-08-06 Kocsen Chung <[email protected]>
+ 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 <[email protected]>
+
+ 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 <[email protected]>
+
Cherry-pick r248018. rdar://problem/54017893
REGRESSION(r241288): Text on Yahoo Japan mobile looks too bold
Modified: branches/safari-608.1-branch/Source/WebCore/page/TextIndicator.cpp (248355 => 248356)
--- branches/safari-608.1-branch/Source/WebCore/page/TextIndicator.cpp 2019-08-07 06:52:53 UTC (rev 248355)
+++ branches/safari-608.1-branch/Source/WebCore/page/TextIndicator.cpp 2019-08-07 06:52:55 UTC (rev 248356)
@@ -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
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
