Conditionalize cross-document messaging support

 top level:

         Conditionalize cross-document messaging support

         The cross-document messaging parts of HTML 5 are in flux and we want
         ports to be able to turn off the support as needed.

         Note that the support is turned off by default right now. A subsequent
         commit will turn it on by default.

         Reviewed by Darin.

         * configure.ac:

 WebCore:

         Conditionalize cross-document messaging support

         The cross-document messaging parts of HTML 5 are in flux and we want
         ports to be able to turn off the support as needed.

         Note that the support is turned off by default right now. A subsequent
         commit will turn it on by default.

         Reviewed by Darin.

         * GNUmakefile.am:
         * WebCore.vcproj/build-generated-files.sh:
         * bindings/js/JSDOMWindowCustom.cpp:
         (WebCore::JSDOMWindow::customGetOwnPropertySlot):
         * bindings/js/JSEventCustom.cpp:
         (WebCore::toJS):
         * dom/Event.cpp:
         (WebCore::Event::isMessageEvent):
         * dom/Event.h:
         * dom/MessageEvent.cpp:
         * dom/MessageEvent.h:
         * dom/MessageEvent.idl:
         * page/DOMWindow.cpp:
         (WebCore::DOMWindow::postMessage):
         * page/DOMWindow.h:
         * page/DOMWindow.idl:

 WebKitTools:

         Conditionalize cross-document messaging support

         The cross-document messaging parts of HTML 5 are in flux and we want
         ports to be able to turn off the support as needed.

         Note that the support is turned off by default right now. A subsequent
         commit will turn it on by default.

         Reviewed by Darin.

         * Scripts/build-webkit:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@30269 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/ChangeLog b/ChangeLog
index 908b518bbb4c834ace67cd6d0ff2728cc67a83c6..d84e14e4961819bece8e5eee333187ff85cf1546 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2008-02-14  Adam Roben  <aroben@apple.com>
+
+        Conditionalize cross-document messaging support
+
+        The cross-document messaging parts of HTML 5 are in flux and we want
+        ports to be able to turn off the support as needed.
+
+        Note that the support is turned off by default right now. A subsequent
+        commit will turn it on by default.
+
+        Reviewed by Darin.
+
+        * configure.ac:
+
 2008-02-12  Rodney Dawes  <dobey@wayofthemonkey.com>
 
         Reviewed by Alp Toker.

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index a51a234ee452b9b76c3f90502a1e4cc02e7245d9..87d69f8222f0837044419a657089646265687a88 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -733,6 +733,35 @@
         * storage/DatabaseTracker.cpp:
         (WebCore::DatabaseTracker::deleteDatabaseFile):
 
+2008-02-14  Adam Roben  <aroben@apple.com>
+
+        Conditionalize cross-document messaging support
+
+        The cross-document messaging parts of HTML 5 are in flux and we want
+        ports to be able to turn off the support as needed.
+
+        Note that the support is turned off by default right now. A subsequent
+        commit will turn it on by default.
+
+        Reviewed by Darin.
+
+        * GNUmakefile.am:
+        * WebCore.vcproj/build-generated-files.sh:
+        * bindings/js/JSDOMWindowCustom.cpp:
+        (WebCore::JSDOMWindow::customGetOwnPropertySlot):
+        * bindings/js/JSEventCustom.cpp:
+        (WebCore::toJS):
+        * dom/Event.cpp:
+        (WebCore::Event::isMessageEvent):
+        * dom/Event.h:
+        * dom/MessageEvent.cpp:
+        * dom/MessageEvent.h:
+        * dom/MessageEvent.idl:
+        * page/DOMWindow.cpp:
+        (WebCore::DOMWindow::postMessage):
+        * page/DOMWindow.h:
+        * page/DOMWindow.idl:
+
 2008-02-14  Adam Roben  <aroben@apple.com>
 
         Improve the efficiency of SecurityOriginHash

diff --git a/WebCore/GNUmakefile.am b/WebCore/GNUmakefile.am
index 86dfbf039894b0cedbb21da61147049b8de19d74..1744c85c682b9147dbe12c6408a967c54a0defbb 100644 (file)
--- a/WebCore/GNUmakefile.am
+++ b/WebCore/GNUmakefile.am
@@ -1000,6 +1000,25 @@ webcore_sources += \
 
 endif # END USE_CURL
 
