Diff
Modified: trunk/LayoutTests/ChangeLog (114380 => 114381)
--- trunk/LayoutTests/ChangeLog 2012-04-17 15:20:29 UTC (rev 114380)
+++ trunk/LayoutTests/ChangeLog 2012-04-17 15:37:03 UTC (rev 114381)
@@ -1,3 +1,14 @@
+2012-04-17 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r114376.
+ http://trac.webkit.org/changeset/114376
+ https://bugs.webkit.org/show_bug.cgi?id=84155
+
+ Wrong patch version committed, asked by the patch author.
+ (Requested by rakuco on #webkit).
+
+ * platform/efl/Skipped:
+
2012-04-17 Stephen Chenney <[email protected]>
[Chromium] Rebaseline svg/carto.net/colourpicker.svg
Modified: trunk/LayoutTests/platform/efl/Skipped (114380 => 114381)
--- trunk/LayoutTests/platform/efl/Skipped 2012-04-17 15:20:29 UTC (rev 114380)
+++ trunk/LayoutTests/platform/efl/Skipped 2012-04-17 15:37:03 UTC (rev 114381)
@@ -754,6 +754,7 @@
fast/history/back-forward-reset-after-error-handling.html
# Missing delegates: tests which need proper frame loader callbacks reporting
+http/tests/security/mixedContent/empty-url-plugin-in-frame.html
fast/loader/file-protocol-fragment.html
# Missing delegates: tests failing because of missing resource load delegate callbacks.
@@ -1162,6 +1163,7 @@
# Failing http tests (via GTK+)
http/tests/loading/bad-scheme-subframe.html
http/tests/loading/bad-server-subframe.html
+http/tests/loading/gmail-assert-on-load.html
http/tests/loading/redirect-with-no-location-crash.html
http/tests/loading/text-content-type-with-binary-extension.html
http/tests/media/video-play-stall-seek.html
@@ -1366,6 +1368,7 @@
fast/html/tab-order.html
fast/inline/skipped-whitespace-boundingBox.html
fast/loader/fragment-after-redirect-gets-back-entry.html
+fast/loader/subframe-removes-itself.html
fast/multicol/client-rects.html
fast/multicol/single-line.html
fast/overflow/overflow-y-scroll.html
@@ -2328,11 +2331,21 @@
http/tests/security/frameNavigation/not-opener.html
http/tests/security/local-image-from-remote-whitelisted.html
http/tests/security/local-user-CSS-from-remote.html
+http/tests/security/mixedContent/about-blank-iframe-in-main-frame.html
+http/tests/security/mixedContent/data-url-iframe-in-main-frame.html
+http/tests/security/mixedContent/data-url-script-in-iframe.html
+http/tests/security/mixedContent/insecure-css-in-iframe.html
+http/tests/security/mixedContent/insecure-css-in-main-frame.html
+http/tests/security/mixedContent/insecure-iframe-in-iframe.html
+http/tests/security/mixedContent/insecure-iframe-in-main-frame.html
+http/tests/security/mixedContent/insecure-image-in-iframe.html
http/tests/security/mixedContent/insecure-image-in-main-frame.html
http/tests/security/mixedContent/insecure-plugin-in-iframe.html
http/tests/security/mixedContent/insecure-script-in-iframe.html
http/tests/security/mixedContent/redirect-http-to-https-iframe-in-main-frame.html
+http/tests/security/mixedContent/redirect-http-to-https-script-in-iframe.html
http/tests/security/mixedContent/redirect-https-to-http-iframe-in-main-frame.html
+http/tests/security/mixedContent/redirect-https-to-http-script-in-iframe.html
http/tests/security/no-referrer.html
http/tests/security/originHeader/origin-header-for-empty.html
http/tests/security/originHeader/origin-header-for-https.html
Modified: trunk/Source/WebKit/efl/ChangeLog (114380 => 114381)
--- trunk/Source/WebKit/efl/ChangeLog 2012-04-17 15:20:29 UTC (rev 114380)
+++ trunk/Source/WebKit/efl/ChangeLog 2012-04-17 15:37:03 UTC (rev 114381)
@@ -1,3 +1,27 @@
+2012-04-17 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r114376.
+ http://trac.webkit.org/changeset/114376
+ https://bugs.webkit.org/show_bug.cgi?id=84155
+
+ Wrong patch version committed, asked by the patch author.
+ (Requested by rakuco on #webkit).
+
+ * WebCoreSupport/FrameLoaderClientEfl.cpp:
+ (WebCore::FrameLoaderClientEfl::postProgressFinishedNotification):
+ (WebCore::FrameLoaderClientEfl::dispatchDidFinishLoad):
+ (WebCore::FrameLoaderClientEfl::dispatchDidHandleOnloadEvents):
+ (WebCore::FrameLoaderClientEfl::dispatchDidCommitLoad):
+ (WebCore::FrameLoaderClientEfl::dispatchDidFailLoad):
+ * WebCoreSupport/FrameLoaderClientEfl.h:
+ (FrameLoaderClientEfl):
+ * ewk/ewk_frame.cpp:
+ * ewk/ewk_frame.h:
+ * ewk/ewk_private.h:
+ * ewk/ewk_view.cpp:
+ (_Ewk_View_Private_Data):
+ * ewk/ewk_view.h:
+
2012-04-17 Christophe Dumez <[email protected]>
[EFL] DRT should support LayoutTestController's dumpFrameLoadCallbacks()
Modified: trunk/Source/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.cpp (114380 => 114381)
--- trunk/Source/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.cpp 2012-04-17 15:20:29 UTC (rev 114380)
+++ trunk/Source/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.cpp 2012-04-17 15:37:03 UTC (rev 114381)
@@ -232,7 +232,16 @@
void FrameLoaderClientEfl::postProgressFinishedNotification()
{
- notImplemented();
+ if (m_loadError.isNull())
+ ewk_frame_load_finished(m_frame, 0, 0, 0, 0, 0);
+ else {
+ ewk_frame_load_finished(m_frame,
+ m_loadError.domain().utf8().data(),
+ m_loadError.errorCode(),
+ m_loadError.isCancellation(),
+ m_loadError.localizedDescription().utf8().data(),
+ m_loadError.failingURL().utf8().data());
+ }
}
void FrameLoaderClientEfl::frameLoaderDestroyed()
@@ -448,7 +457,7 @@
void FrameLoaderClientEfl::dispatchDidFinishLoad()
{
- ewk_frame_load_finished(m_frame, 0, 0, 0, 0, 0);
+ m_loadError = ResourceError(); /* clears previous error */
}
void FrameLoaderClientEfl::frameLoadCompleted()
@@ -535,7 +544,7 @@
void FrameLoaderClientEfl::dispatchDidHandleOnloadEvents()
{
- ewk_view_onload_event(m_view, m_frame);
+ notImplemented();
}
void FrameLoaderClientEfl::dispatchDidReceiveServerRedirectForProvisionalLoad()
@@ -602,7 +611,6 @@
void FrameLoaderClientEfl::dispatchDidCommitLoad()
{
ewk_frame_uri_changed(m_frame);
- ewk_frame_load_committed(m_frame);
if (ewk_view_frame_main_get(m_view) != m_frame)
return;
ewk_view_title_set(m_view, 0);
@@ -753,18 +761,15 @@
void FrameLoaderClientEfl::dispatchDidFailLoad(const ResourceError& err)
{
+ if (!shouldFallBack(err))
+ return;
+
+ m_loadError = err;
ewk_frame_load_error(m_frame,
- err.domain().utf8().data(),
- err.errorCode(), err.isCancellation(),
- err.localizedDescription().utf8().data(),
- err.failingURL().utf8().data());
-
- ewk_frame_load_finished(m_frame,
- err.domain().utf8().data(),
- err.errorCode(),
- err.isCancellation(),
- err.localizedDescription().utf8().data(),
- err.failingURL().utf8().data());
+ m_loadError.domain().utf8().data(),
+ m_loadError.errorCode(), m_loadError.isCancellation(),
+ m_loadError.localizedDescription().utf8().data(),
+ m_loadError.failingURL().utf8().data());
}
void FrameLoaderClientEfl::download(ResourceHandle*, const ResourceRequest& request, const ResourceResponse&)
Modified: trunk/Source/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.h (114380 => 114381)
--- trunk/Source/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.h 2012-04-17 15:20:29 UTC (rev 114380)
+++ trunk/Source/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.h 2012-04-17 15:37:03 UTC (rev 114381)
@@ -212,6 +212,8 @@
String m_userAgent;
String m_customUserAgent;
+ ResourceError m_loadError;
+
// Plugin view to redirect data to
PluginView* m_pluginView;
bool m_hasSentResponseToPlugin;
Modified: trunk/Source/WebKit/efl/ewk/ewk_frame.cpp (114380 => 114381)
--- trunk/Source/WebKit/efl/ewk/ewk_frame.cpp 2012-04-17 15:20:29 UTC (rev 114380)
+++ trunk/Source/WebKit/efl/ewk/ewk_frame.cpp 2012-04-17 15:37:03 UTC (rev 114381)
@@ -1261,17 +1261,6 @@
/**
* @internal
- * Reports the frame committed load.
- *
- * Emits signal: "load,committed" with no parameters.
- */
-void ewk_frame_load_committed(Evas_Object* ewkFrame)
-{
- evas_object_smart_callback_call(ewkFrame, "load,committed", 0);
-}
-
-/**
- * @internal
* Reports the frame started loading something.
*
* Emits signal: "load,started" with no parameters.
Modified: trunk/Source/WebKit/efl/ewk/ewk_frame.h (114380 => 114381)
--- trunk/Source/WebKit/efl/ewk/ewk_frame.h 2012-04-17 15:20:29 UTC (rev 114380)
+++ trunk/Source/WebKit/efl/ewk/ewk_frame.h 2012-04-17 15:37:03 UTC (rev 114381)
@@ -39,7 +39,6 @@
* were changed due new layout, script actions or any other events.
* - "editorclient,contents,changed", void: reports that editor client's
* contents were changed
- * - "load,committed", void: reports load committed.
* - "load,document,finished", void: frame finished loading the document.
* - "load,error", const Ewk_Frame_Load_Error*: reports load failed
* and it gives a pointer to structure defining the error as an argument.
Modified: trunk/Source/WebKit/efl/ewk/ewk_private.h (114380 => 114381)
--- trunk/Source/WebKit/efl/ewk/ewk_private.h 2012-04-17 15:20:29 UTC (rev 114380)
+++ trunk/Source/WebKit/efl/ewk/ewk_private.h 2012-04-17 15:37:03 UTC (rev 114381)
@@ -118,7 +118,6 @@
void ewk_view_load_error(Evas_Object* ewkView, const Ewk_Frame_Load_Error* error);
void ewk_view_load_progress_changed(Evas_Object* ewkView);
void ewk_view_load_show(Evas_Object* ewkView);
-void ewk_view_onload_event(Evas_Object* ewkView, Evas_Object* frame);
void ewk_view_restore_state(Evas_Object* ewkView, Evas_Object* frame);
Evas_Object* ewk_view_window_create(Evas_Object* ewkView, bool _javascript_, const WebCore::WindowFeatures* coreFeatures);
void ewk_view_window_close(Evas_Object* ewkView);
@@ -212,7 +211,6 @@
void ewk_frame_core_gone(Evas_Object* ewkFrame);
-void ewk_frame_load_committed(Evas_Object* ewkFrame);
void ewk_frame_load_started(Evas_Object* ewkFrame);
void ewk_frame_load_provisional(Evas_Object* ewkFrame);
void ewk_frame_load_firstlayout_finished(Evas_Object* ewkFrame);
Modified: trunk/Source/WebKit/efl/ewk/ewk_view.cpp (114380 => 114381)
--- trunk/Source/WebKit/efl/ewk/ewk_view.cpp 2012-04-17 15:20:29 UTC (rev 114380)
+++ trunk/Source/WebKit/efl/ewk/ewk_view.cpp 2012-04-17 15:37:03 UTC (rev 114381)
@@ -2864,19 +2864,6 @@
evas_object_smart_callback_call(ewkView, "load,newwindow,show", 0);
}
-/**
- * @internal
- * Reports an onload event for @p frame.
- *
- * @param ewkView View which contains the frame.
- * @param frame The frame whose onload event was received.
- *
- * Emits signal: "onload,event" with @p frame as the parameter.
- */
-void ewk_view_onload_event(Evas_Object* ewkView, Evas_Object* frame)
-{
- evas_object_smart_callback_call(ewkView, "onload,event", frame);
-}
/**
* @internal
Modified: trunk/Source/WebKit/efl/ewk/ewk_view.h (114380 => 114381)
--- trunk/Source/WebKit/efl/ewk/ewk_view.h 2012-04-17 15:20:29 UTC (rev 114380)
+++ trunk/Source/WebKit/efl/ewk/ewk_view.h 2012-04-17 15:37:03 UTC (rev 114381)
@@ -66,7 +66,6 @@
* - "menubar,visible,set", Eina_Bool: sets menubar visibility.
* - "mixedcontent,displayed", void: any of the containing frames has loaded and displayed mixed content.
* - "mixedcontent,run", void: any of the containing frames has loaded and run mixed content.
- * - "onload,event", Evas_Object*: a frame onload event has been received.
* - "ready", void: page is fully loaded.
* - "resource,request,willsend", Ewk_Frame_Resource_Request*: a resource will
* be requested.
Modified: trunk/Tools/ChangeLog (114380 => 114381)
--- trunk/Tools/ChangeLog 2012-04-17 15:20:29 UTC (rev 114380)
+++ trunk/Tools/ChangeLog 2012-04-17 15:37:03 UTC (rev 114381)
@@ -1,3 +1,20 @@
+2012-04-17 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r114376.
+ http://trac.webkit.org/changeset/114376
+ https://bugs.webkit.org/show_bug.cgi?id=84155
+
+ Wrong patch version committed, asked by the patch author.
+ (Requested by rakuco on #webkit).
+
+ * DumpRenderTree/efl/DumpRenderTreeChrome.cpp:
+ (DumpRenderTreeChrome::createView):
+ (DumpRenderTreeChrome::processWork):
+ (DumpRenderTreeChrome::onLoadFinished):
+ (DumpRenderTreeChrome::onWillSendRequest):
+ * DumpRenderTree/efl/DumpRenderTreeChrome.h:
+ (DumpRenderTreeChrome):
+
2012-04-17 Christophe Dumez <[email protected]>
[EFL] DRT should support LayoutTestController's dumpFrameLoadCallbacks()
Modified: trunk/Tools/DumpRenderTree/efl/DumpRenderTreeChrome.cpp (114380 => 114381)
--- trunk/Tools/DumpRenderTree/efl/DumpRenderTreeChrome.cpp 2012-04-17 15:20:29 UTC (rev 114380)
+++ trunk/Tools/DumpRenderTree/efl/DumpRenderTreeChrome.cpp 2012-04-17 15:37:03 UTC (rev 114381)
@@ -90,22 +90,13 @@
ewk_view_theme_set(view, DATA_DIR"/default.edj");
evas_object_smart_callback_add(view, "load,started", onLoadStarted, 0);
+ evas_object_smart_callback_add(view, "load,finished", onLoadFinished, 0);
evas_object_smart_callback_add(view, "title,changed", onTitleChanged, 0);
evas_object_smart_callback_add(view, "window,object,cleared", onWindowObjectCleared, m_gcController.get());
evas_object_smart_callback_add(view, "statusbar,text,set", onStatusbarTextSet, 0);
evas_object_smart_callback_add(view, "load,document,finished", onDocumentLoadFinished, 0);
evas_object_smart_callback_add(view, "resource,request,willsend", onWillSendRequest, 0);
- evas_object_smart_callback_add(view, "onload,event", onWebViewOnloadEvent, 0);
- evas_object_smart_callback_add(view, "mixedcontent,run", onInsecureContentRun, 0);
- evas_object_smart_callback_add(view, "mixedcontent,displayed", onInsecureContentDisplayed, 0);
- evas_object_smart_callback_add(view, "frame,created", onFrameCreated, 0);
- Evas_Object* mainFrame = ewk_view_frame_main_get(view);
- evas_object_smart_callback_add(mainFrame, "load,provisional", onFrameProvisionalLoad, 0);
- evas_object_smart_callback_add(mainFrame, "load,committed", onFrameLoadCommitted, 0);
- evas_object_smart_callback_add(mainFrame, "load,finished", onFrameLoadFinished, 0);
- evas_object_smart_callback_add(mainFrame, "load,error", onFrameLoadError, 0);
-
return view;
}
@@ -240,16 +231,24 @@
topLoadingFrame = frame;
}
-Eina_Bool DumpRenderTreeChrome::processWork(void*)
+Eina_Bool DumpRenderTreeChrome::processWork(void* data)
{
+ Evas_Object* frame = static_cast<Evas_Object*>(data);
+
if (WorkQueue::shared()->processWork() && !gLayoutTestController->waitToDump())
dump();
return ECORE_CALLBACK_CANCEL;
}
-void DumpRenderTreeChrome::topLoadingFrameLoadFinished()
+void DumpRenderTreeChrome::onLoadFinished(void*, Evas_Object* view, void*)
{
+ // FIXME: we actually need the frame related to this event
+ Evas_Object* frame = ewk_view_frame_main_get(view);
+
+ if (topLoadingFrame != frame)
+ return;
+
topLoadingFrame = 0;
WorkQueue::shared()->setFrozen(true);
@@ -257,7 +256,7 @@
return;
if (WorkQueue::shared()->count())
- ecore_idler_add(processWork, 0 /*frame*/);
+ ecore_idler_add(processWork, frame);
else
dump();
}
@@ -315,81 +314,3 @@
request->url = ""
}
}
-
-void DumpRenderTreeChrome::onWebViewOnloadEvent(void*, Evas_Object*, void* eventInfo)
-{
- const Evas_Object* frame = static_cast<Evas_Object*>(eventInfo);
-
- if (!done && gLayoutTestController->dumpFrameLoadCallbacks()) {
- const String frameName(DumpRenderTreeSupportEfl::suitableDRTFrameName(frame));
- printf("%s - didHandleOnloadEventsForFrame\n", frameName.utf8().data());
- }
-}
-
-void DumpRenderTreeChrome::onInsecureContentRun(void*, Evas_Object*, void*)
-{
- if (!done && gLayoutTestController->dumpFrameLoadCallbacks())
- printf("didRunInsecureContent\n");
-}
-
-void DumpRenderTreeChrome::onInsecureContentDisplayed(void*, Evas_Object*, void*)
-{
- if (!done && gLayoutTestController->dumpFrameLoadCallbacks())
- printf("didDisplayInsecureContent\n");
-}
-
-void DumpRenderTreeChrome::onFrameCreated(void*, Evas_Object*, void* eventInfo)
-{
- Evas_Object* frame = static_cast<Evas_Object*>(eventInfo);
-
- evas_object_smart_callback_add(frame, "load,provisional", onFrameProvisionalLoad, 0);
- evas_object_smart_callback_add(frame, "load,committed", onFrameLoadCommitted, 0);
- evas_object_smart_callback_add(frame, "load,finished", onFrameLoadFinished, 0);
- evas_object_smart_callback_add(frame, "load,error", onFrameLoadError, 0);
-}
-
-void DumpRenderTreeChrome::onFrameProvisionalLoad(void*, Evas_Object* frame, void*)
-{
- if (!done && gLayoutTestController->dumpFrameLoadCallbacks()) {
- const String frameName(DumpRenderTreeSupportEfl::suitableDRTFrameName(frame));
- printf("%s - didStartProvisionalLoadForFrame\n", frameName.utf8().data());
- }
-}
-
-void DumpRenderTreeChrome::onFrameLoadCommitted(void*, Evas_Object* frame, void*)
-{
- if (!done && gLayoutTestController->dumpFrameLoadCallbacks()) {
- const String frameName(DumpRenderTreeSupportEfl::suitableDRTFrameName(frame));
- printf("%s - didCommitLoadForFrame\n", frameName.utf8().data());
- }
-}
-
-void DumpRenderTreeChrome::onFrameLoadFinished(void*, Evas_Object* frame, void* eventInfo)
-{
- const Ewk_Frame_Load_Error* error = static_cast<Ewk_Frame_Load_Error*>(eventInfo);
-
- // EFL port emits both "load,finished" and "load,error" signals in error case.
- // Error case is therefore already handled in onFrameLoadError() and we don't need
- // to handle it here.
- if (error)
- return;
-
- if (!done && gLayoutTestController->dumpFrameLoadCallbacks()) {
- const String frameName(DumpRenderTreeSupportEfl::suitableDRTFrameName(frame));
- printf("%s - didFinishLoadForFrame\n", frameName.utf8().data());
- }
-
- if (frame == topLoadingFrame)
- topLoadingFrameLoadFinished();
-}
-
-void DumpRenderTreeChrome::onFrameLoadError(void*, Evas_Object* frame, void*)
-{
- if (!done && gLayoutTestController->dumpFrameLoadCallbacks()) {
- const String frameName(DumpRenderTreeSupportEfl::suitableDRTFrameName(frame));
- printf("%s - didFailLoadWithError\n", frameName.utf8().data());
- }
-
- if (frame == topLoadingFrame)
- topLoadingFrameLoadFinished();
-}
Modified: trunk/Tools/DumpRenderTree/efl/DumpRenderTreeChrome.h (114380 => 114381)
--- trunk/Tools/DumpRenderTree/efl/DumpRenderTreeChrome.h 2012-04-17 15:20:29 UTC (rev 114380)
+++ trunk/Tools/DumpRenderTree/efl/DumpRenderTreeChrome.h 2012-04-17 15:37:03 UTC (rev 114381)
@@ -68,7 +68,7 @@
static Eina_Bool processWork(void*);
- static void topLoadingFrameLoadFinished();
+ static void onLoadFinished(void*, Evas_Object*, void*);
static void onStatusbarTextSet(void*, Evas_Object*, void*);
@@ -77,22 +77,6 @@
static void onDocumentLoadFinished(void*, Evas_Object*, void*);
static void onWillSendRequest(void*, Evas_Object*, void*);
-
- static void onWebViewOnloadEvent(void*, Evas_Object*, void*);
-
- static void onInsecureContentRun(void*, Evas_Object*, void*);
-
- static void onInsecureContentDisplayed(void*, Evas_Object*, void*);
-
- static void onFrameCreated(void*, Evas_Object*, void*);
-
- static void onFrameProvisionalLoad(void*, Evas_Object*, void*);
-
- static void onFrameLoadCommitted(void*, Evas_Object*, void*);
-
- static void onFrameLoadFinished(void*, Evas_Object*, void*);
-
- static void onFrameLoadError(void*, Evas_Object*, void*);
};
#endif // DumpRenderTreeChrome_h
