Rollback WebKit merge since background images don't paint.

TBR=amanda

Review URL: http://codereview.chromium.org/21193

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9434 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 6 insertions, 6 deletions

diff --git a/webkit/glue/editor_client_impl.cc b/webkit/glue/editor_client_impl.cc
index 2f2214e..3d4e96f 100644
--- a/webkit/glue/editor_client_impl.cc
+++ b/webkit/glue/editor_client_impl.cc
@@ -230,18 +230,18 @@ bool EditorClientImpl::shouldDeleteRange(WebCore::Range* range) {
   return true;
 }
 
-bool EditorClientImpl::shouldChangeSelectedRange(WebCore::Range* from_range, 
-                                                 WebCore::Range* to_range, 
+bool EditorClientImpl::shouldChangeSelectedRange(WebCore::Range* fromRange, 
+                                                 WebCore::Range* toRange, 
                                                  WebCore::EAffinity affinity, 
-                                                 bool still_selecting) {
+                                                 bool stillSelecting) {
   if (use_editor_delegate_) {
     WebViewDelegate* d = web_view_->delegate();
     if (d) {
       return d->ShouldChangeSelectedRange(web_view_, 
-                                          Describe(from_range), 
-                                          Describe(to_range), 
+                                          Describe(fromRange), 
+                                          Describe(toRange), 
                                           Describe(affinity), 
-                                          still_selecting);
+                                          stillSelecting);
     }
   }
   return true;