From 5820f0350691cd4b49109fa41c3715d4d184ffdc Mon Sep 17 00:00:00 2001 From: "mmaxfield@apple.com" Date: Fri, 24 Oct 2014 01:32:48 +0000 Subject: [PATCH] Unreviewed iOS build fix Patch by Myles C. Maxfield on 2014-10-23 * editing/FrameSelection.cpp: git-svn-id: https://svn.webkit.org/repository/webkit/trunk@175155 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- Source/WebCore/ChangeLog | 6 ++++++ Source/WebCore/editing/FrameSelection.cpp | 2 ++ 2 files changed, 8 insertions(+) diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog index a7fc36b44e46..b1d7ad772985 100644 --- a/Source/WebCore/ChangeLog +++ b/Source/WebCore/ChangeLog @@ -1,3 +1,9 @@ +2014-10-23 Myles C. Maxfield + + Unreviewed iOS build fix + + * editing/FrameSelection.cpp: + 2014-10-23 Chris Dumez [Mac] Optimize URL::createCFURL() for the common case diff --git a/Source/WebCore/editing/FrameSelection.cpp b/Source/WebCore/editing/FrameSelection.cpp index d9f4d5cb11c1..13223dd751cf 100644 --- a/Source/WebCore/editing/FrameSelection.cpp +++ b/Source/WebCore/editing/FrameSelection.cpp @@ -1474,10 +1474,12 @@ void FrameSelection::paintCaret(GraphicsContext* context, const LayoutPoint& pai CaretBase::paintCaret(m_selection.start().deprecatedNode(), context, paintOffset, clipRect); } +#if ENABLE(TEXT_CARET) static inline bool disappearsIntoBackground(Color foreground, Color background) { return background.blend(foreground) == background; } +#endif void CaretBase::paintCaret(Node* node, GraphicsContext* context, const LayoutPoint& paintOffset, const LayoutRect& clipRect) const { -- 2.36.0