14 files changed, 30 insertions, 28 deletions
diff --git a/Source/WebKit/android/nav/CacheBuilder.cpp b/Source/WebKit/android/nav/CacheBuilder.cpp
index 019ac49..a31169b 100644
--- a/Source/WebKit/android/nav/CacheBuilder.cpp
+++ b/Source/WebKit/android/nav/CacheBuilder.cpp
@@ -1171,7 +1171,7 @@ void CacheBuilder::BuildFrame(Frame* root, Frame* frame,
             goto keepNode;
         }
         // Only use the root contentEditable element
-        if (node->isContentEditable() && !node->parentOrHostNode()->isContentEditable()) {
+        if (node->rendererIsEditable() && !node->parentOrHostNode()->rendererIsEditable()) {
             bounds = absBounds;
             takesFocus = true;
             type = CONTENT_EDITABLE_CACHEDNODETYPE;
diff --git a/Source/WebKit/android/nav/CacheBuilder.h b/Source/WebKit/android/nav/CacheBuilder.h
index d48a045..8f1cc72 100644
--- a/Source/WebKit/android/nav/CacheBuilder.h
+++ b/Source/WebKit/android/nav/CacheBuilder.h
@@ -23,8 +23,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef CacheBuilder_H
-#define CacheBuilder_H
+#ifndef CacheBuilder_h
+#define CacheBuilder_h
 
 #include "CachedDebug.h"
 #include "CachedNodeType.h"
diff --git a/Source/WebKit/android/nav/CachedColor.h b/Source/WebKit/android/nav/CachedColor.h
index 4b39810..2ba9b18 100644
--- a/Source/WebKit/android/nav/CachedColor.h
+++ b/Source/WebKit/android/nav/CachedColor.h
@@ -23,8 +23,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef CachedColor_H
-#define CachedColor_H
+#ifndef CachedColor_h
+#define CachedColor_h
 
 #include "CachedDebug.h"
 #include "Color.h"
diff --git a/Source/WebKit/android/nav/CachedDebug.h b/Source/WebKit/android/nav/CachedDebug.h
index 3d9e012..f77c07a 100644
--- a/Source/WebKit/android/nav/CachedDebug.h
+++ b/Source/WebKit/android/nav/CachedDebug.h
@@ -23,8 +23,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef CachedDebug_H
-#define CachedDebug_H
+#ifndef CachedDebug_h
+#define CachedDebug_h
 
 #define DUMP_NAV_CACHE 0
 #define DEBUG_NAV_UI 0
diff --git a/Source/WebKit/android/nav/CachedFrame.h b/Source/WebKit/android/nav/CachedFrame.h
index 5802e36..da86521 100644
--- a/Source/WebKit/android/nav/CachedFrame.h
+++ b/Source/WebKit/android/nav/CachedFrame.h
@@ -23,8 +23,10 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef CachedFrame_H
-#define CachedFrame_H
+// FIXME: A file of this name already exists in WebCore/history.
+// This file should be renamed.
+#ifndef AndroidCachedFrame_h
+#define AndroidCachedFrame_h
 
 #include "CachedColor.h"
 #include "CachedInput.h"
@@ -282,4 +284,4 @@ public:
 
 }
 
-#endif
+#endif // AndroidCachedFrame_h
diff --git a/Source/WebKit/android/nav/CachedHistory.h b/Source/WebKit/android/nav/CachedHistory.h
index e8c1ad9..96975ca 100644
--- a/Source/WebKit/android/nav/CachedHistory.h
+++ b/Source/WebKit/android/nav/CachedHistory.h
@@ -23,8 +23,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef CachedHistory_H
-#define CachedHistory_H
+#ifndef CachedHistory_h
+#define CachedHistory_h
 
 #include "CachedFrame.h"
 
diff --git a/Source/WebKit/android/nav/CachedInput.h b/Source/WebKit/android/nav/CachedInput.h
index f7f9eea..a3eabc7 100644
--- a/Source/WebKit/android/nav/CachedInput.h
+++ b/Source/WebKit/android/nav/CachedInput.h
@@ -23,8 +23,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef CachedInput_H
-#define CachedInput_H
+#ifndef CachedInput_h
+#define CachedInput_h
 
 #include "CachedDebug.h"
 #include "HTMLInputElement.h"
diff --git a/Source/WebKit/android/nav/CachedLayer.h b/Source/WebKit/android/nav/CachedLayer.h
index 3d963e0..fa427d2 100644
--- a/Source/WebKit/android/nav/CachedLayer.h
+++ b/Source/WebKit/android/nav/CachedLayer.h
@@ -23,8 +23,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef CachedLayer_H
-#define CachedLayer_H
+#ifndef CachedLayer_h
+#define CachedLayer_h
 
 #include "CachedDebug.h"
 #include "IntRect.h"
diff --git a/Source/WebKit/android/nav/CachedNode.h b/Source/WebKit/android/nav/CachedNode.h
index f9bcbed..602dda6 100644
--- a/Source/WebKit/android/nav/CachedNode.h
+++ b/Source/WebKit/android/nav/CachedNode.h
@@ -23,8 +23,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef CachedNode_H
-#define CachedNode_H
+#ifndef CachedNode_h
+#define CachedNode_h
 
 #include "CachedDebug.h"
 #include "CachedNodeType.h"
diff --git a/Source/WebKit/android/nav/CachedNodeType.h b/Source/WebKit/android/nav/CachedNodeType.h
index 8bc9328..f922946 100644
--- a/Source/WebKit/android/nav/CachedNodeType.h
+++ b/Source/WebKit/android/nav/CachedNodeType.h
@@ -23,8 +23,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef CachedNodeType_H
-#define CachedNodeType_H
+#ifndef CachedNodeType_h
+#define CachedNodeType_h
 
 namespace android {
 
diff --git a/Source/WebKit/android/nav/CachedPrefix.h b/Source/WebKit/android/nav/CachedPrefix.h
index 73a5c2c..576aa4a 100644
--- a/Source/WebKit/android/nav/CachedPrefix.h
+++ b/Source/WebKit/android/nav/CachedPrefix.h
@@ -23,8 +23,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef CachedPrefix_H
-#define CachedPrefix_H
+#ifndef CachedPrefix_h
+#define CachedPrefix_h
 
 #ifndef LOG_TAG
 #define LOG_TAG "navcache"
diff --git a/Source/WebKit/android/nav/CachedRoot.h b/Source/WebKit/android/nav/CachedRoot.h
index 1f8b851..45fc27a 100644
--- a/Source/WebKit/android/nav/CachedRoot.h
+++ b/Source/WebKit/android/nav/CachedRoot.h
@@ -23,8 +23,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef CachedRoot_H
-#define CachedRoot_H
+#ifndef CachedRoot_h
+#define CachedRoot_h
 
 #include "CachedFrame.h"
 #include "IntRect.h"
diff --git a/Source/WebKit/android/nav/ParseCanvas.h b/Source/WebKit/android/nav/ParseCanvas.h
index 9b7a889..a34e4ad 100644
--- a/Source/WebKit/android/nav/ParseCanvas.h
+++ b/Source/WebKit/android/nav/ParseCanvas.h
@@ -23,8 +23,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef PARSE_CANVAS_H
-#define PARSE_CANVAS_H
+#ifndef ParseCanvas_h
+#define ParseCanvas_h
 
 #include "SkCanvas.h"
 
diff --git a/Source/WebKit/android/nav/SelectText.h b/Source/WebKit/android/nav/SelectText.h
index 42239cf..de577ac 100644
--- a/Source/WebKit/android/nav/SelectText.h
+++ b/Source/WebKit/android/nav/SelectText.h
@@ -23,8 +23,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef SELECT_TEXT_H
-#define SELECT_TEXT_H
+#ifndef SelectText_h
+#define SelectText_h
 
 #include "DrawExtra.h"
 #include "IntPoint.h"