+# ----
+# Cross-document messaging support
+# ----
+
+if ENABLE_CROSS_DOCUMENT_MESSAGING
+FEATURE_DEFINES_JAVASCRIPT += ENABLE_CROSS_DOCUMENT_MESSAGING=1
+
+webcore_built_sources += \
+       DerivedSources/JSMessageEvent.h
+       DerivedSources/JSMessageEvent.cpp
+
+IDL_BINDINGS += \
+       WebCore/dom/MessageEvent.idl
+
+webcore_cppflags += \
+       -DENABLE_CROSS_DOCUMENT_MESSAGING=1
+
+endif # END ENABLE_CROSS_DOCUMENT_MESSAGING
+
 # ----
 # Database Support
 # ----

diff --git a/WebCore/WebCore.vcproj/build-generated-files.sh b/WebCore/WebCore.vcproj/build-generated-files.sh
index eef4b0d2c6199c9e24a19fe1a2e4d6a1c0fca1f2..217efa47a6a7a3c681a2abfc8875fd3e28c53be4 100644 (file)
--- a/WebCore/WebCore.vcproj/build-generated-files.sh
+++ b/WebCore/WebCore.vcproj/build-generated-files.sh
@@ -65,5 +65,5 @@ mkdir -p "${BUILT_PRODUCTS_DIR}/DerivedSources"
 cd "${BUILT_PRODUCTS_DIR}/DerivedSources"
 
 export WebCore="${XSRCROOT}"
-export FEATURE_DEFINES="ENABLE_DATABASE ENABLE_ICONDATABASE ENABLE_XPATH ENABLE_SVG ENABLE_SVG_FONTS ENABLE_SVG_FOREIGN_OBJECT ENABLE_SVG_AS_IMAGE ENABLE_SVG_USE ENABLE_VIDEO"
+export FEATURE_DEFINES="ENABLE_CROSS_DOCUMENT_MESSAGING ENABLE_DATABASE ENABLE_ICONDATABASE ENABLE_XPATH ENABLE_SVG ENABLE_SVG_FONTS ENABLE_SVG_FOREIGN_OBJECT ENABLE_SVG_AS_IMAGE ENABLE_SVG_USE ENABLE_VIDEO"
 make -f "$WebCore/DerivedSources.make" -j ${NUMCPUS} || exit 1

diff --git a/WebCore/bindings/js/JSDOMWindowCustom.cpp b/WebCore/bindings/js/JSDOMWindowCustom.cpp
index 31a78653375599d6e73eac9b5d657a7a0ddde6a8..4c1ae6a9ed5e775c07371026d833112c34c06ce0 100644 (file)
--- a/WebCore/bindings/js/JSDOMWindowCustom.cpp
+++ b/WebCore/bindings/js/JSDOMWindowCustom.cpp
@@ -86,7 +86,10 @@ bool JSDOMWindow::customGetOwnPropertySlot(ExecState* exec, const Identifier& pr
                 && (entry->value.functionValue == jsDOMWindowPrototypeFunctionBlur
                     || entry->value.functionValue == jsDOMWindowPrototypeFunctionClose
                     || entry->value.functionValue == jsDOMWindowPrototypeFunctionFocus
-                    || entry->value.functionValue == jsDOMWindowPrototypeFunctionPostMessage)) {
+#if ENABLE(CROSS_DOCUMENT_MESSAGING)
+                    || entry->value.functionValue == jsDOMWindowPrototypeFunctionPostMessage
+#endif
+                    )) {
             if (!allowsAccess) {
                 slot.setStaticEntry(this, entry, nonCachingStaticFunctionGetter);
                 return true;
@@ -143,6 +146,7 @@ bool JSDOMWindow::customGetPropertyNames(ExecState* exec, PropertyNameArray&)
     return false;
 }
 
+#if ENABLE(CROSS_DOCUMENT_MESSAGING)
 JSValue* JSDOMWindow::postMessage(ExecState* exec, const List& args)
 {
     DOMWindow* window = impl();
@@ -159,5 +163,6 @@ JSValue* JSDOMWindow::postMessage(ExecState* exec, const List& args)
     
     return jsUndefined();
 }
+#endif
 
 } // namespace WebCore

diff --git a/WebCore/bindings/js/JSEventCustom.cpp b/WebCore/bindings/js/JSEventCustom.cpp
index 55a5f1d31808b8df57fc2514718fe0b6691ff51d..4ba7f9663ff726b3a7663628bb408379cca0895f 100644 (file)
--- a/WebCore/bindings/js/JSEventCustom.cpp
+++ b/WebCore/bindings/js/JSEventCustom.cpp
@@ -86,8 +86,10 @@ JSValue* toJS(ExecState* exec, Event* event)
         ret = new JSMutationEvent(JSMutationEventPrototype::self(exec), static_cast<MutationEvent*>(event));
     else if (event->isOverflowEvent())
         ret = new JSOverflowEvent(JSOverflowEventPrototype::self(exec), static_cast<OverflowEvent*>(event));
