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

8240247: No longer need to wrap files with contentContainer #2203

Closed
wants to merge 1 commit into from

Conversation

aivanov-jdk
Copy link
Member

@aivanov-jdk aivanov-jdk commented Jan 22, 2021

JDK-8231144 wrapped the contents of plain HTML documents into <div class="contentContainer"> to apply the styles and add the margins around the content for a consistent look.

This is no longer necessary after JDK-8239817 was fixed.

These documents looks fine without being wrapped. So this fix basically undoes changes under JDK-8231144 and removes the redundant <div> wrapper element.


Progress

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

Issue

  • JDK-8240247: No longer need to wrap files with contentContainer

Reviewers

Download

$ git fetch https://git.openjdk.java.net/jdk pull/2203/head:pull/2203
$ git checkout pull/2203

@bridgekeeper
Copy link

bridgekeeper bot commented Jan 22, 2021

👋 Welcome back aivanov! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

@openjdk openjdk bot added the rfr Pull request is ready for review label Jan 22, 2021
@openjdk
Copy link

openjdk bot commented Jan 22, 2021

@aivanov-jdk The following labels will be automatically applied to this pull request:

  • 2d
  • awt
  • swing

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing lists. If you would like to change these labels, use the /label pull request command.

@openjdk openjdk bot added 2d client-libs-dev@openjdk.org swing client-libs-dev@openjdk.org awt client-libs-dev@openjdk.org labels Jan 22, 2021
@mlbridge
Copy link

mlbridge bot commented Jan 22, 2021

Webrevs

mrserb
mrserb approved these changes Jan 22, 2021
@openjdk
Copy link

openjdk bot commented Jan 22, 2021

@aivanov-jdk This change now passes all automated pre-integration checks.

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

After integration, the commit message for the final commit will be:

8240247: No longer need to wrap files with contentContainer

Reviewed-by: serb

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been 15 new commits pushed to the master branch:

  • 5aca934: 8260304: (se) EPollSelectorImpl wakeup mechanism broken on Linux 32-bit
  • 53fecba: 8258805: Japanese characters not entered by mouse click on Windows 10
  • a887177: 8246788: ZoneRules invariants can be broken
  • 874aef4: 8259707: LDAP channel binding does not work with StartTLS extension
  • c5ad713: 8260250: Duplicate check in DebugInformationRecorder::recorders_frozen
  • bf5e801: 8259922: MethodHandles.collectArguments does not throw IAE if pos is outside the arity range
  • 0ea5862: 8260053: Optimize Tokens' use of Names
  • 18eb6d9: 8255348: NPE in PKIXCertPathValidator event logging code
  • a97f3c1: 8258853: Support separate function declaration and definition with ENABLE_IF-based SFINAE
  • 154e1d6: 8259009: G1 heap summary should be shown in "Heap Parameters" window on HSDB
  • ... and 5 more: https://git.openjdk.java.net/jdk/compare/d066f2b06c08d41e47cd7a4b1f047f40df1a5972...master

As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details.

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

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Jan 22, 2021
@aivanov-jdk
Copy link
Member Author

aivanov-jdk commented Jan 23, 2021

/integrate

@openjdk openjdk bot closed this Jan 23, 2021
@openjdk openjdk bot added integrated Pull request has been integrated and removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Jan 23, 2021
@openjdk
Copy link

openjdk bot commented Jan 23, 2021

@aivanov-jdk Since your change was applied there have been 25 commits pushed to the master branch:

  • 5cdcce1: 8260307: Do not include method.hpp in frame.hpp
  • 6f2a394: Merge
  • 685c03d: 8259271: gc/parallel/TestDynShrinkHeap.java still fails "assert(covered_region.contains(new_memregion)) failed: new region is not in covered_region"
  • d90e06a: 8259775: [Vector API] Incorrect code-gen for VectorReinterpret operation
  • ede1bea: 8227695: assert(pss->trim_ticks().seconds() == 0.0) failed: Unexpected partial trimming during evacuation
  • 62eab50: 8255199: Catching a few NumberFormatExceptions in xmldsig
  • a5367cb: 8247619: Improve Direct Buffering of Characters
  • aa57d07: 8259214: MetaspaceClosure support for Arrays of MetaspaceObj
  • bdc305e: 8258917: NativeMemoryTracking is handled by launcher inconsistenly
  • 7be9113: 8255216: Change _directive->BreakAtCompileOption to env()->break_at_compile()
  • ... and 15 more: https://git.openjdk.java.net/jdk/compare/d066f2b06c08d41e47cd7a4b1f047f40df1a5972...master

Your commit was automatically rebased without conflicts.

Pushed as commit f624dba.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

@aivanov-jdk aivanov-jdk deleted the JDK-8240247 branch Feb 18, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
2d client-libs-dev@openjdk.org awt client-libs-dev@openjdk.org integrated Pull request has been integrated swing client-libs-dev@openjdk.org
2 participants