Unreviewed; rolling out r128081.

http://trac.webkit.org/changeset/128081
https://bugs.webkit.org/show_bug.cgi?id=96134

New test http/tests/media/video-donottrack.html fails to run on Apple test bots.

Source/WebCore:

* html/HTMLMediaElement.cpp:
* html/HTMLMediaElement.h:
(HTMLMediaElement):
* loader/FrameLoaderClient.h:
* platform/graphics/MediaPlayer.h:
(MediaPlayer):
* platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
(WebCore::MediaPlayerPrivateAVFoundationObjC::createAVAssetForURL):

Source/WebKit/mac:

* WebCoreSupport/WebFrameLoaderClient.h:
* WebCoreSupport/WebFrameLoaderClient.mm:
* WebView/WebDelegateImplementationCaching.h:
(WebFrameLoadDelegateImplementationCache):
* WebView/WebDelegateImplementationCaching.mm:
* WebView/WebView.mm:
(-[WebView _cacheFrameLoadDelegateImplementations]):

Source/WebKit2:

* Shared/APIClientTraits.h:
* WebProcess/InjectedBundle/API/c/WKBundlePage.h:
* WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.cpp:
* WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.h:
(InjectedBundlePageLoaderClient):
* WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
* WebProcess/WebCoreSupport/WebFrameLoaderClient.h:
(WebFrameLoaderClient):
* WebProcess/qt/QtBuiltinBundlePage.cpp:
(WebKit::QtBuiltinBundlePage::QtBuiltinBundlePage):

Tools:

* DumpRenderTree/TestRunner.cpp:
(TestRunner::TestRunner):
(TestRunner::staticFunctions):
* DumpRenderTree/TestRunner.h:
(TestRunner):
* DumpRenderTree/mac/FrameLoadDelegate.mm:
* WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl:
* WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp:
(WTR::InjectedBundlePage::InjectedBundlePage):
* WebKitTestRunner/InjectedBundle/InjectedBundlePage.h:
(InjectedBundlePage):
* WebKitTestRunner/InjectedBundle/TestRunner.cpp:
(WTR::TestRunner::TestRunner):
* WebKitTestRunner/InjectedBundle/TestRunner.h:
(TestRunner):

LayoutTests:

* http/tests/media/resources/video-donottrack-check-donottrack.php: Removed.
* http/tests/media/video-donottrack-expected.txt: Removed.
* http/tests/media/video-donottrack.html: Removed.
* platform/chromium/TestExpectations:
* platform/efl/TestExpectations:
* platform/gtk/TestExpectations:
* platform/qt/TestExpectations:
* platform/win/Skipped:

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

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index abb95a0..f01c1c0 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,20 @@
+2012-09-10  Jer Noble  <jer.noble@apple.com>
+
+        Unreviewed; rolling out r128081.
+        http://trac.webkit.org/changeset/128081
+        https://bugs.webkit.org/show_bug.cgi?id=96134
+
+        New test http/tests/media/video-donottrack.html fails to run on Apple test bots.
+
+        * http/tests/media/resources/video-donottrack-check-donottrack.php: Removed.
+        * http/tests/media/video-donottrack-expected.txt: Removed.
+        * http/tests/media/video-donottrack.html: Removed.
+        * platform/chromium/TestExpectations:
+        * platform/efl/TestExpectations:
+        * platform/gtk/TestExpectations:
+        * platform/qt/TestExpectations:
+        * platform/win/Skipped:
+
 2012-09-10  Fady Samuel  <fsamuel@chromium.org>
 
         Mark gradient-with-scaled-ancestor.html as flaky

diff --git a/LayoutTests/http/tests/media/resources/video-donottrack-check-donottrack.php b/LayoutTests/http/tests/media/resources/video-donottrack-check-donottrack.php
deleted file mode 100644 (file)
index 22c7691..0000000
--- a/LayoutTests/http/tests/media/resources/video-donottrack-check-donottrack.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-    $dnt = $_SERVER["HTTP_DNT"];
-    if (!isset($dnt) || stripos($dnt, "1") === false)
-        die;
-
-    $fileName = $_GET["name"];
-    $type = $_GET["type"];
-
-    $_GET = array();
-    $_GET['name'] = $fileName;
-    $_GET['type'] = $type;
-    @include("./serve-video.php");
-?>

diff --git a/LayoutTests/http/tests/media/video-donottrack-expected.txt b/LayoutTests/http/tests/media/video-donottrack-expected.txt
deleted file mode 100644 (file)
index e5e8432..0000000
--- a/LayoutTests/http/tests/media/video-donottrack-expected.txt
+++ /dev/null
@@ -1,4 +0,0 @@
- Tests that the media player will send the relevant referer when requesting the media file.
-EVENT(canplay)
-END OF TEST
-

