Unreviewed, rolling out r92415.

http://trac.webkit.org/changeset/92415
https://bugs.webkit.org/show_bug.cgi?id=65728

Causes many DEBUG crashes (Requested by abarth on #webkit).

Patch by Sheriff Bot <webkit.review.bot@gmail.com> on 2011-08-04

Source/WebCore:

* platform/network/chromium/ResourceRequest.h:
* xml/XMLHttpRequest.cpp:
(WebCore::XMLHttpRequest::createRequest):

Source/WebKit/chromium:

* public/WebURLRequest.h:

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

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 602caa02d09dd49e6b5ad7dc8092b89d32913cab..306b00b77b1d50a049822a7835f88eccb333dfbb 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2011-08-04  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r92415.
+        http://trac.webkit.org/changeset/92415
+        https://bugs.webkit.org/show_bug.cgi?id=65728
+
+        Causes many DEBUG crashes (Requested by abarth on #webkit).
+
+        * platform/network/chromium/ResourceRequest.h:
+        * xml/XMLHttpRequest.cpp:
+        (WebCore::XMLHttpRequest::createRequest):
+
 2011-08-04  Tim Horton  <timothy_horton@apple.com>
 
         Reviewed by Nikolas Zimmerman.

diff --git a/Source/WebCore/platform/network/chromium/ResourceRequest.h b/Source/WebCore/platform/network/chromium/ResourceRequest.h
index 01e341c506bcab7a8fcd91c7b3656eba5fcfab3e..6b578b0c239c957eb93aa55ea558e4f5720ac099 100644 (file)
--- a/Source/WebCore/platform/network/chromium/ResourceRequest.h
+++ b/Source/WebCore/platform/network/chromium/ResourceRequest.h
@@ -55,7 +55,6 @@ namespace WebCore {
             TargetIsPrefetch,
             TargetIsPrerender,
             TargetIsFavicon,
-            TargetIsXHR,
         };
 
         class ExtraData : public RefCounted<ExtraData> {

diff --git a/Source/WebCore/xml/XMLHttpRequest.cpp b/Source/WebCore/xml/XMLHttpRequest.cpp
index 7382de143a5f2faf6dda09065e88ed9f8ba8e888..663416764298b3fea93a7f38cae0d99b7e7ef8a5 100644 (file)
--- a/Source/WebCore/xml/XMLHttpRequest.cpp
+++ b/Source/WebCore/xml/XMLHttpRequest.cpp
@@ -636,9 +636,6 @@ void XMLHttpRequest::createRequest(ExceptionCode& ec)
 
     ResourceRequest request(m_url);
     request.setHTTPMethod(m_method);
-#if PLATFORM(CHROMIUM)
-    request.setTargetType(ResourceRequest::TargetIsXHR);
-#endif
 
     if (m_requestEntityBody) {
         ASSERT(m_method != "GET");

diff --git a/Source/WebKit/chromium/ChangeLog b/Source/WebKit/chromium/ChangeLog
index 3e9e69076d4a2c6677d7a7af2390c7b66da06e0e..da26de7c431a9da532d7d473ffe3f54b00574f0d 100644 (file)
--- a/Source/WebKit/chromium/ChangeLog
+++ b/Source/WebKit/chromium/ChangeLog
@@ -1,3 +1,13 @@
+2011-08-04  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r92415.
+        http://trac.webkit.org/changeset/92415
+        https://bugs.webkit.org/show_bug.cgi?id=65728
+
+        Causes many DEBUG crashes (Requested by abarth on #webkit).
+
+        * public/WebURLRequest.h:
+
 2011-08-04  Jochen Eisinger  <jochen@chromium.org>
 
         Introduce a new ResourceRequest::TargetType for XHRs

diff --git a/Source/WebKit/chromium/public/WebURLRequest.h b/Source/WebKit/chromium/public/WebURLRequest.h
index f4e3c7cf5aff847fbd64bd443ce11d585068d4e8..d6081c56f601ebd71bfec6507457e13cfee93512 100644 (file)
--- a/Source/WebKit/chromium/public/WebURLRequest.h
+++ b/Source/WebKit/chromium/public/WebURLRequest.h
@@ -36,8 +36,6 @@
 
 #if defined(WEBKIT_IMPLEMENTATION)
 namespace WebCore { class ResourceRequest; }
-#else
-#define WEBKIT_HAS_TARGET_IS_XHR
 #endif
 
 namespace WebKit {
@@ -73,7 +71,6 @@ public:
         TargetIsPrefetch = 11,
         TargetIsPrerender = 12,
         TargetIsFavicon = 13,
-        TargetIsXHR = 14,
     };
 
     class ExtraData {