+#if ENABLE(CROSS_DOCUMENT_MESSAGING)
     else if (event->isMessageEvent())
         ret = new JSMessageEvent(JSMessageEventPrototype::self(exec), static_cast<MessageEvent*>(event));
+#endif
     else if (event->isProgressEvent())
         ret = new JSProgressEvent(JSProgressEventPrototype::self(exec), static_cast<ProgressEvent*>(event));
     else

diff --git a/WebCore/dom/Event.cpp b/WebCore/dom/Event.cpp
index f41692e12a4679c53d7e12219bb44ad220cfb25c..543dfffe76faf1c80f05ff26cffd9c04fc695873 100644 (file)
--- a/WebCore/dom/Event.cpp
+++ b/WebCore/dom/Event.cpp
@@ -112,10 +112,12 @@ bool Event::isWheelEvent() const
     return false;
 }
 
+#if ENABLE(CROSS_DOCUMENT_MESSAGING)
 bool Event::isMessageEvent() const
 {
     return false;
 }
+#endif
 
 bool Event::isBeforeTextInsertedEvent() const
 {

diff --git a/WebCore/dom/Event.h b/WebCore/dom/Event.h
index 993682b304e462db4f9997bc6dd98a7aa9c903d0..b74bc166fd84154d80752e9e4273e9b2ab661689 100644 (file)
--- a/WebCore/dom/Event.h
+++ b/WebCore/dom/Event.h
@@ -101,7 +101,9 @@ namespace WebCore {
         virtual bool isTextEvent() const;
         virtual bool isDragEvent() const; // a subset of mouse events
         virtual bool isClipboardEvent() const;
+#if ENABLE(CROSS_DOCUMENT_MESSAGING)
         virtual bool isMessageEvent() const;
+#endif
         virtual bool isWheelEvent() const;
         virtual bool isBeforeTextInsertedEvent() const;
         virtual bool isOverflowEvent() const;

diff --git a/WebCore/dom/MessageEvent.cpp b/WebCore/dom/MessageEvent.cpp
index 863b1332ad164f55fadb7cbb83d35a66a6bded75..06f253dd1d92d025b041ac7d0531f007243f0c9c 100644 (file)
--- a/WebCore/dom/MessageEvent.cpp
+++ b/WebCore/dom/MessageEvent.cpp
@@ -27,6 +27,8 @@
 
 #include "config.h"
 
+#if ENABLE(CROSS_DOCUMENT_MESSAGING)
+
 #include "DOMWindow.h"
 #include "EventNames.h"
 #include "MessageEvent.h"
@@ -71,3 +73,5 @@ bool MessageEvent::isMessageEvent() const
 }
 
 } // namespace WebCore
+
+#endif // ENABLE(CROSS_DOCUMENT_MESSAGING)

diff --git a/WebCore/dom/MessageEvent.h b/WebCore/dom/MessageEvent.h
index c7fc53dda3fe65e46f9be2065f9a20feb30a1678..f8b5f78f2e0fabc406d6ff1c985a55fc16fb88d6 100644 (file)
--- a/WebCore/dom/MessageEvent.h
+++ b/WebCore/dom/MessageEvent.h
@@ -28,6 +28,8 @@
 #ifndef MessageEvent_h
 #define MessageEvent_h
 
