-
Notifications
You must be signed in to change notification settings - Fork 3.8k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
browser(webkit): roll to WebKit ToT 1/29/2020 #737
Conversation
@@ -2719,9 +2710,12 @@ index d4e6b5d1f2151a1f4c16081b2695dd66da416ba2..7ddcea8b824043a6a17cfe2d209d861b | |||
+ m_frontendDispatcher->navigatedWithinDocument(frameId(&frame), url); | |||
} | |||
|
|||
-void InspectorPageAgent::didClearWindowObjectInWorld(Frame& frame) | |||
-void InspectorPageAgent::didClearWindowObjectInWorld(Frame& frame, DOMWrapperWorld& world) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why can't we use the same logic as upstream?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We should not eval bootstrap scripts in two different locations. And they should not do that either.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Agree with that, you can remove
if (&world != &mainThreadNormalWorld())
return;
check from this method and should work for us too with a smaller diff. Do you know btw why it's not evaluated in all worlds upstream?
+ | ||
+ // Create user worlds. | ||
+ for (auto pair : pageAgent->isolatedWorldScripts()) | ||
+ createIsolatedWorld(frame, pair.key, pair.value); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This code used to force creation of the isolated worlds for new frames. The new code will only initialize it if already exists. We need a code that ensures isolated worlds creation for new frames.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Worlds outlive navigation, notifyCreated will be called and it'll create our isolated world.
da2be9d
to
3820f92
Compare
@@ -39,12 +41,15 @@ | ||
#include "CustomHeaderFields.h" | ||
@@ -40,12 +42,15 @@ | ||
#include "DOMWrapperWorld.h" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
revert?
3820f92
to
6c09bdb
Compare
6c09bdb
to
24f25db
Compare
pavelfeldman/WebKit@3033a40pavelfeldman/WebKit@3941bf4