From e18a2c3b29338a65e45046ccb82b77dd92b505a5 Mon Sep 17 00:00:00 2001 From: Phil Race Date: Mon, 8 Sep 2014 09:07:59 -0700 Subject: [PATCH] 8056209: Remove unused files for libawt Reviewed-by: erikj, ihse, serb --- jdk/make/lib/Awt2dLibraries.gmk | 2 - .../sun/awt/windows/WBufferStrategy.java | 49 --------------- .../libawt/sun/java2d/d3d/D3DPipeline.cpp | 40 ------------- .../libawt/sun/windows/WBufferStrategy.cpp | 60 ------------------- 4 files changed, 151 deletions(-) delete mode 100644 jdk/src/java.desktop/windows/classes/sun/awt/windows/WBufferStrategy.java delete mode 100644 jdk/src/java.desktop/windows/native/libawt/sun/java2d/d3d/D3DPipeline.cpp delete mode 100644 jdk/src/java.desktop/windows/native/libawt/sun/windows/WBufferStrategy.cpp diff --git a/jdk/make/lib/Awt2dLibraries.gmk b/jdk/make/lib/Awt2dLibraries.gmk index e5161a35552..fa74e6e3694 100644 --- a/jdk/make/lib/Awt2dLibraries.gmk +++ b/jdk/make/lib/Awt2dLibraries.gmk @@ -217,10 +217,8 @@ ifeq ($(OPENJDK_TARGET_OS), windows) -I$(JDK_OUTPUTDIR)/gensrc_headers/java.base \ # LIBAWT_EXFILES += \ - sun/java2d/d3d/D3DPipeline.cpp \ sun/java2d/d3d/D3DShaderGen.c \ sun/awt/image/cvutils/img_colors.c \ - sun/windows/WBufferStrategy.cpp \ # LIBAWT_LANG := C++ diff --git a/jdk/src/java.desktop/windows/classes/sun/awt/windows/WBufferStrategy.java b/jdk/src/java.desktop/windows/classes/sun/awt/windows/WBufferStrategy.java deleted file mode 100644 index 372b3ccf6d8..00000000000 --- a/jdk/src/java.desktop/windows/classes/sun/awt/windows/WBufferStrategy.java +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the LICENSE file that accompanied this code. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ - - -package sun.awt.windows; - -import java.awt.Image; -import java.awt.Component; - -/** - * This sun-private class exists solely to get a handle to - * the back buffer associated with a Component. If that - * Component has a BufferStrategy with >1 buffer, then the - * Image subclass associated with that buffer will be returned. - * Note: the class is used by the JAWT3d. - */ -public final class WBufferStrategy { - - private static native void initIDs(Class componentClass); - - static { - initIDs(Component.class); - } - - public static native Image getDrawBuffer(Component comp); - -} diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/java2d/d3d/D3DPipeline.cpp b/jdk/src/java.desktop/windows/native/libawt/sun/java2d/d3d/D3DPipeline.cpp deleted file mode 100644 index 16e9e2209d7..00000000000 --- a/jdk/src/java.desktop/windows/native/libawt/sun/java2d/d3d/D3DPipeline.cpp +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright (c) 2007, 2008, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the LICENSE file that accompanied this code. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ - -#include "D3DPipeline.h" - -BOOL APIENTRY DllMain( HANDLE hModule, - DWORD ul_reason_for_call, - LPVOID lpReserved) -{ - switch (ul_reason_for_call) { - case DLL_PROCESS_ATTACH: - case DLL_THREAD_ATTACH: - case DLL_THREAD_DETACH: - case DLL_PROCESS_DETACH: - break; - } - return TRUE; -} diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/WBufferStrategy.cpp b/jdk/src/java.desktop/windows/native/libawt/sun/windows/WBufferStrategy.cpp deleted file mode 100644 index daf24f3d54f..00000000000 --- a/jdk/src/java.desktop/windows/native/libawt/sun/windows/WBufferStrategy.cpp +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the LICENSE file that accompanied this code. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ - -#include "sun_awt_windows_WBufferStrategy.h" -#include "jni_util.h" - - -static jmethodID getBackBufferID; - -/* - * Class: sun_awt_windows_WBufferStrategy - * Method: initIDs - * Signature: (Ljava/lang/Class;)V - */ -JNIEXPORT void JNICALL -Java_sun_awt_windows_WBufferStrategy_initIDs(JNIEnv *env, jclass wbs, - jclass componentClass) -{ - getBackBufferID = env->GetMethodID(componentClass, "getBackBuffer", - "()Ljava/awt/Image;"); -} - -/** - * Native method of WBufferStrategy.java. Given a Component - * object, this method will find the back buffer associated - * with the Component's BufferStrategy and return a handle - * to it. - */ -extern "C" JNIEXPORT jobject JNICALL -Java_sun_awt_windows_WBufferStrategy_getDrawBuffer(JNIEnv *env, jclass wbs, - jobject component) -{ - if (!JNU_IsNull(env, getBackBufferID)) { - return env->CallObjectMethod(component, getBackBufferID); - } else { - return NULL; - } -}