Title: [89764] trunk
- Revision
- 89764
- Author
- [email protected]
- Date
- 2011-06-25 23:33:59 -0700 (Sat, 25 Jun 2011)
Log Message
2011-06-25 Adam Barth <[email protected]>
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 <[email protected]>
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):
Modified Paths
Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (89763 => 89764)
--- trunk/Source/WebKit/chromium/ChangeLog 2011-06-26 05:43:00 UTC (rev 89763)
+++ trunk/Source/WebKit/chromium/ChangeLog 2011-06-26 06:33:59 UTC (rev 89764)
@@ -1,5 +1,15 @@
2011-06-25 Adam Barth <[email protected]>
+ 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 <[email protected]>
+
Roll Chromium DEPS.
* DEPS:
Modified: trunk/Source/WebKit/chromium/src/FrameLoaderClientImpl.cpp (89763 => 89764)
--- trunk/Source/WebKit/chromium/src/FrameLoaderClientImpl.cpp 2011-06-26 05:43:00 UTC (rev 89763)
+++ trunk/Source/WebKit/chromium/src/FrameLoaderClientImpl.cpp 2011-06-26 06:33:59 UTC (rev 89764)
@@ -58,6 +58,7 @@
#include "StringExtras.h"
#include "WebDataSourceImpl.h"
#include "WebDevToolsAgentPrivate.h"
+#include "WebDocument.h"
#include "WebFormElement.h"
#include "WebFrameClient.h"
#include "WebFrameImpl.h"
@@ -586,7 +587,7 @@
{
// 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;
// FIXME: bug 1135512. Webkit does not properly notify us of cancelling
Modified: trunk/Tools/ChangeLog (89763 => 89764)
--- trunk/Tools/ChangeLog 2011-06-26 05:43:00 UTC (rev 89763)
+++ trunk/Tools/ChangeLog 2011-06-26 06:33:59 UTC (rev 89764)
@@ -1,3 +1,13 @@
+2011-06-25 Adam Barth <[email protected]>
+
+ 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 <[email protected]>
Unreviewed build correction after r89426.
Modified: trunk/Tools/DumpRenderTree/chromium/LayoutTestController.cpp (89763 => 89764)
--- trunk/Tools/DumpRenderTree/chromium/LayoutTestController.cpp 2011-06-26 05:43:00 UTC (rev 89763)
+++ trunk/Tools/DumpRenderTree/chromium/LayoutTestController.cpp 2011-06-26 06:33:59 UTC (rev 89764)
@@ -497,7 +497,7 @@
{
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());
string target = "";
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
