Diff
Modified: trunk/Source/WebCore/CMakeLists.txt (87291 => 87292)
--- trunk/Source/WebCore/CMakeLists.txt 2011-05-25 11:43:46 UTC (rev 87291)
+++ trunk/Source/WebCore/CMakeLists.txt 2011-05-25 11:55:13 UTC (rev 87292)
@@ -877,6 +877,7 @@
html/parser/TextViewSourceParser.cpp
html/parser/XSSFilter.cpp
+ html/shadow/ElementWithPseudoId.cpp
html/shadow/DetailsMarkerControl.cpp
html/shadow/MediaControls.cpp
html/shadow/MediaControlRootElement.cpp
Modified: trunk/Source/WebCore/ChangeLog (87291 => 87292)
--- trunk/Source/WebCore/ChangeLog 2011-05-25 11:43:46 UTC (rev 87291)
+++ trunk/Source/WebCore/ChangeLog 2011-05-25 11:55:13 UTC (rev 87292)
@@ -1,3 +1,25 @@
+2011-05-25 Keishi Hattori <[email protected]>
+
+ Reviewed by Kent Tamura.
+
+ Move ElementWithPseudoId to separate file
+ https://bugs.webkit.org/show_bug.cgi?id=61430
+
+ No new tests because no behavior changes.
+
+ * CMakeLists.txt: Added ElementWithPseudoId.cpp
+ * GNUmakefile.list.am: Added ElementWithPseudoId.{h,cpp}
+ * WebCore.gypi: Added ElementWithPseudoId.{h,cpp}
+ * WebCore.pro: Added ElementWithPseudoId.{h,cpp}
+ * WebCore.vcproj/WebCore.vcproj: Added ElementWithPseudoId.{h,cpp}
+ * WebCore.xcodeproj/project.pbxproj: Added ElementWithPseudoId.{h,cpp}
+ * html/ValidationMessage.cpp: Removed ElementWithPseudoId definition.
+ * html/shadow/ElementWithPseudoId.cpp: Added.
+ (WebCore::ElementWithPseudoId::shadowPseudoId):
+ * html/shadow/ElementWithPseudoId.h: Added.
+ (WebCore::ElementWithPseudoId::create):
+ (WebCore::ElementWithPseudoId::ElementWithPseudoId):
+
2011-05-25 Alexis Menard <[email protected]>
Reviewed by Antonio Gomes.
Modified: trunk/Source/WebCore/GNUmakefile.list.am (87291 => 87292)
--- trunk/Source/WebCore/GNUmakefile.list.am 2011-05-25 11:43:46 UTC (rev 87291)
+++ trunk/Source/WebCore/GNUmakefile.list.am 2011-05-25 11:55:13 UTC (rev 87292)
@@ -1828,6 +1828,8 @@
Source/WebCore/html/parser/TextViewSourceParser.h \
Source/WebCore/html/parser/XSSFilter.cpp \
Source/WebCore/html/parser/XSSFilter.h \
+ Source/WebCore/html/shadow/ElementWithPseudoId.cpp \
+ Source/WebCore/html/shadow/ElementWithPseudoId.h \
Source/WebCore/html/shadow/DetailsMarkerControl.cpp \
Source/WebCore/html/shadow/DetailsMarkerControl.h \
Source/WebCore/html/shadow/MediaControls.cpp \
Modified: trunk/Source/WebCore/WebCore.gypi (87291 => 87292)
--- trunk/Source/WebCore/WebCore.gypi 2011-05-25 11:43:46 UTC (rev 87291)
+++ trunk/Source/WebCore/WebCore.gypi 2011-05-25 11:55:13 UTC (rev 87292)
@@ -3175,6 +3175,8 @@
'html/parser/TextViewSourceParser.h',
'html/parser/XSSFilter.cpp',
'html/parser/XSSFilter.h',
+ 'html/shadow/ElementWithPseudoId.cpp',
+ 'html/shadow/ElementWithPseudoId.h',
'html/shadow/DetailsMarkerControl.cpp',
'html/shadow/DetailsMarkerControl.h',
'html/shadow/MediaControls.cpp',
Modified: trunk/Source/WebCore/WebCore.pro (87291 => 87292)
--- trunk/Source/WebCore/WebCore.pro 2011-05-25 11:43:46 UTC (rev 87291)
+++ trunk/Source/WebCore/WebCore.pro 2011-05-25 11:55:13 UTC (rev 87292)
@@ -796,6 +796,7 @@
html/parser/TextDocumentParser.cpp \
html/parser/TextViewSourceParser.cpp \
html/parser/XSSFilter.cpp \
+ html/shadow/ElementWithPseudoId.cpp \
html/shadow/DetailsMarkerControl.cpp \
html/shadow/MediaControls.cpp \
html/shadow/MediaControlRootElement.cpp \
@@ -1746,6 +1747,7 @@
html/parser/XSSFilter.h \
html/shadow/MediaControlElements.h \
html/shadow/DetailsMarkerControl.h \
+ html/shadow/ElementWithPseudoId.h \
inspector/ConsoleMessage.h \
inspector/DOMNodeHighlighter.h \
inspector/EventsCollector.h \
Modified: trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj (87291 => 87292)
--- trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj 2011-05-25 11:43:46 UTC (rev 87291)
+++ trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj 2011-05-25 11:55:13 UTC (rev 87292)
@@ -56873,6 +56873,14 @@
Name="shadow"
>
<File
+ RelativePath="..\html\shadow\ElementWithPseudoId.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\html\shadow\ElementWithPseudoId.h"
+ >
+ </File>
+ <File
RelativePath="..\html\shadow\DetailsMarkerControl.cpp"
>
</File>
Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (87291 => 87292)
--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2011-05-25 11:43:46 UTC (rev 87291)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2011-05-25 11:55:13 UTC (rev 87292)
@@ -5338,6 +5338,8 @@
C0F2A44113869AAB0066C534 /* preprocessor.pm in Headers */ = {isa = PBXBuildFile; fileRef = C0F2A43F13869A280066C534 /* preprocessor.pm */; settings = {ATTRIBUTES = (Private, ); }; };
C105DA620F3AA68F001DD44F /* TextEncodingDetectorICU.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C105DA610F3AA68F001DD44F /* TextEncodingDetectorICU.cpp */; };
C105DA640F3AA6B8001DD44F /* TextEncodingDetector.h in Headers */ = {isa = PBXBuildFile; fileRef = C105DA630F3AA6B8001DD44F /* TextEncodingDetector.h */; };
+ C39509B6138D05D400912E52 /* ElementWithPseudoId.h in Headers */ = {isa = PBXBuildFile; fileRef = C39509B4138D05D400912E52 /* ElementWithPseudoId.h */; };
+ C39509B7138D05D400912E52 /* ElementWithPseudoId.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C39509B5138D05D400912E52 /* ElementWithPseudoId.cpp */; };
C50B561612119D23008B46E0 /* GroupSettings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C50B561412119D23008B46E0 /* GroupSettings.cpp */; };
C50B561712119D23008B46E0 /* GroupSettings.h in Headers */ = {isa = PBXBuildFile; fileRef = C50B561512119D23008B46E0 /* GroupSettings.h */; settings = {ATTRIBUTES = (Private, ); }; };
C50D0E820FF4272900AC2644 /* StorageNamespace.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C50D0E800FF4272900AC2644 /* StorageNamespace.cpp */; };
@@ -11831,6 +11833,8 @@
C0F2A43F13869A280066C534 /* preprocessor.pm */ = {isa = PBXFileReference; lastKnownFileType = text.script.perl; name = preprocessor.pm; path = scripts/preprocessor.pm; sourceTree = "<group>"; };
C105DA610F3AA68F001DD44F /* TextEncodingDetectorICU.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TextEncodingDetectorICU.cpp; sourceTree = "<group>"; };
C105DA630F3AA6B8001DD44F /* TextEncodingDetector.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TextEncodingDetector.h; sourceTree = "<group>"; };
+ C39509B4138D05D400912E52 /* ElementWithPseudoId.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ElementWithPseudoId.h; sourceTree = "<group>"; };
+ C39509B5138D05D400912E52 /* ElementWithPseudoId.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ElementWithPseudoId.cpp; sourceTree = "<group>"; };
C50B561412119D23008B46E0 /* GroupSettings.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GroupSettings.cpp; sourceTree = "<group>"; };
C50B561512119D23008B46E0 /* GroupSettings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GroupSettings.h; sourceTree = "<group>"; };
C50D0E800FF4272900AC2644 /* StorageNamespace.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StorageNamespace.cpp; sourceTree = "<group>"; };
@@ -13525,6 +13529,8 @@
children = (
A7C9ABF61357A3BF00F5503F /* DetailsMarkerControl.cpp */,
A7C9ABF71357A3BF00F5503F /* DetailsMarkerControl.h */,
+ C39509B5138D05D400912E52 /* ElementWithPseudoId.cpp */,
+ C39509B4138D05D400912E52 /* ElementWithPseudoId.h */,
417253A81354BBBC00360F2A /* MediaControlElements.cpp */,
417253A91354BBBC00360F2A /* MediaControlElements.h */,
4157AF7F12F1FB0400A8C6F5 /* MediaControlRootElement.cpp */,
@@ -20986,6 +20992,7 @@
A8C4A80709D563270003AC8D /* Element.h in Headers */,
63F5D4F70E8C4B7100C0BD04 /* ElementRareData.h in Headers */,
E415F1840D9A1A830033CE97 /* ElementTimeControl.h in Headers */,
+ C39509B6138D05D400912E52 /* ElementWithPseudoId.h in Headers */,
A8CFF6BE0A156118000A4234 /* EllipsisBox.h in Headers */,
F55B3DBC1251F12D003EF269 /* EmailInputType.h in Headers */,
B25599A50D00D8BA00BB825C /* EmptyClients.h in Headers */,
@@ -23845,6 +23852,7 @@
93A38B4B0D0E5808006872C2 /* EditorCommand.cpp in Sources */,
ED501DC60B249F2900AE18D9 /* EditorMac.mm in Sources */,
A8C4A80809D563270003AC8D /* Element.cpp in Sources */,
+ C39509B7138D05D400912E52 /* ElementWithPseudoId.cpp in Sources */,
A8CFF6CB0A1561CD000A4234 /* EllipsisBox.cpp in Sources */,
F55B3DBB1251F12D003EF269 /* EmailInputType.cpp in Sources */,
A8EA7EC10A1945D000A8EF5F /* EntityReference.cpp in Sources */,
Modified: trunk/Source/WebCore/html/ValidationMessage.cpp (87291 => 87292)
--- trunk/Source/WebCore/html/ValidationMessage.cpp 2011-05-25 11:43:46 UTC (rev 87291)
+++ trunk/Source/WebCore/html/ValidationMessage.cpp 2011-05-25 11:55:13 UTC (rev 87292)
@@ -34,6 +34,7 @@
#include "CSSPropertyNames.h"
#include "CSSStyleSelector.h"
#include "CSSValueKeywords.h"
+#include "ElementWithPseudoId.h"
#include "FormAssociatedElement.h"
#include "HTMLBRElement.h"
#include "HTMLNames.h"
@@ -104,23 +105,6 @@
}
}
-class ElementWithPseudoId : public HTMLElement {
-public:
- static PassRefPtr<HTMLElement> create(Document* doc, const AtomicString& pseudoName)
- {
- return adoptRef(new ElementWithPseudoId(doc, pseudoName));
- }
-
-protected:
- ElementWithPseudoId(Document* doc, const AtomicString& pseudoName)
- : HTMLElement(divTag, doc)
- , m_pseudoName(pseudoName) { };
- virtual const AtomicString& shadowPseudoId() const { return m_pseudoName; }
-
-private:
- AtomicString m_pseudoName;
-};
-
static void adjustBubblePosition(const IntRect& hostRect, HTMLElement* bubble)
{
ASSERT(bubble);
Added: trunk/Source/WebCore/html/shadow/ElementWithPseudoId.cpp (0 => 87292)
--- trunk/Source/WebCore/html/shadow/ElementWithPseudoId.cpp (rev 0)
+++ trunk/Source/WebCore/html/shadow/ElementWithPseudoId.cpp 2011-05-25 11:55:13 UTC (rev 87292)
@@ -0,0 +1,41 @@
+/*
+ * Copyright (C) 2011 Google Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ * * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "ElementWithPseudoId.h"
+
+namespace WebCore {
+
+const AtomicString& ElementWithPseudoId::shadowPseudoId() const
+{
+ return m_pseudoName;
+}
+
+}
Added: trunk/Source/WebCore/html/shadow/ElementWithPseudoId.h (0 => 87292)
--- trunk/Source/WebCore/html/shadow/ElementWithPseudoId.h (rev 0)
+++ trunk/Source/WebCore/html/shadow/ElementWithPseudoId.h 2011-05-25 11:55:13 UTC (rev 87292)
@@ -0,0 +1,61 @@
+/*
+ * Copyright (C) 2011 Google Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ * * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef ElementWithPseudoId_h
+#define ElementWithPseudoId_h
+
+#include "HTMLDivElement.h"
+#include "HTMLNames.h"
+
+namespace WebCore {
+
+class ElementWithPseudoId : public HTMLElement {
+public:
+ static PassRefPtr<ElementWithPseudoId> create(Document* document, const AtomicString& pseudoName)
+ {
+ return adoptRef(new ElementWithPseudoId(document, pseudoName));
+ }
+
+protected:
+ ElementWithPseudoId(Document* document, const AtomicString& pseudoName)
+ : HTMLElement(HTMLNames::divTag, document)
+ , m_pseudoName(pseudoName)
+ {
+ }
+
+ virtual const AtomicString& shadowPseudoId() const;
+
+private:
+ AtomicString m_pseudoName;
+};
+
+}
+
+#endif // ElementWithPseudoId_h