+#if ENABLE(CROSS_DOCUMENT_MESSAGING)
+
 #include "Event.h"
 
 namespace WebCore {
@@ -58,4 +60,6 @@ namespace WebCore {
 
 } // namespace WebCore
 
+#endif // ENABLE(CROSS_DOCUMENT_MESSAGING)
+
 #endif // MessageEvent_h

diff --git a/WebCore/dom/MessageEvent.idl b/WebCore/dom/MessageEvent.idl
index bbb71c8889cbf2caf55204a8d1dd972f15b54e44..22f526267589a2cff55dc16baabdf5afaa16c9c6 100644 (file)
--- a/WebCore/dom/MessageEvent.idl
+++ b/WebCore/dom/MessageEvent.idl
@@ -26,7 +26,7 @@
 
 module events {
 
-    interface [GenerateConstructor] MessageEvent : Event {
+    interface [Conditional=CROSS_DOCUMENT_MESSAGING,GenerateConstructor] MessageEvent : Event {
 
         readonly attribute DOMString data;
         readonly attribute DOMString domain;

diff --git a/WebCore/page/DOMWindow.cpp b/WebCore/page/DOMWindow.cpp
index 3997d877347d91aaf4cc0fc56581882f5467ee05..a0523bcb61c3f5755b7ebb477df5788c7469b8bc 100644 (file)
--- a/WebCore/page/DOMWindow.cpp
+++ b/WebCore/page/DOMWindow.cpp
@@ -220,11 +220,13 @@ Console* DOMWindow::console() const
     return m_console.get();
 }
 
+#if ENABLE(CROSS_DOCUMENT_MESSAGING)
 void DOMWindow::postMessage(const String& message, const String& domain, const String& uri, DOMWindow* source) const
 {
    ExceptionCode ec;
    document()->dispatchEvent(new MessageEvent(message, domain, uri, source), ec, true);
 }
+#endif
 
 DOMSelection* DOMWindow::getSelection()
 {

diff --git a/WebCore/page/DOMWindow.h b/WebCore/page/DOMWindow.h
index 3f5b5446927db1e839e135d3fb23cd1433dfeaf0..05fdc4f04db1c844eb70115c6621501069c17c15 100644 (file)
--- a/WebCore/page/DOMWindow.h
+++ b/WebCore/page/DOMWindow.h
@@ -142,7 +142,9 @@ namespace WebCore {
 
         Console* console() const;
         
+#if ENABLE(CROSS_DOCUMENT_MESSAGING)
         void postMessage(const String& message, const String& domain, const String& uri, DOMWindow* source) const;
+#endif
 
         void scrollBy(int x, int y) const;
         void scrollTo(int x, int y) const;

diff --git a/WebCore/page/DOMWindow.idl b/WebCore/page/DOMWindow.idl
index 142eee0a19937cfd0c43211cee99bbb11006cf7f..655d6abf184cc7340a117c14d7adecc3a952ee1c 100644 (file)
--- a/WebCore/page/DOMWindow.idl
+++ b/WebCore/page/DOMWindow.idl
@@ -134,8 +134,10 @@ module window {
 
                  attribute [Replaceable] Console console;
 
+#if defined(ENABLE_CROSS_DOCUMENT_MESSAGING)
         // cross-document messaging
         [DoNotCheckDomainSecurity, Custom] void postMessage(in DOMString message);
+#endif
 
 #if defined(LANGUAGE_JAVASCRIPT)
         // Global constructors
@@ -252,7 +254,6 @@ module window {
         attribute HTMLUListElementConstructor HTMLUListElement;
 
         attribute EventConstructor Event;
-        attribute MessageEventConstructor MessageEvent;
         attribute KeyboardEventConstructor KeyboardEvent;
         attribute MouseEventConstructor MouseEvent;
         attribute MutationEventConstructor MutationEvent;
@@ -276,6 +277,10 @@ module window {
 
         attribute XMLHttpRequestExceptionConstructor XMLHttpRequestException;
 
+#if defined(ENABLE_CROSS_DOCUMENT_MESSAGING)
+        attribute MessageEventConstructor MessageEvent;
+#endif
+
 #if defined(ENABLE_VIDEO)
         attribute HTMLAudioElementConstructor HTMLAudioElement;
         attribute HTMLMediaElementConstructor HTMLMediaElement;

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index f76e9d6f54d165c03f6af8f403633027dcbc179e..693c7d1a303392e5d18bd57bbaf8bc3a2b9fe4a5 100644 (file)
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,17 @@
+2008-02-14  Adam Roben  <aroben@apple.com>
+
+        Conditionalize cross-document messaging support
+
+        The cross-document messaging parts of HTML 5 are in flux and we want
+        ports to be able to turn off the support as needed.
+
+        Note that the support is turned off by default right now. A subsequent
+        commit will turn it on by default.
+
+        Reviewed by Darin.
+
+        * Scripts/build-webkit:
+
 2008-02-14  Darin Adler  <darin@apple.com>
 
        - fix Windows build

diff --git a/WebKitTools/Scripts/build-webkit b/WebKitTools/Scripts/build-webkit
index 4cd88172a54b0c7b8c26ed3885ada0a2c6fa346d..2ef5c3d8b76a5244d3e02af3ee30fd3c8117d055 100755 (executable)
--- a/WebKitTools/Scripts/build-webkit
+++ b/WebKitTools/Scripts/build-webkit
@@ -39,6 +39,7 @@ use POSIX;
 
 my $originalWorkingDirectory = getcwd();
 
+my $crossDocumentMessagingSupport = 0;
 my $databaseSupport = 1;
 my $iconDatabaseSupport = 1;
 my $svgSupport = 1;
@@ -60,6 +61,7 @@ my $programName = basename($0);
 my $usage = <<EOF;
 Usage: $programName [options] [options to pass to build system]
   --help                        Show this help message
+  --[no-]cross-document-messaging   Toggle cross-document messaging support (default: $crossDocumentMessagingSupport)
   --[no-]database               Toggle Database Support (default: $databaseSupport)
   --[no-]icon-database          Toggle Icon database support (default: $iconDatabaseSupport)
   --[no-]svg                    Toggle SVG support (default: $svgSupport)
@@ -77,7 +79,8 @@ Usage: $programName [options] [options to pass to build system]
   --[no-]coverage               Toggle code coverage support (default: $coverageSupport)
 EOF
 
-GetOptions('database!' => \$databaseSupport,
+GetOptions('cross-document-messaging!' => \$crossDocumentMessagingSupport,
+           'database!' => \$databaseSupport,
            'icon-database!' => \$iconDatabaseSupport,
            'svg!' => \$svgSupport,
            'svg-experimental!' => \$svgExperimentalSupport,
@@ -140,6 +143,7 @@ if (isWx()) {
 my $productDir = productDir();
 my @overrideFeatureDefinesOption = ();
 
+push @overrideFeatureDefinesOption, "ENABLE_CROSS_DOCUMENT_MESSAGIN" if $crossDocumentMessagingSupport;
 push @overrideFeatureDefinesOption, "ENABLE_DATABASE" if $databaseSupport;
 push @overrideFeatureDefinesOption, "ENABLE_ICONDATABASE" if $iconDatabaseSupport;
 push @overrideFeatureDefinesOption, "ENABLE_SVG" if $svgSupport;
@@ -181,6 +185,7 @@ if ($clean && isOSX()) {
 
 # enable autotool options accordingly
 if ($ENV{WEBKITAUTOTOOLS}) {
+    push @options, autotoolsFlag($crossDocumentMessagingSupport, "cross-document-messaging");
     push @options, autotoolsFlag($databaseSupport, "database");
     push @options, autotoolsFlag($iconDatabaseSupport, "icon-database");
     push @options, autotoolsFlag($svgSupport, "svg");

diff --git a/configure.ac b/configure.ac
index 1cfd2df73e6607999269f369b16dc0975d3a2ba1..ce3ca36dbfa61a0a70ce5772ee09c4e035369bda 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -222,6 +222,14 @@ AC_ARG_ENABLE(debug,
               [],[enable_debug="no"])
 AC_MSG_RESULT([$enable_debug])
 
+# check whether to build with cross-document messaging support
+AC_MSG_CHECKING([whether to enable HTML5 client-side storage support])
+AC_ARG_ENABLE(cross_document_messaging,
+              AC_HELP_STRING([--enable-cross-document-messaging],
+                             [enable HTML5 cross-document messaging support [default=no]]),
+              [],[enable_cross_document_messaging="no"])
+AC_MSG_RESULT([$enable_cross_document_messaging])
+
 # check whether to build with database support
 AC_MSG_CHECKING([whether to enable HTML5 client-side storage support])
 AC_ARG_ENABLE(database,
@@ -431,6 +439,7 @@ AM_CONDITIONAL([USE_CURL], [test "$http_backend" = "curl"])
 
 # WebKit feature conditionals
 AM_CONDITIONAL([ENABLE_DEBUG],[test "$enable_debug" = "yes"])
+AM_CONDITIONAL([ENABLE_CROSS_DOCUMENT_MESSAGING],[test "$enable_cross_document_messaging" = "yes"])
 AM_CONDITIONAL([ENABLE_DATABASE],[test "$enable_database" = "yes"])
 AM_CONDITIONAL([ENABLE_ICONDATABASE],[test "$enable_icon_database" = "yes"])
 AM_CONDITIONAL([ENABLE_XPATH],[test "$enable_xpath" = "yes"])
@@ -464,6 +473,7 @@ WebKit was configured with the following options:
  Enable debug                      : $enable_debug
  Code coverage support             : $enable_coverage
  Optimized memory allocator        : $enable_fast_malloc
+ HTML5 cross-document messaging    : $enable_cross_document_messaging
  HTML5 client-side storage support : $enable_database
  HTML5 video element support       : $enable_video
  Icon database support             : $enable_icon_database