Title: [197238] trunk/Source/WebKit2
- Revision
- 197238
- Author
- [email protected]
- Date
- 2016-02-26 22:09:55 -0800 (Fri, 26 Feb 2016)
Log Message
Fix GTK and maybe EFL build after r197172.
Unreviewed.
* CMakeLists.txt:
* UIProcess/API/gtk/WebKitUserContent.cpp:
(_WebKitUserScript::_WebKitUserScript):
* WebProcess/UserContent/WebUserContentController.cpp:
(WebKit::WebUserContentController::removeUserContentWorld):
(WebKit::WebUserContentController::addUserScripts):
(WebKit::WebUserContentController::removeUserScript):
(WebKit::WebUserContentController::removeAllUserScripts):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/CMakeLists.txt (197237 => 197238)
--- trunk/Source/WebKit2/CMakeLists.txt 2016-02-27 06:09:37 UTC (rev 197237)
+++ trunk/Source/WebKit2/CMakeLists.txt 2016-02-27 06:09:55 UTC (rev 197238)
@@ -403,6 +403,7 @@
UIProcess/API/APISessionState.cpp
UIProcess/API/APIUserContentExtension.cpp
UIProcess/API/APIUserContentExtensionStore.cpp
+ UIProcess/API/APIUserContentWorld.cpp
UIProcess/API/APIWebsiteDataStore.cpp
UIProcess/API/APIWindowFeatures.cpp
Modified: trunk/Source/WebKit2/ChangeLog (197237 => 197238)
--- trunk/Source/WebKit2/ChangeLog 2016-02-27 06:09:37 UTC (rev 197237)
+++ trunk/Source/WebKit2/ChangeLog 2016-02-27 06:09:55 UTC (rev 197238)
@@ -1,5 +1,20 @@
2016-02-26 Michael Catanzaro <[email protected]>
+ Fix GTK and maybe EFL build after r197172.
+
+ Unreviewed.
+
+ * CMakeLists.txt:
+ * UIProcess/API/gtk/WebKitUserContent.cpp:
+ (_WebKitUserScript::_WebKitUserScript):
+ * WebProcess/UserContent/WebUserContentController.cpp:
+ (WebKit::WebUserContentController::removeUserContentWorld):
+ (WebKit::WebUserContentController::addUserScripts):
+ (WebKit::WebUserContentController::removeUserScript):
+ (WebKit::WebUserContentController::removeAllUserScripts):
+
+2016-02-26 Michael Catanzaro <[email protected]>
+
[GTK] Fix order of parameters in gtkdoc for webkit_web_view_get_snapshot
Unreviewed.
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitUserContent.cpp (197237 => 197238)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitUserContent.cpp 2016-02-27 06:09:37 UTC (rev 197237)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitUserContent.cpp 2016-02-27 06:09:55 UTC (rev 197238)
@@ -179,7 +179,7 @@
String::fromUTF8(source), URL { },
toStringVector(whitelist), toStringVector(blacklist),
toUserScriptInjectionTime(injectionTime),
- toUserContentInjectedFrames(injectedFrames) })))
+ toUserContentInjectedFrames(injectedFrames) }, API::UserContentWorld::normalWorld())))
, referenceCount(1)
{
}
Modified: trunk/Source/WebKit2/WebProcess/UserContent/WebUserContentController.cpp (197237 => 197238)
--- trunk/Source/WebKit2/WebProcess/UserContent/WebUserContentController.cpp 2016-02-27 06:09:37 UTC (rev 197237)
+++ trunk/Source/WebKit2/WebProcess/UserContent/WebUserContentController.cpp 2016-02-27 06:09:55 UTC (rev 197238)
@@ -112,7 +112,7 @@
auto it = worldMap().find(worldIdentifier);
if (it == worldMap().end()) {
- WTFLogAlways("Trying to remove a UserContentWorld (id=%llu) that is does not exist.", worldIdentifier);
+ WTFLogAlways("Trying to remove a UserContentWorld (id=%" PRIu64 ") that is does not exist.", worldIdentifier);
return;
}
@@ -127,7 +127,7 @@
for (const auto& userScriptWorldPair : userScripts) {
auto it = worldMap().find(userScriptWorldPair.first);
if (it == worldMap().end()) {
- WTFLogAlways("Trying to add a UserScript to a UserContentWorld (id=%llu) that does not exist.", userScriptWorldPair.first);
+ WTFLogAlways("Trying to add a UserScript to a UserContentWorld (id=%" PRIu64 ") that does not exist.", userScriptWorldPair.first);
continue;
}
@@ -139,7 +139,7 @@
{
auto it = worldMap().find(worldIdentifier);
if (it == worldMap().end()) {
- WTFLogAlways("Trying to remove a UserScript from a UserContentWorld (id=%llu) that does not exist.", worldIdentifier);
+ WTFLogAlways("Trying to remove a UserScript from a UserContentWorld (id=%" PRIu64 ") that does not exist.", worldIdentifier);
return;
}
@@ -150,7 +150,7 @@
{
auto it = worldMap().find(worldIdentifier);
if (it == worldMap().end()) {
- WTFLogAlways("Trying to remove all UserScripts from a UserContentWorld (id=%llu) that does not exist.", worldIdentifier);
+ WTFLogAlways("Trying to remove all UserScripts from a UserContentWorld (id=%" PRIu64 ") that does not exist.", worldIdentifier);
return;
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
