iOS build fix.
authormitz@apple.com <mitz@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 10 Jul 2014 17:07:41 +0000 (17:07 +0000)
committermitz@apple.com <mitz@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 10 Jul 2014 17:07:41 +0000 (17:07 +0000)
* WebProcess/WebPage/ServicesOverlayController.h:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@170967 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebKit2/ChangeLog
Source/WebKit2/WebProcess/WebPage/ServicesOverlayController.h

index 77ff4f915afeb4e6b8a6d0f8d6eba855ebd76d10..f0c7270dc5f68422ee126bda9ae63068df8334bb 100644 (file)
@@ -1,4 +1,9 @@
-<<<<<<< HEAD
+2014-07-10  Dan Bernstein  <mitz@apple.com>
+
+        iOS build fix.
+
+        * WebProcess/WebPage/ServicesOverlayController.h:
+
 2014-07-10  Timothy Horton  <timothy_horton@apple.com>
 
         Assertions or crashes under _takeViewSnapshot when restoring windows
index e6780a091f9e4ca7a7b275e90bcf75043f648963..8f30a9a1d665d5efa27a363abbf9fb3274ee48e2 100644 (file)
  */
 
 #ifndef ServicesOverlayController_h
+#define ServicesOverlayController_h
 
 #if ENABLE(SERVICE_CONTROLS) || ENABLE(TELEPHONE_NUMBER_DETECTION)
 
 #include "PageOverlay.h"
+#include <WebCore/Range.h>
 
 typedef void* DDHighlightRef;
 
 namespace WebCore {
 class LayoutRect;
-class Range;
 
 struct GapRects;
 }