Title: [104272] trunk/Source/WebCore
Revision
104272
Author
[email protected]
Date
2012-01-06 00:09:16 -0800 (Fri, 06 Jan 2012)

Log Message

Unreviewed, rolling out r104268.
http://trac.webkit.org/changeset/104268
https://bugs.webkit.org/show_bug.cgi?id=75689

It broke the mac build (Requested by Ossy on #webkit).

Patch by Sheriff Bot <[email protected]> on 2012-01-06

* CMakeLists.txt:
* GNUmakefile.list.am:
* Target.pri:
* WebCore.gypi:
* WebCore.vcproj/WebCore.vcproj:
* WebCore.xcodeproj/project.pbxproj:
* html/HTMLElementsAllInOne.cpp:
* html/HTMLFormControlElement.cpp:
(WebCore::HTMLFormControlElementWithState::HTMLFormControlElementWithState):
(WebCore::HTMLFormControlElementWithState::~HTMLFormControlElementWithState):
(WebCore::HTMLFormControlElementWithState::didMoveToNewDocument):
(WebCore::HTMLFormControlElementWithState::shouldAutocomplete):
(WebCore::HTMLFormControlElementWithState::shouldSaveAndRestoreFormControlState):
(WebCore::HTMLFormControlElementWithState::finishParsingChildren):
* html/HTMLFormControlElement.h:
(WebCore::HTMLFormControlElementWithState::canContainRangeEndPoint):
(WebCore::HTMLFormControlElementWithState::saveFormControlState):
(WebCore::HTMLFormControlElementWithState::restoreFormControlState):
* html/HTMLFormControlElementWithState.cpp: Removed.
* html/HTMLFormControlElementWithState.h: Removed.
* html/HTMLKeygenElement.h:
* html/HTMLSelectElement.h:
* html/HTMLTextFormControlElement.h:

Modified Paths

Removed Paths

Diff

Modified: trunk/Source/WebCore/CMakeLists.txt (104271 => 104272)


--- trunk/Source/WebCore/CMakeLists.txt	2012-01-06 08:07:42 UTC (rev 104271)
+++ trunk/Source/WebCore/CMakeLists.txt	2012-01-06 08:09:16 UTC (rev 104272)
@@ -739,7 +739,6 @@
     html/HTMLFontElement.cpp
     html/HTMLFormCollection.cpp
     html/HTMLFormControlElement.cpp
-    html/HTMLFormControlElementWithState.cpp
     html/HTMLFormElement.cpp
     html/HTMLFrameElement.cpp
     html/HTMLFrameElementBase.cpp

Modified: trunk/Source/WebCore/ChangeLog (104271 => 104272)


--- trunk/Source/WebCore/ChangeLog	2012-01-06 08:07:42 UTC (rev 104271)
+++ trunk/Source/WebCore/ChangeLog	2012-01-06 08:09:16 UTC (rev 104272)
@@ -1,5 +1,37 @@
 2012-01-06  Sheriff Bot  <[email protected]>
 
+        Unreviewed, rolling out r104268.
+        http://trac.webkit.org/changeset/104268
+        https://bugs.webkit.org/show_bug.cgi?id=75689
+
+        It broke the mac build (Requested by Ossy on #webkit).
+
+        * CMakeLists.txt:
+        * GNUmakefile.list.am:
+        * Target.pri:
+        * WebCore.gypi:
+        * WebCore.vcproj/WebCore.vcproj:
+        * WebCore.xcodeproj/project.pbxproj:
+        * html/HTMLElementsAllInOne.cpp:
+        * html/HTMLFormControlElement.cpp:
+        (WebCore::HTMLFormControlElementWithState::HTMLFormControlElementWithState):
+        (WebCore::HTMLFormControlElementWithState::~HTMLFormControlElementWithState):
+        (WebCore::HTMLFormControlElementWithState::didMoveToNewDocument):
+        (WebCore::HTMLFormControlElementWithState::shouldAutocomplete):
+        (WebCore::HTMLFormControlElementWithState::shouldSaveAndRestoreFormControlState):
+        (WebCore::HTMLFormControlElementWithState::finishParsingChildren):
+        * html/HTMLFormControlElement.h:
+        (WebCore::HTMLFormControlElementWithState::canContainRangeEndPoint):
+        (WebCore::HTMLFormControlElementWithState::saveFormControlState):
+        (WebCore::HTMLFormControlElementWithState::restoreFormControlState):
+        * html/HTMLFormControlElementWithState.cpp: Removed.
+        * html/HTMLFormControlElementWithState.h: Removed.
+        * html/HTMLKeygenElement.h:
+        * html/HTMLSelectElement.h:
+        * html/HTMLTextFormControlElement.h:
+
+2012-01-06  Sheriff Bot  <[email protected]>
+
         Unreviewed, rolling out r104259 and r104261.
         http://trac.webkit.org/changeset/104259
         http://trac.webkit.org/changeset/104261

Modified: trunk/Source/WebCore/GNUmakefile.list.am (104271 => 104272)


--- trunk/Source/WebCore/GNUmakefile.list.am	2012-01-06 08:07:42 UTC (rev 104271)
+++ trunk/Source/WebCore/GNUmakefile.list.am	2012-01-06 08:09:16 UTC (rev 104272)
@@ -2018,8 +2018,6 @@
 	Source/WebCore/html/HTMLFormCollection.h \
 	Source/WebCore/html/HTMLFormControlElement.cpp \
 	Source/WebCore/html/HTMLFormControlElement.h \
-	Source/WebCore/html/HTMLFormControlElementWithState.cpp \
-	Source/WebCore/html/HTMLFormControlElementWithState.h \
 	Source/WebCore/html/HTMLFormElement.cpp \
 	Source/WebCore/html/HTMLFormElement.h \
 	Source/WebCore/html/HTMLFrameElementBase.cpp \

Modified: trunk/Source/WebCore/Target.pri (104271 => 104272)


--- trunk/Source/WebCore/Target.pri	2012-01-06 08:07:42 UTC (rev 104271)
+++ trunk/Source/WebCore/Target.pri	2012-01-06 08:09:16 UTC (rev 104272)
@@ -724,7 +724,6 @@
     html/HTMLFontElement.cpp \
     html/HTMLFormCollection.cpp \
     html/HTMLFormControlElement.cpp \
-    html/HTMLFormControlElementWithState.cpp \
     html/HTMLFormElement.cpp \
     html/HTMLFrameElement.cpp \
     html/HTMLFrameElementBase.cpp \
@@ -1794,7 +1793,6 @@
     html/HTMLFontElement.h \
     html/HTMLFormCollection.h \
     html/HTMLFormControlElement.h \
-    html/HTMLFormControlElementWithState.h \
     html/HTMLFormElement.h \
     html/HTMLFrameElementBase.h \
     html/HTMLFrameElement.h \

Modified: trunk/Source/WebCore/WebCore.gypi (104271 => 104272)


--- trunk/Source/WebCore/WebCore.gypi	2012-01-06 08:07:42 UTC (rev 104271)
+++ trunk/Source/WebCore/WebCore.gypi	2012-01-06 08:09:16 UTC (rev 104272)
@@ -1065,7 +1065,6 @@
             'html/HTMLDocument.h',
             'html/HTMLElement.h',
             'html/HTMLFormControlElement.h',
-            'html/HTMLFormControlElementWithState.h',
             'html/HTMLFormElement.h',
             'html/HTMLFrameElement.h',
             'html/HTMLFrameElementBase.h',
@@ -5572,7 +5571,6 @@
             'html/HTMLFormCollection.cpp',
             'html/HTMLFormCollection.h',
             'html/HTMLFormControlElement.cpp',
-            'html/HTMLFormControlElementWithState.cpp',
             'html/HTMLFormElement.cpp',
             'html/HTMLFrameElement.cpp',
             'html/HTMLFrameElementBase.cpp',

Modified: trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj (104271 => 104272)


--- trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj	2012-01-06 08:07:42 UTC (rev 104271)
+++ trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj	2012-01-06 08:09:16 UTC (rev 104272)
@@ -57297,62 +57297,6 @@
 				RelativePath="..\html\HTMLFormControlElement.h"
 				>
 			</File>
-                        <File
-                                RelativePath="..\html\HTMLFormControlElementWithState.cpp"
-                                >
-                                <FileConfiguration
-                                        Name="Debug|Win32"
-                                        ExcludedFromBuild="true"
-                                        >
-                                        <Tool
-                                                Name="VCCLCompilerTool"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|Win32"
-                                        ExcludedFromBuild="true"
-                                        >
-                                        <Tool
-                                                Name="VCCLCompilerTool"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Debug_Cairo_CFLite|Win32"
-                                        ExcludedFromBuild="true"
-                                        >
-                                        <Tool
-                                                Name="VCCLCompilerTool"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release_Cairo_CFLite|Win32"
-                                        ExcludedFromBuild="true"
-                                        >
-                                        <Tool
-                                                Name="VCCLCompilerTool"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Debug_All|Win32"
-                                        ExcludedFromBuild="true"
-                                        >
-                                        <Tool
-                                                Name="VCCLCompilerTool"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Production|Win32"
-                                        ExcludedFromBuild="true"
-                                        >
-                                        <Tool
-                                                Name="VCCLCompilerTool"
-                                        />
-                                </FileConfiguration>
-                        </File>
-                        <File
-                                RelativePath="..\html\HTMLFormControlElementWithState.h"
-                                >
-                        </File>
 			<File
 				RelativePath="..\html\HTMLFormElement.cpp"
 				>

Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (104271 => 104272)


--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj	2012-01-06 08:07:42 UTC (rev 104271)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj	2012-01-06 08:09:16 UTC (rev 104272)
@@ -5901,8 +5901,6 @@
 		E12EDBEA0B308E0B002704B6 /* EventTarget.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E12EDBE90B308E0B002704B6 /* EventTarget.cpp */; };
 		E134F5AB12EE343F004EC58D /* IntRectHash.h in Headers */ = {isa = PBXBuildFile; fileRef = E134F5AA12EE343F004EC58D /* IntRectHash.h */; settings = {ATTRIBUTES = (Private, ); }; };
 		E13F01F11270E19000DFBA71 /* CookieStorageMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = E13F01F01270E19000DFBA71 /* CookieStorageMac.mm */; };
