Changeset 89764 in webkit

Timestamp:

Jun 25, 2011 11:33:59 PM (13 years ago)

Author:

abarth@webkit.org

Message:

2011-06-25 Adam Barth <​abarth@webkit.org>

Reviewed by Eric Seidel.

[Chromium] Update WebKit for WEBKIT_FRAME_TO_DOCUMENT_API_MOVE
​https://bugs.webkit.org/show_bug.cgi?id=63394

• src/FrameLoaderClientImpl.cpp: (WebKit::FrameLoaderClientImpl::dispatchWillPerformClientRedirect):

2011-06-25 Adam Barth <​abarth@webkit.org>

Reviewed by Eric Seidel.

[Chromium] Update WebKit for WEBKIT_FRAME_TO_DOCUMENT_API_MOVE
​https://bugs.webkit.org/show_bug.cgi?id=63394

• DumpRenderTree/chromium/LayoutTestController.cpp: (LayoutTestController::queueLoad):

Location:

trunk

Files:

• Source/WebKit/chromium/ChangeLog (modified) (1 diff)
• Source/WebKit/chromium/src/FrameLoaderClientImpl.cpp (modified) (2 diffs)
• Tools/ChangeLog (modified) (1 diff)
• Tools/DumpRenderTree/chromium/LayoutTestController.cpp (modified) (1 diff)

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2011-06-25  Adam Barth  <abarth@webkit.org>
+
+        Reviewed by Eric Seidel.
+
+        [Chromium] Update WebKit for WEBKIT_FRAME_TO_DOCUMENT_API_MOVE
+        https://bugs.webkit.org/show_bug.cgi?id=63394
+
+        * src/FrameLoaderClientImpl.cpp:
+        (WebKit::FrameLoaderClientImpl::dispatchWillPerformClientRedirect):
+
 2011-06-25  Adam Barth  <abarth@webkit.org>
 

trunk/Source/WebKit/chromium/src/FrameLoaderClientImpl.cpp

@@ -59 +59 @@
 #include "WebDataSourceImpl.h"
 #include "WebDevToolsAgentPrivate.h"
+#include "WebDocument.h"
 #include "WebFormElement.h"
 #include "WebFrameClient.h"
@@ -587 +588 @@
     // Tells dispatchDidStartProvisionalLoad that if it sees this item it is a
     // redirect and the source item should be added as the start of the chain.
-    m_expectedClientRedirectSrc = m_webFrame->url();
+    m_expectedClientRedirectSrc = m_webFrame->document().url();
     m_expectedClientRedirectDest = url;
 

trunk/Tools/ChangeLog

@@ +1 @@
+2011-06-25  Adam Barth  <abarth@webkit.org>
+
+        Reviewed by Eric Seidel.
+
+        [Chromium] Update WebKit for WEBKIT_FRAME_TO_DOCUMENT_API_MOVE
+        https://bugs.webkit.org/show_bug.cgi?id=63394
+
+        * DumpRenderTree/chromium/LayoutTestController.cpp:
+        (LayoutTestController::queueLoad):
+
 2011-06-25  Brent Fulgham  <bfulgham@webkit.org>
 

trunk/Tools/DumpRenderTree/chromium/LayoutTestController.cpp

@@ -498 +498 @@
     if (arguments.size() > 0 && arguments[0].isString()) {
         // FIXME: Implement WebURL::resolve() and avoid GURL.
-        GURL currentURL = m_shell->webView()->mainFrame()->url();
+        GURL currentURL = m_shell->webView()->mainFrame()->document().url();
         GURL fullURL = currentURL.Resolve(arguments[0].toString());