Unreviewed iOS build fix
authormmaxfield@apple.com <mmaxfield@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 24 Oct 2014 01:32:48 +0000 (01:32 +0000)
committermmaxfield@apple.com <mmaxfield@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 24 Oct 2014 01:32:48 +0000 (01:32 +0000)
Patch by Myles C. Maxfield <mmaxfield@apple.com> 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
Source/WebCore/editing/FrameSelection.cpp

index a7fc36b44e46132e2bff710ee7dedf39361bc65a..b1d7ad772985523598e93d3898f9690567672ef8 100644 (file)
@@ -1,3 +1,9 @@
+2014-10-23  Myles C. Maxfield  <mmaxfield@apple.com>
+
+        Unreviewed iOS build fix
+
+        * editing/FrameSelection.cpp:
+
 2014-10-23  Chris Dumez  <cdumez@apple.com>
 
         [Mac] Optimize URL::createCFURL() for the common case
 2014-10-23  Chris Dumez  <cdumez@apple.com>
 
         [Mac] Optimize URL::createCFURL() for the common case
index d9f4d5cb11c1d3a651481aba672e66411b064b5c..13223dd751cf7f58319d62267ccb72c5d1a65589 100644 (file)
@@ -1474,10 +1474,12 @@ void FrameSelection::paintCaret(GraphicsContext* context, const LayoutPoint& pai
         CaretBase::paintCaret(m_selection.start().deprecatedNode(), context, paintOffset, clipRect);
 }
 
         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;
 }
 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
 {
 
 void CaretBase::paintCaret(Node* node, GraphicsContext* context, const LayoutPoint& paintOffset, const LayoutRect& clipRect) const
 {