From 5e86dc63da68e46049c5252367ef8b2a54016f0a Mon Sep 17 00:00:00 2001 From: Ben Murdoch Date: Fri, 22 Oct 2010 13:52:39 +0100 Subject: Merge Webkit at r70209: Fix conflicts WebCore/page/FrameView.cpp http://trac.webkit.org/changeset/69896 WebCore/html/parser/HTMLDocumentParser.cpp http://trac.webkit.org/changeset/69283 WebCore/html/HTMLPlugInElement.h http://trac.webkit.org/changeset/69596 WebCore/html/HTMLInputElement.cpp http://trac.webkit.org/changeset/68996 http://trac.webkit.org/changeset/69378 WebCore/plugins/npapi.cpp http://trac.webkit.org/changeset/69808 WebCore/css/CSSComputedStyleDeclaration.cpp http://trac.webkit.org/changeset/69220 WebCore/css/CSSParser.cpp http://trac.webkit.org/changeset/69196 WebCore/rendering/style/RenderStyle.h http://trac.webkit.org/changeset/68680 WebCore/rendering/RenderImage.cpp http://trac.webkit.org/changeset/68917 WebCore/platform/android/FileSystemAndroid.cpp http://trac.webkit.org/changeset/69594 WebCore/inspector/InspectorController.h http://trac.webkit.org/changeset/68767 See also Android change I4c724f2f52a5a9db6dca6b58032b6a902aac74b5 which is why this is a conflict. JavaScriptCore/parser/Parser.cpp http://trac.webkit.org/changeset/69516 Change-Id: I5a708c6590ba029a2b3ecc3b30478ea303e1f2f5 --- WebCore/html/HTMLPlugInElement.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'WebCore/html/HTMLPlugInElement.h') diff --git a/WebCore/html/HTMLPlugInElement.h b/WebCore/html/HTMLPlugInElement.h index 44c6149..9d25fee 100644 --- a/WebCore/html/HTMLPlugInElement.h +++ b/WebCore/html/HTMLPlugInElement.h @@ -59,15 +59,13 @@ protected: virtual bool mapToEntry(const QualifiedName& attrName, MappedAttributeEntry& result) const; virtual void parseMappedAttribute(Attribute*); -<<<<<<< HEAD + bool m_inBeforeLoadEventHandler; + #if PLATFORM(ANDROID) // in Android, plugin has a focused mode where it accepts all the touch events. // so need to claim that plugin element supports focus instead of using the default. virtual bool supportsFocus() const; #endif -======= - bool m_inBeforeLoadEventHandler; ->>>>>>> webkit.org at r70209 private: virtual void defaultEventHandler(Event*); -- cgit v1.1