diff --git a/LayoutTests/http/tests/media/video-donottrack.html b/LayoutTests/http/tests/media/video-donottrack.html
deleted file mode 100644 (file)
index a1d0907..0000000
--- a/LayoutTests/http/tests/media/video-donottrack.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<!DOCTYPE html>
-<html>
-    <head>
-        <script src=../../media-resources/video-test.js></script>
-        <script src=../../media-resources/media-file.js></script>
-        <script>
-            function runTest () {
-                if (window.testRunner)
-                    window.testRunner.setShouldSendDoNotTrackHTTPHeader(true);
-
-                findMediaElement();
-                var movie = findMediaFile('video', 'test');
-                var type = mimeTypeForExtension(movie.split('.').pop());
-
-                source = document.getElementById('source');
-                source.src = 'http://127.0.0.1:8000/media/resources/video-donottrack-check-donottrack.php?name=' + movie + '&type=' + type;
-                source.type = type;
-
-                waitForEventAndFail('error');
-                waitForEventAndEnd('canplay');
-                video.load();
-            }
-        </script>
-    </head>
-    <body onload="runTest()">
-        <video id="video">
-            <source id="source">
-        </video>
-        Tests that the media player will send the relevant referer when requesting the media file.<br/>
-    </body>
-</html>

diff --git a/LayoutTests/platform/chromium/TestExpectations b/LayoutTests/platform/chromium/TestExpectations
index ee9d753..867720a 100644 (file)
--- a/LayoutTests/platform/chromium/TestExpectations
+++ b/LayoutTests/platform/chromium/TestExpectations
@@ -1472,8 +1472,6 @@ BUGCR10361 WIN : http/tests/misc/single-character-pi-stylesheet.xhtml = TEXT
 // Windows is missing the green box. Started to pass in roll to WebKit r50313
 BUGCR8729 WIN : http/tests/multipart/invalid-image-data.html = IMAGE+TEXT
 
-BUGWK96287 SKIP : http/tests/media/video-donottrack.html = TIMEOUT
-
 // -----------------------------------------------------------------
 // MAC PORT TESTS
 // -----------------------------------------------------------------

diff --git a/LayoutTests/platform/efl/TestExpectations b/LayoutTests/platform/efl/TestExpectations
index c3f8911..5b4c4b7 100644 (file)
--- a/LayoutTests/platform/efl/TestExpectations
+++ b/LayoutTests/platform/efl/TestExpectations
@@ -166,9 +166,6 @@ BUGWK95300 SKIP : fast/dom/DeviceMotion = TEXT
 // The EFL port has no support for accessibility features
 BUGWKEFL SKIP : accessibility = TEXT
 
-// Missing DNT support for HTMLMediaElement
-BUGWK96292 : http/tests/media/video-donottrack.html = TEXT
-
 //////////////////////////////////////////////////////////////////////////////////////////
 // CRASHES
 //////////////////////////////////////////////////////////////////////////////////////////

diff --git a/LayoutTests/platform/gtk/TestExpectations b/LayoutTests/platform/gtk/TestExpectations
index b5f5a14..96370f7 100644 (file)
--- a/LayoutTests/platform/gtk/TestExpectations
+++ b/LayoutTests/platform/gtk/TestExpectations
@@ -1316,8 +1316,6 @@ BUGWK96226 : fast/spatial-navigation/snav-div-overflow-scrol-hidden.html = TEXT
 BUGWK96226 : fast/spatial-navigation/snav-fully-aligned-vertically.html = TEXT
 BUGWK96226 : fast/spatial-navigation/snav-imagemap-overlapped-areas.html = TEXT
 
-BUGWK96290 : http/tests/media/video-donottrack.html = TEXT
-
 //////////////////////////////////////////////////////////////////////////////////////////
 // End of Tests failing
 //////////////////////////////////////////////////////////////////////////////////////////

diff --git a/LayoutTests/platform/qt/TestExpectations b/LayoutTests/platform/qt/TestExpectations
index 5a57521..8e0cc6f 100644 (file)
--- a/LayoutTests/platform/qt/TestExpectations
+++ b/LayoutTests/platform/qt/TestExpectations
@@ -138,5 +138,3 @@ BUGWK94005 : css2.1/20110323/word-spacing-remove-space-003.htm = IMAGE
 BUGWK94005 : css2.1/20110323/word-spacing-remove-space-006.htm = IMAGE
 BUGWK94006 : fast/css/word-spacing-characters-complex-text.html = IMAGE
 
-// Added by bug 96134
-BUGWK96292 : http/tests/media/video-donottrack.html = TEXT

diff --git a/LayoutTests/platform/win/Skipped b/LayoutTests/platform/win/Skipped
index 3ca6ac2..deb00cf 100644 (file)
--- a/LayoutTests/platform/win/Skipped
+++ b/LayoutTests/platform/win/Skipped
@@ -2218,6 +2218,3 @@ fast/dom/HTMLDialogElement
 
 # Windows does not have global selection.
 editing/pasteboard/paste-global-selection.html
