From 1ef6c06a097db0fdba2947ddb1c73a1f091dd4dc Mon Sep 17 00:00:00 2001
From: "dglazkov@chromium.org"
 <dglazkov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Sat, 24 Oct 2009 17:11:50 +0000
Subject: WebKit update 49997:50027.

The changes accommodate fixing up HTMLAllCollection refactoring
upstream: http://trac.webkit.org/changeset/49998

TBR=tony
TEST=none
BUG=none

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30008 0039d316-1c4b-4281-b951-d872f2087c98
---
 DEPS                                   | 2 +-
 webkit/glue/dom_operations.cc          | 2 +-
 webkit/glue/dom_serializer.cc          | 4 ++--
 webkit/glue/dom_serializer_unittest.cc | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/DEPS b/DEPS
index 0d1c3ec..84db2ac 100644
--- a/DEPS
+++ b/DEPS
@@ -1,7 +1,7 @@
 vars = {
   "webkit_trunk":
     "http://svn.webkit.org/repository/webkit/trunk",
-  "webkit_revision": "49997",
+  "webkit_revision": "50027",
   "ffmpeg_revision": "28488",
 }
 
diff --git a/webkit/glue/dom_operations.cc b/webkit/glue/dom_operations.cc
index f859ce4..ba1e2bc 100644
--- a/webkit/glue/dom_operations.cc
+++ b/webkit/glue/dom_operations.cc
@@ -16,7 +16,7 @@ MSVC_PUSH_WARNING_LEVEL(0);
 #include "Element.h"
 #include "EventListener.h"
 #include "EventNames.h"
-#include "HTMLCollection.h"
+#include "HTMLAllCollection.h"
 #include "HTMLElement.h"
 #include "HTMLFormElement.h"
 #include "HTMLFrameOwnerElement.h"
diff --git a/webkit/glue/dom_serializer.cc b/webkit/glue/dom_serializer.cc
index a1fb29d..a4a0683 100644
--- a/webkit/glue/dom_serializer.cc
+++ b/webkit/glue/dom_serializer.cc
@@ -58,7 +58,7 @@ MSVC_PUSH_WARNING_LEVEL(0);
 #include "FrameLoader.h"
 #include "Document.h"
 #include "Element.h"
-#include "HTMLCollection.h"
+#include "HTMLAllCollection.h"
 #include "HTMLElement.h"
 #include "HTMLFormElement.h"
 #include "HTMLMetaElement.h"
@@ -543,7 +543,7 @@ void DomSerializer::CollectTargetFrames() {
     // Get current using document.
     WebCore::Document* current_doc = current_frame->frame()->document();
     // Go through sub-frames.
-    RefPtr<WebCore::HTMLCollection> all = current_doc->all();
+    RefPtr<WebCore::HTMLAllCollection> all = current_doc->all();
     for (WebCore::Node* node = all->firstItem(); node != NULL;
          node = all->nextItem()) {
       if (!node->isHTMLElement())
diff --git a/webkit/glue/dom_serializer_unittest.cc b/webkit/glue/dom_serializer_unittest.cc
index 67cb4e9..449227e 100644
--- a/webkit/glue/dom_serializer_unittest.cc
+++ b/webkit/glue/dom_serializer_unittest.cc
@@ -12,7 +12,7 @@ MSVC_PUSH_WARNING_LEVEL(0);
 #include "Element.h"
 #include "FrameLoader.h"
 #include "FrameView.h"
-#include "HTMLCollection.h"
+#include "HTMLAllCollection.h"
 #include "HTMLHeadElement.h"
 #include "HTMLMetaElement.h"
 #include "HTMLNames.h"
@@ -672,7 +672,7 @@ TEST_F(DomSerializerTests, SerialzeHTMLDOMWithBaseTag) {
   WebCore::Document* doc = web_frame->frame()->document();
   ASSERT_TRUE(doc->isHTMLDocument());
   // Go through all descent nodes.
-  RefPtr<WebCore::HTMLCollection> all = doc->all();
+  RefPtr<WebCore::HTMLAllCollection> all = doc->all();
   int original_base_tag_count = 0;
   for (WebCore::Node* node = all->firstItem(); node != NULL;
        node = all->nextItem()) {
-- 
cgit v1.1