summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShimeng (Simon) Wang <swang@google.com>2011-05-26 10:57:09 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-05-26 10:57:09 -0700
commita1a66033d6e22a4f286a01970b021709db23f4f4 (patch)
tree65b59af827bc16ea23b545c8ba9e252ffc6ea64e
parent40e04567ebf81b0600a4ee02831215c653d157cd (diff)
parent4a0335562999c54f09b48a51e98d2ec695216471 (diff)
downloadexternal_webkit-a1a66033d6e22a4f286a01970b021709db23f4f4.zip
external_webkit-a1a66033d6e22a4f286a01970b021709db23f4f4.tar.gz
external_webkit-a1a66033d6e22a4f286a01970b021709db23f4f4.tar.bz2
Merge "Fix compilation error when debug_nav_ui is turned on."
-rw-r--r--Source/WebKit/android/nav/CachedRoot.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/Source/WebKit/android/nav/CachedRoot.cpp b/Source/WebKit/android/nav/CachedRoot.cpp
index e841683..5c16c91 100644
--- a/Source/WebKit/android/nav/CachedRoot.cpp
+++ b/Source/WebKit/android/nav/CachedRoot.cpp
@@ -1158,8 +1158,10 @@ const CachedNode* CachedRoot::findAt(const WebCore::IntRect& rect,
#if DEBUG_NAV_UI
DBG_NAV_LOGD("rect=(%d,%d,w=%d,h=%d) xy=(%d,%d)", rect.x(), rect.y(),
rect.width(), rect.height(), *x, *y);
+#if DUMP_NAV_CACHE
if (mRootLayer) CachedLayer::Debug::printRootLayerAndroid(mRootLayer);
#endif
+#endif
int best = INT_MAX;
bool inside = false;
(const_cast<CachedRoot*>(this))->resetClippedOut();