Merge changes Ifb6cc64e,I4d819cc5

* changes:
  Simplify logic in ScrollableLayerAndroid::scrollTo()
  Fixes style and adds some comments to layers code

3 files changed, 4 insertions, 5 deletions

diff --git a/Source/WebKit/android/nav/FindCanvas.cpp b/Source/WebKit/android/nav/FindCanvas.cpp
index 38fb71e..ca3cfba 100644
--- a/Source/WebKit/android/nav/FindCanvas.cpp
+++ b/Source/WebKit/android/nav/FindCanvas.cpp
@@ -598,7 +598,7 @@ void FindOnPage::draw(SkCanvas* canvas, LayerAndroid* layer, IntRect* inval) {
     unsigned numberOfMatches = m_matches->size();
     if (numberOfMatches > 1
             && numberOfMatches < MAX_NUMBER_OF_MATCHES_TO_DRAW) {
-        for(unsigned i = 0; i < numberOfMatches; i++) {
+        for (unsigned i = 0; i < numberOfMatches; i++) {
             // The current match has already been drawn
             if (i == m_findIndex)
                 continue;
diff --git a/Source/WebKit/android/nav/FindCanvas.h b/Source/WebKit/android/nav/FindCanvas.h
index f693a3f..994ff17 100644
--- a/Source/WebKit/android/nav/FindCanvas.h
+++ b/Source/WebKit/android/nav/FindCanvas.h
@@ -54,9 +54,9 @@ public:
     SkPicture* getPicture() const { return m_picture; }
     // This will make a copy of the region, and increase the ref count on the
     // SkPicture.  If this MatchInfo already had one, unref it.
+    void set(const SkRegion& region, SkPicture* pic, int layerId);
     bool isInLayer() const { return m_layerId >= 0; }
     int layerId() const { return m_layerId; }
-    void set(const SkRegion& region, SkPicture* pic, int layerId);
 private:
     MatchInfo& operator=(MatchInfo& src);
     SkRegion    m_location;
@@ -141,7 +141,7 @@ public:
                                 const SkPaint& paint) {
     }
 
-    void drawLayers(LayerAndroid* );
+    void drawLayers(LayerAndroid*);
     int found() const { return mNumFound; }
     void setLayerId(int layerId) { mLayerId = layerId; }
 
diff --git a/Source/WebKit/android/nav/WebView.cpp b/Source/WebKit/android/nav/WebView.cpp
index 209cc04..101e206 100644
--- a/Source/WebKit/android/nav/WebView.cpp
+++ b/Source/WebKit/android/nav/WebView.cpp
@@ -105,8 +105,7 @@ class WebView
 public:
 enum FrameCachePermission {
     DontAllowNewer,
-    AllowNewer,
-    AllowNewest
+    AllowNewer
 };
 
 enum DrawExtras { // keep this in sync with WebView.java