-
-# https://bugs.webkit.org/show_bug.cgi?id=96293
-http/tests/media/video-donottrack.html

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 2032c72..774e892 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,20 @@
+2012-09-10  Jer Noble  <jer.noble@apple.com>
+
+        Unreviewed; rolling out r128081.
+        http://trac.webkit.org/changeset/128081
+        https://bugs.webkit.org/show_bug.cgi?id=96134
+
+        New test http/tests/media/video-donottrack.html fails to run on Apple test bots.
+
+        * html/HTMLMediaElement.cpp:
+        * html/HTMLMediaElement.h:
+        (HTMLMediaElement):
+        * loader/FrameLoaderClient.h:
+        * platform/graphics/MediaPlayer.h:
+        (MediaPlayer):
+        * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
+        (WebCore::MediaPlayerPrivateAVFoundationObjC::createAVAssetForURL):
+
 2012-09-10  Dimitri Glazkov  <dglazkov@chromium.org>
 
         Reduce the number of treeScope queries when matching rules.

diff --git a/Source/WebCore/html/HTMLMediaElement.cpp b/Source/WebCore/html/HTMLMediaElement.cpp
index 059af9d..c3dd65d 100644 (file)
--- a/Source/WebCore/html/HTMLMediaElement.cpp
+++ b/Source/WebCore/html/HTMLMediaElement.cpp
@@ -4487,19 +4487,6 @@ IntRect HTMLMediaElement::mediaPlayerWindowClipRect()
     return mediaPlayerOwningDocument()->view()->windowClipRect();
 }
 
-bool HTMLMediaElement::mediaPlayerShouldSendDoNotTrackHTTPHeader() const
-{
-    Frame* frame = document()->frame();
-    if (!frame)
-        return false;
-
-    FrameLoaderClient* client = frame->loader()->client();
-    if (!client)
-        return false;
-
-    return client->shouldSendDoNotTrackHTTPHeader();
-}
-
 void HTMLMediaElement::removeBehaviorsRestrictionsAfterFirstUserGesture()
 {
     m_restrictions = NoRestrictions;

diff --git a/Source/WebCore/html/HTMLMediaElement.h b/Source/WebCore/html/HTMLMediaElement.h
index 95bdaf3..1f30b29 100644 (file)
--- a/Source/WebCore/html/HTMLMediaElement.h
+++ b/Source/WebCore/html/HTMLMediaElement.h
@@ -433,7 +433,6 @@ private:
     virtual bool mediaPlayerIsPaused() const OVERRIDE;
     virtual HostWindow* mediaPlayerHostWindow() OVERRIDE;
     virtual IntRect mediaPlayerWindowClipRect() OVERRIDE;
-    virtual bool mediaPlayerShouldSendDoNotTrackHTTPHeader() const OVERRIDE;
 
 #if PLATFORM(WIN) && USE(AVFOUNDATION)
     virtual GraphicsDeviceAdapter* mediaPlayerGraphicsDeviceAdapter(const MediaPlayer*) const OVERRIDE;

diff --git a/Source/WebCore/loader/FrameLoaderClient.h b/Source/WebCore/loader/FrameLoaderClient.h
index c1b2f7d..be81028 100644 (file)
--- a/Source/WebCore/loader/FrameLoaderClient.h
+++ b/Source/WebCore/loader/FrameLoaderClient.h
@@ -343,8 +343,6 @@ namespace WebCore {
         virtual void dispatchWillDisconnectDOMWindowExtensionFromGlobalObject(DOMWindowExtension*) { }
         virtual void dispatchDidReconnectDOMWindowExtensionToGlobalObject(DOMWindowExtension*) { }
         virtual void dispatchWillDestroyGlobalObjectForDOMWindowExtension(DOMWindowExtension*) { }
-
-        virtual bool shouldSendDoNotTrackHTTPHeader() const { return false; }
     };
 
 } // namespace WebCore

diff --git a/Source/WebCore/platform/graphics/MediaPlayer.h b/Source/WebCore/platform/graphics/MediaPlayer.h
index 58e8da8..9a2c6b7 100644 (file)
--- a/Source/WebCore/platform/graphics/MediaPlayer.h
+++ b/Source/WebCore/platform/graphics/MediaPlayer.h
@@ -202,8 +202,6 @@ public:
     virtual bool mediaPlayerIsPaused() const { return true; }
     virtual HostWindow* mediaPlayerHostWindow() { return 0; }
     virtual IntRect mediaPlayerWindowClipRect() { return IntRect(); }