-		E14F1C4414B5DAC600EA9009 /* HTMLFormControlElementWithState.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E14F1C4214B5DAC600EA9009 /* HTMLFormControlElementWithState.cpp */; };
-		E14F1C4514B5DAC600EA9009 /* HTMLFormControlElementWithState.h in Headers */ = {isa = PBXBuildFile; fileRef = E14F1C4314B5DAC600EA9009 /* HTMLFormControlElementWithState.h */; };
 		E15A36D71104572000B7B639 /* XMLNSNames.h in Headers */ = {isa = PBXBuildFile; fileRef = E15A36D61104572000B7B639 /* XMLNSNames.h */; };
 		E15A36D91104572700B7B639 /* XMLNSNames.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E15A36D81104572700B7B639 /* XMLNSNames.cpp */; };
 		E169803D1133542D00894115 /* CRuntimeObject.h in Headers */ = {isa = PBXBuildFile; fileRef = E169803C1133542D00894115 /* CRuntimeObject.h */; };
@@ -13279,8 +13277,6 @@
 		E134F5AA12EE343F004EC58D /* IntRectHash.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IntRectHash.h; sourceTree = "<group>"; };
 		E13F01EA1270E10D00DFBA71 /* CookieStorage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CookieStorage.h; sourceTree = "<group>"; };
 		E13F01F01270E19000DFBA71 /* CookieStorageMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = CookieStorageMac.mm; sourceTree = "<group>"; };
-		E14F1C4214B5DAC600EA9009 /* HTMLFormControlElementWithState.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HTMLFormControlElementWithState.cpp; sourceTree = "<group>"; };
-		E14F1C4314B5DAC600EA9009 /* HTMLFormControlElementWithState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HTMLFormControlElementWithState.h; sourceTree = "<group>"; };
 		E15A36D61104572000B7B639 /* XMLNSNames.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XMLNSNames.h; sourceTree = "<group>"; };
 		E15A36D81104572700B7B639 /* XMLNSNames.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = XMLNSNames.cpp; sourceTree = "<group>"; };
 		E169803C1133542D00894115 /* CRuntimeObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CRuntimeObject.h; sourceTree = "<group>"; };
@@ -17248,8 +17244,6 @@
 				A8DF3FC6097FA0FB0052981B /* HTMLFormCollection.h */,
 				A81369B3097374F500D74463 /* HTMLFormControlElement.cpp */,
 				A81369B2097374F500D74463 /* HTMLFormControlElement.h */,
