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

8240218: IOS Webkit implementation broken #128

Closed
wants to merge 3 commits into from

Conversation

@johanvos
Copy link
Collaborator

@johanvos johanvos commented Feb 28, 2020

Make modifications to javafx.web files for iOS, so that it can compile again.

Fix for JDK-8240218


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed

Issue

Reviewers

  • Kevin Rushforth (kcr - Reviewer)

Download

$ git fetch https://git.openjdk.java.net/jfx pull/128/head:pull/128
$ git checkout pull/128

…e again.

Fix for JDK-8240218
@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Feb 28, 2020

👋 Welcome back jvos! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request.

@openjdk openjdk bot added the rfr label Feb 28, 2020
@mlbridge
Copy link

@mlbridge mlbridge bot commented Feb 28, 2020

Webrevs

Copy link
Member

@kevinrushforth kevinrushforth left a comment

The HTMLEditorSkin class needs to move to match the package declaration. The rest looks fine.

@@ -23,7 +23,7 @@
* questions.
*/

package com.sun.javafx.scene.web.skin;
package javafx.scene.web;

This comment has been minimized.

@kevinrushforth

kevinrushforth Feb 28, 2020
Member

The package and the file location no longer match. I think the file needs to move to modules/javafx.web/src/ios/java/javafx/scene/web/skin/HTMLEditorSkin.java .

@kevinrushforth
Copy link
Member

@kevinrushforth kevinrushforth commented Feb 28, 2020

It's still not in the right place.

@openjdk
Copy link

@openjdk openjdk bot commented Feb 28, 2020

@johanvos This change now passes all automated pre-integration checks. When the change also fulfills all project specific requirements, type /integrate in a new comment to proceed. After integration, the commit message will be:

8240218: IOS Webkit implementation broken

Reviewed-by: kcr
  • If you would like to add a summary, use the /summary command.
  • To credit additional contributors, use the /contributor command.
  • To add additional solved issues, use the /solves command.

➡️ To integrate this PR with the above commit message, type /integrate in a new comment.

@openjdk openjdk bot added the ready label Feb 28, 2020
@johanvos
Copy link
Collaborator Author

@johanvos johanvos commented Feb 28, 2020

/integrate

@openjdk openjdk bot closed this Feb 28, 2020
@openjdk openjdk bot added integrated and removed ready labels Feb 28, 2020
@openjdk
Copy link

@openjdk openjdk bot commented Feb 28, 2020

@johanvos
Pushed as commit 20328b3.

@openjdk openjdk bot removed the rfr label Feb 28, 2020
@mlbridge
Copy link

@mlbridge mlbridge bot commented Feb 28, 2020

Mailing list message from Johan Vos on openjfx-dev:

Changeset: 20328b3
Author: Johan Vos <jvos at openjdk.org>
Date: 2020-02-28 16:20:49 +0000
URL: https://git.openjdk.java.net/jfx/commit/20328b38

8240218: IOS Webkit implementation broken

Reviewed-by: kcr

+ modules/javafx.web/src/ios/java/com/sun/java/scene/web/WebViewHelper.java
! modules/javafx.web/src/ios/java/com/sun/javafx/scene/web/behavior/HTMLEditorBehavior.java
- modules/javafx.web/src/ios/java/com/sun/javafx/scene/web/skin/HTMLEditorSkin.java
! modules/javafx.web/src/ios/java/javafx/scene/web/HTMLEditor.java
+ modules/javafx.web/src/ios/java/javafx/scene/web/HTMLEditorSkin.java
! modules/javafx.web/src/ios/java/javafx/scene/web/WebView.java
+ modules/javafx.web/src/ios/java/module-info.java

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants
You can’t perform that action at this time.