diff options
| author | Steve Block <steveblock@google.com> | 2011-05-18 14:41:47 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-05-25 12:25:49 +0100 |
| commit | 09b60ab8488b362c96df8f268613aafaeebfcfa1 (patch) | |
| tree | 1623751ea9c32fc80fa309017b5d9ea3c7871415 /Source/WebCore/dom | |
| parent | d73b16bdebb9d20b17be0a30e626dc9e66b6d868 (diff) | |
| download | external_webkit-09b60ab8488b362c96df8f268613aafaeebfcfa1.zip external_webkit-09b60ab8488b362c96df8f268613aafaeebfcfa1.tar.gz external_webkit-09b60ab8488b362c96df8f268613aafaeebfcfa1.tar.bz2 | |
Merge WebKit at r78450: Fix remaining conflicts
- Document.cpp
Conflict due to AX object cache disabled on Android
See http://trac.webkit.org/changeset/78314
- CachedResourceLoader.cpp/h
Conflict due to ANDROID_BLOCK_NETWORK_IMAGE
See http://trac.webkit.org/changeset/76701
- Source/WebCore/page/ChromeClient.h
Conflict due to ANDROID_INSTALLABLE_WEB_APPS
See http://trac.webkit.org/changeset/77509
- FrameView.cpp
Conflict due to Android FrameView::updatePositionedObjects()
See http://trac.webkit.org/changeset/77274
- ScrollView.h
Conflict due to Android
ScrollView::actualWidth/Height/ScrollX/ScrollY()
See http://trac.webkit.org/changeset/76831
- TemporaryLinkStubs.cpp and MIMETypeRegistry.cpp
conflict due to Android stubbed out
MIMETypeRegistry::getMIMETypeForExtension()
See http://trac.webkit.org/changeset/77368 and
https://android-git.corp.google.com/g/#change,37272
- ImageDecoder.cpp
Conflict due to Android excluding code
See http://trac.webkit.org/changeset/77427
- ImageDecoder.h
Conflict due to ANDROID guard upstreamed as SKIA guard
See http://trac.webkit.org/changeset/77946
- InlineTextBox.cpp
Conflict due to ANDROID_DISABLE_ROUNDING_HACKS
See http://trac.webkit.org/changeset/76743 and
http://trac.webkit.org/changeset/77286
- RenderBlockLineLayout.cpp
Conflict due to ANDROID_LAYOUT
See http://trac.webkit.org/changeset/77062
Change-Id: Ide4d58dc52418b8fc1a965a9524eb57cd46b4859
Diffstat (limited to 'Source/WebCore/dom')
| -rw-r--r-- | Source/WebCore/dom/Document.cpp | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/Source/WebCore/dom/Document.cpp b/Source/WebCore/dom/Document.cpp index 6b1b90d..ee790ab 100644 --- a/Source/WebCore/dom/Document.cpp +++ b/Source/WebCore/dom/Document.cpp @@ -470,15 +470,7 @@ Document::Document(Frame* frame, const KURL& url, bool isXHTML, bool isHTML) if ((frame && frame->ownerElement()) || !url.isEmpty()) setURL(url); -<<<<<<< HEAD - // 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; - #if !PLATFORM(ANDROID) -======= ->>>>>>> webkit.org at r78450 m_axObjectCache = 0; #endif |