[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[bfulgham at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 73aeafe44131d72a98166972702e426106a13d40
Author: bfulgham at webkit.org <bfulgham at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Jan 9 00:20:30 2010 +0000

    Build fix, no review.
    
    Protect video control logic inside ENABLE(VIDEO).
    
    * WebView.cpp:
    (WebView::enterFullscreenForNode):
    (WebView::exitFullscreen):
    * WebView.h:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53022 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/win/ChangeLog b/WebKit/win/ChangeLog
index 78b924f..1561225 100644
--- a/WebKit/win/ChangeLog
+++ b/WebKit/win/ChangeLog
@@ -1,3 +1,14 @@
+2010-01-08  Brent Fulgham  <bfulgham at webkit.org>
+
+        Build fix, no review.
+
+        Protect video control logic inside ENABLE(VIDEO).
+
+        * WebView.cpp:
+        (WebView::enterFullscreenForNode):
+        (WebView::exitFullscreen):
+        * WebView.h:
+
 2010-01-08  Chris Marrin  <cmarrin at apple.com>
 
         Reviewed by Adam Roben.
diff --git a/WebKit/win/WebView.cpp b/WebKit/win/WebView.cpp
index 3f28c5b..bd7a32f 100644
--- a/WebKit/win/WebView.cpp
+++ b/WebKit/win/WebView.cpp
@@ -5665,6 +5665,7 @@ void WebView::enterFullscreenForNode(Node* node)
     if (!node->hasTagName(HTMLNames::videoTag))
         return;
 
+#if ENABLE(VIDEO)
     HTMLMediaElement* videoElement = static_cast<HTMLMediaElement*>(node);
 
     if (m_fullscreenController) {
@@ -5684,14 +5685,17 @@ void WebView::enterFullscreenForNode(Node* node)
 
     m_fullscreenController = new FullscreenVideoController;
     m_fullscreenController->setMediaElement(videoElement);
-    m_fullscreenController->enterFullscreen();        
+    m_fullscreenController->enterFullscreen();
+#endif
 }
 
 void WebView::exitFullscreen()
 {
+#if ENABLE(VIDEO)
     if (m_fullscreenController)
         m_fullscreenController->exitFullscreen();
     m_fullscreenController = 0;
+#endif
 }
 
 static PassOwnPtr<Vector<String> > toStringVector(unsigned patternsCount, BSTR* patterns)
diff --git a/WebKit/win/WebView.h b/WebKit/win/WebView.h
index 88f656b..60c2de5 100644
--- a/WebKit/win/WebView.h
+++ b/WebKit/win/WebView.h
@@ -988,7 +988,9 @@ protected:
     long m_xOverpan;
     long m_yOverpan;
 
+#if ENABLE(VIDEO)
     OwnPtr<FullscreenVideoController> m_fullscreenController;
+#endif
 
 #if USE(ACCELERATED_COMPOSITING)
     bool isAcceleratedCompositing() const { return m_isAcceleratedCompositing; }

-- 
WebKit Debian packaging