Skip to content
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

Merged
merged 1 commit into from
Jan 29, 2020

Conversation

pavelfeldman
Copy link
Member

@pavelfeldman pavelfeldman commented Jan 29, 2020

@@ -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)
Copy link
Member

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?

Copy link
Member Author

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.

Copy link
Member

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);
Copy link
Member

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.

Copy link
Member Author

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.

@@ -39,12 +41,15 @@
#include "CustomHeaderFields.h"
@@ -40,12 +42,15 @@
#include "DOMWrapperWorld.h"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

revert?

@pavelfeldman pavelfeldman merged commit 87abfe0 into microsoft:master Jan 29, 2020
@pavelfeldman pavelfeldman deleted the be_roll_29 branch January 29, 2020 22:46
sand4rt pushed a commit to sand4rt/playwright that referenced this pull request Dec 21, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants