<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[185188] trunk/Source/WebKit2</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/185188">185188</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-06-03 22:14:25 -0700 (Wed, 03 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[EFL] Implement window_object_cleared callback in EwkPageClient.
https://bugs.webkit.org/show_bug.cgi?id=145603
Patch by Hyungwook Lee <hyungwook.lee@navercorp.com> on 2015-06-03
Reviewed by Gyuyoung Kim.
We need to provide right timing for custom JS API that may need to work at the beginning of the page.
* UIProcess/API/efl/tests/extensions/extension_sample.cpp:
* WebProcess/InjectedBundle/API/efl/ewk_page.cpp:
(EwkPage::EwkPage):
(EwkPage::didStartProvisionalLoadForFrame):
(EwkPage::didClearWindowObjectForFrame):
(EwkPage::didFinishDocumentLoadForFrame):
* WebProcess/InjectedBundle/API/efl/ewk_page.h:
* WebProcess/InjectedBundle/API/efl/ewk_page_private.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIefltestsextensionsextension_samplecpp">trunk/Source/WebKit2/UIProcess/API/efl/tests/extensions/extension_sample.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleAPIeflewk_pagecpp">trunk/Source/WebKit2/WebProcess/InjectedBundle/API/efl/ewk_page.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleAPIeflewk_pageh">trunk/Source/WebKit2/WebProcess/InjectedBundle/API/efl/ewk_page.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleAPIeflewk_page_privateh">trunk/Source/WebKit2/WebProcess/InjectedBundle/API/efl/ewk_page_private.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (185187 => 185188)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-06-04 04:42:57 UTC (rev 185187)
+++ trunk/Source/WebKit2/ChangeLog 2015-06-04 05:14:25 UTC (rev 185188)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2015-06-03 Hyungwook Lee <hyungwook.lee@navercorp.com>
+
+ [EFL] Implement window_object_cleared callback in EwkPageClient.
+ https://bugs.webkit.org/show_bug.cgi?id=145603
+
+ Reviewed by Gyuyoung Kim.
+
+ We need to provide right timing for custom JS API that may need to work at the beginning of the page.
+
+ * UIProcess/API/efl/tests/extensions/extension_sample.cpp:
+ * WebProcess/InjectedBundle/API/efl/ewk_page.cpp:
+ (EwkPage::EwkPage):
+ (EwkPage::didStartProvisionalLoadForFrame):
+ (EwkPage::didClearWindowObjectForFrame):
+ (EwkPage::didFinishDocumentLoadForFrame):
+ * WebProcess/InjectedBundle/API/efl/ewk_page.h:
+ * WebProcess/InjectedBundle/API/efl/ewk_page_private.h:
+
</ins><span class="cx"> 2015-06-03 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Add SPI that returns the snapshot layer contents for a given back/forward list item
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIefltestsextensionsextension_samplecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/efl/tests/extensions/extension_sample.cpp (185187 => 185188)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/efl/tests/extensions/extension_sample.cpp 2015-06-04 04:42:57 UTC (rev 185187)
+++ trunk/Source/WebKit2/UIProcess/API/efl/tests/extensions/extension_sample.cpp 2015-06-04 05:14:25 UTC (rev 185188)
</span><span class="lines">@@ -48,13 +48,9 @@
</span><span class="cx"> {
</span><span class="cx"> pageLoadStarted = true;
</span><span class="cx"> }
</span><del>-
-void loadFinished(Ewk_Page* page, void* data)
</del><ins>+
+void windowObjectCleared(Ewk_Page* page, void* data)
</ins><span class="cx"> {
</span><del>- if (!pageLoadStarted)
- return;
- pageLoadStarted = false;
-
</del><span class="cx"> JSGlobalContextRef jsContext = ewk_page_js_global_context_get(page);
</span><span class="cx"> JSObjectRef windowObject = JSContextGetGlobalObject(jsContext);
</span><span class="cx">
</span><span class="lines">@@ -78,6 +74,13 @@
</span><span class="cx"> JSStringRelease(property);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void loadFinished(Ewk_Page* page, void* data)
+{
+ if (!pageLoadStarted)
+ return;
+ pageLoadStarted = false;
+}
+
</ins><span class="cx"> static Ewk_Page_Client pageClient;
</span><span class="cx">
</span><span class="cx"> static void pageAdded(Ewk_Page* page, void* data)
</span><span class="lines">@@ -85,6 +88,7 @@
</span><span class="cx"> pageClient.version = 1;
</span><span class="cx"> pageClient.data = data;
</span><span class="cx"> pageClient.load_started = loadStarted;
</span><ins>+ pageClient.window_object_cleared = windowObjectCleared;
</ins><span class="cx"> pageClient.load_finished = loadFinished;
</span><span class="cx">
</span><span class="cx"> ewk_page_client_register(page, &pageClient);
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleAPIeflewk_pagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/efl/ewk_page.cpp (185187 => 185188)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/efl/ewk_page.cpp 2015-06-04 04:42:57 UTC (rev 185187)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/efl/ewk_page.cpp 2015-06-04 05:14:25 UTC (rev 185188)
</span><span class="lines">@@ -62,7 +62,7 @@
</span><span class="cx"> 0, // didRemoveFrameFromHierarchy
</span><span class="cx"> 0, // didDisplayInsecureContentForFrame
</span><span class="cx"> 0, // didRunInsecureContentForFrame
</span><del>- 0, // didClearWindowObjectForFrame,
</del><ins>+ didClearWindowObjectForFrame,
</ins><span class="cx"> 0, // didCancelClientRedirectForFrame
</span><span class="cx"> 0, // willPerformClientRedirectForFrame
</span><span class="cx"> 0, // didHandleOnloadEventsForFrame
</span><span class="lines">@@ -109,6 +109,18 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void EwkPage::didClearWindowObjectForFrame(WKBundlePageRef, WKBundleFrameRef frame, WKBundleScriptWorldRef, const void* clientInfo)
+{
+ if (!WKBundleFrameIsMainFrame(frame))
+ return;
+
+ EwkPage* self = toEwkPage(clientInfo);
+ for (auto& it : self->m_clients) {
+ if (it->window_object_cleared)
+ it->window_object_cleared(self, it->data);
+ }
+}
+
</ins><span class="cx"> void EwkPage::didFinishDocumentLoadForFrame(WKBundlePageRef, WKBundleFrameRef frame, WKTypeRef*, const void* clientInfo)
</span><span class="cx"> {
</span><span class="cx"> if (!WKBundleFrameIsMainFrame(frame))
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleAPIeflewk_pageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/efl/ewk_page.h (185187 => 185188)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/efl/ewk_page.h 2015-06-04 04:42:57 UTC (rev 185187)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/efl/ewk_page.h 2015-06-04 05:14:25 UTC (rev 185188)
</span><span class="lines">@@ -57,6 +57,14 @@
</span><span class="cx"> void (*load_started)(EwkPage *page, void *data);
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * Callbacks to report window object cleared.
+ *
+ * @param page page that the JavaScript window object has been cleared
+ * @param data data of a page client
+ */
+ void (*window_object_cleared)(EwkPage *page, void *data);
+
+ /**
</ins><span class="cx"> * Callbacks to report load finished.
</span><span class="cx"> *
</span><span class="cx"> * @param page page to be finished
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleAPIeflewk_page_privateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/efl/ewk_page_private.h (185187 => 185188)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/efl/ewk_page_private.h 2015-06-04 04:42:57 UTC (rev 185187)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/efl/ewk_page_private.h 2015-06-04 05:14:25 UTC (rev 185188)
</span><span class="lines">@@ -43,6 +43,7 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> static void didStartProvisionalLoadForFrame(WKBundlePageRef, WKBundleFrameRef, WKTypeRef*, const void *);
</span><ins>+ static void didClearWindowObjectForFrame(WKBundlePageRef, WKBundleFrameRef, WKBundleScriptWorldRef, const void *);
</ins><span class="cx"> static void didFinishDocumentLoadForFrame(WKBundlePageRef, WKBundleFrameRef, WKTypeRef*, const void *);
</span><span class="cx">
</span><span class="cx"> WebKit::WebPage* m_page;
</span></span></pre>
</div>
</div>
</body>
</html>