Changeset 60352 in webkit

Timestamp:

May 28, 2010 6:57:17 AM (14 years ago)

Author:

antti.j.koivisto@nokia.com

Message:

Add a missing #if ENABLE(), some null checking.

Reviewed by Kenneth Rohde Christiansen.

• Api/qwebpage.cpp:

(QWebPagePrivate::dynamicPropertyChangeEvent):

Location:

trunk/WebKit/qt

Files:

• Api/qwebpage.cpp (modified) (3 diffs)
• ChangeLog (modified) (1 diff)

trunk/WebKit/qt/Api/qwebpage.cpp

@@ -1221 +1221 @@
         double timeDelay = q->property("_q_HTMLTokenizerTimeDelay").toDouble();
         q->handle()->page->setCustomHTMLTokenizerTimeDelay(timeDelay);
-    } else if (event->propertyName() == "_q_TiledBackingStoreTileSize") {
+    } 
+#if ENABLE(TILED_BACKING_STORE)
+    else if (event->propertyName() == "_q_TiledBackingStoreTileSize") {
+        WebCore::Frame* frame = QWebFramePrivate::core(q->mainFrame());
+        if (!frame->tiledBackingStore())
+            return;
         QSize tileSize = q->property("_q_TiledBackingStoreTileSize").toSize();
-        WebCore::Frame* frame = QWebFramePrivate::core(q->mainFrame());
         frame->tiledBackingStore()->setTileSize(tileSize);
     } else if (event->propertyName() == "_q_TiledBackingStoreTileCreationDelay") {
+        WebCore::Frame* frame = QWebFramePrivate::core(q->mainFrame());
+        if (!frame->tiledBackingStore())
+            return;
         int tileCreationDelay = q->property("_q_TiledBackingStoreTileCreationDelay").toInt();
-        WebCore::Frame* frame = QWebFramePrivate::core(q->mainFrame());
         frame->tiledBackingStore()->setTileCreationDelay(static_cast<double>(tileCreationDelay) / 1000.);
     } else if (event->propertyName() == "_q_TiledBackingStoreKeepAreaMultiplier") {
+        WebCore::Frame* frame = QWebFramePrivate::core(q->mainFrame());
+        if (!frame->tiledBackingStore())
+            return;
         FloatSize keepMultiplier;
         FloatSize coverMultiplier;
-        WebCore::Frame* frame = QWebFramePrivate::core(q->mainFrame());
         frame->tiledBackingStore()->getKeepAndCoverAreaMultipliers(keepMultiplier, coverMultiplier);
         QSizeF qSize = q->property("_q_TiledBackingStoreKeepAreaMultiplier").toSizeF();
@@ -1238 +1246 @@
         frame->tiledBackingStore()->setKeepAndCoverAreaMultipliers(keepMultiplier, coverMultiplier);
     } else if (event->propertyName() == "_q_TiledBackingStoreCoverAreaMultiplier") {
+        WebCore::Frame* frame = QWebFramePrivate::core(q->mainFrame());
+        if (!frame->tiledBackingStore())
+            return;
         FloatSize keepMultiplier;
         FloatSize coverMultiplier;
-        WebCore::Frame* frame = QWebFramePrivate::core(q->mainFrame());
         frame->tiledBackingStore()->getKeepAndCoverAreaMultipliers(keepMultiplier, coverMultiplier);
         QSizeF qSize = q->property("_q_TiledBackingStoreCoverAreaMultiplier").toSizeF();
@@ -1246 +1256 @@
         frame->tiledBackingStore()->setKeepAndCoverAreaMultipliers(keepMultiplier, coverMultiplier);
     }
+#endif
 }
 

trunk/WebKit/qt/ChangeLog

@@ +1 @@
+2010-05-28  Antti Koivisto  <koivisto@iki.fi>
+
+        Reviewed by Kenneth Rohde Christiansen.
+    
+        Add a missing #if ENABLE(), some null checking.
+
+        * Api/qwebpage.cpp:
+        (QWebPagePrivate::dynamicPropertyChangeEvent):
+
 2010-05-28  Antti Koivisto  <koivisto@iki.fi>