-				E14F1C4214B5DAC600EA9009 /* HTMLFormControlElementWithState.cpp */,
-				E14F1C4314B5DAC600EA9009 /* HTMLFormControlElementWithState.h */,
 				A81369B5097374F500D74463 /* HTMLFormElement.cpp */,
 				A81369B4097374F500D74463 /* HTMLFormElement.h */,
 				A8D064EF0A23BFEA005E7203 /* HTMLFormElement.idl */,
@@ -23041,7 +23035,6 @@
 				977B386F122883E900B81FF8 /* HTMLFormattingElementList.h in Headers */,
 				A8DF3FCE097FA0FC0052981B /* HTMLFormCollection.h in Headers */,
 				A81369CE097374F600D74463 /* HTMLFormControlElement.h in Headers */,
-				E14F1C4514B5DAC600EA9009 /* HTMLFormControlElementWithState.h in Headers */,
 				A81369D0097374F600D74463 /* HTMLFormElement.h in Headers */,
 				A871DE2B0A152AC800B12A68 /* HTMLFrameElement.h in Headers */,
 				14FFE31D0AE1963300136BF5 /* HTMLFrameElementBase.h in Headers */,
@@ -26059,7 +26052,6 @@
 				977B386E122883E900B81FF8 /* HTMLFormattingElementList.cpp in Sources */,
 				A8DF3FCF097FA0FC0052981B /* HTMLFormCollection.cpp in Sources */,
 				A81369CF097374F600D74463 /* HTMLFormControlElement.cpp in Sources */,
