LayoutTests:

        * win/Skipped:
        removed one test from skipped list to see whether it will pass with the new
        DOM Paste API change that is being added simultaneously.

WebKitTools:

        Reviewed by Adam Roben.

        setting DOM Paste Allowed Pref

        * DumpRenderTree/DumpRenderTree.vcproj/DumpRenderTree/DumpRenderTree.cpp:
        (initializePreferences):

win:

        Reviewed by Adam Roben.

        Adding DOM Paste Allowed preference, setters and getters
        for the purpose of layout tests.

        * Interfaces/IWebPreferences.idl:
        * WebPreferenceKeysPrivate.h:
        * WebPreferences.cpp:
        (WebPreferences::isDOMPasteAllowed):
        (WebPreferences::setDOMPasteAllowed):
        * WebPreferences.h:
        * WebView.cpp:
        (WebView::updateWebCoreSettingsFromPreferences):

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

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index c01055a03369ca8f6a87165a1e20f0f7c99be401..c6a2e93a3a0491faac3e884df2406ff595e998c5 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,9 @@
+2007-07-09  Alice Liu  <alice.liu@apple.com>
+
+        * win/Skipped:
+        removed one test from skipped list to see whether it will pass with the new
+        DOM Paste API change that is being added simultaneously. 
+
 2007-07-09  Justin Garcia  <justin.garcia@apple.com>
 
         Rolling the fix for 5310404 back in now that 5310404 has been fixed in Mail.

diff --git a/LayoutTests/win/Skipped b/LayoutTests/win/Skipped
index d03cdba8facc659b3f97a0b96c052194a8555009..949faf7b81a4e29aa5d373dde3396fca6fdc7da4 100644 (file)
--- a/LayoutTests/win/Skipped
+++ b/LayoutTests/win/Skipped
@@ -428,7 +428,7 @@ dom/xhtml/level2/html/frame.xhtml
 tables/mozilla/bugs/bug50695-2.html
 
 # execCommand("Paste") fails? <rdar://problem/5230263>
-editing/execCommand/paste-1.html
+#editing/execCommand/paste-1.html
 editing/execCommand/paste-2.html
 editing/pasteboard/4242293-1.html
 editing/pasteboard/5247341.html

diff --git a/WebKit/win/ChangeLog b/WebKit/win/ChangeLog
index 7b6dec94573cb7f764db1b04a19f54a678f0cd23..6aca5c329aa5868a021ea595f81c72ed3748a9bf 100644 (file)
--- a/WebKit/win/ChangeLog
+++ b/WebKit/win/ChangeLog
@@ -1,3 +1,19 @@
+2007-07-09  Alice Liu  <alice.liu@apple.com>
+
+        Reviewed by Adam Roben.
+        
+        Adding DOM Paste Allowed preference, setters and getters
+        for the purpose of layout tests.
+
+        * Interfaces/IWebPreferences.idl:
+        * WebPreferenceKeysPrivate.h:
+        * WebPreferences.cpp:
+        (WebPreferences::isDOMPasteAllowed):
+        (WebPreferences::setDOMPasteAllowed):
+        * WebPreferences.h:
+        * WebView.cpp:
+        (WebView::updateWebCoreSettingsFromPreferences):
+
 2007-07-09  Anders Carlsson  <andersca@apple.com>
 
         Build fix.

diff --git a/WebKit/win/Interfaces/IWebPreferences.idl b/WebKit/win/Interfaces/IWebPreferences.idl
index 39f02bd9b5b4e9f66ba261eaea313604480544a8..977dfff3ecbc3370625c7828f692e8e771bdc289 100644 (file)
--- a/WebKit/win/Interfaces/IWebPreferences.idl
+++ b/WebKit/win/Interfaces/IWebPreferences.idl
@@ -501,6 +501,9 @@ interface IWebPreferences : IUnknown
     HRESULT allowContinuousSpellChecking([out, retval] BOOL *allowed);
     HRESULT setAllowContinuousSpellChecking([in] BOOL allowed);
 
+    HRESULT isDOMPasteAllowed([out, retval] BOOL *allowed);
+    HRESULT setDOMPasteAllowed([in] BOOL allowed);
+
     /*
         - (BOOL)usesPageCache;
     */

diff --git a/WebKit/win/WebPreferenceKeysPrivate.h b/WebKit/win/WebPreferenceKeysPrivate.h
index 7508fc6b14f49ecaf7807a4dea2c4c3309529ceb..ab39b0f54c6e63252b1faf1f283ad051bbb07f8b 100644 (file)
--- a/WebKit/win/WebPreferenceKeysPrivate.h
+++ b/WebKit/win/WebPreferenceKeysPrivate.h
@@ -91,3 +91,5 @@
 #define WebGrammarCheckingEnabledPreferenceKey "WebGrammarCheckingEnabled" // default: false
 
 #define AllowContinuousSpellCheckingPreferenceKey "AllowContinuousSpellCheckingPreferenceKey" // default: true
