Title: [230799] trunk/Source/WebCore
- Revision
- 230799
- Author
- utatane....@gmail.com
- Date
- 2018-04-19 05:47:33 -0700 (Thu, 19 Apr 2018)
Log Message
Unreviewed, build fix for Ubuntu LTS GCC
https://bugs.webkit.org/show_bug.cgi?id=184756
The variable name "windowProxy" (with auto&) conflicts with the function name "windowProxy".
* bindings/js/ScriptController.cpp:
(WebCore::ScriptController::updateDocument):
(WebCore::ScriptController::collectIsolatedContexts):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (230798 => 230799)
--- trunk/Source/WebCore/ChangeLog 2018-04-19 12:35:40 UTC (rev 230798)
+++ trunk/Source/WebCore/ChangeLog 2018-04-19 12:47:33 UTC (rev 230799)
@@ -1,3 +1,14 @@
+2018-04-19 Yusuke Suzuki <utatane....@gmail.com>
+
+ Unreviewed, build fix for Ubuntu LTS GCC
+ https://bugs.webkit.org/show_bug.cgi?id=184756
+
+ The variable name "windowProxy" (with auto&) conflicts with the function name "windowProxy".
+
+ * bindings/js/ScriptController.cpp:
+ (WebCore::ScriptController::updateDocument):
+ (WebCore::ScriptController::collectIsolatedContexts):
+
2018-04-19 Manuel Rego Casasnovas <r...@igalia.com>
Caret rendered at incorrect location inside empty table cell
Modified: trunk/Source/WebCore/bindings/js/ScriptController.cpp (230798 => 230799)
--- trunk/Source/WebCore/bindings/js/ScriptController.cpp 2018-04-19 12:35:40 UTC (rev 230798)
+++ trunk/Source/WebCore/bindings/js/ScriptController.cpp 2018-04-19 12:47:33 UTC (rev 230799)
@@ -383,9 +383,9 @@
void ScriptController::updateDocument()
{
- for (auto& windowProxy : windowProxy().jsWindowProxiesAsVector()) {
- JSLockHolder lock(windowProxy->world().vm());
- jsCast<JSDOMWindow*>(windowProxy->window())->updateDocument();
+ for (auto& jsWindowProxy : windowProxy().jsWindowProxiesAsVector()) {
+ JSLockHolder lock(jsWindowProxy->world().vm());
+ jsCast<JSDOMWindow*>(jsWindowProxy->window())->updateDocument();
}
}
@@ -427,9 +427,9 @@
void ScriptController::collectIsolatedContexts(Vector<std::pair<JSC::ExecState*, SecurityOrigin*>>& result)
{
- for (auto& windowProxy : windowProxy().jsWindowProxiesAsVector()) {
- auto* exec = windowProxy->window()->globalExec();
- auto* origin = &downcast<DOMWindow>(windowProxy->wrapped()).document()->securityOrigin();
+ for (auto& jsWindowProxy : windowProxy().jsWindowProxiesAsVector()) {
+ auto* exec = jsWindowProxy->window()->globalExec();
+ auto* origin = &downcast<DOMWindow>(jsWindowProxy->wrapped()).document()->securityOrigin();
result.append(std::make_pair(exec, origin));
}
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