-
-    virtual bool mediaPlayerShouldSendDoNotTrackHTTPHeader() const { return false; }
 };
 
 class MediaPlayerSupportsTypeClient {
@@ -421,8 +419,6 @@ public:
 
     String engineDescription() const;
 
-    bool shouldSendDoNotTrackHTTPHeader() const;
-
 private:
     MediaPlayer(MediaPlayerClient*);
     void loadWithNextMediaEngine(MediaPlayerFactory*);

diff --git a/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm b/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm
index 913ca2b..cf75d0c 100644 (file)
--- a/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm
+++ b/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm
@@ -297,9 +297,6 @@ void MediaPlayerPrivateAVFoundationObjC::createAVAssetForURL(const String& url)
     if (!userAgent.isEmpty())
         [headerFields.get() setObject:userAgent forKey:@"User-Agent"];
 
-    if (player()->mediaPlayerClient()->mediaPlayerShouldSendDoNotTrackHTTPHeader())
-        [headerFields.get() setObject:@"1" forKey:@"DNT"];
-
     if ([headerFields.get() count])
         [options.get() setObject:headerFields.get() forKey:@"AVURLAssetHTTPHeaderFieldsKey"];
 #endif

diff --git a/Source/WebKit/mac/ChangeLog b/Source/WebKit/mac/ChangeLog
index 7ae9784..91b7ffa 100644 (file)
--- a/Source/WebKit/mac/ChangeLog
+++ b/Source/WebKit/mac/ChangeLog
@@ -1,3 +1,19 @@
+2012-09-10  Jer Noble  <jer.noble@apple.com>
+
+        Unreviewed; rolling out r128081.
+        http://trac.webkit.org/changeset/128081
+        https://bugs.webkit.org/show_bug.cgi?id=96134
+
+        New test http/tests/media/video-donottrack.html fails to run on Apple test bots.
+
+        * WebCoreSupport/WebFrameLoaderClient.h:
+        * WebCoreSupport/WebFrameLoaderClient.mm:
+        * WebView/WebDelegateImplementationCaching.h:
+        (WebFrameLoadDelegateImplementationCache):
+        * WebView/WebDelegateImplementationCaching.mm:
+        * WebView/WebView.mm:
+        (-[WebView _cacheFrameLoadDelegateImplementations]):
+
 2012-09-07  Jon Lee  <jonlee@apple.com>
 
         Update notifications to latest spec

diff --git a/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.h b/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.h
index f22a69a..3c1a405 100644 (file)
--- a/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.h
+++ b/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.h
@@ -227,8 +227,6 @@ private:
 #if PLATFORM(MAC)
     virtual RemoteAXObjectRef accessibilityRemoteObject() OVERRIDE { return 0; }
 #endif
-
-    virtual bool shouldSendDoNotTrackHTTPHeader() const OVERRIDE;
     
     RetainPtr<WebFramePolicyListener> setUpPolicyListener(WebCore::FramePolicyFunction);
 

diff --git a/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm b/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm
index a24e397..5b68a1f 100644 (file)
--- a/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm
+++ b/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm
@@ -1980,16 +1980,6 @@ jobject WebFrameLoaderClient::javaApplet(NSView* view)
 }
 #endif
 
