Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 411c77df authored by Android (Google) Code Review's avatar Android (Google) Code Review Committed by The Android Open Source Project
Browse files

am 5de674e1: Merge change 3013 into donut 

Merge commit '5de674e1'

* commit '5de674e1':
  Adding missing callback onJsConfirm to dismiss any confirmation dialogs
  fix a bug in GL lighting where the specular component could be ommited when vertex material was disabled.
parents a6cfdb1c 5de674e1

opengl/libagl/light.cpp

+5 −0
Original line number Diff line number Diff line
@@ -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,

tests/DumpRenderTree/src/com/android/dumprendertree/ReliabilityTestActivity.java

+6 −0
Original line number Diff line number Diff line
@@ -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) {