Source/WebCore/html/HTMLObjectElement.h - Issue 6488001: Merge 77891

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: Source/WebCore/html/HTMLObjectElement.h

Issue 6488001: Merge 77891 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/648/

Patch Set: Created 9 years, 10 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch

OLD	NEW
1 /*	1 /*

2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)	2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)

3 * (C) 1999 Antti Koivisto (koivisto@kde.org)	3 * (C) 1999 Antti Koivisto (koivisto@kde.org)

4 * Copyright (C) 2004, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.	4 * Copyright (C) 2004, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.

5 *	5 *

6 * This library is free software; you can redistribute it and/or	6 * This library is free software; you can redistribute it and/or

7 * modify it under the terms of the GNU Library General Public	7 * modify it under the terms of the GNU Library General Public

8 * License as published by the Free Software Foundation; either	8 * License as published by the Free Software Foundation; either

9 * version 2 of the License, or (at your option) any later version.	9 * version 2 of the License, or (at your option) any later version.

10 *	10 *

(...skipping 80 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
91 bool hasFallbackContent() const;	91 bool hasFallbackContent() const;

92	92

93 // FIXME: This function should not deal with url or serviceType	93 // FIXME: This function should not deal with url or serviceType

94 // so that we can better share code between <object> and <embed>.	94 // so that we can better share code between <object> and <embed>.

95 void parametersForPlugin(Vector<String>& paramNames, Vector<String>& paramVa lues, String& url, String& serviceType);	95 void parametersForPlugin(Vector<String>& paramNames, Vector<String>& paramVa lues, String& url, String& serviceType);

96	96

97 bool hasValidClassId();	97 bool hasValidClassId();

98	98

99 virtual void refFormAssociatedElement() { ref(); }	99 virtual void refFormAssociatedElement() { ref(); }

100 virtual void derefFormAssociatedElement() { deref(); }	100 virtual void derefFormAssociatedElement() { deref(); }

	101 virtual HTMLFormElement* virtualForm() const;

101	102

102 virtual const AtomicString& formControlName() const;	103 virtual const AtomicString& formControlName() const;

103	104

104 AtomicString m_id;	105 AtomicString m_id;

105 String m_classId;	106 String m_classId;

106 bool m_docNamedItem : 1;	107 bool m_docNamedItem : 1;

107 bool m_useFallbackContent : 1;	108 bool m_useFallbackContent : 1;

108 };	109 };

109	110

110 }	111 }

111	112

112 #endif	113 #endif

OLD	NEW