OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2009 Google Inc. All rights reserved. | 2 * Copyright (C) 2009 Google Inc. All rights reserved. |
3 * | 3 * |
4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
6 * met: | 6 * met: |
7 * | 7 * |
8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
(...skipping 861 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
872 } | 872 } |
873 | 873 |
874 v8::Handle<v8::Value> WebFrameImpl::executeScriptAndReturnValue(const WebScriptS
ource& source) | 874 v8::Handle<v8::Value> WebFrameImpl::executeScriptAndReturnValue(const WebScriptS
ource& source) |
875 { | 875 { |
876 ASSERT(frame()); | 876 ASSERT(frame()); |
877 | 877 |
878 // FIXME: This fake user gesture is required to make a bunch of pyauto | 878 // FIXME: This fake user gesture is required to make a bunch of pyauto |
879 // tests pass. If this isn't needed in non-test situations, we should | 879 // tests pass. If this isn't needed in non-test situations, we should |
880 // consider removing this code and changing the tests. | 880 // consider removing this code and changing the tests. |
881 // http://code.google.com/p/chromium/issues/detail?id=86397 | 881 // http://code.google.com/p/chromium/issues/detail?id=86397 |
882 UserGestureIndicator gestureIndicator(DefinitelyProcessingUserGesture); | 882 UserGestureIndicator gestureIndicator(DefinitelyProcessingNewUserGesture); |
883 | 883 |
884 TextPosition position(OrdinalNumber::fromOneBasedInt(source.startLine), Ordi
nalNumber::first()); | 884 TextPosition position(OrdinalNumber::fromOneBasedInt(source.startLine), Ordi
nalNumber::first()); |
885 return frame()->script()->executeScript(ScriptSourceCode(source.code, source
.url, position)).v8Value(); | 885 return frame()->script()->executeScript(ScriptSourceCode(source.code, source
.url, position)).v8Value(); |
886 } | 886 } |
887 | 887 |
888 void WebFrameImpl::executeScriptInIsolatedWorld(int worldID, const WebScriptSour
ce* sourcesIn, unsigned numSources, int extensionGroup, WebVector<v8::Local<v8::
Value> >* results) | 888 void WebFrameImpl::executeScriptInIsolatedWorld(int worldID, const WebScriptSour
ce* sourcesIn, unsigned numSources, int extensionGroup, WebVector<v8::Local<v8::
Value> >* results) |
889 { | 889 { |
890 ASSERT(frame()); | 890 ASSERT(frame()); |
891 | 891 |
892 Vector<ScriptSourceCode> sources; | 892 Vector<ScriptSourceCode> sources; |
(...skipping 1679 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2572 | 2572 |
2573 // There is a possibility that the frame being detached was the only | 2573 // There is a possibility that the frame being detached was the only |
2574 // pending one. We need to make sure final replies can be sent. | 2574 // pending one. We need to make sure final replies can be sent. |
2575 flushCurrentScopingEffort(m_findRequestIdentifier); | 2575 flushCurrentScopingEffort(m_findRequestIdentifier); |
2576 | 2576 |
2577 cancelPendingScopingEffort(); | 2577 cancelPendingScopingEffort(); |
2578 } | 2578 } |
2579 } | 2579 } |
2580 | 2580 |
2581 } // namespace WebKit | 2581 } // namespace WebKit |
OLD | NEW |