-				E14F1C4414B5DAC600EA9009 /* HTMLFormControlElementWithState.cpp in Sources */,
 				A81369D1097374F600D74463 /* HTMLFormElement.cpp in Sources */,
 				A871DE230A152AC800B12A68 /* HTMLFrameElement.cpp in Sources */,
 				14FFE31E0AE1963300136BF5 /* HTMLFrameElementBase.cpp in Sources */,

Modified: trunk/Source/WebCore/html/HTMLElementsAllInOne.cpp (104271 => 104272)


--- trunk/Source/WebCore/html/HTMLElementsAllInOne.cpp	2012-01-06 08:07:42 UTC (rev 104271)
+++ trunk/Source/WebCore/html/HTMLElementsAllInOne.cpp	2012-01-06 08:09:16 UTC (rev 104272)
@@ -51,7 +51,6 @@
 #include "HTMLFieldSetElement.cpp"
 #include "HTMLFontElement.cpp"
 #include "HTMLFormControlElement.cpp"
-#include "HTMLFormControlElementWithState.cpp"
 #include "HTMLFormElement.cpp"
 #include "HTMLFrameElement.cpp"
 #include "HTMLFrameElementBase.cpp"

Modified: trunk/Source/WebCore/html/HTMLFormControlElement.cpp (104271 => 104272)


--- trunk/Source/WebCore/html/HTMLFormControlElement.cpp	2012-01-06 08:07:42 UTC (rev 104271)
+++ trunk/Source/WebCore/html/HTMLFormControlElement.cpp	2012-01-06 08:09:16 UTC (rev 104272)
@@ -500,4 +500,54 @@
     return list.release();
 }
 
+HTMLFormControlElementWithState::HTMLFormControlElementWithState(const QualifiedName& tagName, Document* doc, HTMLFormElement* f)
+    : HTMLFormControlElement(tagName, doc, f)
+{
+    document()->registerFormElementWithState(this);
+}
+
+HTMLFormControlElementWithState::~HTMLFormControlElementWithState()
+{
+    document()->unregisterFormElementWithState(this);
+}
+
+void HTMLFormControlElementWithState::didMoveToNewDocument(Document* oldDocument)
+{
+    if (oldDocument)
+        oldDocument->unregisterFormElementWithState(this);
+    document()->registerFormElementWithState(this);
+    HTMLFormControlElement::didMoveToNewDocument(oldDocument);
+}
+
+bool HTMLFormControlElementWithState::shouldAutocomplete() const
+{
+    if (!form())
+        return true;
+    return form()->shouldAutocomplete();
+}
+
+bool HTMLFormControlElementWithState::shouldSaveAndRestoreFormControlState() const
+{
+    // We don't save/restore control state in a form with autocomplete=off.
+    return attached() && shouldAutocomplete();
+}
+
+void HTMLFormControlElementWithState::finishParsingChildren()
+{
+    HTMLFormControlElement::finishParsingChildren();
+
+    // We don't save state of a control with shouldSaveAndRestoreFormControlState()=false.
+    // But we need to skip restoring process too because a control in another
+    // form might have the same pair of name and type and saved its state.
+    if (!shouldSaveAndRestoreFormControlState())
+        return;
+
+    Document* doc = document();
+    if (doc->hasStateForNewFormElements()) {
+        String state;
+        if (doc->takeStateForFormElement(name().impl(), type().impl(), state))
+            restoreFormControlState(state);
+    }
+}
+
 } // namespace Webcore

