Attachment 361014 Details for Bug 194203 – Patch

[patch] Patch

bug-194203-20190203092040.patch (text/plain), 2.92 KB, created by Simon Fraser (smfr) on 2019-02-03 09:20:41 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Simon Fraser (smfr)

Created: 2019-02-03 09:20:41 PST

Size: 2.92 KB

patch

obsolete

>Subversion Revision: 240903
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index e234e19b2a7043f5bbd66b09743ffd258e845241..0deef5d5c6f698168d6b01dcf91d9adec735130c 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,18 @@
>+2019-02-03  Simon Fraser  <simon.fraser@apple.com>
>+
>+        Tidyup of Pagination and FrameView m_mediaType initialization
>+        https://bugs.webkit.org/show_bug.cgi?id=194203
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        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  <megan_gardner@apple.com>
> 
>         Turn on Smart Paste
>diff --git a/Source/WebCore/page/FrameView.cpp b/Source/WebCore/page/FrameView.cpp
>index 12c1de424c8ea0485a82e5d0eef049a21a0be71c..a0e3b687970bcc800d4dc0fedfc74600dbbd3481 100644
>--- a/Source/WebCore/page/FrameView.cpp
>+++ b/Source/WebCore/page/FrameView.cpp
>@@ -189,7 +189,6 @@ FrameView::FrameView(Frame& frame)
>     , m_delayedScrollEventTimer(*this, &FrameView::sendScrollEvent)
>     , m_delayedScrollToFocusedElementTimer(*this, &FrameView::scrollToFocusedElementTimerFired)
>     , m_speculativeTilingEnableTimer(*this, &FrameView::speculativeTilingEnableTimerFired)
>-    , m_mediaType("screen")
> {
>     init();
> 
>diff --git a/Source/WebCore/page/FrameView.h b/Source/WebCore/page/FrameView.h
>index 9b4753cb6a8d8be7faad6f13b985af532b6bbc93..aab4a9a84d5435480c26e07b52e7b28630bdc6b4 100644
>--- a/Source/WebCore/page/FrameView.h
>+++ b/Source/WebCore/page/FrameView.h
>@@ -841,7 +841,7 @@ private:
>     Color m_baseBackgroundColor { Color::white };
>     IntSize m_lastViewportSize;
> 
>-    String m_mediaType;
>+    String m_mediaType { "screen"_s };
>     String m_mediaTypeWhenNotPrinting;
> 
>     Vector<FloatRect> m_trackedRepaintRects;
>diff --git a/Source/WebCore/rendering/Pagination.h b/Source/WebCore/rendering/Pagination.h
>index d7afebdad31cf731a844b611358e797bd1938532..f6fe63c882d3e0a18500acc0e086009532059e29 100644
>--- a/Source/WebCore/rendering/Pagination.h
>+++ b/Source/WebCore/rendering/Pagination.h
>@@ -30,8 +30,6 @@ namespace WebCore {
> 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 @@ struct Pagination {
> 
>     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 };

Actions: View | Formatted Diff | Diff

Attachments on bug 194203: 361014