Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(81)

Side by Side Diff: content/renderer/render_frame_impl.h

Issue 518583003: Don't take a fake UGI every time we execute Javascript. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix styling Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « content/public/test/browser_test_utils.cc ('k') | content/renderer/render_frame_impl.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ 5 #ifndef CONTENT_RENDERER_RENDER_FRAME_IMPL_H_
6 #define CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ 6 #define CONTENT_RENDERER_RENDER_FRAME_IMPL_H_
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 499 matching lines...) Expand 10 before | Expand all | Expand 10 after
510 void OnDelete(); 510 void OnDelete();
511 void OnSelectAll(); 511 void OnSelectAll();
512 void OnSelectRange(const gfx::Point& start, const gfx::Point& end); 512 void OnSelectRange(const gfx::Point& start, const gfx::Point& end);
513 void OnUnselect(); 513 void OnUnselect();
514 void OnReplace(const base::string16& text); 514 void OnReplace(const base::string16& text);
515 void OnReplaceMisspelling(const base::string16& text); 515 void OnReplaceMisspelling(const base::string16& text);
516 void OnCSSInsertRequest(const std::string& css); 516 void OnCSSInsertRequest(const std::string& css);
517 void OnJavaScriptExecuteRequest(const base::string16& javascript, 517 void OnJavaScriptExecuteRequest(const base::string16& javascript,
518 int id, 518 int id,
519 bool notify_result); 519 bool notify_result);
520 void OnJavaScriptExecuteRequestForTests(const base::string16& javascript,
521 int id,
522 bool notify_result);
520 void OnSetEditableSelectionOffsets(int start, int end); 523 void OnSetEditableSelectionOffsets(int start, int end);
521 void OnSetCompositionFromExistingText( 524 void OnSetCompositionFromExistingText(
522 int start, int end, 525 int start, int end,
523 const std::vector<blink::WebCompositionUnderline>& underlines); 526 const std::vector<blink::WebCompositionUnderline>& underlines);
524 void OnExtendSelectionAndDelete(int before, int after); 527 void OnExtendSelectionAndDelete(int before, int after);
525 void OnReload(bool ignore_cache); 528 void OnReload(bool ignore_cache);
526 void OnTextSurroundingSelectionRequest(size_t max_length); 529 void OnTextSurroundingSelectionRequest(size_t max_length);
527 void OnAddStyleSheetByURL(const std::string& url); 530 void OnAddStyleSheetByURL(const std::string& url);
528 void OnSetupTransitionView(const std::string& markup); 531 void OnSetupTransitionView(const std::string& markup);
529 void OnBeginExitTransition(const std::string& css_selector); 532 void OnBeginExitTransition(const std::string& css_selector);
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
580 const base::string16& message, 583 const base::string16& message,
581 const base::string16& default_value, 584 const base::string16& default_value,
582 const GURL& frame_url, 585 const GURL& frame_url,
583 base::string16* result); 586 base::string16* result);
584 587
585 // Loads the appropriate error page for the specified failure into the frame. 588 // Loads the appropriate error page for the specified failure into the frame.
586 void LoadNavigationErrorPage(const blink::WebURLRequest& failed_request, 589 void LoadNavigationErrorPage(const blink::WebURLRequest& failed_request,
587 const blink::WebURLError& error, 590 const blink::WebURLError& error,
588 bool replace); 591 bool replace);
589 592
593 void HandleJavascriptExecutionResult(const base::string16& javascript,
594 int id,
595 bool notify_result,
596 v8::Handle<v8::Value> result);
597
590 // Initializes |web_user_media_client_|. If this fails, because it wasn't 598 // Initializes |web_user_media_client_|. If this fails, because it wasn't
591 // possible to create a MediaStreamClient (e.g., WebRTC is disabled), then 599 // possible to create a MediaStreamClient (e.g., WebRTC is disabled), then
592 // |web_user_media_client_| will remain NULL. 600 // |web_user_media_client_| will remain NULL.
593 void InitializeUserMediaClient(); 601 void InitializeUserMediaClient();
594 602
595 blink::WebMediaPlayer* CreateWebMediaPlayerForMediaStream( 603 blink::WebMediaPlayer* CreateWebMediaPlayerForMediaStream(
596 const blink::WebURL& url, 604 const blink::WebURL& url,
597 blink::WebMediaPlayerClient* client); 605 blink::WebMediaPlayerClient* client);
598 606
599 // Creates a factory object used for creating audio and video renderers. 607 // Creates a factory object used for creating audio and video renderers.
(...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after
733 #endif 741 #endif
734 742
735 base::WeakPtrFactory<RenderFrameImpl> weak_factory_; 743 base::WeakPtrFactory<RenderFrameImpl> weak_factory_;
736 744
737 DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl); 745 DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl);
738 }; 746 };
739 747
740 } // namespace content 748 } // namespace content
741 749
742 #endif // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ 750 #endif // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_
OLDNEW
« no previous file with comments | « content/public/test/browser_test_utils.cc ('k') | content/renderer/render_frame_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698