Modified: trunk/Source/WebCore/html/HTMLFormControlElement.h (104271 => 104272)


--- trunk/Source/WebCore/html/HTMLFormControlElement.h	2012-01-06 08:07:42 UTC (rev 104271)
+++ trunk/Source/WebCore/html/HTMLFormControlElement.h	2012-01-06 08:09:16 UTC (rev 104272)
@@ -169,6 +169,25 @@
     bool m_hasAutofocused : 1;
 };
 
+// FIXME: Give this class its own header file.
+class HTMLFormControlElementWithState : public HTMLFormControlElement {
+public:
+    virtual ~HTMLFormControlElementWithState();
+
+    virtual bool canContainRangeEndPoint() const { return false; }
+
+    bool shouldSaveAndRestoreFormControlState() const;
+    virtual bool saveFormControlState(String&) const { return false; }
+    virtual void restoreFormControlState(const String&) { }
+
+protected:
+    HTMLFormControlElementWithState(const QualifiedName& tagName, Document*, HTMLFormElement*);
+
+    virtual bool shouldAutocomplete() const;
+    virtual void finishParsingChildren();
+    virtual void didMoveToNewDocument(Document* oldDocument) OVERRIDE;
+};
+
 } // namespace
 
 #endif

Deleted: trunk/Source/WebCore/html/HTMLFormControlElementWithState.cpp (104271 => 104272)


--- trunk/Source/WebCore/html/HTMLFormControlElementWithState.cpp	2012-01-06 08:07:42 UTC (rev 104271)
+++ trunk/Source/WebCore/html/HTMLFormControlElementWithState.cpp	2012-01-06 08:09:16 UTC (rev 104272)
@@ -1,82 +0,0 @@
-/*
- * Copyright (C) 1999 Lars Knoll ([email protected])
- *           (C) 1999 Antti Koivisto ([email protected])
- *           (C) 2001 Dirk Mueller ([email protected])
- * Copyright (C) 2004, 2005, 2006, 2007 Apple Inc. All rights reserved.
- *           (C) 2006 Alexey Proskuryakov ([email protected])
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with this library; see the file COPYING.LIB.  If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- *
- */
-
-#include "config.h"
-#include "HTMLFormControlElementWithState.h"
-
-#include "HTMLFormElement.h"
-
-namespace WebCore {
-
-HTMLFormControlElementWithState::HTMLFormControlElementWithState(const QualifiedName& tagName, Document* doc, HTMLFormElement* f)
-    : HTMLFormControlElement(tagName, doc, f)
-{
-    document()->registerFormElementWithState(this);
-}
-
-HTMLFormControlElementWithState::~HTMLFormControlElementWithState()
-{
-    document()->unregisterFormElementWithState(this);
-}
-
-void HTMLFormControlElementWithState::didMoveToNewDocument(Document* oldDocument)
-{
-    if (oldDocument)
-        oldDocument->unregisterFormElementWithState(this);
-    document()->registerFormElementWithState(this);
-    HTMLFormControlElement::didMoveToNewDocument(oldDocument);
-}
-
-bool HTMLFormControlElementWithState::shouldAutocomplete() const
-{
-    if (!form())
-        return true;
-    return form()->shouldAutocomplete();
-}
-
-bool HTMLFormControlElementWithState::shouldSaveAndRestoreFormControlState() const
-{
-    // We don't save/restore control state in a form with autocomplete=off.
-    return attached() && shouldAutocomplete();
-}
-
-void HTMLFormControlElementWithState::finishParsingChildren()
-{
-    HTMLFormControlElement::finishParsingChildren();
-
-    // We don't save state of a control with shouldSaveAndRestoreFormControlState()=false.
-    // But we need to skip restoring process too because a control in another
-    // form might have the same pair of name and type and saved its state.
-    if (!shouldSaveAndRestoreFormControlState())
-        return;
-
-    Document* doc = document();
-    if (doc->hasStateForNewFormElements()) {
-        String state;
-        if (doc->takeStateForFormElement(name().impl(), type().impl(), state))
-            restoreFormControlState(state);
-    }
-}
-
-} // namespace Webcore

