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

8253356: JavaFX Terminology Refresh #368

Closed
Closed
Changes from all commits
Commits
File filter
Filter file types
Jump to
Jump to file
Failed to load files.

Always

Just for now

@@ -29,7 +29,7 @@ jbs=jdk
tags=(jdk-){0,1}([1-9]([0-9]*)(\.(0|[1-9][0-9]*)){0,3})(\+(([0-9]+))|(-ga))|[1-9]((\.\d{1,3}){0,2})-((b\d{2,3})|(ga))|[1-9]u(\d{1,3})-((b\d{2,3})|(ga))

[checks]
error=blacklist,author,reviewers,merge,message,issues,whitespace,executable
error=author,reviewers,merge,message,issues,whitespace,executable

[census]
version=0
@@ -36,7 +36,7 @@ jar {
//exclude 'META-INF/*'
}

// Merge the Apache Lucene jars into our master jar.
// Merge the Apache Lucene jars into our main jar.
jar.doLast() {
ant.zip(destfile: jar.archivePath, update: true, duplicate: "preserve") {
zipgroupfileset(dir: new File("./lib"), includes:"*.jar")
@@ -54,18 +54,13 @@
* These methods can be used to uniquely identify a particular build
* for internal test and deployment:
*
* The method getHudsonJobName() will returns the name of the hudson job.
* For example, a master build will have the name as "presidio", and a
* graphics-scrum will have the name as "presidio-graphics" and so for.
* An empty string is returned if the build isn't build on Hudson, such as a
* The method getHudsonJobName() returns the name of the Hudson job.
* An empty string is returned if the build isn't built on Hudson, such as a
* local build on a developer machine.
*
* The method getHudsonBuildNumber() will returns the number of the hudson job
* on a particular build scrum. The job number is sequentially incremented for
* each build job.
* For example, a master build job number of 25 was built before master job
* number 26.
* A string of zeros is returned if the build isn't build on Hudson, such as a
* The method getHudsonBuildNumber() returns the number of the Hudson build
* for a particular job.
* A string of zeros is returned if the build isn't built on Hudson, such as a
* local build on a developer machine.
*
* The method getBuildTimestamp() will returns the timestamp of the build.
@@ -103,9 +103,9 @@ private void recalculate(Shape v0, Shape v1) {
geom1 = new Geometry(v1);
float tvals0[] = geom0.getTvals();
float tvals1[] = geom1.getTvals();
float masterTvals[] = mergeTvals(tvals0, tvals1);
geom0.setTvals(masterTvals);
geom1.setTvals(masterTvals);
float combinedTvals[] = mergeTvals(tvals0, tvals1);
geom0.setTvals(combinedTvals);
geom1.setTvals(combinedTvals);
}

private Shape getShape(float fraction) {
@@ -64,7 +64,7 @@
import com.sun.javafx.runtime.async.AsyncOperationListener;
import com.sun.javafx.scene.text.TextLayoutFactory;
import com.sun.scenario.DelayedRunnable;
import com.sun.scenario.animation.AbstractMasterTimer;
import com.sun.scenario.animation.AbstractPrimaryTimer;
import com.sun.scenario.effect.FilterContext;
import com.sun.scenario.effect.Filterable;

@@ -282,7 +282,7 @@ public boolean isNestedLoopRunning() {
}

@Override
public AbstractMasterTimer getMasterTimer() {
public AbstractPrimaryTimer getPrimaryTimer() {
return null;
}

@@ -89,7 +89,7 @@
import com.sun.javafx.sg.prism.NGNode;
import com.sun.javafx.util.Utils;
import com.sun.scenario.DelayedRunnable;
import com.sun.scenario.animation.AbstractMasterTimer;
import com.sun.scenario.animation.AbstractPrimaryTimer;
import com.sun.scenario.effect.AbstractShadow.ShadowMode;
import com.sun.scenario.effect.Color4f;
import com.sun.scenario.effect.FilterContext;
@@ -715,7 +715,7 @@ protected static final double clampStopOffset(double offset) {
public abstract boolean isForwardTraversalKey(KeyEvent e);
public abstract boolean isBackwardTraversalKey(KeyEvent e);

public abstract AbstractMasterTimer getMasterTimer();
public abstract AbstractPrimaryTimer getPrimaryTimer();

public abstract FontLoader getFontLoader();
public abstract TextLayoutFactory getTextLayoutFactory();
@@ -90,7 +90,7 @@ public void run() {
public abstract boolean isPerfLoggingEnabled();

public final long nanoTime() {
return Toolkit.getToolkit().getMasterTimer().nanos();
return Toolkit.getToolkit().getPrimaryTimer().nanos();
}

private static final class PerformanceTrackerDefaultImpl
@@ -30,7 +30,7 @@
import com.sun.javafx.tk.Toolkit;
import com.sun.scenario.DelayedRunnable;
import com.sun.scenario.Settings;
import com.sun.scenario.animation.AbstractMasterTimer;
import com.sun.scenario.animation.AbstractPrimaryTimer;
import com.sun.scenario.animation.AnimationPulse;

/**
@@ -42,21 +42,21 @@
*
* For now it is hidden until we have some use to expose it.
*/
public final class MasterTimer extends AbstractMasterTimer {
public final class PrimaryTimer extends AbstractPrimaryTimer {

/** Prevent external instantiation of MasterTimer */
private MasterTimer() {
/** Prevent external instantiation of PrimaryTimer */
private PrimaryTimer() {
}

private static final Object MASTER_TIMER_KEY = new StringBuilder(
"MasterTimerKey");
private static final Object PRIMARY_TIMER_KEY = new StringBuilder(
"PrimaryTimerKey");

public static synchronized MasterTimer getInstance() {
public static synchronized PrimaryTimer getInstance() {
Map<Object, Object> contextMap = Toolkit.getToolkit().getContextMap();
MasterTimer instance = (MasterTimer) contextMap.get(MASTER_TIMER_KEY);
PrimaryTimer instance = (PrimaryTimer) contextMap.get(PRIMARY_TIMER_KEY);
if (instance == null) {
instance = new MasterTimer();
contextMap.put(MASTER_TIMER_KEY, instance);
instance = new PrimaryTimer();
contextMap.put(PRIMARY_TIMER_KEY, instance);
if (Settings.getBoolean(ANIMATION_MBEAN_ENABLED,
enableAnimationMBean)) {
AnimationPulse.getDefaultBean().setEnabled(true);
@@ -125,7 +125,7 @@
import com.sun.prism.impl.Disposer;
import com.sun.prism.impl.PrismSettings;
import com.sun.scenario.DelayedRunnable;
import com.sun.scenario.animation.AbstractMasterTimer;
import com.sun.scenario.animation.AbstractPrimaryTimer;
import com.sun.scenario.effect.FilterContext;
import com.sun.scenario.effect.Filterable;
import com.sun.scenario.effect.impl.prism.PrFilterContext;
@@ -365,7 +365,7 @@ void runToolkit() {
try {
Application.invokeAndWait(this.userRunnable);

if (getMasterTimer().isFullspeed()) {
if (getPrimaryTimer().isFullspeed()) {
/*
* FULLSPEED_INTVERVAL workaround
*
@@ -1129,8 +1129,8 @@ public Shape createStrokedShape(Shape shape,
return PrFilterContext.getInstance(screen);
}

@Override public AbstractMasterTimer getMasterTimer() {
return MasterTimer.getInstance();
@Override public AbstractPrimaryTimer getPrimaryTimer() {
return PrimaryTimer.getInstance();
}

@Override public FontLoader getFontLoader() {
@@ -42,16 +42,16 @@
// Entries must be in lowercase and null string is a wild card
// For Linux Beta release we will limit es2 pipe qualification check to NVidia GPUs only
private GLGPUInfo preQualificationFilter[] = null;
private GLGPUInfo blackList[] = null;
private GLGPUInfo rejectList[] = null;

@Override
GLGPUInfo[] getPreQualificationFilter() {
return preQualificationFilter;
}

@Override
GLGPUInfo[] getBlackList() {
return blackList;
GLGPUInfo[] getRejectList() {
return rejectList;
}

@Override
@@ -42,16 +42,16 @@

// Entries must be in lowercase and null string is a wild card
private GLGPUInfo preQualificationFilter[] = null;
private GLGPUInfo blackList[] = null;
private GLGPUInfo rejectList[] = null;

@Override
GLGPUInfo[] getPreQualificationFilter() {
return preQualificationFilter;
}

@Override
GLGPUInfo[] getBlackList() {
return blackList;
GLGPUInfo[] getRejectList() {
return rejectList;
}

@Override
@@ -133,8 +133,8 @@ static GLFactory getFactory() throws RuntimeException {
// A null preQualificationFilter implies we may consider any GPU
abstract GLGPUInfo[] getPreQualificationFilter();

// Consists of a list of GPUs that we will block from using the es2 pipe.
abstract GLGPUInfo[] getBlackList();
// Consists of a list of GPUs that we will not use for the es2 pipe.
abstract GLGPUInfo[] getRejectList();

private static GLGPUInfo readGPUInfo(long nativeCtxInfo) {
String glVendor = nGetGLVendor(nativeCtxInfo);
@@ -163,14 +163,13 @@ private boolean inPreQualificationFilter(GLGPUInfo gpuInfo) {
return matches(gpuInfo, preQualificationFilter);
}

private boolean inBlackList(GLGPUInfo gpuInfo) {
return matches(gpuInfo, getBlackList());
private boolean inRejectList(GLGPUInfo gpuInfo) {
return matches(gpuInfo, getRejectList());
}

boolean isQualified(long nativeCtxInfo) {
// Read the GPU (graphics hardware) information and qualifying it by
// checking against the preQualificationFilter and the "blocking"
// blackLis.
// checking against the preQualificationFilter and the rejectList.
GLGPUInfo gpuInfo = readGPUInfo(nativeCtxInfo);

if (gpuInfo.vendor == null || gpuInfo.model == null
@@ -181,7 +180,7 @@ boolean isQualified(long nativeCtxInfo) {
return false;
}

return inPreQualificationFilter(gpuInfo) && !inBlackList(gpuInfo);
return inPreQualificationFilter(gpuInfo) && !inRejectList(gpuInfo);
}

abstract GLContext createGLContext(long nativeCtxInfo);
@@ -40,10 +40,10 @@
}

/**
* Check this GPU information against an entry stored in the whiteList and
* blackList of ES2Qualifier
* Check this GPU information against an entry stored in the preQualificationFilter and
* rejectList of ES2Qualifier
*
* @param gi entry stored in the whiteList or blackList of ES2Qualifier
* @param gi entry stored in the preQualificationFilter or rejectList of ES2Qualifier
* @return true if sub-string matches otherwise false
*/
boolean matches(GLGPUInfo gi) {
@@ -37,7 +37,7 @@
// Entries must be in lowercase and null string is a wild card
private GLGPUInfo preQualificationFilter[] = null;

private GLGPUInfo blackList[] = {
private GLGPUInfo rejectList[] = {
};

@Override
@@ -46,8 +46,8 @@
}

@Override
GLGPUInfo[] getBlackList() {
return blackList;
GLGPUInfo[] getRejectList() {
return rejectList;
}

@Override
@@ -39,7 +39,7 @@

// These are older GPUs that users have reported problem in using the es2 pipe.
// We don't have these units in-house to verify or maintain.
private GLGPUInfo blackList[] = {
private GLGPUInfo rejectList[] = {
new GLGPUInfo("ati", "radeon x1600 opengl engine"),
new GLGPUInfo("ati", "radeon x1900 opengl engine"),
new GLGPUInfo("intel", "gma x3100 opengl engine")
@@ -51,8 +51,8 @@
}

@Override
GLGPUInfo[] getBlackList() {
return blackList;
GLGPUInfo[] getRejectList() {
return rejectList;
}

@Override
@@ -46,7 +46,7 @@
// Entries must be in lowercase and null string is a wild card
// For Linux Beta release we will limit es2 pipe qualification check to NVidia GPUs only
private GLGPUInfo preQualificationFilter[] = null;
private GLGPUInfo blackList[] = null;
private GLGPUInfo rejectList[] = null;

private AcceleratedScreen accScreen = null;

@@ -56,8 +56,8 @@
}

@Override
GLGPUInfo[] getBlackList() {
return blackList;
GLGPUInfo[] getRejectList() {
return rejectList;
}

@Override
@@ -37,16 +37,16 @@

// Entries must be in lowercase and null string is a wild card
private GLGPUInfo preQualificationFilter[] = null;
private GLGPUInfo blackList[] = null;
private GLGPUInfo rejectList[] = null;

@Override
GLGPUInfo[] getPreQualificationFilter() {
return preQualificationFilter;
}

@Override
GLGPUInfo[] getBlackList() {
return blackList;
GLGPUInfo[] getRejectList() {
return rejectList;
}

@Override
@@ -48,7 +48,7 @@
new GLGPUInfo("x.org", null)
};

private GLGPUInfo blackList[] = {
private GLGPUInfo rejectList[] = {
new GLGPUInfo("ati", "radeon x1300"),
new GLGPUInfo("ati", "radeon x1350"),
new GLGPUInfo("ati", "radeon x1400"),
@@ -97,8 +97,8 @@
}

@Override
GLGPUInfo[] getBlackList() {
return blackList;
GLGPUInfo[] getRejectList() {
return rejectList;
}

@Override
@@ -52,10 +52,10 @@
static {
SETTINGS_KEY = new StringBuilder("SettingsKey");

// It seems no longer necessary to force loading of MasterTimer to pick
// It seems no longer necessary to force loading of PrimaryTimer to pick
// up the hi-res timer workaround. Also, this is causing some init
// order problems (RT-5572), so it's being commented out.
// Object obj = ToolkitAccessor.getMasterTimer();
// Object obj = ToolkitAccessor.getPrimaryTimer();
}

private static synchronized Settings getInstance() {
ProTip! Use n and p to navigate between commits in a pull request.