+
+#define WebKitDOMPasteAllowedPreferenceKey "WebKitDOMPasteAllowedPreferenceKey" // default: false

diff --git a/WebKit/win/WebPreferences.cpp b/WebKit/win/WebPreferences.cpp
index 109446b238613ab1df244d4e4957d632e78dd6b0..bf6c7cb6b31b41dee608e2a7d90f6db8232c75f7 100644 (file)
--- a/WebKit/win/WebPreferences.cpp
+++ b/WebKit/win/WebPreferences.cpp
@@ -1227,3 +1227,15 @@ HRESULT WebPreferences::setAllowContinuousSpellChecking(BOOL enabled)
     setBoolValue(CFSTR(AllowContinuousSpellCheckingPreferenceKey), enabled);
     return S_OK;
 }
+
+HRESULT WebPreferences::isDOMPasteAllowed(BOOL* enabled)
+{
+    *enabled = boolValueForKey(CFSTR(WebKitDOMPasteAllowedPreferenceKey));
+    return S_OK;
+}
+    
+HRESULT WebPreferences::setDOMPasteAllowed(BOOL enabled)
+{
+    setBoolValue(CFSTR(WebKitDOMPasteAllowedPreferenceKey), enabled);
+    return S_OK;
+}

diff --git a/WebKit/win/WebPreferences.h b/WebKit/win/WebPreferences.h
index 66d5ab0d25774390fcfa21193d44353c966ea23b..e53b9a3dd962486c8c1f17d45bc3462881d91099 100644 (file)
--- a/WebKit/win/WebPreferences.h
+++ b/WebKit/win/WebPreferences.h
@@ -265,6 +265,12 @@ public:
     virtual HRESULT STDMETHODCALLTYPE setAllowContinuousSpellChecking( 
         /* [in] */ BOOL enabled);
 
+    virtual HRESULT STDMETHODCALLTYPE isDOMPasteAllowed( 
+        /* [retval][out] */ BOOL *enabled);
+    
+    virtual HRESULT STDMETHODCALLTYPE setDOMPasteAllowed( 
+        /* [in] */ BOOL enabled);
+
     // WebPreferences
     static BSTR webPreferencesChangedNotification();
     static void setInstance(WebPreferences* instance, BSTR identifier);

diff --git a/WebKit/win/WebView.cpp b/WebKit/win/WebView.cpp
index 02f0d3166fb6c0500db3989de182af4440734b32..53a19a6a0ec6377ce60207a75539a3d172ab2af3 100644 (file)
--- a/WebKit/win/WebView.cpp
+++ b/WebKit/win/WebView.cpp
@@ -1461,6 +1461,11 @@ HRESULT WebView::updateWebCoreSettingsFromPreferences(IWebPreferences* preferenc
         return hr;
     settings->setUsesPageCache(!!enabled);
 
+    hr = preferences->isDOMPasteAllowed(&enabled);
+    if (FAILED(hr))
+        return hr;
+    settings->setDOMPasteAllowed(!!enabled);
+
     ResourceHandle::setCookieStorageAcceptPolicy(acceptPolicy);
 
     settings->setShowsURLsInToolTips(false);

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 8797d590009da51b9d9260df68ed569fa9197605..63f50a9431159242d895a2613d7eacf4ac48b2db 100644 (file)
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,12 @@
+2007-07-09  Alice Liu  <alice.liu@apple.com>
+
+        Reviewed by Adam Roben.
+
+        setting DOM Paste Allowed Pref 
+
+        * DumpRenderTree/DumpRenderTree.vcproj/DumpRenderTree/DumpRenderTree.cpp:
+        (initializePreferences):
+
 2007-07-05  Kevin McCullough  <kmccullough@apple.com>
 
         Reviewed by Adam, Sam, and Ada.

diff --git a/WebKitTools/DumpRenderTree/DumpRenderTree.vcproj/DumpRenderTree/DumpRenderTree.cpp b/WebKitTools/DumpRenderTree/DumpRenderTree.vcproj/DumpRenderTree/DumpRenderTree.cpp
index ab17c6ac1d529e9e2ee68508a5e36cbf377f2f04..f535fc2e1a07abee1aba619df8e029c09eec1296 100644 (file)
--- a/WebKitTools/DumpRenderTree/DumpRenderTree.vcproj/DumpRenderTree/DumpRenderTree.cpp
+++ b/WebKitTools/DumpRenderTree/DumpRenderTree.vcproj/DumpRenderTree/DumpRenderTree.cpp
@@ -588,6 +588,7 @@ static void initializePreferences(IWebPreferences* preferences)
     preferences->setAutosaves(FALSE);
     preferences->setJavaEnabled(FALSE);
     preferences->setPlugInsEnabled(TRUE);
+    preferences->setDOMPasteAllowed(TRUE);
 
     SysFreeString(standardFamily);
     SysFreeString(fixedFamily);