From 7c7dface993a66778c506179ae11cadd6a88f7b1 Mon Sep 17 00:00:00 2001 From: Mathias Agopian Date: Tue, 2 Jun 2009 22:51:09 -0700 Subject: [PATCH 1/2] fix a bug in GL lighting where the specular component could be ommited when vertex material was disabled. the specular enable flag wasn't computed in that case. --- opengl/libagl/light.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/opengl/libagl/light.cpp b/opengl/libagl/light.cpp index 25c41d0c5b9de..bc9449c0bdef8 100644 --- a/opengl/libagl/light.cpp +++ b/opengl/libagl/light.cpp @@ -318,6 +318,11 @@ void lightVertexMaterial(ogles_context_t* c, vertex_t* v) vmul3(l.implicitAmbient.v, material.ambient.v, l.ambient.v); vmul3(l.implicitDiffuse.v, material.diffuse.v, l.diffuse.v); vmul3(l.implicitSpecular.v, material.specular.v, l.specular.v); + // this is just a flag to tell if we have a specular component + l.implicitSpecular.v[3] = + l.implicitSpecular.r | + l.implicitSpecular.g | + l.implicitSpecular.b; } // emission and ambient for the whole scene vmla3( c->lighting.implicitSceneEmissionAndAmbient.v, From b9a39cd300998a1a4577ac7eb87f9b505b8621dc Mon Sep 17 00:00:00 2001 From: Guang Zhu Date: Wed, 3 Jun 2009 14:14:27 -0700 Subject: [PATCH 2/2] Adding missing callback onJsConfirm to dismiss any confirmation dialogs --- .../com/android/dumprendertree/ReliabilityTestActivity.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tests/DumpRenderTree/src/com/android/dumprendertree/ReliabilityTestActivity.java b/tests/DumpRenderTree/src/com/android/dumprendertree/ReliabilityTestActivity.java index a374a414c85d7..cbec104d1d61d 100644 --- a/tests/DumpRenderTree/src/com/android/dumprendertree/ReliabilityTestActivity.java +++ b/tests/DumpRenderTree/src/com/android/dumprendertree/ReliabilityTestActivity.java @@ -214,6 +214,12 @@ public class ReliabilityTestActivity extends Activity { return true; } + @Override + public boolean onJsConfirm(WebView view, String url, String message, JsResult result) { + result.confirm(); + return true; + } + @Override public boolean onJsPrompt(WebView view, String url, String message, String defaultValue, JsPromptResult result) {