From: timothy_horton@apple.com <timothy_horton@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu, 23 Jul 2015 10:11:28 +0000 (+0000)
Subject: Fix the build for __IPHONE_OS_VERSION_MIN_REQUIRED <= 80200 || !HAVE(AVKIT)
X-Git-Url: http://git.webkit.org/?p=WebKit-https.git;a=commitdiff_plain;h=2a42aff7160cb7074f06effc48121884f17dc212

Fix the build for __IPHONE_OS_VERSION_MIN_REQUIRED <= 80200 || !HAVE(AVKIT)

* platform/ios/WebVideoFullscreenControllerAVKit.mm:
(elementRectInWindow):
This helper is only used in the #else block, so move it there.


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

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 0e1cc15..8282e65 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,11 @@
+2015-07-23  Tim Horton  <timothy_horton@apple.com>
+
+        Fix the build for __IPHONE_OS_VERSION_MIN_REQUIRED <= 80200 || !HAVE(AVKIT)
+
+        * platform/ios/WebVideoFullscreenControllerAVKit.mm:
+        (elementRectInWindow):
+        This helper is only used in the #else block, so move it there.
+
 2015-07-23  Timothy Horton  <timothy_horton@apple.com>
 
         Try to fix the build
diff --git a/Source/WebCore/platform/ios/WebVideoFullscreenControllerAVKit.mm b/Source/WebCore/platform/ios/WebVideoFullscreenControllerAVKit.mm
index 736922b..b440f3f 100644
--- a/Source/WebCore/platform/ios/WebVideoFullscreenControllerAVKit.mm
+++ b/Source/WebCore/platform/ios/WebVideoFullscreenControllerAVKit.mm
@@ -46,14 +46,6 @@ SOFT_LINK_CLASS(UIKit, UIView)
 
 using namespace WebCore;
 
-static IntRect elementRectInWindow(HTMLVideoElement* videoElement)
-{
-    if (!videoElement || !videoElement->renderer() || !videoElement->document().view())
-        return IntRect();
-    
-    return videoElement->document().view()->convertToContainingWindow(videoElement->renderer()->absoluteBoundingBoxRect());
-}
-
 #if __IPHONE_OS_VERSION_MIN_REQUIRED <= 80200 || !HAVE(AVKIT)
 
 @implementation WebVideoFullscreenController
@@ -84,6 +76,14 @@ static IntRect elementRectInWindow(HTMLVideoElement* videoElement)
 
 #else
 
+static IntRect elementRectInWindow(HTMLVideoElement* videoElement)
+{
+    if (!videoElement || !videoElement->renderer() || !videoElement->document().view())
+        return IntRect();
+    
+    return videoElement->document().view()->convertToContainingWindow(videoElement->renderer()->absoluteBoundingBoxRect());
+}
+
 class WebVideoFullscreenControllerContext;
 
 @interface WebVideoFullscreenController (delegate)