Attachment 151222 Details for Bug 90521 – fix conflict

[patch] fix conflict

bug-90521-20120709192654.patch (text/plain), 50.75 KB, created by Matt Falkenhagen on 2012-07-09 03:26:55 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Matt Falkenhagen

Created: 2012-07-09 03:26:55 PDT

Size: 50.75 KB

patch

obsolete

>Subversion Revision: 122100
>diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
>index c56af00b7489c8f75d29bc7389936843682690ec..6c5ae512ed71d320c7d02a3b0e15f5f8a2b18847 100644
>--- a/Source/JavaScriptCore/ChangeLog
>+++ b/Source/JavaScriptCore/ChangeLog
>@@ -1,3 +1,12 @@
>+2012-07-09  Matt Falkenhagen  <falken@chromium.org>
>+
>+        Add ENABLE_DIALOG_ELEMENT and skeleton files
>+        https://bugs.webkit.org/show_bug.cgi?id=90521
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * Configurations/FeatureDefines.xcconfig:
>+
> 2012-07-08  Ryosuke Niwa  <rniwa@webkit.org>
> 
>         gcc build fix after r121925.
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 6bf070511b64b364b6658f65c5d7c1ba4127b232..0b547d2100c28b1d0506c04bc70acdb83892c5bc 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,47 @@
>+2012-07-09  Matt Falkenhagen  <falken@chromium.org>
>+
>+        Add ENABLE_DIALOG_ELEMENT and skeleton files
>+        https://bugs.webkit.org/show_bug.cgi?id=90521
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        This adds the ENABLE_DIALOG_ELEMENT feature flag and dummy implementation files for <dialog>. In addition, a runtime feature flag is added.
>+        The feature is diabled by default.
>+
>+        No new tests, as there is no behavior change.
>+
>+        * CMakeLists.txt:
>+        * Configurations/FeatureDefines.xcconfig:
>+        * DerivedSources.cpp:
>+        * DerivedSources.make:
>+        * DerivedSources.pri:
>+        * Target.pri:
>+        * WebCore.gypi:
>+        * WebCore.xcodeproj/project.pbxproj:
>+        * bindings/generic/RuntimeEnabledFeatures.cpp:
>+        (WebCore):
>+        * bindings/generic/RuntimeEnabledFeatures.h: Added a runtime feature flag for dialog.
>+        (RuntimeEnabledFeatures):
>+        (WebCore::RuntimeEnabledFeatures::dialogElementEnabled):
>+        (WebCore::RuntimeEnabledFeatures::setDialogElementEnabled):
>+        * dom/ContextFeatures.cpp:
>+        (WebCore::ContextFeatures::dialogElementEnabled):
>+        (WebCore):
>+        * dom/ContextFeatures.h: Added a per-context flag for dialog so that dialog can be disabled in HTMLTagNames.in and DOMWindow.idl when the dialog runtime feature flag is off.
>+        * html/HTMLDialogElement.cpp: Added.
>+        (WebCore):
>+        (WebCore::HTMLDialogElement::HTMLDialogElement):
>+        (WebCore::HTMLDialogElement::create):
>+        (WebCore::HTMLDialogElement::close):
>+        (WebCore::HTMLDialogElement::show):
>+        * html/HTMLDialogElement.h: Added.
>+        (WebCore):
>+        (HTMLDialogElement):
>+        * html/HTMLDialogElement.idl: Added.
>+        * html/HTMLElementsAllInOne.cpp:
>+        * html/HTMLTagNames.in:
>+        * page/DOMWindow.idl:
>+
> 2012-07-09  MORITA Hajime  <morrita@google.com>
> 
>         [Chromium] ContextFeaturesClient::isEnabled is slow
>diff --git a/Source/WebKit/chromium/ChangeLog b/Source/WebKit/chromium/ChangeLog
>index d20bea46fd030472faeceeb086af702646957b12..3f0c65d2a85b0b43225f23d95bfc7319ef9cd731 100644
>--- a/Source/WebKit/chromium/ChangeLog
>+++ b/Source/WebKit/chromium/ChangeLog
>@@ -1,3 +1,18 @@
>+2012-07-09  Matt Falkenhagen  <falken@chromium.org>
>+
>+        Add ENABLE_DIALOG_ELEMENT and skeleton files
>+        https://bugs.webkit.org/show_bug.cgi?id=90521
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * features.gypi:
>+        * public/WebRuntimeFeatures.h:
>+        (WebRuntimeFeatures):
>+        * src/WebRuntimeFeatures.cpp:
>+        (WebKit::WebRuntimeFeatures::enableDialogElement):
>+        (WebKit):
>+        (WebKit::WebRuntimeFeatures::isDialogElementEnabled):
>+
> 2012-07-09  MORITA Hajime  <morrita@google.com>
> 
>         [Chromium] ContextFeaturesClient::isEnabled is slow
>diff --git a/Source/WebKit/mac/ChangeLog b/Source/WebKit/mac/ChangeLog
>index d9af0f7a6801c9586e8361f8516bfb9951bf8abb..aa0d4bef75acef78ae0387502f56509d7b7fddcd 100644
>--- a/Source/WebKit/mac/ChangeLog
>+++ b/Source/WebKit/mac/ChangeLog
>@@ -1,3 +1,12 @@
>+2012-07-08  Matt Falkenhagen  <falken@chromium.org>
>+
>+        Add ENABLE_DIALOG_ELEMENT and skeleton files
>+        https://bugs.webkit.org/show_bug.cgi?id=90521
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * Configurations/FeatureDefines.xcconfig:
>+
> 2012-07-04  John Mellor  <johnme@chromium.org>
> 
>         Text Autosizing: Add compile flag and runtime setting
>diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
>index 6acac7171d0c99ca8d66a25097968a93090d6445..bd868b843a71da1ee5315db69b33646839c8f851 100644
>--- a/Source/WebKit2/ChangeLog
>+++ b/Source/WebKit2/ChangeLog
>@@ -1,3 +1,12 @@
>+2012-07-09  Matt Falkenhagen  <falken@chromium.org>
>+
>+        Add ENABLE_DIALOG_ELEMENT and skeleton files
>+        https://bugs.webkit.org/show_bug.cgi?id=90521
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * Configurations/FeatureDefines.xcconfig:
>+
> 2012-07-09  Dan Bernstein  <mitz@apple.com>
> 
>         Fix the Mac build when codesign_allocate is not installed at /usr/bin.
>diff --git a/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig b/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig
>index a5a34a47c2dc38b593ec762aa7ca3a4e73c55542..5fa30a6e9f339d962d66b92c996bc02c1d020aea 100644
>--- a/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig
>+++ b/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig
>@@ -51,6 +51,7 @@ ENABLE_DATALIST = ;
> ENABLE_DATA_TRANSFER_ITEMS = ;
> ENABLE_DETAILS = ENABLE_DETAILS;
> ENABLE_DEVICE_ORIENTATION = ;
>+ENABLE_DIALOG_ELEMENT = ;
> ENABLE_DIRECTORY_UPLOAD = ;
> ENABLE_FILE_SYSTEM = ;
> ENABLE_FILTERS = $(ENABLE_FILTERS_$(REAL_PLATFORM_NAME));
>@@ -132,4 +133,4 @@ ENABLE_WEB_TIMING = ;
> ENABLE_WORKERS = ENABLE_WORKERS;
> ENABLE_XSLT = ENABLE_XSLT;
> 
>-FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ANIMATION_API) $(ENABLE_BLOB) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS3_FLEXBOX) $(ENABLE_CSS_EXCLUSIONS) $(ENABLE_CSS_FILTERS) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SHADERS) $(ENABLE_CSS_VARIABLES) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_FILE_SYSTEM) $(ENABLE_FILTERS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_HIGH_DPI_CANVAS) $(ENABLE_ICONDATABASE) $(ENABLE_IFRAME_SEAMLESS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LINK_PREFETCH) $(ENABLE_LINK_PRERENDER) $(ENABLE_MATHML) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_TAG) $(ENABLE_MICRODATA) $(ENABLE_MUTATION_OBSERVERS) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PROGRESS_TAG) $(ENABLE_QUOTA) $(ENABLE_REGISTER_PROTOCOL_HANDLER) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_SCRIPTED_SPEECH) $(ENABLE_SHADOW_DOM) $(ENABLE_SHARED_WORKERS) $(ENABLE_SQL_DATABASE) $(ENABLE_STYLE_SCOPED) $(ENABLE_SVG) $(ENABLE_SVG_DOM_OBJC_BINDINGS) $(ENABLE_SVG_FONTS) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TEXT_NOTIFICATIONS_ONLY) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_UNDO_MANAGER) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WORKERS) $(ENABLE_XSLT);
>+FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ANIMATION_API) $(ENABLE_BLOB) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS3_FLEXBOX) $(ENABLE_CSS_EXCLUSIONS) $(ENABLE_CSS_FILTERS) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SHADERS) $(ENABLE_CSS_VARIABLES) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIALOG_ELEMENT) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_FILE_SYSTEM) $(ENABLE_FILTERS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_HIGH_DPI_CANVAS) $(ENABLE_ICONDATABASE) $(ENABLE_IFRAME_SEAMLESS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LINK_PREFETCH) $(ENABLE_LINK_PRERENDER) $(ENABLE_MATHML) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_TAG) $(ENABLE_MICRODATA) $(ENABLE_MUTATION_OBSERVERS) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PROGRESS_TAG) $(ENABLE_QUOTA) $(ENABLE_REGISTER_PROTOCOL_HANDLER) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_SCRIPTED_SPEECH) $(ENABLE_SHADOW_DOM) $(ENABLE_SHARED_WORKERS) $(ENABLE_SQL_DATABASE) $(ENABLE_STYLE_SCOPED) $(ENABLE_SVG) $(ENABLE_SVG_DOM_OBJC_BINDINGS) $(ENABLE_SVG_FONTS) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TEXT_NOTIFICATIONS_ONLY) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_UNDO_MANAGER) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WORKERS) $(ENABLE_XSLT);
>diff --git a/Source/WebCore/CMakeLists.txt b/Source/WebCore/CMakeLists.txt
>index e357707f273d776ea56b13166db0dae080f58ece..7db099f90ab5be6f92be08de7cb5ac2bc353ed2c 100644
>--- a/Source/WebCore/CMakeLists.txt
>+++ b/Source/WebCore/CMakeLists.txt
>@@ -278,6 +278,7 @@ SET(WebCore_IDL_FILES
>     html/HTMLCollection.idl
>     html/HTMLDataListElement.idl
>     html/HTMLDetailsElement.idl
>+    html/HTMLDialogElement.idl
>     html/HTMLDirectoryElement.idl
>     html/HTMLDivElement.idl
>     html/HTMLDListElement.idl
>@@ -786,6 +787,7 @@ SET(WebCore_SOURCES
>     html/HTMLDListElement.cpp
>     html/HTMLDataListElement.cpp
>     html/HTMLDetailsElement.cpp
>+    html/HTMLDialogElement.cpp
>     html/HTMLDirectoryElement.cpp
>     html/HTMLDivElement.cpp
>     html/HTMLDocument.cpp
>diff --git a/Source/WebCore/Configurations/FeatureDefines.xcconfig b/Source/WebCore/Configurations/FeatureDefines.xcconfig
>index 65f3d72f2e1c645a8ef74682da8c2236358a5432..7f95c3018e0c957aa804b3f35568ec8fbb043262 100644
>--- a/Source/WebCore/Configurations/FeatureDefines.xcconfig
>+++ b/Source/WebCore/Configurations/FeatureDefines.xcconfig
>@@ -52,6 +52,7 @@ ENABLE_DATALIST = ;
> ENABLE_DATA_TRANSFER_ITEMS = ;
> ENABLE_DETAILS = ENABLE_DETAILS;
> ENABLE_DEVICE_ORIENTATION = ;
>+ENABLE_DIALOG_ELEMENT = ;
> ENABLE_DIRECTORY_UPLOAD = ;
> ENABLE_FILE_SYSTEM = ;
> ENABLE_FILTERS = $(ENABLE_FILTERS_$(REAL_PLATFORM_NAME));
>@@ -133,4 +134,4 @@ ENABLE_WEB_TIMING = ;
> ENABLE_WORKERS = ENABLE_WORKERS;
> ENABLE_XSLT = ENABLE_XSLT;
> 
>-FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ANIMATION_API) $(ENABLE_BLOB) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS3_FLEXBOX) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_EXCLUSIONS) $(ENABLE_CSS_FILTERS) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SHADERS) $(ENABLE_CSS_VARIABLES) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_FILE_SYSTEM) $(ENABLE_FILTERS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_HIGH_DPI_CANVAS) $(ENABLE_ICONDATABASE) $(ENABLE_IFRAME_SEAMLESS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LINK_PREFETCH) $(ENABLE_LINK_PRERENDER) $(ENABLE_MATHML) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_TAG) $(ENABLE_MICRODATA) $(ENABLE_MUTATION_OBSERVERS) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PROGRESS_TAG) $(ENABLE_QUOTA) $(ENABLE_REGISTER_PROTOCOL_HANDLER) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_SCRIPTED_SPEECH) $(ENABLE_SHADOW_DOM) $(ENABLE_SHARED_WORKERS) $(ENABLE_SQL_DATABASE) $(ENABLE_STYLE_SCOPED) $(ENABLE_SVG) $(ENABLE_SVG_DOM_OBJC_BINDINGS) $(ENABLE_SVG_FONTS) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TEXT_NOTIFICATIONS_ONLY) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_UNDO_MANAGER) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WORKERS) $(ENABLE_XSLT);
>+FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ANIMATION_API) $(ENABLE_BLOB) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS3_FLEXBOX) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_EXCLUSIONS) $(ENABLE_CSS_FILTERS) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SHADERS) $(ENABLE_CSS_VARIABLES) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIALOG_ELEMENT) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_FILE_SYSTEM) $(ENABLE_FILTERS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_HIGH_DPI_CANVAS) $(ENABLE_ICONDATABASE) $(ENABLE_IFRAME_SEAMLESS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LINK_PREFETCH) $(ENABLE_LINK_PRERENDER) $(ENABLE_MATHML) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_TAG) $(ENABLE_MICRODATA) $(ENABLE_MUTATION_OBSERVERS) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PROGRESS_TAG) $(ENABLE_QUOTA) $(ENABLE_REGISTER_PROTOCOL_HANDLER) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_SCRIPTED_SPEECH) $(ENABLE_SHADOW_DOM) $(ENABLE_SHARED_WORKERS) $(ENABLE_SQL_DATABASE) $(ENABLE_STYLE_SCOPED) $(ENABLE_SVG) $(ENABLE_SVG_DOM_OBJC_BINDINGS) $(ENABLE_SVG_FONTS) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TEXT_NOTIFICATIONS_ONLY) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_UNDO_MANAGER) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WORKERS) $(ENABLE_XSLT);
>diff --git a/Source/WebCore/DerivedSources.cpp b/Source/WebCore/DerivedSources.cpp
>index 8e810b90e36f023d2680d6198ee19750346c23f6..2b5a391d70161b6145ed72200d371e80190d803e 100644
>--- a/Source/WebCore/DerivedSources.cpp
>+++ b/Source/WebCore/DerivedSources.cpp
>@@ -150,6 +150,7 @@
> #include "JSHTMLContentElement.cpp"
> #include "JSHTMLDataListElement.cpp"
> #include "JSHTMLDetailsElement.cpp"
>+#include "JSHTMLDialogElement.cpp"
> #include "JSHTMLDirectoryElement.cpp"
> #include "JSHTMLDivElement.cpp"
> #include "JSHTMLDListElement.cpp"
>diff --git a/Source/WebCore/DerivedSources.make b/Source/WebCore/DerivedSources.make
>index a9c99a143957666caa6f6af6cb246edd762b329c..cf3d2c93ddeb70f15a39eb834826599065b71dbd 100644
>--- a/Source/WebCore/DerivedSources.make
>+++ b/Source/WebCore/DerivedSources.make
>@@ -286,6 +286,7 @@ BINDING_IDLS = \
>     $(WebCore)/html/HTMLDListElement.idl \
>     $(WebCore)/html/HTMLDataListElement.idl \
>     $(WebCore)/html/HTMLDetailsElement.idl \
>+    $(WebCore)/html/HTMLDialogElement.idl \
>     $(WebCore)/html/HTMLDirectoryElement.idl \
>     $(WebCore)/html/HTMLDivElement.idl \
>     $(WebCore)/html/HTMLDocument.idl \
>diff --git a/Source/WebCore/DerivedSources.pri b/Source/WebCore/DerivedSources.pri
>index c6dc80dc064cfeae78d37ef41fa7fe1c8e5e62b6..2f93c4ae0becdaed94e7a1382f8f0e8cd549c713 100644
>--- a/Source/WebCore/DerivedSources.pri
>+++ b/Source/WebCore/DerivedSources.pri
>@@ -333,6 +333,7 @@ IDL_BINDINGS += \
>     $$PWD/html/HTMLCollection.idl \
>     $$PWD/html/HTMLDataListElement.idl \
>     $$PWD/html/HTMLDetailsElement.idl \
>+    $$PWD/html/HTMLDialogElement.idl \
>     $$PWD/html/HTMLDirectoryElement.idl \
>     $$PWD/html/HTMLDivElement.idl \
>     $$PWD/html/HTMLDListElement.idl \
>diff --git a/Source/WebCore/Target.pri b/Source/WebCore/Target.pri
>index 57708edc48200cdcba44888f2dbe88d4c6334975..4d62ad8e02fe7e5622723f889416edfad49363e5 100644
>--- a/Source/WebCore/Target.pri
>+++ b/Source/WebCore/Target.pri
>@@ -753,6 +753,7 @@ SOURCES += \
>     html/HTMLCollection.cpp \
>     html/HTMLDListElement.cpp \
>     html/HTMLDataListElement.cpp \
>+    html/HTMLDialogElement.cpp \
>     html/HTMLDirectoryElement.cpp \
>     html/HTMLDetailsElement.cpp \
>     html/HTMLDivElement.cpp \
>@@ -1924,6 +1925,7 @@ HEADERS += \
>     html/HTMLButtonElement.h \
>     html/HTMLCanvasElement.h \
>     html/HTMLCollection.h \
>+    html/HTMLDialogElement.h \
>     html/HTMLDirectoryElement.h \
>     html/HTMLDetailsElement.h \
>     html/HTMLDivElement.h \
>diff --git a/Source/WebCore/WebCore.gypi b/Source/WebCore/WebCore.gypi
>index efa43c785812b411cdde09f90de9f9dc63ee7e49..a03ac50efb9b31cc433c83a6cb4c48fecd230252 100644
>--- a/Source/WebCore/WebCore.gypi
>+++ b/Source/WebCore/WebCore.gypi
>@@ -1031,6 +1031,7 @@
>             'html/HTMLDListElement.idl',
>             'html/HTMLDataListElement.idl',
>             'html/HTMLDetailsElement.idl',
>+            'html/HTMLDialogElement.idl',
>             'html/HTMLDirectoryElement.idl',
>             'html/HTMLDivElement.idl',
>             'html/HTMLDocument.idl',
>@@ -5377,6 +5378,8 @@
>             'html/HTMLDataListElement.h',
>             'html/HTMLDetailsElement.cpp',
>             'html/HTMLDetailsElement.h',
>+            'html/HTMLDialogElement.cpp',
>+            'html/HTMLDialogElement.h',
>             'html/HTMLDirectoryElement.cpp',
>             'html/HTMLDirectoryElement.h',
>             'html/HTMLDivElement.cpp',
>diff --git a/Source/WebCore/WebCore.xcodeproj/project.pbxproj b/Source/WebCore/WebCore.xcodeproj/project.pbxproj
>index b66d7f2f028c09262bfea4b7d3112639c9bfccdb..10949ab0d9379de31a91643ca5c1991d18f7f64f 100644
>--- a/Source/WebCore/WebCore.xcodeproj/project.pbxproj
>+++ b/Source/WebCore/WebCore.xcodeproj/project.pbxproj
>@@ -1865,8 +1865,13 @@
> 		75793ED40D0CE85B007FC0AC /* DOMMessageEvent.mm in Sources */ = {isa = PBXBuildFile; fileRef = 75793ED10D0CE85B007FC0AC /* DOMMessageEvent.mm */; };
> 		75793ED50D0CE85B007FC0AC /* DOMMessageEventInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 75793ED20D0CE85B007FC0AC /* DOMMessageEventInternal.h */; };
> 		758978EC127090D60076D5A9 /* SpeechInputResult.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 758978EA127090D60076D5A9 /* SpeechInputResult.cpp */; };
>+		762F1ED7159D960A007408F2 /* HTMLDialogElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 762F1ED6159D960A007408F2 /* HTMLDialogElement.h */; };
>+		762F1ED9159D961A007408F2 /* HTMLDialogElement.idl in Resources */ = {isa = PBXBuildFile; fileRef = 762F1ED8159D961A007408F2 /* HTMLDialogElement.idl */; };
>+		762F1EDB159D968A007408F2 /* HTMLDialogElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 762F1EDA159D968A007408F2 /* HTMLDialogElement.cpp */; };
> 		7633A72613D8B33A008501B6 /* LocaleToScriptMapping.h in Headers */ = {isa = PBXBuildFile; fileRef = 7633A72413D8B33A008501B6 /* LocaleToScriptMapping.h */; };
> 		7633A72713D8B33A008501B6 /* LocaleToScriptMappingDefault.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7633A72513D8B33A008501B6 /* LocaleToScriptMappingDefault.cpp */; };
>+		76808B4F159DADFA002B5233 /* JSHTMLDialogElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 76808B4D159DADFA002B5233 /* JSHTMLDialogElement.cpp */; };
>+		76808B50159DADFA002B5233 /* JSHTMLDialogElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 76808B4E159DADFA002B5233 /* JSHTMLDialogElement.h */; };
> 		7694563C1214D97C0007CBAE /* JSDOMTokenList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7694563A1214D97C0007CBAE /* JSDOMTokenList.cpp */; };
> 		7694563D1214D97C0007CBAE /* JSDOMTokenList.h in Headers */ = {isa = PBXBuildFile; fileRef = 7694563B1214D97C0007CBAE /* JSDOMTokenList.h */; };
> 		7694565B1214DB630007CBAE /* DOMDOMTokenList.h in Headers */ = {isa = PBXBuildFile; fileRef = 769456591214DB630007CBAE /* DOMDOMTokenList.h */; };
>@@ -8977,8 +8982,13 @@
> 		75793ED20D0CE85B007FC0AC /* DOMMessageEventInternal.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DOMMessageEventInternal.h; sourceTree = "<group>"; };
> 		758978EA127090D60076D5A9 /* SpeechInputResult.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SpeechInputResult.cpp; sourceTree = "<group>"; };
> 		758978EB127090D60076D5A9 /* SpeechInputResult.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SpeechInputResult.h; sourceTree = "<group>"; };
>+		762F1ED6159D960A007408F2 /* HTMLDialogElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HTMLDialogElement.h; sourceTree = "<group>"; };
>+		762F1ED8159D961A007408F2 /* HTMLDialogElement.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = HTMLDialogElement.idl; sourceTree = "<group>"; };
>+		762F1EDA159D968A007408F2 /* HTMLDialogElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HTMLDialogElement.cpp; sourceTree = "<group>"; };
> 		7633A72413D8B33A008501B6 /* LocaleToScriptMapping.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LocaleToScriptMapping.h; sourceTree = "<group>"; };
> 		7633A72513D8B33A008501B6 /* LocaleToScriptMappingDefault.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LocaleToScriptMappingDefault.cpp; sourceTree = "<group>"; };
>+		76808B4D159DADFA002B5233 /* JSHTMLDialogElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = JSHTMLDialogElement.cpp; path = ../../../Release/DerivedSources/WebCore/JSHTMLDialogElement.cpp; sourceTree = "<group>"; };
>+		76808B4E159DADFA002B5233 /* JSHTMLDialogElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JSHTMLDialogElement.h; path = ../../../Release/DerivedSources/WebCore/JSHTMLDialogElement.h; sourceTree = "<group>"; };
> 		7694563A1214D97C0007CBAE /* JSDOMTokenList.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSDOMTokenList.cpp; sourceTree = "<group>"; };
> 		7694563B1214D97C0007CBAE /* JSDOMTokenList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSDOMTokenList.h; sourceTree = "<group>"; };
> 		769456591214DB630007CBAE /* DOMDOMTokenList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DOMDOMTokenList.h; sourceTree = "<group>"; };
>@@ -17203,6 +17213,9 @@
> 				D359D786129CA2710006E5D2 /* HTMLDetailsElement.cpp */,
> 				D359D787129CA2710006E5D2 /* HTMLDetailsElement.h */,
> 				D359D788129CA2710006E5D2 /* HTMLDetailsElement.idl */,
>+				762F1EDA159D968A007408F2 /* HTMLDialogElement.cpp */,
>+				762F1ED8159D961A007408F2 /* HTMLDialogElement.idl */,
>+				762F1ED6159D960A007408F2 /* HTMLDialogElement.h */,
> 				A8EA79ED0A1916DF00A8EF5F /* HTMLDirectoryElement.cpp */,
> 				A8EA79EE0A1916DF00A8EF5F /* HTMLDirectoryElement.h */,
> 				1A85B1D90A1B23A400D8C87C /* HTMLDirectoryElement.idl */,
>@@ -18044,6 +18057,8 @@
> 				6EBC5EAD138B50F200A0CF8A /* JSFloat64Array.cpp */,
> 				6EBC5EAE138B50F200A0CF8A /* JSFloat64Array.h */,
> 				BC97E410109154FA0010D361 /* JSHTMLAllCollection.cpp */,
>+				76808B4D159DADFA002B5233 /* JSHTMLDialogElement.cpp */,
>+				76808B4E159DADFA002B5233 /* JSHTMLDialogElement.h */,
> 				BC97E411109154FA0010D361 /* JSHTMLAllCollection.h */,
> 				1A4A2DEB0A1B852A00C807F8 /* JSHTMLAnchorElement.cpp */,
> 				1A4A2DEC0A1B852A00C807F8 /* JSHTMLAnchorElement.h */,
>@@ -25178,6 +25193,8 @@
> 				50987C27157D676D00BDA835 /* CustomFilterGlobalContext.h in Headers */,
> 				4F32BB1B14FA85E800F6C1A3 /* MemoryInstrumentation.h in Headers */,
> 				A882DA231593848D000115ED /* CSSToStyleMap.h in Headers */,
>+				762F1ED7159D960A007408F2 /* HTMLDialogElement.h in Headers */,
>+				76808B50159DADFA002B5233 /* JSHTMLDialogElement.h in Headers */,
> 				1FAFBF1915A5FA7400083A20 /* UTIUtilities.h in Headers */,
> 			);
> 			runOnlyForDeploymentPostprocessing = 0;
>@@ -28233,6 +28250,8 @@
> 				CE7B2DB61586ABAD0098B3FA /* TextAlternativeWithRange.mm in Sources */,
> 				50987C26157D676D00BDA835 /* CustomFilterGlobalContext.cpp in Sources */,
> 				A882DA201593846A000115ED /* CSSToStyleMap.cpp in Sources */,
>+				762F1EDB159D968A007408F2 /* HTMLDialogElement.cpp in Sources */,
>+				76808B4F159DADFA002B5233 /* JSHTMLDialogElement.cpp in Sources */,
> 				1FAFBF1815A5FA6E00083A20 /* UTIUtilities.mm in Sources */,
> 			);
> 			runOnlyForDeploymentPostprocessing = 0;
>diff --git a/Source/WebCore/bindings/generic/RuntimeEnabledFeatures.cpp b/Source/WebCore/bindings/generic/RuntimeEnabledFeatures.cpp
>index db8ce367de4401858bb616ac58c0c5a485d8c31e..494f866b0a76a4f09cd80bbf88701a8e86b61b05 100644
>--- a/Source/WebCore/bindings/generic/RuntimeEnabledFeatures.cpp
>+++ b/Source/WebCore/bindings/generic/RuntimeEnabledFeatures.cpp
>@@ -198,4 +198,8 @@ bool RuntimeEnabledFeatures::isStyleScopedEnabled = false;
> bool RuntimeEnabledFeatures::isInputTypeDateEnabled = true;
> #endif
> 
>+#if ENABLE(DIALOG_ELEMENT)
>+bool RuntimeEnabledFeatures::isDialogElementEnabled = false;
>+#endif
>+
> } // namespace WebCore
>diff --git a/Source/WebCore/bindings/generic/RuntimeEnabledFeatures.h b/Source/WebCore/bindings/generic/RuntimeEnabledFeatures.h
>index 6f491431669cb4e628cb20cc14222d45badb20dc..a176889094c0768e38182418a59417477a216d5e 100644
>--- a/Source/WebCore/bindings/generic/RuntimeEnabledFeatures.h
>+++ b/Source/WebCore/bindings/generic/RuntimeEnabledFeatures.h
>@@ -231,6 +231,11 @@ public:
>     static void setInputTypeDateEnabled(bool isEnabled) { isInputTypeDateEnabled = isEnabled; }
> #endif
> 
>+#if ENABLE(DIALOG_ELEMENT)
>+    static bool dialogElementEnabled() { return isDialogElementEnabled; }
>+    static void setDialogElementEnabled(bool isEnabled) { isDialogElementEnabled = isEnabled; }
>+#endif
>+
> private:
>     // Never instantiate.
>     RuntimeEnabledFeatures() { }
>@@ -304,6 +309,10 @@ private:
> #if ENABLE(INPUT_TYPE_DATE)
>     static bool isInputTypeDateEnabled;
> #endif
>+
>+#if ENABLE(DIALOG_ELEMENT)
>+    static bool isDialogElementEnabled;
>+#endif
> };
> 
> } // namespace WebCore
>diff --git a/Source/WebCore/dom/ContextFeatures.cpp b/Source/WebCore/dom/ContextFeatures.cpp
>index 887db4cb25da7fea00f46ceee073e42492a25f79..7e3daa671dc9afe256151b70cd5aa012e923388f 100644
>--- a/Source/WebCore/dom/ContextFeatures.cpp
>+++ b/Source/WebCore/dom/ContextFeatures.cpp
>@@ -51,6 +51,18 @@ ContextFeatures* ContextFeatures::defaultSwitch()
>     return instance.get();
> }
> 
>+bool ContextFeatures::dialogElementEnabled(Document* document)
>+{
>+#if ENABLE(DIALOG_ELEMENT)
>+    if (!document)
>+        return RuntimeEnabledFeatures::dialogElementEnabled();
>+    return document->contextFeatures()->isEnabled(document, DialogElement, RuntimeEnabledFeatures::dialogElementEnabled());
>+#else
>+    UNUSED_PARAM(document);
>+    return false;
>+#endif
>+}
>+
> bool ContextFeatures::shadowDOMEnabled(Document* document)
> {
> #if ENABLE(SHADOW_DOM)
>diff --git a/Source/WebCore/dom/ContextFeatures.h b/Source/WebCore/dom/ContextFeatures.h
>index fc3036d2147dc8acfe7266cc103ebf38ae3e8ba2..31dda92dfeae804be76e3fead36be1458440b5a1 100644
>--- a/Source/WebCore/dom/ContextFeatures.h
>+++ b/Source/WebCore/dom/ContextFeatures.h
>@@ -1,4 +1,3 @@
>-
> /*
>  * Copyright (C) 2012 Google Inc. All rights reserved.
>  *
>@@ -40,16 +39,18 @@ class Page;
> class ContextFeatures : public RefCountedSupplement<Page, ContextFeatures> {
> public:
>     enum FeatureType {
>-        ShadowDOM = 0,
>+        DialogElement = 0,
>+        ShadowDOM,
>         StyleScoped,
>         PagePopup,
>-        FeatureTypeSize // Should be the last enetry.
>+        FeatureTypeSize // Should be the last entry.
>     };
> 
>     static const AtomicString& supplementName();
>     static ContextFeatures* defaultSwitch();
>     static PassRefPtr<ContextFeatures> create(ContextFeaturesClient*);
> 
>+    static bool dialogElementEnabled(Document*);
>     static bool shadowDOMEnabled(Document*);
>     static bool styleScopedEnabled(Document*);
>     static bool pagePopupEnabled(Document*);
>diff --git a/Source/WebCore/html/HTMLDialogElement.cpp b/Source/WebCore/html/HTMLDialogElement.cpp
>new file mode 100644
>index 0000000000000000000000000000000000000000..bd630ef67676abf82612e02353aeff7542f29b70
>--- /dev/null
>+++ b/Source/WebCore/html/HTMLDialogElement.cpp
>@@ -0,0 +1,58 @@
>+/*
>+ * Copyright (C) 2012 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:
>+ *
>+ * 1.  Redistributions of source code must retain the above copyright
>+ *     notice, this list of conditions and the following disclaimer.
>+ * 2.  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.
>+ *
>+ * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS 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 APPLE OR ITS 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 "HTMLDialogElement.h"
>+
>+#if ENABLE(DIALOG_ELEMENT)
>+
>+namespace WebCore {
>+
>+using namespace HTMLNames;
>+
>+HTMLDialogElement::HTMLDialogElement(const QualifiedName& tagName, Document* document)
>+    : HTMLElement(tagName, document)
>+{
>+    ASSERT(hasTagName(dialogTag));
>+}
>+
>+PassRefPtr<HTMLDialogElement> HTMLDialogElement::create(const QualifiedName& tagName, Document* document)
>+{
>+    return adoptRef(new HTMLDialogElement(tagName, document));
>+}
>+
>+void HTMLDialogElement::close()
>+{
>+    // FIXME: Implement.
>+}
>+
>+void HTMLDialogElement::show()
>+{
>+    // FIXME: Implement.
>+}
>+
>+}
>+
>+#endif
>diff --git a/Source/WebCore/html/HTMLDialogElement.h b/Source/WebCore/html/HTMLDialogElement.h
>new file mode 100644
>index 0000000000000000000000000000000000000000..cc5c2db0b135c85f5dabd5155ee4df2ef123a764
>--- /dev/null
>+++ b/Source/WebCore/html/HTMLDialogElement.h
>@@ -0,0 +1,53 @@
>+/*
>+ * Copyright (C) 2012 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:
>+ *
>+ * 1.  Redistributions of source code must retain the above copyright
>+ *     notice, this list of conditions and the following disclaimer.
>+ * 2.  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.
>+ *
>+ * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS 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 APPLE OR ITS 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 HTMLDialogElement_h
>+#define HTMLDialogElement_h
>+
>+#if ENABLE(DIALOG_ELEMENT)
>+
>+#include "HTMLElement.h"
>+
>+namespace WebCore {
>+
>+class Document;
>+class QualifiedName;
>+
>+class HTMLDialogElement : public HTMLElement {
>+public:
>+    static PassRefPtr<HTMLDialogElement> create(const QualifiedName&, Document*);
>+
>+    void close();
>+    void show();
>+
>+private:
>+    HTMLDialogElement(const QualifiedName&, Document*);
>+};
>+
>+} // namespace WebCore
>+
>+#endif
>+
>+#endif
>diff --git a/Source/WebCore/html/HTMLDialogElement.idl b/Source/WebCore/html/HTMLDialogElement.idl
>new file mode 100644
>index 0000000000000000000000000000000000000000..e5d6479ba29978ace4dff37f1bb752ee26b512c1
>--- /dev/null
>+++ b/Source/WebCore/html/HTMLDialogElement.idl
>@@ -0,0 +1,36 @@
>+/*
>+ * Copyright (C) 2012 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:
>+ *
>+ * 1.  Redistributions of source code must retain the above copyright
>+ *     notice, this list of conditions and the following disclaimer.
>+ * 2.  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.
>+ *
>+ * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS 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 APPLE OR ITS 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.
>+ */
>+
>+module html {
>+
>+    interface [
>+        Conditional=DIALOG_ELEMENT
>+    ] HTMLDialogElement : HTMLElement {
>+        attribute [Reflect] boolean open;
>+        void close();
>+        void show();
>+    };
>+
>+}
>diff --git a/Source/WebCore/html/HTMLElementsAllInOne.cpp b/Source/WebCore/html/HTMLElementsAllInOne.cpp
>index cd89b4687c6d2f07d2f1b7a1218aee3924abffda..3adde30c56d051b2bf867b7b2655af1aa04f796c 100644
>--- a/Source/WebCore/html/HTMLElementsAllInOne.cpp
>+++ b/Source/WebCore/html/HTMLElementsAllInOne.cpp
>@@ -45,6 +45,7 @@
> #include "HTMLDataListElement.cpp"
> #include "HTMLDetailsElement.cpp"
> #include "HTMLDListElement.cpp"
>+#include "HTMLDialogElement.cpp"
> #include "HTMLDirectoryElement.cpp"
> #include "HTMLDivElement.cpp"
> #include "HTMLElement.cpp"
>diff --git a/Source/WebCore/html/HTMLTagNames.in b/Source/WebCore/html/HTMLTagNames.in
>index 58093c592b044b375087d4cd94d93f73dc334127..bfdcd35718da5d1cd3d16a07d2f16a77c5349a23 100644
>--- a/Source/WebCore/html/HTMLTagNames.in
>+++ b/Source/WebCore/html/HTMLTagNames.in
>@@ -39,6 +39,7 @@ del interfaceName=HTMLModElement
> details conditional=DETAILS
> dfn interfaceName=HTMLElement
> dir interfaceName=HTMLDirectoryElement
>+dialog conditional=DIALOG_ELEMENT, contextConditional=dialogElement
> div
> dl interfaceName=HTMLDListElement
> dt interfaceName=HTMLElement
>diff --git a/Source/WebCore/page/DOMWindow.idl b/Source/WebCore/page/DOMWindow.idl
>index b206543b15586724d9fb81e0ea19360b70394606..d22e0a4f35b305e65b718cdbbdfa751d206b628a 100644
>--- a/Source/WebCore/page/DOMWindow.idl
>+++ b/Source/WebCore/page/DOMWindow.idl
>@@ -407,6 +407,7 @@ module window {
>         attribute HTMLCanvasElementConstructor HTMLCanvasElement;
>         attribute HTMLDListElementConstructor HTMLDListElement;
>         attribute [Conditional=DATALIST] HTMLDataListElementConstructor HTMLDataListElement;
>+        attribute [Conditional=DIALOG_ELEMENT, V8EnabledPerContext=dialogElement] HTMLDialogElementConstructor HTMLDialogElement;
>         attribute HTMLDirectoryElementConstructor HTMLDirectoryElement;
>         attribute HTMLDivElementConstructor HTMLDivElement;
>         attribute HTMLEmbedElementConstructor HTMLEmbedElement;
>diff --git a/Source/WebKit/chromium/features.gypi b/Source/WebKit/chromium/features.gypi
>index a9803af3d76ca704388a998e7bf6fe2bc5c5103a..ec09ff8bb7ea16028d05176539f4e1fbd4c94cb4 100644
>--- a/Source/WebKit/chromium/features.gypi
>+++ b/Source/WebKit/chromium/features.gypi
>@@ -53,6 +53,7 @@
>       'ENABLE_DATA_TRANSFER_ITEMS=1',
>       'ENABLE_DETAILS=1',
>       'ENABLE_DEVICE_ORIENTATION=1',
>+      'ENABLE_DIALOG_ELEMENT=1',
>       'ENABLE_DIRECTORY_UPLOAD=1',
>       'ENABLE_DOWNLOAD_ATTRIBUTE=1',
>       'ENABLE_ENCRYPTED_MEDIA=1',
>diff --git a/Source/WebKit/chromium/public/WebRuntimeFeatures.h b/Source/WebKit/chromium/public/WebRuntimeFeatures.h
>index 0a954e164536b3007bc587cacce5e0fb7e1cce73..a0dd0499759df0329149e459788d499787f84e5b 100644
>--- a/Source/WebKit/chromium/public/WebRuntimeFeatures.h
>+++ b/Source/WebKit/chromium/public/WebRuntimeFeatures.h
>@@ -139,6 +139,9 @@ public:
>     WEBKIT_EXPORT static void enableInputTypeDate(bool);
>     WEBKIT_EXPORT static bool isInputTypeDateEnabled();
> 
>+    WEBKIT_EXPORT static void enableDialogElement(bool);
>+    WEBKIT_EXPORT static bool isDialogElementEnabled();
>+
> private:
>     WebRuntimeFeatures();
> };
>diff --git a/Source/WebKit/chromium/src/WebRuntimeFeatures.cpp b/Source/WebKit/chromium/src/WebRuntimeFeatures.cpp
>index 03129c54da01698f97296db185efb215510d47dc..491a3031111ac2e6372ef68d43d430b83e8827de 100644
>--- a/Source/WebKit/chromium/src/WebRuntimeFeatures.cpp
>+++ b/Source/WebKit/chromium/src/WebRuntimeFeatures.cpp
>@@ -531,4 +531,23 @@ bool WebRuntimeFeatures::isInputTypeDateEnabled()
> #endif
> }
> 
>+void WebRuntimeFeatures::enableDialogElement(bool enable)
>+{
>+#if ENABLE(DIALOG_ELEMENT)
>+    RuntimeEnabledFeatures::setDialogElementEnabled(enable);
>+#else
>+    UNUSED_PARAM(enable);
>+#endif
>+}
>+
>+bool WebRuntimeFeatures::isDialogElementEnabled()
>+{
>+#if ENABLE(DIALOG_ELEMENT)
>+    return RuntimeEnabledFeatures::dialogElementEnabled();
>+#else
>+    return false;
>+#endif
>+}
>+
>+
> } // namespace WebKit
>diff --git a/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig b/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig
>index 65f3d72f2e1c645a8ef74682da8c2236358a5432..7f95c3018e0c957aa804b3f35568ec8fbb043262 100644
>--- a/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig
>+++ b/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig
>@@ -52,6 +52,7 @@ ENABLE_DATALIST = ;
> ENABLE_DATA_TRANSFER_ITEMS = ;
> ENABLE_DETAILS = ENABLE_DETAILS;
> ENABLE_DEVICE_ORIENTATION = ;
>+ENABLE_DIALOG_ELEMENT = ;
> ENABLE_DIRECTORY_UPLOAD = ;
> ENABLE_FILE_SYSTEM = ;
> ENABLE_FILTERS = $(ENABLE_FILTERS_$(REAL_PLATFORM_NAME));
>@@ -133,4 +134,4 @@ ENABLE_WEB_TIMING = ;
> ENABLE_WORKERS = ENABLE_WORKERS;
> ENABLE_XSLT = ENABLE_XSLT;
> 
>-FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ANIMATION_API) $(ENABLE_BLOB) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS3_FLEXBOX) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_EXCLUSIONS) $(ENABLE_CSS_FILTERS) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SHADERS) $(ENABLE_CSS_VARIABLES) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_FILE_SYSTEM) $(ENABLE_FILTERS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_HIGH_DPI_CANVAS) $(ENABLE_ICONDATABASE) $(ENABLE_IFRAME_SEAMLESS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LINK_PREFETCH) $(ENABLE_LINK_PRERENDER) $(ENABLE_MATHML) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_TAG) $(ENABLE_MICRODATA) $(ENABLE_MUTATION_OBSERVERS) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PROGRESS_TAG) $(ENABLE_QUOTA) $(ENABLE_REGISTER_PROTOCOL_HANDLER) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_SCRIPTED_SPEECH) $(ENABLE_SHADOW_DOM) $(ENABLE_SHARED_WORKERS) $(ENABLE_SQL_DATABASE) $(ENABLE_STYLE_SCOPED) $(ENABLE_SVG) $(ENABLE_SVG_DOM_OBJC_BINDINGS) $(ENABLE_SVG_FONTS) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TEXT_NOTIFICATIONS_ONLY) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_UNDO_MANAGER) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WORKERS) $(ENABLE_XSLT);
>+FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ANIMATION_API) $(ENABLE_BLOB) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS3_FLEXBOX) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_EXCLUSIONS) $(ENABLE_CSS_FILTERS) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SHADERS) $(ENABLE_CSS_VARIABLES) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIALOG_ELEMENT) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_FILE_SYSTEM) $(ENABLE_FILTERS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_HIGH_DPI_CANVAS) $(ENABLE_ICONDATABASE) $(ENABLE_IFRAME_SEAMLESS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LINK_PREFETCH) $(ENABLE_LINK_PRERENDER) $(ENABLE_MATHML) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_TAG) $(ENABLE_MICRODATA) $(ENABLE_MUTATION_OBSERVERS) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PROGRESS_TAG) $(ENABLE_QUOTA) $(ENABLE_REGISTER_PROTOCOL_HANDLER) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_SCRIPTED_SPEECH) $(ENABLE_SHADOW_DOM) $(ENABLE_SHARED_WORKERS) $(ENABLE_SQL_DATABASE) $(ENABLE_STYLE_SCOPED) $(ENABLE_SVG) $(ENABLE_SVG_DOM_OBJC_BINDINGS) $(ENABLE_SVG_FONTS) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TEXT_NOTIFICATIONS_ONLY) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_UNDO_MANAGER) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WORKERS) $(ENABLE_XSLT);
>diff --git a/Source/WebKit2/Configurations/FeatureDefines.xcconfig b/Source/WebKit2/Configurations/FeatureDefines.xcconfig
>index 65f3d72f2e1c645a8ef74682da8c2236358a5432..7f95c3018e0c957aa804b3f35568ec8fbb043262 100644
>--- a/Source/WebKit2/Configurations/FeatureDefines.xcconfig
>+++ b/Source/WebKit2/Configurations/FeatureDefines.xcconfig
>@@ -52,6 +52,7 @@ ENABLE_DATALIST = ;
> ENABLE_DATA_TRANSFER_ITEMS = ;
> ENABLE_DETAILS = ENABLE_DETAILS;
> ENABLE_DEVICE_ORIENTATION = ;
>+ENABLE_DIALOG_ELEMENT = ;
> ENABLE_DIRECTORY_UPLOAD = ;
> ENABLE_FILE_SYSTEM = ;
> ENABLE_FILTERS = $(ENABLE_FILTERS_$(REAL_PLATFORM_NAME));
>@@ -133,4 +134,4 @@ ENABLE_WEB_TIMING = ;
> ENABLE_WORKERS = ENABLE_WORKERS;
> ENABLE_XSLT = ENABLE_XSLT;
> 
>-FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ANIMATION_API) $(ENABLE_BLOB) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS3_FLEXBOX) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_EXCLUSIONS) $(ENABLE_CSS_FILTERS) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SHADERS) $(ENABLE_CSS_VARIABLES) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_FILE_SYSTEM) $(ENABLE_FILTERS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_HIGH_DPI_CANVAS) $(ENABLE_ICONDATABASE) $(ENABLE_IFRAME_SEAMLESS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LINK_PREFETCH) $(ENABLE_LINK_PRERENDER) $(ENABLE_MATHML) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_TAG) $(ENABLE_MICRODATA) $(ENABLE_MUTATION_OBSERVERS) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PROGRESS_TAG) $(ENABLE_QUOTA) $(ENABLE_REGISTER_PROTOCOL_HANDLER) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_SCRIPTED_SPEECH) $(ENABLE_SHADOW_DOM) $(ENABLE_SHARED_WORKERS) $(ENABLE_SQL_DATABASE) $(ENABLE_STYLE_SCOPED) $(ENABLE_SVG) $(ENABLE_SVG_DOM_OBJC_BINDINGS) $(ENABLE_SVG_FONTS) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TEXT_NOTIFICATIONS_ONLY) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_UNDO_MANAGER) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WORKERS) $(ENABLE_XSLT);
>+FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ANIMATION_API) $(ENABLE_BLOB) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS3_FLEXBOX) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_EXCLUSIONS) $(ENABLE_CSS_FILTERS) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SHADERS) $(ENABLE_CSS_VARIABLES) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIALOG_ELEMENT) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_FILE_SYSTEM) $(ENABLE_FILTERS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_HIGH_DPI_CANVAS) $(ENABLE_ICONDATABASE) $(ENABLE_IFRAME_SEAMLESS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LINK_PREFETCH) $(ENABLE_LINK_PRERENDER) $(ENABLE_MATHML) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_TAG) $(ENABLE_MICRODATA) $(ENABLE_MUTATION_OBSERVERS) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PROGRESS_TAG) $(ENABLE_QUOTA) $(ENABLE_REGISTER_PROTOCOL_HANDLER) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_SCRIPTED_SPEECH) $(ENABLE_SHADOW_DOM) $(ENABLE_SHARED_WORKERS) $(ENABLE_SQL_DATABASE) $(ENABLE_STYLE_SCOPED) $(ENABLE_SVG) $(ENABLE_SVG_DOM_OBJC_BINDINGS) $(ENABLE_SVG_FONTS) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TEXT_NOTIFICATIONS_ONLY) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_UNDO_MANAGER) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WORKERS) $(ENABLE_XSLT);
>diff --git a/Source/cmake/WebKitFeatures.cmake b/Source/cmake/WebKitFeatures.cmake
>index b1170369cdd3ef28918823f72c27256ff1b1f6cb..179335c467e86baa2d6f4a766c91c650dcba062c 100644
>--- a/Source/cmake/WebKitFeatures.cmake
>+++ b/Source/cmake/WebKitFeatures.cmake
>@@ -31,7 +31,8 @@ MACRO (WEBKIT_OPTION_BEGIN)
>     WEBKIT_OPTION_DEFINE(ENABLE_DATA_TRANSFER_ITEMS "Toggle HTML5 data transfer items support" OFF)
>     WEBKIT_OPTION_DEFINE(ENABLE_DETAILS "Toggle HTML5 details support" ON)
>     WEBKIT_OPTION_DEFINE(ENABLE_DEVICE_ORIENTATION "Toggle DeviceOrientation support" OFF)
>-    WEBKIT_OPTION_DEFINE(ENABLE_DIRECTORY_UPLOAD "Toogle Directory upload support" OFF)
>+    WEBKIT_OPTION_DEFINE(ENABLE_DIALOG_ELEMENT "Toggle Dialog Element support" OFF)
>+    WEBKIT_OPTION_DEFINE(ENABLE_DIRECTORY_UPLOAD "Toggle Directory upload support" OFF)
>     WEBKIT_OPTION_DEFINE(ENABLE_DOWNLOAD_ATTRIBUTE "Toggle download attribute support" OFF)
>     WEBKIT_OPTION_DEFINE(ENABLE_DRAG_SUPPORT "Toggle Drag Support" OFF)
>     WEBKIT_OPTION_DEFINE(ENABLE_FAST_MOBILE_SCROLLING "Toogle Fast Mobile Scrolling support" OFF)
>diff --git a/Source/cmakeconfig.h.cmake b/Source/cmakeconfig.h.cmake
>index 20fa4468c6c8b1abe06bfef4b1f0c5c2336be770..6fd60a273934cd04d52767567ecb479d7b0a72fe 100644
>--- a/Source/cmakeconfig.h.cmake
>+++ b/Source/cmakeconfig.h.cmake
>@@ -24,6 +24,7 @@
> #cmakedefine01 ENABLE_DATA_TRANSFER_ITEMS
> #cmakedefine01 ENABLE_DETAILS
> #cmakedefine01 ENABLE_DEVICE_ORIENTATION
>+#cmakedefine01 ENABLE_DIALOG_ELEMENT
> #cmakedefine01 ENABLE_DOWNLOAD_ATTRIBUTE
> #cmakedefine01 ENABLE_DRAG_SUPPORT
> #cmakedefine01 ENABLE_EVENT_MODE_METATAGS
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index 1668df6403b5005aa8e0b2cd2c431c7c476ce1c2..16f918ec84014ef609f207b7199bfce8be296969 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,12 @@
>+2012-07-09  Matt Falkenhagen  <falken@chromium.org>
>+
>+        Add ENABLE_DIALOG_ELEMENT and skeleton files
>+        https://bugs.webkit.org/show_bug.cgi?id=90521
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * Scripts/webkitperl/FeatureList.pm:
>+
> 2012-07-08  Kent Tamura  <tkent@chromium.org>
> 
>         Unreviewed, rolling out r122076.
>diff --git a/Tools/Scripts/webkitperl/FeatureList.pm b/Tools/Scripts/webkitperl/FeatureList.pm
>index 407fbb96cc3da577c9d0cfbcb2d05641b0d30907..ca3b9e3d6a8b92139a6915aefbb390c629f0e74e 100644
>--- a/Tools/Scripts/webkitperl/FeatureList.pm
>+++ b/Tools/Scripts/webkitperl/FeatureList.pm
>@@ -62,6 +62,7 @@ my (
>     $datalistSupport,
>     $detailsSupport,
>     $deviceOrientationSupport,
>+    $dialogElementSupport,
>     $directoryUploadSupport,
>     $downloadAttributeSupport,
>     $fileSystemSupport,
>@@ -192,7 +193,10 @@ my @features = (
>     { option => "device-orientation", desc => "Toggle Device Orientation support",
>       define => "ENABLE_DEVICE_ORIENTATION", default => isBlackBerry(), value => \$deviceOrientationSupport },
> 
>-    { option => "directory-upload", desc => "Toogle Directory Upload support",
>+    { option => "dialog", desc => "Toggle Dialog Element support",
>+      define => "ENABLE_DIALOG_ELEMENT", default => 0, value => \$dialogElementSupport },
>+
>+    { option => "directory-upload", desc => "Toggle Directory Upload support",
>       define => "ENABLE_DIRECTORY_UPLOAD", default => 0, value => \$directoryUploadSupport },
> 
>     { option => "download-attribute", desc => "Toggle Download Attribute support",
>diff --git a/ChangeLog b/ChangeLog
>index 342a41adad7945dbb2b9b716a6a2514a4dd68926..3dd2f49c9eb0ca157780f14b162365252abe87bd 100644
>--- a/ChangeLog
>+++ b/ChangeLog
>@@ -1,3 +1,13 @@
>+2012-07-08  Matt Falkenhagen  <falken@chromium.org>
>+
>+        Add ENABLE_DIALOG_ELEMENT and skeleton files
>+        https://bugs.webkit.org/show_bug.cgi?id=90521
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * Source/cmake/WebKitFeatures.cmake:
>+        * Source/cmakeconfig.h.cmake:
>+
> 2012-07-06  Thiago Marcos P. Santos  <thiago.santos@intel.com>
> 
>         [EFL][CMake] Move gtest sources to an upper level

Actions: View | Formatted Diff | Diff

Attachments on bug 90521: 150727 | 150885 | 151184 | 151189 | 151198 | 151218 | 151222 | 151391