Title: [240904] trunk/Source/WebCore
- Revision
- 240904
- Author
- [email protected]
- Date
- 2019-02-03 11:46:31 -0800 (Sun, 03 Feb 2019)
Log Message
Tidyup of Pagination and FrameView m_mediaType initialization
https://bugs.webkit.org/show_bug.cgi?id=194203
Reviewed by Darin Adler.
Fix post-commit feedback on lines around code changed in r240901.
* page/FrameView.cpp:
(WebCore::FrameView::FrameView):
* page/FrameView.h:
* rendering/Pagination.h:
(WebCore::Pagination::operator!= const):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (240903 => 240904)
--- trunk/Source/WebCore/ChangeLog 2019-02-03 13:53:54 UTC (rev 240903)
+++ trunk/Source/WebCore/ChangeLog 2019-02-03 19:46:31 UTC (rev 240904)
@@ -1,3 +1,18 @@
+2019-02-03 Simon Fraser <[email protected]>
+
+ Tidyup of Pagination and FrameView m_mediaType initialization
+ https://bugs.webkit.org/show_bug.cgi?id=194203
+
+ Reviewed by Darin Adler.
+
+ Fix post-commit feedback on lines around code changed in r240901.
+
+ * page/FrameView.cpp:
+ (WebCore::FrameView::FrameView):
+ * page/FrameView.h:
+ * rendering/Pagination.h:
+ (WebCore::Pagination::operator!= const):
+
2019-02-03 Megan Gardner <[email protected]>
Turn on Smart Paste
Modified: trunk/Source/WebCore/page/FrameView.cpp (240903 => 240904)
--- trunk/Source/WebCore/page/FrameView.cpp 2019-02-03 13:53:54 UTC (rev 240903)
+++ trunk/Source/WebCore/page/FrameView.cpp 2019-02-03 19:46:31 UTC (rev 240904)
@@ -189,7 +189,6 @@
, m_delayedScrollEventTimer(*this, &FrameView::sendScrollEvent)
, m_delayedScrollToFocusedElementTimer(*this, &FrameView::scrollToFocusedElementTimerFired)
, m_speculativeTilingEnableTimer(*this, &FrameView::speculativeTilingEnableTimerFired)
- , m_mediaType("screen")
{
init();
Modified: trunk/Source/WebCore/page/FrameView.h (240903 => 240904)
--- trunk/Source/WebCore/page/FrameView.h 2019-02-03 13:53:54 UTC (rev 240903)
+++ trunk/Source/WebCore/page/FrameView.h 2019-02-03 19:46:31 UTC (rev 240904)
@@ -841,7 +841,7 @@
Color m_baseBackgroundColor { Color::white };
IntSize m_lastViewportSize;
- String m_mediaType;
+ String m_mediaType { "screen"_s };
String m_mediaTypeWhenNotPrinting;
Vector<FloatRect> m_trackedRepaintRects;
Modified: trunk/Source/WebCore/rendering/Pagination.h (240903 => 240904)
--- trunk/Source/WebCore/rendering/Pagination.h 2019-02-03 13:53:54 UTC (rev 240903)
+++ trunk/Source/WebCore/rendering/Pagination.h 2019-02-03 19:46:31 UTC (rev 240904)
@@ -30,8 +30,6 @@
struct Pagination {
enum Mode : uint8_t { Unpaginated, LeftToRightPaginated, RightToLeftPaginated, TopToBottomPaginated, BottomToTopPaginated };
- Pagination() = default;
-
bool operator==(const Pagination& other) const
{
return mode == other.mode && behavesLikeColumns == other.behavesLikeColumns && pageLength == other.pageLength && gap == other.gap;
@@ -39,7 +37,7 @@
bool operator!=(const Pagination& other) const
{
- return mode != other.mode || behavesLikeColumns != other.behavesLikeColumns || pageLength != other.pageLength || gap != other.gap;
+ return !(*this == other);
}
Mode mode { Unpaginated };
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
