diff options
| author | Steve Block <steveblock@google.com> | 2010-09-21 19:03:24 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-09-29 17:45:33 +0100 |
| commit | 8de7ac488df2f39f82e56811541f4847b3f2e952 (patch) | |
| tree | deaaf69de23d3ecbb3b8ed41e89d341bca4990df /WebCore/dom/Document.cpp | |
| parent | 68513a70bcd92384395513322f1b801e7bf9c729 (diff) | |
| download | external_webkit-8de7ac488df2f39f82e56811541f4847b3f2e952.zip external_webkit-8de7ac488df2f39f82e56811541f4847b3f2e952.tar.gz external_webkit-8de7ac488df2f39f82e56811541f4847b3f2e952.tar.bz2 | |
Merge WebKit at r67908: Fix conflicts
Whitespace difference in config.h - http://trac.webkit.org/changeset/67323
- WebCore/config.h
Conflict due to ANDROID_LAYOUT - http://trac.webkit.org/changeset/67882
- WebCore/css/CSSComputedStyleDeclaration.cpp
Conflict due to ANDROID_INSTRUMENT - http://trac.webkit.org/changeset/67704
- WebCore/css/CSSParser.cpp
Conflict due to ANDROID_CSS_RING - http://trac.webkit.org/changeset/67667
- WebCore/css/CSSParser.cpp
- WebCore/css/CSSStyleSelector.cpp
Conflict due to axObjectCache - http://trac.webkit.org/changeset/67292
- WebCore/dom/Document.cpp
Conflict due to ANDROID_ACCEPT_CHANGES_TO_FOCUSED_TEXTFIELDS - http://trac.webkit.org/changeset/67903
- WebCore/html/HTMLInputElement.cpp
Conflict due to ARCHIVE - http://trac.webkit.org/changeset/67198
- WebCore/loader/DocumentLoader.cpp
- WebCore/loader/FrameLoader.cpp
Conflict due to ARCHIVE - http://trac.webkit.org/changeset/67253
- WebCore/loader/FrameLoader.cpp
Conflict due to actualWidth() vs width() - http://trac.webkit.org/changeset/67762
- WebCore/page/DOMWindow.cpp
Conflict due to ANDROID_PLUGINS - http://trac.webkit.org/changeset/67890
- WebCore/page/Settings.cpp
- WebCore/page/Settings.h
Conflict due to Android MIME types - http://trac.webkit.org/changeset/67375
- WebCore/platform/MIMETypeRegistry.cpp
Android fix in PluginView no longer needed after http://trac.webkit.org/changeset/67325
- WebCore/plugins/PluginView.cpp
Conflict due to ANDROID_FLATTEN_IFRAME and ANDROID_FLATTEN_FRAMESET - http://trac.webkit.org/changeset/67660
- WebCore/rendering/RenderBlockLineLayout.cpp
Conflict due to ANDROID_LAYOUT - http://trac.webkit.org/changeset/67660
- WebCore/rendering/RenderBox.h
- WebCore/rendering/RenderTable.cpp
Android fix in RenderTableCell no longer needed after http://trac.webkit.org/changeset/67862
- WebCore/rendering/RenderTableCell.cpp
Conflict due to ANDROID_CSS_RING - http://trac.webkit.org/changeset/67889 and http://trac.webkit.org/changeset/67667
- WebCore/rendering/style/RenderStyle.h
Change-Id: Ie36bd7de6d89a1f873c91984048f2507cabd864c
fix conflicts
Change-Id: I3acaba9492f6f39869e69fa24270cefbb74ba673
Diffstat (limited to 'WebCore/dom/Document.cpp')
| -rw-r--r-- | WebCore/dom/Document.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/WebCore/dom/Document.cpp b/WebCore/dom/Document.cpp index 262dad2..180b943 100644 --- a/WebCore/dom/Document.cpp +++ b/WebCore/dom/Document.cpp @@ -441,15 +441,12 @@ Document::Document(Frame* frame, const KURL& url, bool isXHTML, bool isHTML, con if (frame || !url.isEmpty()) setURL(url); -<<<<<<< HEAD -#if !PLATFORM(ANDROID) -======= // Setting of m_baseURL needs to happen after the setURL call, since that // calls updateBaseURL, which would clobber the passed in value. if (!baseURL.isNull()) m_baseURL = baseURL; ->>>>>>> webkit.org at r67908 +#if !PLATFORM(ANDROID) m_axObjectCache = 0; #endif |