diff options
| author | Kristian Monsen <kristianm@google.com> | 2010-06-30 19:28:40 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2010-07-02 10:29:56 +0100 |
| commit | 7b3d71e01ef2779f8b8939f812921d0f9b1a00a8 (patch) | |
| tree | da9360b494b879387ce0923e01907c189f2ea971 /WebCore/dom | |
| parent | 5981f58abbce556536da16dc85544f53b5bbe817 (diff) | |
| download | external_webkit-7b3d71e01ef2779f8b8939f812921d0f9b1a00a8.zip external_webkit-7b3d71e01ef2779f8b8939f812921d0f9b1a00a8.tar.gz external_webkit-7b3d71e01ef2779f8b8939f812921d0f9b1a00a8.tar.bz2 | |
Merge WebKit at r61871: Fix conflicts
V8Proxy.cpp
http://trac.webkit.org/changeset/61499
npapi.h:
http://trac.webkit.org/changeset/61277
Document.cpp
http://trac.webkit.org/changeset/61787
XMLDocumentParser.h:
http://trac.webkit.org/changeset/61663
HTMLLinkElement.*:
http://trac.webkit.org/changeset/61424
HTMLTableCellElement.cpp
http://trac.webkit.org/changeset/61630
ResourceHandleAndroid.cpp:
http://trac.webkit.org/changeset/61768
Change-Id: If991d3c112eeefd3098aa68b862c65798d505e1f
Diffstat (limited to 'WebCore/dom')
| -rw-r--r-- | WebCore/dom/Document.cpp | 5 | ||||
| -rw-r--r-- | WebCore/dom/XMLDocumentParser.h | 4 |
2 files changed, 1 insertions, 8 deletions
diff --git a/WebCore/dom/Document.cpp b/WebCore/dom/Document.cpp index c9a2182..99ec33e 100644 --- a/WebCore/dom/Document.cpp +++ b/WebCore/dom/Document.cpp @@ -431,13 +431,10 @@ Document::Document(Frame* frame, const KURL& url, bool isXHTML, bool isHTML) m_frame = frame; -<<<<<<< HEAD -#if !PLATFORM(ANDROID) -======= if (frame || !url.isEmpty()) setURL(url); ->>>>>>> webkit.org at r61871 +#if !PLATFORM(ANDROID) m_axObjectCache = 0; #endif diff --git a/WebCore/dom/XMLDocumentParser.h b/WebCore/dom/XMLDocumentParser.h index 9915409..7553cea 100644 --- a/WebCore/dom/XMLDocumentParser.h +++ b/WebCore/dom/XMLDocumentParser.h @@ -319,10 +319,6 @@ bool parseXMLDocumentFragment(const String&, DocumentFragment*, Element* parent } // namespace WebCore -<<<<<<< HEAD #endif // USE(EXPAT) -#endif // XMLTokenizer_h -======= #endif // XMLDocumentParser_h ->>>>>>> webkit.org at r61871 |