diff options
| author | Steve Block <steveblock@google.com> | 2010-08-27 12:31:11 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-09-02 17:17:20 +0100 |
| commit | b7ddb6671c47bb6409bec6b6d017d9f88e557401 (patch) | |
| tree | 670add84f8652796304ae7dc58c93fcaf8b55596 /WebCore/dom | |
| parent | e8b154fd68f9b33be40a3590e58347f353835f5c (diff) | |
| download | external_webkit-b7ddb6671c47bb6409bec6b6d017d9f88e557401.zip external_webkit-b7ddb6671c47bb6409bec6b6d017d9f88e557401.tar.gz external_webkit-b7ddb6671c47bb6409bec6b6d017d9f88e557401.tar.bz2 | |
Merge WebKit at r66079 : Fix conflicts
- WebCore/dom/Document.cpp
Conflict due to Android guards around m_axObjectCache
See http://trac.webkit.org/changeset/65787
- WebCore/dom/Document.h
Conflict due to Android guards around m_axObjectCache whitespace diff
See http://trac.webkit.org/changeset/65787
and http://trac.webkit.org/changeset/66037
- WebCore/html/HTMLDocumentParser.cpp
Conflict due to ANDROID_INSTRUMENT
See http://trac.webkit.org/changeset/65692
- WebCore/platform/image-decoders/ImageDecoder.cpp
Conflict due to Android not implementing ImageDecoder::create()
See http://trac.webkit.org/changeset/66039
- WebCore/plugins/PluginView.h
Conflict due to PLUGIN_SCHEDULE_TIMER
See http://trac.webkit.org/changeset/65697
Change-Id: I5dc94bad471ea566dbabf965425938b732735d02
Diffstat (limited to 'WebCore/dom')
| -rw-r--r-- | WebCore/dom/Document.cpp | 4 | ||||
| -rw-r--r-- | WebCore/dom/Document.h | 15 |
2 files changed, 0 insertions, 19 deletions
diff --git a/WebCore/dom/Document.cpp b/WebCore/dom/Document.cpp index 03ad8e7..2528b3a 100644 --- a/WebCore/dom/Document.cpp +++ b/WebCore/dom/Document.cpp @@ -432,14 +432,10 @@ Document::Document(Frame* frame, const KURL& url, bool isXHTML, bool isHTML) #if !PLATFORM(ANDROID) m_axObjectCache = 0; -<<<<<<< HEAD #endif - -======= m_markers = new DocumentMarkerController(); ->>>>>>> webkit.org at r66079 m_docLoader = new DocLoader(this); m_visuallyOrdered = false; diff --git a/WebCore/dom/Document.h b/WebCore/dom/Document.h index ff7e646..18dc838 100644 --- a/WebCore/dom/Document.h +++ b/WebCore/dom/Document.h @@ -1169,18 +1169,10 @@ private: OwnPtr<RenderArena> m_renderArena; -<<<<<<< HEAD - typedef std::pair<Vector<DocumentMarker>, Vector<IntRect> > MarkerMapVectorPair; - typedef HashMap<RefPtr<Node>, MarkerMapVectorPair*> MarkerMap; - MarkerMap m_markers; - #if !PLATFORM(ANDROID) mutable AXObjectCache* m_axObjectCache; #endif -======= - mutable AXObjectCache* m_axObjectCache; OwnPtr<DocumentMarkerController> m_markers; ->>>>>>> webkit.org at r66079 Timer<Document> m_updateFocusAppearanceTimer; @@ -1202,13 +1194,6 @@ private: RefPtr<Document> m_transformSourceDocument; #endif -<<<<<<< HEAD -#if ENABLE(XBL) - OwnPtr<XBLBindingManager> m_bindingManager; // The access point through which documents and elements communicate with XBL. -#endif - -======= ->>>>>>> webkit.org at r66079 typedef HashMap<AtomicStringImpl*, HTMLMapElement*> ImageMapsByName; ImageMapsByName m_imageMapsByName; |