Diff
Modified: trunk/Source/WebCore/ChangeLog (142247 => 142248)
--- trunk/Source/WebCore/ChangeLog 2013-02-08 09:12:52 UTC (rev 142247)
+++ trunk/Source/WebCore/ChangeLog 2013-02-08 09:34:13 UTC (rev 142248)
@@ -1,3 +1,69 @@
+2013-02-08 Kent Tamura <[email protected]>
+
+ Adjust usage of ENABLE flags to enable whole content
+ https://bugs.webkit.org/show_bug.cgi?id=109270
+
+ Reviewed by Eric Seidel.
+
+ Our common usage of ENABLE flags to enable whole content of files is:
+
+ For .cpp files:
+ #include "config.h"
+ #if ENABLE(FOOBAR)
+ #include "FooBar.h"
+
+ For .h files:
+ #ifndef FooBar_h
+ #define FooBar_h
+ #if ENABLE(FOOBAR)
+
+ Fix files which have uncommon usage, and fix CodeGeneratorV8.pm so that
+ it generates the common pattern. Note that CodeGeneratorJS.pm already
+ generates code in this order.
+
+ * bindings/scripts/CodeGeneratorV8.pm:
+ (GenerateHeaderContentHeader):
+ (GenerateImplementationContentHeader):
+ * bindings/scripts/test/V8/V8TestCallback.cpp:
+ * bindings/scripts/test/V8/V8TestCallback.h:
+ * bindings/scripts/test/V8/V8TestInterface.cpp:
+ * bindings/scripts/test/V8/V8TestInterface.h:
+ * bindings/scripts/test/V8/V8TestSerializedScriptValueInterface.cpp:
+ * bindings/scripts/test/V8/V8TestSerializedScriptValueInterface.h:
+ * html/BaseMultipleFieldsDateAndTimeInputType.h:
+ * html/ColorInputType.cpp:
+ * html/ColorInputType.h:
+ * html/DateInputType.cpp:
+ * html/DateTimeInputType.cpp:
+ * html/DateTimeInputType.h:
+ * html/DateTimeLocalInputType.cpp:
+ * html/HTMLAudioElement.cpp:
+ * html/HTMLAudioElement.h:
+ * html/HTMLDataListElement.cpp:
+ * html/HTMLDialogElement.cpp:
+ * html/HTMLDialogElement.h:
+ * html/HTMLMediaElement.cpp:
+ * html/HTMLMediaElement.h:
+ * html/HTMLMeterElement.cpp:
+ * html/HTMLProgressElement.cpp:
+ * html/HTMLSourceElement.cpp:
+ * html/HTMLSourceElement.h:
+ * html/HTMLTrackElement.cpp:
+ * html/HTMLTrackElement.h:
+ * html/HTMLVideoElement.cpp:
+ * html/HTMLVideoElement.h:
+ * html/MonthInputType.cpp:
+ * html/TimeInputType.cpp:
+ * html/WeekInputType.cpp:
+ * html/shadow/DateTimeFieldElement.h:
+ * html/shadow/DetailsMarkerControl.cpp:
+ * html/shadow/MeterShadowElement.cpp:
+ * html/shadow/ProgressShadowElement.cpp:
+ * rendering/RenderDetailsMarker.cpp:
+ * rendering/RenderInputSpeech.cpp:
+ * rendering/RenderMeter.cpp:
+ * rendering/RenderProgress.cpp:
+
2013-02-08 Mike West <[email protected]>
Replace ExceptionCode assertions with ASSERT_NO_EXCEPTION macro.
Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorV8.pm (142247 => 142248)
--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorV8.pm 2013-02-08 09:12:52 UTC (rev 142247)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorV8.pm 2013-02-08 09:34:13 UTC (rev 142248)
@@ -3258,9 +3258,9 @@
my @headerContentHeader = split("\r", $headerTemplate);
- push(@headerContentHeader, "\n#if ${conditionalString}\n") if $conditionalString;
- push(@headerContentHeader, "\n#ifndef ${v8InterfaceName}" . "_h");
- push(@headerContentHeader, "\n#define ${v8InterfaceName}" . "_h\n\n");
+ push(@headerContentHeader, "\n#ifndef ${v8InterfaceName}" . "_h\n");
+ push(@headerContentHeader, "#define ${v8InterfaceName}" . "_h\n\n");
+ push(@headerContentHeader, "#if ${conditionalString}\n") if $conditionalString;
return @headerContentHeader;
}
@@ -3273,8 +3273,8 @@
my @implContentHeader = split("\r", $headerTemplate);
push(@implContentHeader, "\n#include \"config.h\"\n");
+ push(@implContentHeader, "#if ${conditionalString}\n") if $conditionalString;
push(@implContentHeader, "#include \"${v8InterfaceName}.h\"\n\n");
- push(@implContentHeader, "#if ${conditionalString}\n\n") if $conditionalString;
return @implContentHeader;
}
Modified: trunk/Source/WebCore/bindings/scripts/test/V8/V8TestCallback.cpp (142247 => 142248)
--- trunk/Source/WebCore/bindings/scripts/test/V8/V8TestCallback.cpp 2013-02-08 09:12:52 UTC (rev 142247)
+++ trunk/Source/WebCore/bindings/scripts/test/V8/V8TestCallback.cpp 2013-02-08 09:34:13 UTC (rev 142248)
@@ -19,10 +19,9 @@
*/
#include "config.h"
+#if ENABLE(SQL_DATABASE)
#include "V8TestCallback.h"
-#if ENABLE(SQL_DATABASE)
-
#include "ScriptExecutionContext.h"
#include "V8Binding.h"
#include "V8Callback.h"
Modified: trunk/Source/WebCore/bindings/scripts/test/V8/V8TestCallback.h (142247 => 142248)
--- trunk/Source/WebCore/bindings/scripts/test/V8/V8TestCallback.h 2013-02-08 09:12:52 UTC (rev 142247)
+++ trunk/Source/WebCore/bindings/scripts/test/V8/V8TestCallback.h 2013-02-08 09:34:13 UTC (rev 142248)
@@ -18,11 +18,10 @@
Boston, MA 02111-1307, USA.
*/
-#if ENABLE(SQL_DATABASE)
-
#ifndef V8TestCallback_h
#define V8TestCallback_h
+#if ENABLE(SQL_DATABASE)
#include "ActiveDOMCallback.h"
#include "ScopedPersistent.h"
#include "TestCallback.h"
Modified: trunk/Source/WebCore/bindings/scripts/test/V8/V8TestInterface.cpp (142247 => 142248)
--- trunk/Source/WebCore/bindings/scripts/test/V8/V8TestInterface.cpp 2013-02-08 09:12:52 UTC (rev 142247)
+++ trunk/Source/WebCore/bindings/scripts/test/V8/V8TestInterface.cpp 2013-02-08 09:34:13 UTC (rev 142248)
@@ -19,10 +19,9 @@
*/
#include "config.h"
+#if ENABLE(Condition1) || ENABLE(Condition2)
#include "V8TestInterface.h"
-#if ENABLE(Condition1) || ENABLE(Condition2)
-
#include "BindingState.h"
#include "ContextFeatures.h"
#include "ExceptionCode.h"
Modified: trunk/Source/WebCore/bindings/scripts/test/V8/V8TestInterface.h (142247 => 142248)
--- trunk/Source/WebCore/bindings/scripts/test/V8/V8TestInterface.h 2013-02-08 09:12:52 UTC (rev 142247)
+++ trunk/Source/WebCore/bindings/scripts/test/V8/V8TestInterface.h 2013-02-08 09:34:13 UTC (rev 142248)
@@ -18,11 +18,10 @@
Boston, MA 02111-1307, USA.
*/
-#if ENABLE(Condition1) || ENABLE(Condition2)
-
#ifndef V8TestInterface_h
#define V8TestInterface_h
+#if ENABLE(Condition1) || ENABLE(Condition2)
#include "TestInterface.h"
#include "V8Binding.h"
#include "V8DOMWrapper.h"
Modified: trunk/Source/WebCore/bindings/scripts/test/V8/V8TestSerializedScriptValueInterface.cpp (142247 => 142248)
--- trunk/Source/WebCore/bindings/scripts/test/V8/V8TestSerializedScriptValueInterface.cpp 2013-02-08 09:12:52 UTC (rev 142247)
+++ trunk/Source/WebCore/bindings/scripts/test/V8/V8TestSerializedScriptValueInterface.cpp 2013-02-08 09:34:13 UTC (rev 142248)
@@ -19,10 +19,9 @@
*/
#include "config.h"
+#if ENABLE(Condition1) || ENABLE(Condition2)
#include "V8TestSerializedScriptValueInterface.h"
-#if ENABLE(Condition1) || ENABLE(Condition2)
-
#include "BindingState.h"
#include "ContextFeatures.h"
#include "ExceptionCode.h"
Modified: trunk/Source/WebCore/bindings/scripts/test/V8/V8TestSerializedScriptValueInterface.h (142247 => 142248)
--- trunk/Source/WebCore/bindings/scripts/test/V8/V8TestSerializedScriptValueInterface.h 2013-02-08 09:12:52 UTC (rev 142247)
+++ trunk/Source/WebCore/bindings/scripts/test/V8/V8TestSerializedScriptValueInterface.h 2013-02-08 09:34:13 UTC (rev 142248)
@@ -18,11 +18,10 @@
Boston, MA 02111-1307, USA.
*/
-#if ENABLE(Condition1) || ENABLE(Condition2)
-
#ifndef V8TestSerializedScriptValueInterface_h
#define V8TestSerializedScriptValueInterface_h
+#if ENABLE(Condition1) || ENABLE(Condition2)
#include "TestSerializedScriptValueInterface.h"
#include "V8Binding.h"
#include "V8DOMWrapper.h"
Modified: trunk/Source/WebCore/html/BaseMultipleFieldsDateAndTimeInputType.h (142247 => 142248)
--- trunk/Source/WebCore/html/BaseMultipleFieldsDateAndTimeInputType.h 2013-02-08 09:12:52 UTC (rev 142247)
+++ trunk/Source/WebCore/html/BaseMultipleFieldsDateAndTimeInputType.h 2013-02-08 09:34:13 UTC (rev 142248)
@@ -31,9 +31,9 @@
#ifndef BaseMultipleFieldsDateAndTimeInputType_h
#define BaseMultipleFieldsDateAndTimeInputType_h
+#if ENABLE(INPUT_MULTIPLE_FIELDS_UI)
#include "BaseDateAndTimeInputType.h"
-#if ENABLE(INPUT_MULTIPLE_FIELDS_UI)
#include "DateTimeEditElement.h"
#include "PickerIndicatorElement.h"
#include "SpinButtonElement.h"
@@ -114,4 +114,4 @@
} // namespace WebCore
#endif
-#endif // TimeInputType_h
+#endif // BaseMultipleFieldsDateAndTimeInputType_h
Modified: trunk/Source/WebCore/html/ColorInputType.cpp (142247 => 142248)
--- trunk/Source/WebCore/html/ColorInputType.cpp 2013-02-08 09:12:52 UTC (rev 142247)
+++ trunk/Source/WebCore/html/ColorInputType.cpp 2013-02-08 09:34:13 UTC (rev 142248)
@@ -29,6 +29,7 @@
*/
#include "config.h"
+#if ENABLE(INPUT_TYPE_COLOR)
#include "ColorInputType.h"
#include "CSSPropertyNames.h"
@@ -45,12 +46,9 @@
#include "RenderView.h"
#include "ScriptController.h"
#include "ShadowRoot.h"
-
#include <wtf/PassOwnPtr.h>
#include <wtf/text/WTFString.h>
-#if ENABLE(INPUT_TYPE_COLOR)
-
namespace WebCore {
using namespace HTMLNames;
Modified: trunk/Source/WebCore/html/ColorInputType.h (142247 => 142248)
--- trunk/Source/WebCore/html/ColorInputType.h 2013-02-08 09:12:52 UTC (rev 142247)
+++ trunk/Source/WebCore/html/ColorInputType.h 2013-02-08 09:34:13 UTC (rev 142248)
@@ -31,11 +31,10 @@
#ifndef ColorInputType_h
#define ColorInputType_h
+#if ENABLE(INPUT_TYPE_COLOR)
#include "BaseClickableWithKeyInputType.h"
#include "ColorChooserClient.h"
-#if ENABLE(INPUT_TYPE_COLOR)
-
namespace WebCore {
class ColorInputType : public BaseClickableWithKeyInputType, public ColorChooserClient {
Modified: trunk/Source/WebCore/html/DateInputType.cpp (142247 => 142248)
--- trunk/Source/WebCore/html/DateInputType.cpp 2013-02-08 09:12:52 UTC (rev 142247)
+++ trunk/Source/WebCore/html/DateInputType.cpp 2013-02-08 09:34:13 UTC (rev 142248)
@@ -29,9 +29,9 @@
*/
#include "config.h"
+#if ENABLE(INPUT_TYPE_DATE)
#include "DateInputType.h"
-#if ENABLE(INPUT_TYPE_DATE)
#include "DateComponents.h"
#include "DateTimeFieldsState.h"
#include "HTMLInputElement.h"
Modified: trunk/Source/WebCore/html/DateTimeInputType.cpp (142247 => 142248)
--- trunk/Source/WebCore/html/DateTimeInputType.cpp 2013-02-08 09:12:52 UTC (rev 142247)
+++ trunk/Source/WebCore/html/DateTimeInputType.cpp 2013-02-08 09:34:13 UTC (rev 142248)
@@ -29,6 +29,7 @@
*/
#include "config.h"
+#if ENABLE(INPUT_TYPE_DATETIME)
#include "DateTimeInputType.h"
#include "DateComponents.h"
@@ -38,8 +39,6 @@
#include <wtf/CurrentTime.h>
#include <wtf/PassOwnPtr.h>
-#if ENABLE(INPUT_TYPE_DATETIME)
-
#if ENABLE(INPUT_MULTIPLE_FIELDS_UI)
#include "DateTimeFieldsState.h"
#include "LocalizedStrings.h"
Modified: trunk/Source/WebCore/html/DateTimeInputType.h (142247 => 142248)
--- trunk/Source/WebCore/html/DateTimeInputType.h 2013-02-08 09:12:52 UTC (rev 142247)
+++ trunk/Source/WebCore/html/DateTimeInputType.h 2013-02-08 09:34:13 UTC (rev 142248)
@@ -31,10 +31,9 @@
#ifndef DateTimeInputType_h
#define DateTimeInputType_h
-#include "BaseDateAndTimeInputType.h"
-
#if ENABLE(INPUT_TYPE_DATETIME)
#include "BaseChooserOnlyDateAndTimeInputType.h"
+#include "BaseDateAndTimeInputType.h"
#include "BaseMultipleFieldsDateAndTimeInputType.h"
namespace WebCore {
Modified: trunk/Source/WebCore/html/DateTimeLocalInputType.cpp (142247 => 142248)
--- trunk/Source/WebCore/html/DateTimeLocalInputType.cpp 2013-02-08 09:12:52 UTC (rev 142247)
+++ trunk/Source/WebCore/html/DateTimeLocalInputType.cpp 2013-02-08 09:34:13 UTC (rev 142248)
@@ -29,6 +29,7 @@
*/
#include "config.h"
+#if ENABLE(INPUT_TYPE_DATETIMELOCAL)
#include "DateTimeLocalInputType.h"
#include "DateComponents.h"
@@ -37,8 +38,6 @@
#include "InputTypeNames.h"
#include <wtf/PassOwnPtr.h>
-#if ENABLE(INPUT_TYPE_DATETIMELOCAL)
-
#if ENABLE(INPUT_MULTIPLE_FIELDS_UI)
#include "DateTimeFieldsState.h"
#include "LocalizedStrings.h"
Modified: trunk/Source/WebCore/html/HTMLAudioElement.cpp (142247 => 142248)
--- trunk/Source/WebCore/html/HTMLAudioElement.cpp 2013-02-08 09:12:52 UTC (rev 142247)
+++ trunk/Source/WebCore/html/HTMLAudioElement.cpp 2013-02-08 09:34:13 UTC (rev 142248)
@@ -25,7 +25,6 @@
*/
#include "config.h"
-
#if ENABLE(VIDEO)
#include "HTMLAudioElement.h"
Modified: trunk/Source/WebCore/html/HTMLAudioElement.h (142247 => 142248)
--- trunk/Source/WebCore/html/HTMLAudioElement.h 2013-02-08 09:12:52 UTC (rev 142247)
+++ trunk/Source/WebCore/html/HTMLAudioElement.h 2013-02-08 09:34:13 UTC (rev 142248)
@@ -28,7 +28,6 @@
#define HTMLAudioElement_h
#if ENABLE(VIDEO)
-
#include "HTMLMediaElement.h"
namespace WebCore {
Modified: trunk/Source/WebCore/html/HTMLDataListElement.cpp (142247 => 142248)
--- trunk/Source/WebCore/html/HTMLDataListElement.cpp 2013-02-08 09:12:52 UTC (rev 142247)
+++ trunk/Source/WebCore/html/HTMLDataListElement.cpp 2013-02-08 09:34:13 UTC (rev 142248)
@@ -30,9 +30,9 @@
*/
#include "config.h"
+#if ENABLE(DATALIST_ELEMENT)
#include "HTMLDataListElement.h"
-#if ENABLE(DATALIST_ELEMENT)
#include "FeatureObserver.h"
#include "HTMLNames.h"
#include "IdTargetObserverRegistry.h"
Modified: trunk/Source/WebCore/html/HTMLDialogElement.cpp (142247 => 142248)
--- trunk/Source/WebCore/html/HTMLDialogElement.cpp 2013-02-08 09:12:52 UTC (rev 142247)
+++ trunk/Source/WebCore/html/HTMLDialogElement.cpp 2013-02-08 09:34:13 UTC (rev 142248)
@@ -24,10 +24,9 @@
*/
#include "config.h"
+#if ENABLE(DIALOG_ELEMENT)
#include "HTMLDialogElement.h"
-#if ENABLE(DIALOG_ELEMENT)
-
#include "ExceptionCode.h"
#include "RenderDialog.h"
Modified: trunk/Source/WebCore/html/HTMLDialogElement.h (142247 => 142248)
--- trunk/Source/WebCore/html/HTMLDialogElement.h 2013-02-08 09:12:52 UTC (rev 142247)
+++ trunk/Source/WebCore/html/HTMLDialogElement.h 2013-02-08 09:34:13 UTC (rev 142248)
@@ -27,7 +27,6 @@
#define HTMLDialogElement_h
#if ENABLE(DIALOG_ELEMENT)
-
#include "HTMLElement.h"
namespace WebCore {
Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (142247 => 142248)
--- trunk/Source/WebCore/html/HTMLMediaElement.cpp 2013-02-08 09:12:52 UTC (rev 142247)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp 2013-02-08 09:34:13 UTC (rev 142248)
@@ -24,7 +24,6 @@
*/
#include "config.h"
-
#if ENABLE(VIDEO)
#include "HTMLMediaElement.h"
Modified: trunk/Source/WebCore/html/HTMLMediaElement.h (142247 => 142248)
--- trunk/Source/WebCore/html/HTMLMediaElement.h 2013-02-08 09:12:52 UTC (rev 142247)
+++ trunk/Source/WebCore/html/HTMLMediaElement.h 2013-02-08 09:34:13 UTC (rev 142248)
@@ -27,7 +27,6 @@
#define HTMLMediaElement_h
#if ENABLE(VIDEO)
-
#include "HTMLElement.h"
#include "ActiveDOMObject.h"
#include "GenericEventQueue.h"
Modified: trunk/Source/WebCore/html/HTMLMeterElement.cpp (142247 => 142248)
--- trunk/Source/WebCore/html/HTMLMeterElement.cpp 2013-02-08 09:12:52 UTC (rev 142247)
+++ trunk/Source/WebCore/html/HTMLMeterElement.cpp 2013-02-08 09:34:13 UTC (rev 142248)
@@ -19,9 +19,9 @@
*/
#include "config.h"
+#if ENABLE(METER_ELEMENT)
#include "HTMLMeterElement.h"
-#if ENABLE(METER_ELEMENT)
#include "Attribute.h"
#include "EventNames.h"
#include "ExceptionCode.h"
Modified: trunk/Source/WebCore/html/HTMLProgressElement.cpp (142247 => 142248)
--- trunk/Source/WebCore/html/HTMLProgressElement.cpp 2013-02-08 09:12:52 UTC (rev 142247)
+++ trunk/Source/WebCore/html/HTMLProgressElement.cpp 2013-02-08 09:34:13 UTC (rev 142248)
@@ -19,9 +19,9 @@
*/
#include "config.h"
+#if ENABLE(PROGRESS_ELEMENT)
#include "HTMLProgressElement.h"
-#if ENABLE(PROGRESS_ELEMENT)
#include "Attribute.h"
#include "EventNames.h"
#include "ExceptionCode.h"
Modified: trunk/Source/WebCore/html/HTMLSourceElement.cpp (142247 => 142248)
--- trunk/Source/WebCore/html/HTMLSourceElement.cpp 2013-02-08 09:12:52 UTC (rev 142247)
+++ trunk/Source/WebCore/html/HTMLSourceElement.cpp 2013-02-08 09:34:13 UTC (rev 142248)
@@ -24,7 +24,6 @@
*/
#include "config.h"
-
#if ENABLE(VIDEO)
#include "HTMLSourceElement.h"
Modified: trunk/Source/WebCore/html/HTMLSourceElement.h (142247 => 142248)
--- trunk/Source/WebCore/html/HTMLSourceElement.h 2013-02-08 09:12:52 UTC (rev 142247)
+++ trunk/Source/WebCore/html/HTMLSourceElement.h 2013-02-08 09:34:13 UTC (rev 142248)
@@ -27,7 +27,6 @@
#define HTMLSourceElement_h
#if ENABLE(VIDEO)
-
#include "HTMLElement.h"
#include "Timer.h"
Modified: trunk/Source/WebCore/html/HTMLTrackElement.cpp (142247 => 142248)
--- trunk/Source/WebCore/html/HTMLTrackElement.cpp 2013-02-08 09:12:52 UTC (rev 142247)
+++ trunk/Source/WebCore/html/HTMLTrackElement.cpp 2013-02-08 09:34:13 UTC (rev 142248)
@@ -24,7 +24,6 @@
*/
#include "config.h"
-
#if ENABLE(VIDEO_TRACK)
#include "HTMLTrackElement.h"
@@ -36,9 +35,9 @@
#include "RuntimeEnabledFeatures.h"
#include "ScriptCallStack.h"
#include "ScriptEventListener.h"
+
using namespace std;
-
namespace WebCore {
using namespace HTMLNames;
Modified: trunk/Source/WebCore/html/HTMLTrackElement.h (142247 => 142248)
--- trunk/Source/WebCore/html/HTMLTrackElement.h 2013-02-08 09:12:52 UTC (rev 142247)
+++ trunk/Source/WebCore/html/HTMLTrackElement.h 2013-02-08 09:34:13 UTC (rev 142248)
@@ -27,7 +27,6 @@
#define HTMLTrackElement_h
#if ENABLE(VIDEO_TRACK)
-
#include "HTMLElement.h"
#include "LoadableTextTrack.h"
#include "TextTrack.h"
Modified: trunk/Source/WebCore/html/HTMLVideoElement.cpp (142247 => 142248)
--- trunk/Source/WebCore/html/HTMLVideoElement.cpp 2013-02-08 09:12:52 UTC (rev 142247)
+++ trunk/Source/WebCore/html/HTMLVideoElement.cpp 2013-02-08 09:34:13 UTC (rev 142248)
@@ -24,7 +24,6 @@
*/
#include "config.h"
-
#if ENABLE(VIDEO)
#include "HTMLVideoElement.h"
Modified: trunk/Source/WebCore/html/HTMLVideoElement.h (142247 => 142248)
--- trunk/Source/WebCore/html/HTMLVideoElement.h 2013-02-08 09:12:52 UTC (rev 142247)
+++ trunk/Source/WebCore/html/HTMLVideoElement.h 2013-02-08 09:34:13 UTC (rev 142248)
@@ -27,7 +27,6 @@
#define HTMLVideoElement_h
#if ENABLE(VIDEO)
-
#include "HTMLMediaElement.h"
namespace WebCore {
Modified: trunk/Source/WebCore/html/MonthInputType.cpp (142247 => 142248)
--- trunk/Source/WebCore/html/MonthInputType.cpp 2013-02-08 09:12:52 UTC (rev 142247)
+++ trunk/Source/WebCore/html/MonthInputType.cpp 2013-02-08 09:34:13 UTC (rev 142248)
@@ -29,6 +29,7 @@
*/
#include "config.h"
+#if ENABLE(INPUT_TYPE_MONTH)
#include "MonthInputType.h"
#include "DateComponents.h"
@@ -40,8 +41,6 @@
#include <wtf/MathExtras.h>
#include <wtf/PassOwnPtr.h>
-#if ENABLE(INPUT_TYPE_MONTH)
-
#if ENABLE(INPUT_MULTIPLE_FIELDS_UI)
#include "DateTimeFieldsState.h"
#include "LocalizedStrings.h"
Modified: trunk/Source/WebCore/html/TimeInputType.cpp (142247 => 142248)
--- trunk/Source/WebCore/html/TimeInputType.cpp 2013-02-08 09:12:52 UTC (rev 142247)
+++ trunk/Source/WebCore/html/TimeInputType.cpp 2013-02-08 09:34:13 UTC (rev 142248)
@@ -29,6 +29,7 @@
*/
#include "config.h"
+#if ENABLE(INPUT_TYPE_TIME)
#include "TimeInputType.h"
#include "DateComponents.h"
@@ -40,8 +41,6 @@
#include <wtf/MathExtras.h>
#include <wtf/PassOwnPtr.h>
-#if ENABLE(INPUT_TYPE_TIME)
-
#if ENABLE(INPUT_MULTIPLE_FIELDS_UI)
#include "DateTimeFieldsState.h"
#include "PlatformLocale.h"
Modified: trunk/Source/WebCore/html/WeekInputType.cpp (142247 => 142248)
--- trunk/Source/WebCore/html/WeekInputType.cpp 2013-02-08 09:12:52 UTC (rev 142247)
+++ trunk/Source/WebCore/html/WeekInputType.cpp 2013-02-08 09:34:13 UTC (rev 142248)
@@ -29,6 +29,7 @@
*/
#include "config.h"
+#if ENABLE(INPUT_TYPE_WEEK)
#include "WeekInputType.h"
#include "DateComponents.h"
@@ -37,8 +38,6 @@
#include "InputTypeNames.h"
#include <wtf/PassOwnPtr.h>
-#if ENABLE(INPUT_TYPE_WEEK)
-
#if ENABLE(INPUT_MULTIPLE_FIELDS_UI)
#include "DateTimeFieldsState.h"
#include "LocalizedStrings.h"
Modified: trunk/Source/WebCore/html/shadow/DateTimeFieldElement.h (142247 => 142248)
--- trunk/Source/WebCore/html/shadow/DateTimeFieldElement.h 2013-02-08 09:12:52 UTC (rev 142247)
+++ trunk/Source/WebCore/html/shadow/DateTimeFieldElement.h 2013-02-08 09:34:13 UTC (rev 142248)
@@ -27,7 +27,6 @@
#define DateTimeFieldElement_h
#if ENABLE(INPUT_MULTIPLE_FIELDS_UI)
-
#include "HTMLDivElement.h"
namespace WebCore {
Modified: trunk/Source/WebCore/html/shadow/DetailsMarkerControl.cpp (142247 => 142248)
--- trunk/Source/WebCore/html/shadow/DetailsMarkerControl.cpp 2013-02-08 09:12:52 UTC (rev 142247)
+++ trunk/Source/WebCore/html/shadow/DetailsMarkerControl.cpp 2013-02-08 09:34:13 UTC (rev 142248)
@@ -29,9 +29,9 @@
*/
#include "config.h"
+#if ENABLE(DETAILS_ELEMENT)
#include "DetailsMarkerControl.h"
-#if ENABLE(DETAILS_ELEMENT)
#include "HTMLNames.h"
#include "HTMLSummaryElement.h"
#include "RenderDetailsMarker.h"
Modified: trunk/Source/WebCore/html/shadow/MeterShadowElement.cpp (142247 => 142248)
--- trunk/Source/WebCore/html/shadow/MeterShadowElement.cpp 2013-02-08 09:12:52 UTC (rev 142247)
+++ trunk/Source/WebCore/html/shadow/MeterShadowElement.cpp 2013-02-08 09:34:13 UTC (rev 142248)
@@ -29,9 +29,9 @@
*/
#include "config.h"
+#if ENABLE(METER_ELEMENT)
#include "MeterShadowElement.h"
-#if ENABLE(METER_ELEMENT)
#include "CSSPropertyNames.h"
#include "HTMLMeterElement.h"
#include "HTMLNames.h"
Modified: trunk/Source/WebCore/html/shadow/ProgressShadowElement.cpp (142247 => 142248)
--- trunk/Source/WebCore/html/shadow/ProgressShadowElement.cpp 2013-02-08 09:12:52 UTC (rev 142247)
+++ trunk/Source/WebCore/html/shadow/ProgressShadowElement.cpp 2013-02-08 09:34:13 UTC (rev 142248)
@@ -29,9 +29,9 @@
*/
#include "config.h"
+#if ENABLE(PROGRESS_ELEMENT)
#include "ProgressShadowElement.h"
-#if ENABLE(PROGRESS_ELEMENT)
#include "HTMLNames.h"
#include "HTMLProgressElement.h"
#include "RenderProgress.h"
Modified: trunk/Source/WebCore/rendering/RenderDetailsMarker.cpp (142247 => 142248)
--- trunk/Source/WebCore/rendering/RenderDetailsMarker.cpp 2013-02-08 09:12:52 UTC (rev 142247)
+++ trunk/Source/WebCore/rendering/RenderDetailsMarker.cpp 2013-02-08 09:34:13 UTC (rev 142248)
@@ -19,9 +19,9 @@
*/
#include "config.h"
+#if ENABLE(DETAILS_ELEMENT) || ENABLE(INPUT_MULTIPLE_FIELDS_UI)
#include "RenderDetailsMarker.h"
-#if ENABLE(DETAILS_ELEMENT) || ENABLE(INPUT_MULTIPLE_FIELDS_UI)
#include "Element.h"
#include "GraphicsContext.h"
#include "HTMLNames.h"
Modified: trunk/Source/WebCore/rendering/RenderInputSpeech.cpp (142247 => 142248)
--- trunk/Source/WebCore/rendering/RenderInputSpeech.cpp 2013-02-08 09:12:52 UTC (rev 142247)
+++ trunk/Source/WebCore/rendering/RenderInputSpeech.cpp 2013-02-08 09:34:13 UTC (rev 142248)
@@ -29,10 +29,9 @@
*/
#include "config.h"
+#if ENABLE(INPUT_SPEECH)
#include "RenderInputSpeech.h"
-#if ENABLE(INPUT_SPEECH)
-
#include "GraphicsContext.h"
#include "HTMLNames.h"
#include "PaintInfo.h"
Modified: trunk/Source/WebCore/rendering/RenderMeter.cpp (142247 => 142248)
--- trunk/Source/WebCore/rendering/RenderMeter.cpp 2013-02-08 09:12:52 UTC (rev 142247)
+++ trunk/Source/WebCore/rendering/RenderMeter.cpp 2013-02-08 09:34:13 UTC (rev 142248)
@@ -19,9 +19,9 @@
*/
#include "config.h"
+#if ENABLE(METER_ELEMENT)
#include "RenderMeter.h"
-#if ENABLE(METER_ELEMENT)
#include "HTMLMeterElement.h"
#include "HTMLNames.h"
#include "RenderTheme.h"
Modified: trunk/Source/WebCore/rendering/RenderProgress.cpp (142247 => 142248)
--- trunk/Source/WebCore/rendering/RenderProgress.cpp 2013-02-08 09:12:52 UTC (rev 142247)
+++ trunk/Source/WebCore/rendering/RenderProgress.cpp 2013-02-08 09:34:13 UTC (rev 142248)
@@ -19,9 +19,9 @@
*/
#include "config.h"
+#if ENABLE(PROGRESS_ELEMENT)
#include "RenderProgress.h"
-#if ENABLE(PROGRESS_ELEMENT)
#include "HTMLNames.h"
#include "HTMLProgressElement.h"
#include "PaintInfo.h"