-bool WebFrameLoaderClient::shouldSendDoNotTrackHTTPHeader() const
-{
-    WebView *webView = getWebView(m_webFrame.get());
-    WebFrameLoadDelegateImplementationCache* implementations = WebViewGetFrameLoadDelegateImplementations(webView);
-
-    if (implementations->shouldSendDoNotTrackHTTPHeaderFunc)
-        return CallFrameLoadDelegateReturningBoolean(YES, implementations->shouldSendDoNotTrackHTTPHeaderFunc, webView, @selector(webViewShouldSendDoNotTrackHTTPHeader:));
-    return false;
-}
-
 @implementation WebFramePolicyListener
 + (void)initialize
 {

diff --git a/Source/WebKit/mac/WebView/WebDelegateImplementationCaching.h b/Source/WebKit/mac/WebView/WebDelegateImplementationCaching.h
index b4fabd1..29a4388 100644 (file)
--- a/Source/WebKit/mac/WebView/WebDelegateImplementationCaching.h
+++ b/Source/WebKit/mac/WebView/WebDelegateImplementationCaching.h
@@ -78,7 +78,6 @@ struct WebFrameLoadDelegateImplementationCache {
     IMP didDisplayInsecureContentFunc;
     IMP didRunInsecureContentFunc;
     IMP didDetectXSSFunc;
-    IMP shouldSendDoNotTrackHTTPHeaderFunc;
 };
 
 struct WebScriptDebugDelegateImplementationCache {
@@ -138,7 +137,6 @@ id CallResourceLoadDelegate(IMP, WebView *, SEL, id, id, id, id);
 id CallResourceLoadDelegate(IMP, WebView *, SEL, id, NSInteger, id);
 id CallResourceLoadDelegate(IMP, WebView *, SEL, id, id, NSInteger, id);
 
-BOOL CallResourceLoadDelegateReturningBoolean(BOOL, IMP, WebView *, SEL);
 BOOL CallResourceLoadDelegateReturningBoolean(BOOL, IMP, WebView *, SEL, id);
 BOOL CallResourceLoadDelegateReturningBoolean(BOOL, IMP, WebView *, SEL, id, id);
 BOOL CallResourceLoadDelegateReturningBoolean(BOOL, IMP, WebView *, SEL, id, id, id);

diff --git a/Source/WebKit/mac/WebView/WebDelegateImplementationCaching.mm b/Source/WebKit/mac/WebView/WebDelegateImplementationCaching.mm
index 227f5a1..3c3e3c9 100644 (file)
--- a/Source/WebKit/mac/WebView/WebDelegateImplementationCaching.mm
+++ b/Source/WebKit/mac/WebView/WebDelegateImplementationCaching.mm
@@ -510,16 +510,6 @@ id CallResourceLoadDelegate(IMP implementation, WebView *self, SEL selector, id
     return CallDelegate(implementation, self, self->_private->resourceProgressDelegate, selector, object1, object2, integer, object3);
 }
 
-BOOL CallResourceLoadDelegateReturningBoolean(BOOL result, IMP implementation, WebView *self, SEL selector)
-{
-    @try {
-        return reinterpret_cast<BOOL (*)(id, SEL, WebView *)>(objc_msgSend)(self->_private->resourceProgressDelegate, selector, self);
-    } @catch(id exception) {
-        ReportDiscardedDelegateException(selector, exception);
-    }
-    return result;
-}
-
 BOOL CallResourceLoadDelegateReturningBoolean(BOOL result, IMP implementation, WebView *self, SEL selector, id object1)
 {
     @try {

diff --git a/Source/WebKit/mac/WebView/WebView.mm b/Source/WebKit/mac/WebView/WebView.mm
index 4fd9509..7b8412c 100644 (file)
--- a/Source/WebKit/mac/WebView/WebView.mm
+++ b/Source/WebKit/mac/WebView/WebView.mm
@@ -1629,7 +1629,6 @@ static inline IMP getMethod(id o, SEL s)
     cache->didDisplayInsecureContentFunc = getMethod(delegate, @selector(webViewDidDisplayInsecureContent:));
     cache->didRunInsecureContentFunc = getMethod(delegate, @selector(webView:didRunInsecureContent:));
     cache->didDetectXSSFunc = getMethod(delegate, @selector(webView:didDetectXSS:));
-    cache->shouldSendDoNotTrackHTTPHeaderFunc = getMethod(delegate, @selector(webViewShouldSendDoNotTrackHTTPHeader:));
 }
 
 - (void)_cacheScriptDebugDelegateImplementations

diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index 2f50d64..21d0a10 100644 (file)
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -1,3 +1,22 @@
+2012-09-10  Jer Noble  <jer.noble@apple.com>
+
+        Unreviewed; rolling out r128081.
+        http://trac.webkit.org/changeset/128081
+        https://bugs.webkit.org/show_bug.cgi?id=96134
+
+        New test http/tests/media/video-donottrack.html fails to run on Apple test bots.
+
+        * Shared/APIClientTraits.h:
+        * WebProcess/InjectedBundle/API/c/WKBundlePage.h:
+        * WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.cpp:
+        * WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.h:
+        (InjectedBundlePageLoaderClient):
+        * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
+        * WebProcess/WebCoreSupport/WebFrameLoaderClient.h:
+        (WebFrameLoaderClient):
+        * WebProcess/qt/QtBuiltinBundlePage.cpp:
+        (WebKit::QtBuiltinBundlePage::QtBuiltinBundlePage):
+
 2012-09-07  Jon Lee  <jonlee@apple.com>
 
         Update notifications to latest spec

diff --git a/Source/WebKit2/Shared/APIClientTraits.h b/Source/WebKit2/Shared/APIClientTraits.h
index 481f95f..7352b56 100644 (file)
--- a/Source/WebKit2/Shared/APIClientTraits.h
+++ b/Source/WebKit2/Shared/APIClientTraits.h
@@ -43,7 +43,7 @@ template<> struct APIClientTraits<WKBundleClient> {
 };
 
 template<> struct APIClientTraits<WKBundlePageLoaderClient> {
-    static const size_t interfaceSizesByVersion[5];
+    static const size_t interfaceSizesByVersion[4];
 };
 
 template<> struct APIClientTraits<WKBundlePageResourceLoadClient> {

diff --git a/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.h b/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.h
index 25d96ce..8bc7670 100644 (file)
--- a/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.h
+++ b/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.h
@@ -111,7 +111,6 @@ typedef void (*WKBundlePageWillDestroyGlobalObjectForDOMWindowExtensionCallback)
 typedef bool (*WKBundlePageShouldForceUniversalAccessFromLocalURLCallback)(WKBundlePageRef, WKStringRef url, const void* clientInfo);
 typedef void (*WKBundlePageDidReceiveIntentForFrameCallback)(WKBundlePageRef page, WKBundleFrameRef frame, WKBundleIntentRequestRef intentRequest, WKTypeRef* userData, const void* clientInfo);
 typedef void (*WKBundlePageRegisterIntentServiceForFrameCallback)(WKBundlePageRef page, WKBundleFrameRef frame, WKIntentServiceInfoRef serviceInfo, WKTypeRef* userData, const void* clientInfo);
-typedef bool (*WKBundlePageShouldSendDoNotTrackHTTPHeaderCallback)(WKBundlePageRef page, const void* clientInfo);
 
 struct WKBundlePageLoaderClient {
     int                                                                     version;
@@ -154,13 +153,10 @@ struct WKBundlePageLoaderClient {
     // Version 3
     WKBundlePageDidReceiveIntentForFrameCallback                            didReceiveIntentForFrame;
     WKBundlePageRegisterIntentServiceForFrameCallback                       registerIntentServiceForFrame;
-
-    // Version 4
-    WKBundlePageShouldSendDoNotTrackHTTPHeaderCallback                      shouldSendDoNotTrackHTTPHeader;
 };
 typedef struct WKBundlePageLoaderClient WKBundlePageLoaderClient;
 
-enum { kWKBundlePageLoaderClientCurrentVersion = 4 };
+enum { kWKBundlePageLoaderClientCurrentVersion = 3 };
 
 enum {
     WKBundlePagePolicyActionPassThrough,

diff --git a/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.cpp b/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.cpp
index 85a1ade..a6a0612 100644 (file)
--- a/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.cpp
+++ b/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.cpp
@@ -335,12 +335,4 @@ bool InjectedBundlePageLoaderClient::shouldForceUniversalAccessFromLocalURL(WebP
     return m_client.shouldForceUniversalAccessFromLocalURL(toAPI(page), toAPI(url.impl()), m_client.clientInfo);
 }
 
-bool InjectedBundlePageLoaderClient::shouldSendDoNotTrackHTTPHeader(WebPage* page)
-{
-    if (!m_client.shouldSendDoNotTrackHTTPHeader)
-        return false;
-
-    return m_client.shouldSendDoNotTrackHTTPHeader(toAPI(page), m_client.clientInfo);
-}
-
 } // namespace WebKit

diff --git a/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.h b/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.h
index cdf8b88..81d9be4 100644 (file)
--- a/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.h
+++ b/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.h
@@ -94,7 +94,6 @@ public:
     void willDestroyGlobalObjectForDOMWindowExtension(WebPage*, WebCore::DOMWindowExtension*);
 
     bool shouldForceUniversalAccessFromLocalURL(WebPage*, const String& url);
-    bool shouldSendDoNotTrackHTTPHeader(WebPage*);
 };
 
 } // namespace WebKit

diff --git a/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp b/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp
index 4174266..6a80193 100644 (file)
--- a/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp
+++ b/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp
@@ -1622,15 +1622,6 @@ bool WebFrameLoaderClient::shouldForceUniversalAccessFromLocalURL(const WebCore:
     return webPage->injectedBundleLoaderClient().shouldForceUniversalAccessFromLocalURL(webPage, url.string());
 }
 
-bool WebFrameLoaderClient::shouldSendDoNotTrackHTTPHeader() const
-{
-    WebPage* webPage = m_frame->page();
-    if (!webPage)
-        return false;
-
-    return webPage->injectedBundleLoaderClient().shouldSendDoNotTrackHTTPHeader(webPage);
-}
-
 PassRefPtr<FrameNetworkingContext> WebFrameLoaderClient::createNetworkingContext()
 {
     RefPtr<WebFrameNetworkingContext> context = WebFrameNetworkingContext::create(m_frame);

diff --git a/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.h b/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.h
index 11c9b3a..207e442 100644 (file)
--- a/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.h
+++ b/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.h
@@ -241,8 +241,6 @@ private:
 
     virtual bool shouldForceUniversalAccessFromLocalURL(const WebCore::KURL&) OVERRIDE;
 
-    virtual bool shouldSendDoNotTrackHTTPHeader() const OVERRIDE;
-
     virtual PassRefPtr<WebCore::FrameNetworkingContext> createNetworkingContext() OVERRIDE;
 
     WebFrame* m_frame;

diff --git a/Source/WebKit2/WebProcess/qt/QtBuiltinBundlePage.cpp b/Source/WebKit2/WebProcess/qt/QtBuiltinBundlePage.cpp
index a143eb7..d5c60fc 100644 (file)
--- a/Source/WebKit2/WebProcess/qt/QtBuiltinBundlePage.cpp
+++ b/Source/WebKit2/WebProcess/qt/QtBuiltinBundlePage.cpp
@@ -78,7 +78,6 @@ QtBuiltinBundlePage::QtBuiltinBundlePage(QtBuiltinBundle* bundle, WKBundlePageRe
         0, // shouldForceUniversalAccessFromLocalURL
         0, // didReceiveIntentForFrame
         0, // registerIntentServiceForFrame
-        0, // shouldSendDoNotTrackHTTPHeader
     };
     WKBundlePageSetPageLoaderClient(m_page, &loaderClient);
 }

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 6be5a06..009c02d 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,27 @@
+2012-09-10  Jer Noble  <jer.noble@apple.com>
+
+        Unreviewed; rolling out r128081.
+        http://trac.webkit.org/changeset/128081
+        https://bugs.webkit.org/show_bug.cgi?id=96134
+
+        New test http/tests/media/video-donottrack.html fails to run on Apple test bots.
+
+        * DumpRenderTree/TestRunner.cpp:
+        (TestRunner::TestRunner):
+        (TestRunner::staticFunctions):
+        * DumpRenderTree/TestRunner.h:
+        (TestRunner):
+        * DumpRenderTree/mac/FrameLoadDelegate.mm:
+        * WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl:
+        * WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp:
+        (WTR::InjectedBundlePage::InjectedBundlePage):
+        * WebKitTestRunner/InjectedBundle/InjectedBundlePage.h:
+        (InjectedBundlePage):
+        * WebKitTestRunner/InjectedBundle/TestRunner.cpp:
+        (WTR::TestRunner::TestRunner):
+        * WebKitTestRunner/InjectedBundle/TestRunner.h:
+        (TestRunner):
+
 2012-09-10  Christophe Dumez  <christophe.dumez@intel.com>
 
         TestExpectationsChecker._determine_port_from_expectations_path() does not support cascaded TestExpectations

diff --git a/Tools/DumpRenderTree/TestRunner.cpp b/Tools/DumpRenderTree/TestRunner.cpp
index 8da6aeb..1d00c50 100644 (file)
--- a/Tools/DumpRenderTree/TestRunner.cpp
+++ b/Tools/DumpRenderTree/TestRunner.cpp
@@ -93,9 +93,8 @@ TestRunner::TestRunner(const std::string& testPathOrURL, const std::string& expe
     , m_shouldPaintBrokenImage(true)
     , m_shouldStayOnPageAfterHandlingBeforeUnload(false)
     , m_areLegacyWebNotificationPermissionRequestsIgnored(false)
-    , m_customFullScreenBehavior(false)
+    , m_customFullScreenBehavior(false) 
     , m_hasPendingWebNotificationClick(false)
-    , m_shouldSendDoNotTrackHTTPHeader(false)
     , m_testPathOrURL(testPathOrURL)
     , m_expectedPixelHash(expectedPixelHash)
     , m_titleTextDirection("ltr")
@@ -716,16 +715,6 @@ static JSValueRef notifyDoneCallback(JSContextRef context, JSObjectRef function,
     return JSValueMakeUndefined(context);
 }
 
-static JSValueRef setShouldSendDoNotTrackHTTPHeaderCallback(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
-{
-    if (argumentCount < 1)
-        return JSValueMakeUndefined(context);
-
-    TestRunner* controller = static_cast<TestRunner*>(JSObjectGetPrivate(thisObject));
-    controller->setShouldSendDoNotTrackHTTPHeader(JSValueToBoolean(context, arguments[0]));
-    return JSValueMakeUndefined(context);
-}
-
 static JSValueRef numberOfPendingGeolocationPermissionRequestsCallback(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
 {
     TestRunner* controller = static_cast<TestRunner*>(JSObjectGetPrivate(thisObject));
@@ -2338,7 +2327,6 @@ JSStaticFunction* TestRunner::staticFunctions()
         { "denyWebNotificationPermission", denyWebNotificationPermissionCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
         { "removeAllWebNotificationPermissions", removeAllWebNotificationPermissionsCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
         { "simulateWebNotificationClick", simulateWebNotificationClickCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
-        { "setShouldSendDoNotTrackHTTPHeader", setShouldSendDoNotTrackHTTPHeaderCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
         { 0, 0, 0 }
     };
 

diff --git a/Tools/DumpRenderTree/TestRunner.h b/Tools/DumpRenderTree/TestRunner.h
index 4c4a276..9bcc95b 100644 (file)
--- a/Tools/DumpRenderTree/TestRunner.h
+++ b/Tools/DumpRenderTree/TestRunner.h
@@ -367,9 +367,6 @@ public:
 
     bool hasPendingWebNotificationClick() const { return m_hasPendingWebNotificationClick; }
 
-    void setShouldSendDoNotTrackHTTPHeader(bool value) { m_shouldSendDoNotTrackHTTPHeader = value; }
-    bool shouldSendDoNotTrackHTTPHeader() const { return m_shouldSendDoNotTrackHTTPHeader; }
-
 private:
     TestRunner(const std::string& testPathOrURL, const std::string& expectedPixelHash);
 
@@ -426,7 +423,6 @@ private:
     bool m_areLegacyWebNotificationPermissionRequestsIgnored;
     bool m_customFullScreenBehavior;
     bool m_hasPendingWebNotificationClick;
-    bool m_shouldSendDoNotTrackHTTPHeader;
 
     std::string m_authenticationUsername;
     std::string m_authenticationPassword; 

diff --git a/Tools/DumpRenderTree/mac/FrameLoadDelegate.mm b/Tools/DumpRenderTree/mac/FrameLoadDelegate.mm
index 5df5075..88cc7c9 100644 (file)
--- a/Tools/DumpRenderTree/mac/FrameLoadDelegate.mm
+++ b/Tools/DumpRenderTree/mac/FrameLoadDelegate.mm
@@ -430,9 +430,4 @@
         printf ("postProgressFinishedNotification\n");
 }
 
-- (BOOL)webViewShouldSendDoNotTrackHTTPHeader:(WebView*)sender
-{
-    return gTestRunner->shouldSendDoNotTrackHTTPHeader();
-}
-
 @end

diff --git a/Tools/WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl b/Tools/WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl
index 2a3548b..f2a8b81 100644 (file)
--- a/Tools/WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl
+++ b/Tools/WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl
@@ -165,9 +165,6 @@ module WTR {
         void denyWebNotificationPermission(in DOMString origin);
         void removeAllWebNotificationPermissions();
         void simulateWebNotificationClick(in object notification);
-
-        // Do Not Track support
-        void setShouldSendDoNotTrackHTTPHeader(in boolean flag);
     };
 
 }

diff --git a/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp b/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp
index d5fce97..6746a70 100644 (file)
--- a/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp
+++ b/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp
@@ -304,8 +304,7 @@ InjectedBundlePage::InjectedBundlePage(WKBundlePageRef page)
         didFinishProgress, // didFinishProgress
         0, // shouldForceUniversalAccessFromLocalURL
         didReceiveIntentForFrame, // didReceiveIntentForFrame
-        registerIntentServiceForFrame, // registerIntentServiceForFrame
-        shouldSendDoNotTrackHTTPHeader
+        registerIntentServiceForFrame // registerIntentServiceForFrame
     };
     WKBundlePageSetPageLoaderClient(m_page, &loaderClient);
 
@@ -622,11 +621,6 @@ void InjectedBundlePage::registerIntentServiceForFrame(WKBundlePageRef page, WKB
 #endif
 }
 
-bool InjectedBundlePage::shouldSendDoNotTrackHTTPHeader(WKBundlePageRef page, const void* clientInfo)
-{
-    return static_cast<InjectedBundlePage*>(const_cast<void*>(clientInfo))->shouldSendDoNotTrackHTTPHeader();
-}
-
 void InjectedBundlePage::didFinishDocumentLoadForFrame(WKBundlePageRef page, WKBundleFrameRef frame, WKTypeRef*, const void* clientInfo)
 {
     static_cast<InjectedBundlePage*>(const_cast<void*>(clientInfo))->didFinishDocumentLoadForFrame(frame);
@@ -782,11 +776,6 @@ void InjectedBundlePage::didFinishProgress()
     InjectedBundle::shared().stringBuilder()->append("postProgressFinishedNotification\n");
 }
 
-bool InjectedBundlePage::shouldSendDoNotTrackHTTPHeader()
-{
-    return InjectedBundle::shared().testRunner()->shouldSendDoNotTrackHTTPHeader();
-}
-
 enum FrameNamePolicy { ShouldNotIncludeFrameName, ShouldIncludeFrameName };
 
 static void dumpFrameScrollPosition(WKBundleFrameRef frame, FrameNamePolicy shouldIncludeFrameName = ShouldNotIncludeFrameName)

diff --git a/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.h b/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.h
index 2dbca1c..3ad203d 100644 (file)
--- a/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.h
+++ b/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.h
@@ -80,7 +80,6 @@ private:
     static bool shouldCacheResponse(WKBundlePageRef, WKBundleFrameRef, uint64_t identifier, const void*);
     static void didReceiveIntentForFrame(WKBundlePageRef, WKBundleFrameRef, WKBundleIntentRequestRef, WKTypeRef*, const void*);
     static void registerIntentServiceForFrame(WKBundlePageRef, WKBundleFrameRef, WKIntentServiceInfoRef, WKTypeRef*, const void*);
-    static bool shouldSendDoNotTrackHTTPHeader(WKBundlePageRef, const void*);
 
     void didStartProvisionalLoadForFrame(WKBundleFrameRef);
     void didReceiveServerRedirectForProvisionalLoadForFrame(WKBundleFrameRef);
@@ -169,8 +168,6 @@ private:
     void dumpAllFramesText();
     void dumpAllFrameScrollPositions();
 
-    bool shouldSendDoNotTrackHTTPHeader();
-
     WKBundlePageRef m_page;
     WKRetainPtr<WKBundleScriptWorldRef> m_world;
     WKRetainPtr<WKBundleBackForwardListItemRef> m_previousTestBackForwardListItem;

diff --git a/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp b/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp
index be3dc8b..2d478ab 100644 (file)
--- a/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp
+++ b/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp
@@ -90,7 +90,6 @@ TestRunner::TestRunner()
     , m_customFullScreenBehavior(false)
     , m_userStyleSheetEnabled(false)
     , m_userStyleSheetLocation(adoptWK(WKStringCreateWithUTF8CString("")))
-    , m_shouldSendDoNotTrackHTTPHeader(false)
 {
     platformInitialize();
 }

diff --git a/Tools/WebKitTestRunner/InjectedBundle/TestRunner.h b/Tools/WebKitTestRunner/InjectedBundle/TestRunner.h
index 65aa097..080e519 100644 (file)
--- a/Tools/WebKitTestRunner/InjectedBundle/TestRunner.h
+++ b/Tools/WebKitTestRunner/InjectedBundle/TestRunner.h
@@ -235,9 +235,6 @@ public:
     void setPageVisibility(JSStringRef state);
     void resetPageVisibility();
 
-    bool shouldSendDoNotTrackHTTPHeader() const { return m_shouldSendDoNotTrackHTTPHeader; }
-    void setShouldSendDoNotTrackHTTPHeader(bool flag) { m_shouldSendDoNotTrackHTTPHeader = flag; }
-
 private:
     static const double waitToDumpWatchdogTimerInterval;
 
@@ -279,8 +276,6 @@ private:
     WKRetainPtr<WKStringRef> m_userStyleSheetLocation;
 
     PlatformTimerRef m_waitToDumpWatchdogTimer;
-
-    bool m_shouldSendDoNotTrackHTTPHeader;
 };
 
 } // namespace WTR