Deleted: trunk/Source/WebCore/html/HTMLFormControlElementWithState.h (104271 => 104272)


--- trunk/Source/WebCore/html/HTMLFormControlElementWithState.h	2012-01-06 08:07:42 UTC (rev 104271)
+++ trunk/Source/WebCore/html/HTMLFormControlElementWithState.h	2012-01-06 08:09:16 UTC (rev 104272)
@@ -1,51 +0,0 @@
-/*
- * Copyright (C) 1999 Lars Knoll ([email protected])
- *           (C) 1999 Antti Koivisto ([email protected])
- *           (C) 2000 Dirk Mueller ([email protected])
- * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with this library; see the file COPYING.LIB.  If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- *
- */
-
-#ifndef HTMLFormControlElementWithState_h
-#define HTMLFormControlElementWithState_h
-
-#include "HTMLFormControlElement.h"
-
-namespace WebCore {
-
-class HTMLFormControlElementWithState : public HTMLFormControlElement {
-public:
-    virtual ~HTMLFormControlElementWithState();
-
-    virtual bool canContainRangeEndPoint() const { return false; }
-
-    bool shouldSaveAndRestoreFormControlState() const;
-    virtual bool saveFormControlState(String&) const { return false; }
-    virtual void restoreFormControlState(const String&) { }
-
-protected:
-    HTMLFormControlElementWithState(const QualifiedName& tagName, Document*, HTMLFormElement*);
-
-    virtual bool shouldAutocomplete() const;
-    virtual void finishParsingChildren();
-    virtual void didMoveToNewDocument(Document* oldDocument) OVERRIDE;
-};
-
-} // namespace
-
-#endif

Modified: trunk/Source/WebCore/html/HTMLKeygenElement.h (104271 => 104272)


--- trunk/Source/WebCore/html/HTMLKeygenElement.h	2012-01-06 08:07:42 UTC (rev 104271)
+++ trunk/Source/WebCore/html/HTMLKeygenElement.h	2012-01-06 08:09:16 UTC (rev 104272)
@@ -24,7 +24,7 @@
 #ifndef HTMLKeygenElement_h
 #define HTMLKeygenElement_h
 
-#include "HTMLFormControlElementWithState.h"
+#include "HTMLFormControlElement.h"
 
 namespace WebCore {
 

Modified: trunk/Source/WebCore/html/HTMLSelectElement.h (104271 => 104272)


--- trunk/Source/WebCore/html/HTMLSelectElement.h	2012-01-06 08:07:42 UTC (rev 104271)
+++ trunk/Source/WebCore/html/HTMLSelectElement.h	2012-01-06 08:09:16 UTC (rev 104272)
@@ -27,7 +27,7 @@
 #define HTMLSelectElement_h
 
 #include "Event.h"
-#include "HTMLFormControlElementWithState.h"
+#include "HTMLFormControlElement.h"
 #include <wtf/Vector.h>
 
 namespace WebCore {

Modified: trunk/Source/WebCore/html/HTMLTextFormControlElement.h (104271 => 104272)


--- trunk/Source/WebCore/html/HTMLTextFormControlElement.h	2012-01-06 08:07:42 UTC (rev 104271)
+++ trunk/Source/WebCore/html/HTMLTextFormControlElement.h	2012-01-06 08:09:16 UTC (rev 104272)
@@ -25,7 +25,7 @@
 #ifndef HTMLTextFormControlElement_h
 #define HTMLTextFormControlElement_h
 
-#include "HTMLFormControlElementWithState.h"
+#include "HTMLFormControlElement.h"
 
 namespace WebCore {
 
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to