diff options
| author | Kristian Monsen <kristianm@google.com> | 2010-09-06 17:18:53 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2010-09-11 12:08:59 +0100 |
| commit | def1f225ae0f21c7d4fd5e7ce949b0de19c11eb1 (patch) | |
| tree | d722e3f44b43b6a215dd00506d36845796c22f80 /WebCore/page | |
| parent | 5ddde30071f639962dd557c453f2ad01f8f0fd00 (diff) | |
| download | external_webkit-def1f225ae0f21c7d4fd5e7ce949b0de19c11eb1.zip external_webkit-def1f225ae0f21c7d4fd5e7ce949b0de19c11eb1.tar.gz external_webkit-def1f225ae0f21c7d4fd5e7ce949b0de19c11eb1.tar.bz2 | |
Merge Webkit at r66666 : Fix conflicts.
css/CSSParser.cpp
Replaced m_mediaQuery = 0 with ASSERT(!m_mediaQuery):
http://trac.webkit.org/changeset/66334/trunk/WebCore/css/CSSParser.cpp
dom/Document.cpp
Removed a function call next to an Android specific change:
http://trac.webkit.org/changeset/66247/trunk/WebCore/dom/Document.cpp
html/HTMLPlugInElement.cpp
Removed a function next to an Android change:
http://trac.webkit.org/changeset/66653/trunk/WebCore/html/HTMLPlugInElement.cpp
page/Settings.h
Whitespace change in this CL:
http://trac.webkit.org/changeset/66570/trunk/WebCore/page/Settings.h
svg/SVGFontFaceUriElement.h
Small change next to an Android change:
http://trac.webkit.org/changeset/66397/trunk/WebCore/svg/SVGFontFaceUriElement.h
Change-Id: I8d395474f9a08d3a1432249da9a1aa06b01765e0
Diffstat (limited to 'WebCore/page')
| -rw-r--r-- | WebCore/page/Settings.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/WebCore/page/Settings.h b/WebCore/page/Settings.h index b95c62d..654f317 100644 --- a/WebCore/page/Settings.h +++ b/WebCore/page/Settings.h @@ -522,14 +522,11 @@ namespace WebCore { #endif bool m_memoryInfoEnabled: 1; bool m_interactiveFormValidation: 1; -<<<<<<< HEAD + #ifdef ANDROID_PLUGINS bool m_pluginsOnDemand : 1; #endif - -======= ->>>>>>> webkit.org at r66666 #if USE(SAFARI_THEME) static bool gShouldPaintNativeControls; #endif |