diff options
| author | playmobil@google.com <playmobil@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-31 15:56:59 +0000 |
|---|---|---|
| committer | playmobil@google.com <playmobil@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-31 15:56:59 +0000 |
| commit | e8904383d516cef2b67845e79009de90f78dbb6a (patch) | |
| tree | 9165f4390d4ac27984666e83c77deb1c9befd632 /webkit/glue | |
| parent | 4ecd074560bcbeb46cb9c0a328f32df433d671d9 (diff) | |
| download | chromium_src-e8904383d516cef2b67845e79009de90f78dbb6a.zip chromium_src-e8904383d516cef2b67845e79009de90f78dbb6a.tar.gz chromium_src-e8904383d516cef2b67845e79009de90f78dbb6a.tar.bz2 | |
Chrome side of WebKit merge 42026:42115
Review URL: http://codereview.chromium.org/57033
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@12861 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue')
| -rw-r--r-- | webkit/glue/autofill_form.cc | 1 | ||||
| -rw-r--r-- | webkit/glue/devtools/dom_agent_impl.cc | 2 | ||||
| -rw-r--r-- | webkit/glue/dom_serializer.cc | 2 | ||||
| -rw-r--r-- | webkit/glue/webframe_impl.cc | 1 |
4 files changed, 4 insertions, 2 deletions
diff --git a/webkit/glue/autofill_form.cc b/webkit/glue/autofill_form.cc index 182aab6..d6988bd 100644 --- a/webkit/glue/autofill_form.cc +++ b/webkit/glue/autofill_form.cc @@ -7,6 +7,7 @@ MSVC_PUSH_WARNING_LEVEL(0); #include "Frame.h" +#include "HTMLFormElement.h" #include "HTMLInputElement.h" #include "HTMLNames.h" MSVC_POP_WARNING(); diff --git a/webkit/glue/devtools/dom_agent_impl.cc b/webkit/glue/devtools/dom_agent_impl.cc index d946a7e..a3a3d75 100644 --- a/webkit/glue/devtools/dom_agent_impl.cc +++ b/webkit/glue/devtools/dom_agent_impl.cc @@ -480,7 +480,7 @@ ListValue* DomAgentImpl::BuildValueForNode(Node* node, int depth) { ListValue* DomAgentImpl::BuildValueForElementAttributes(Element* element) { OwnPtr<ListValue> attributesValue(new ListValue()); // Go through all attributes and serialize them. - const NamedAttrMap *attrMap = element->attributes(true); + const NamedNodeMap *attrMap = element->attributes(true); if (!attrMap) { return attributesValue.release(); } diff --git a/webkit/glue/dom_serializer.cc b/webkit/glue/dom_serializer.cc index 47b4b6f..36dfd53 100644 --- a/webkit/glue/dom_serializer.cc +++ b/webkit/glue/dom_serializer.cc @@ -352,7 +352,7 @@ void DomSerializer::OpenTagToString(const WebCore::Element* element, // Add open tag result += "<" + element->nodeName(); // Go through all attributes and serialize them. - const WebCore::NamedAttrMap *attrMap = element->attributes(true); + const WebCore::NamedNodeMap *attrMap = element->attributes(true); if (attrMap) { unsigned numAttrs = attrMap->length(); for (unsigned i = 0; i < numAttrs; i++) { diff --git a/webkit/glue/webframe_impl.cc b/webkit/glue/webframe_impl.cc index 818d272..532b91b 100644 --- a/webkit/glue/webframe_impl.cc +++ b/webkit/glue/webframe_impl.cc @@ -84,6 +84,7 @@ MSVC_PUSH_WARNING_LEVEL(0); #include "DOMWindow.h" #include "Editor.h" #include "EventHandler.h" +#include "FormState.h" #include "Frame.h" #include "FrameChromium.h" #include "FrameLoader.h" |