[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da

[laszlo.1.gombos at nokia.com]

The following commit has been merged in the debian/experimental branch:
commit 5fcccda4b07bfdf66fa6aa9935a889428a9577dc
Author: laszlo.1.gombos at nokia.com <laszlo.1.gombos at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Dec 3 00:38:54 2010 +0000

    2010-12-02  Laszlo Gombos  <laszlo.1.gombos at nokia.com>
    
            Reviewed by Csaba Osztrogonác.
    
            [Qt] Fix compilation with !ENABLE(OFFLINE_WEB_APPLICATIONS) and
            !ENABLE(TILED_BACKING_STORE) for WebKit2
            https://bugs.webkit.org/show_bug.cgi?id=50071
    
            Add appropriate guards. No functional change if guards are set.
    
            * UIProcess/API/qt/qwkpage.cpp:
            (QWKPage::setActualVisibleContentsRect):
            * UIProcess/TiledDrawingAreaProxy.cpp:
            * UIProcess/qt/TiledDrawingAreaProxyQt.cpp:
            * UIProcess/qt/TiledDrawingAreaTileQt.cpp:
            * UIProcess/qt/WebContextQt.cpp:
            (WebKit::WebContext::applicationCacheDirectory):
            * WebProcess/WebProcess.cpp:
            (WebKit::WebProcess::initializeWebProcess):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73221 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 92e2de1..f143182 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,23 @@
+2010-12-02  Laszlo Gombos  <laszlo.1.gombos at nokia.com>
+
+        Reviewed by Csaba Osztrogonác.
+
+        [Qt] Fix compilation with !ENABLE(OFFLINE_WEB_APPLICATIONS) and 
+        !ENABLE(TILED_BACKING_STORE) for WebKit2
+        https://bugs.webkit.org/show_bug.cgi?id=50071
+
+        Add appropriate guards. No functional change if guards are set.
+
+        * UIProcess/API/qt/qwkpage.cpp:
+        (QWKPage::setActualVisibleContentsRect):
+        * UIProcess/TiledDrawingAreaProxy.cpp:
+        * UIProcess/qt/TiledDrawingAreaProxyQt.cpp:
+        * UIProcess/qt/TiledDrawingAreaTileQt.cpp:
+        * UIProcess/qt/WebContextQt.cpp:
+        (WebKit::WebContext::applicationCacheDirectory):
+        * WebProcess/WebProcess.cpp:
+        (WebKit::WebProcess::initializeWebProcess):
+
 2010-12-02  Sam Weinig  <sam at webkit.org>
 
         Fix Qt.
diff --git a/WebKit2/UIProcess/API/qt/qwkpage.cpp b/WebKit2/UIProcess/API/qt/qwkpage.cpp
index 8b9d0fc..d8f292d 100644
--- a/WebKit2/UIProcess/API/qt/qwkpage.cpp
+++ b/WebKit2/UIProcess/API/qt/qwkpage.cpp
@@ -443,7 +443,9 @@ QWKPage::ViewportAttributes QWKPage::viewportAttributesForSize(const QSize& avai
 
 void QWKPage::setActualVisibleContentsRect(const QRect& rect) const
 {
+#if ENABLE(TILED_BACKING_STORE)
     d->page->setActualVisibleContentRect(rect);
+#endif
 }
 
 void QWKPage::timerEvent(QTimerEvent* ev)
diff --git a/WebKit2/UIProcess/TiledDrawingAreaProxy.cpp b/WebKit2/UIProcess/TiledDrawingAreaProxy.cpp
index b79ec02..a5d2de4 100644
--- a/WebKit2/UIProcess/TiledDrawingAreaProxy.cpp
+++ b/WebKit2/UIProcess/TiledDrawingAreaProxy.cpp
@@ -25,6 +25,7 @@
 
 #include "TiledDrawingAreaProxy.h"
 
+#if ENABLE(TILED_BACKING_STORE)
 #include "DrawingAreaMessageKinds.h"
 #include "DrawingAreaProxyMessageKinds.h"
 #include "MessageID.h"
@@ -625,3 +626,4 @@ bool TiledDrawingAreaProxy::hasPendingUpdates() const
 
 } // namespace WebKit
 
+#endif
diff --git a/WebKit2/UIProcess/qt/TiledDrawingAreaProxyQt.cpp b/WebKit2/UIProcess/qt/TiledDrawingAreaProxyQt.cpp
index 73519da..59faa1e 100644
--- a/WebKit2/UIProcess/qt/TiledDrawingAreaProxyQt.cpp
+++ b/WebKit2/UIProcess/qt/TiledDrawingAreaProxyQt.cpp
@@ -25,6 +25,8 @@
 
 #include "TiledDrawingAreaProxy.h"
 
+#if ENABLE(TILED_BACKING_STORE)
+
 #include "DrawingAreaMessageKinds.h"
 #include "DrawingAreaProxyMessageKinds.h"
 #include "UpdateChunk.h"
@@ -65,3 +67,5 @@ void TiledDrawingAreaProxy::snapshotTaken(UpdateChunk& chunk)
 }
 
 } // namespace WebKit
+
+#endif
diff --git a/WebKit2/UIProcess/qt/TiledDrawingAreaTileQt.cpp b/WebKit2/UIProcess/qt/TiledDrawingAreaTileQt.cpp
index 5f95d02..f8db8c3 100644
--- a/WebKit2/UIProcess/qt/TiledDrawingAreaTileQt.cpp
+++ b/WebKit2/UIProcess/qt/TiledDrawingAreaTileQt.cpp
@@ -25,6 +25,8 @@
 
 #include "TiledDrawingAreaTile.h"
 
+#if ENABLE(TILED_BACKING_STORE)
+
 #include "GraphicsContext.h"
 #include "TiledDrawingAreaProxy.h"
 #include "WebPageProxy.h"
@@ -203,3 +205,4 @@ void TiledDrawingAreaTile::updateBackBuffer()
 }
 
 }
+#endif
diff --git a/WebKit2/UIProcess/qt/WebContextQt.cpp b/WebKit2/UIProcess/qt/WebContextQt.cpp
index 396c6e3..5b2cd88 100644
--- a/WebKit2/UIProcess/qt/WebContextQt.cpp
+++ b/WebKit2/UIProcess/qt/WebContextQt.cpp
@@ -33,7 +33,11 @@ namespace WebKit {
 
 String WebContext::applicationCacheDirectory()
 {
+#if ENABLE(OFFLINE_WEB_APPLICATIONS)
     return WebCore::cacheStorage().cacheDirectory();
+#else
+    return QString();
+#endif
 }
 
 void WebContext::platformInitializeWebProcess(WebProcessCreationParameters&)
diff --git a/WebKit2/WebProcess/WebProcess.cpp b/WebKit2/WebProcess/WebProcess.cpp
index 33494b9..adb1668 100644
--- a/WebKit2/WebProcess/WebProcess.cpp
+++ b/WebKit2/WebProcess/WebProcess.cpp
@@ -137,8 +137,10 @@ void WebProcess::initializeWebProcess(const WebProcessCreationParameters& parame
         }
     }
 
+#if ENABLE(OFFLINE_WEB_APPLICATIONS)
     if (!parameters.applicationCacheDirectory.isEmpty())
         cacheStorage().setCacheDirectory(parameters.applicationCacheDirectory);
+#endif
 
     setShouldTrackVisitedLinks(parameters.shouldTrackVisitedLinks);
     setCacheModel(static_cast<uint32_t>(parameters.cacheModel));

-- 
WebKit Debian packaging