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

7 files changed, 15 insertions, 25 deletions

diff --git a/webkit/build/WebCore/WebCore.vcproj b/webkit/build/WebCore/WebCore.vcproj
index 74c0ee4..3bdc497 100644
--- a/webkit/build/WebCore/WebCore.vcproj
+++ b/webkit/build/WebCore/WebCore.vcproj
@@ -4865,10 +4865,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\WebCore\dom\WorkerContextProxy.h"
-				>
-			</File>
-			<File
 				RelativePath="..\..\..\third_party\WebKit\WebCore\dom\WorkerLocation.cpp"
 				>
 			</File>
@@ -4885,10 +4881,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\WebCore\dom\WorkerObjectProxy.h"
-				>
-			</File>
-			<File
 				RelativePath="..\..\..\third_party\WebKit\WebCore\dom\WorkerRunLoop.cpp"
 				>
 			</File>
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;
diff --git a/webkit/glue/webframe_impl.cc b/webkit/glue/webframe_impl.cc
index 5cf992f..7df51c5 100644
--- a/webkit/glue/webframe_impl.cc
+++ b/webkit/glue/webframe_impl.cc
@@ -827,7 +827,7 @@ bool WebFrameImpl::Find(const FindInPageRequest& request,
         (new_selection.start() == new_selection.end())) {
       active_match_ = NULL;
     } else {
-      active_match_ = new_selection.toNormalizedRange();
+      active_match_ = new_selection.toRange();
       curr_selection_rect = active_match_->boundingBox();
     }
 
@@ -1179,8 +1179,7 @@ void WebFrameImpl::SetFindEndstateFocusAndSelection() {
     // don't focus anything.
     Selection selection(frame()->selection()->selection());
     if (selection.isNone() || (selection.start() == selection.end()) ||
-        active_match_->boundingBox() !=
-            selection.toNormalizedRange()->boundingBox())
+        active_match_->boundingBox() != selection.toRange()->boundingBox())
       return;
 
     // We will be setting focus ourselves, so we want the view to forget its
@@ -1308,8 +1307,8 @@ void WebFrameImpl::Paste() {
 
 void WebFrameImpl::Replace(const std::wstring& wtext) {
   String text = webkit_glue::StdWStringToString(wtext);
-  RefPtr<DocumentFragment> fragment = createFragmentFromText(
-      frame()->selection()->toNormalizedRange().get(), text);
+  RefPtr<DocumentFragment> fragment =
+      createFragmentFromText(frame()->selection()->toRange().get(), text);
   WebCore::applyCommand(WebCore::ReplaceSelectionCommand::create(
       frame()->document(), fragment.get(), false, true, true));
 }
@@ -1351,7 +1350,7 @@ void WebFrameImpl::ClearSelection() {
 }
 
 std::string WebFrameImpl::GetSelection(bool as_html) {
-  RefPtr<Range> range = frame()->selection()->toNormalizedRange();
+  RefPtr<Range> range = frame()->selection()->toRange();
   if (!range.get())
     return std::string();
 
diff --git a/webkit/glue/webframeloaderclient_impl.cc b/webkit/glue/webframeloaderclient_impl.cc
index aaf3500..d68bea5 100644
--- a/webkit/glue/webframeloaderclient_impl.cc
+++ b/webkit/glue/webframeloaderclient_impl.cc
@@ -1112,7 +1112,7 @@ void WebFrameLoaderClient::finishedLoading(DocumentLoader* dl) {
 void WebFrameLoaderClient::updateGlobalHistory() {
 }
 
-void WebFrameLoaderClient::updateGlobalHistoryRedirectLinks() {
+void WebFrameLoaderClient::updateGlobalHistoryForRedirectWithoutHistoryItem() {
 }
 
 bool WebFrameLoaderClient::shouldGoToHistoryItem(HistoryItem*) const {
diff --git a/webkit/glue/webframeloaderclient_impl.h b/webkit/glue/webframeloaderclient_impl.h
index a84b937..68b6d05 100644
--- a/webkit/glue/webframeloaderclient_impl.h
+++ b/webkit/glue/webframeloaderclient_impl.h
@@ -120,8 +120,7 @@ class WebFrameLoaderClient : public WebCore::FrameLoaderClient {
   virtual void finishedLoading(WebCore::DocumentLoader*);
 
   virtual void updateGlobalHistory();
-  virtual void updateGlobalHistoryRedirectLinks();
-
+  virtual void updateGlobalHistoryForRedirectWithoutHistoryItem();
   virtual bool shouldGoToHistoryItem(WebCore::HistoryItem*) const;
 
   virtual WebCore::ResourceError blockedError(const WebCore::ResourceRequest&);
diff --git a/webkit/glue/webtextinput_impl.cc b/webkit/glue/webtextinput_impl.cc
index 3155863..015da9c 100644
--- a/webkit/glue/webtextinput_impl.cc
+++ b/webkit/glue/webtextinput_impl.cc
@@ -118,7 +118,7 @@ void WebTextInputImpl::MarkedRange(std::string* range_str) {
 
 void WebTextInputImpl::SelectedRange(std::string* range_str) {
   WTF::RefPtr<WebCore::Range> range
-      = GetFrame()->selection()->toNormalizedRange();
+      = GetFrame()->selection()->toRange();
 
   // Range::toString() returns a string different from what test expects.
   // So we need to construct the string ourselves.
diff --git a/webkit/glue/webview_impl.cc b/webkit/glue/webview_impl.cc
index c2165ea..64de3d2 100644
--- a/webkit/glue/webview_impl.cc
+++ b/webkit/glue/webview_impl.cc
@@ -628,7 +628,7 @@ bool WebViewImpl::SendContextMenuEvent(const WebKeyboardEvent& event) {
     if (!renderer)
       return false;
 
-    RefPtr<Range> selection = main_frame->selection()->toNormalizedRange();
+    RefPtr<Range> selection = main_frame->selection()->toRange();
     IntRect first_rect = main_frame->firstRectForRange(selection.get());
 
     int x = right_aligned ? first_rect.right() : first_rect.x();