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

Side by Side Diff: third_party/WebKit/Source/web/WebPluginContainerImpl.cpp

Issue 2811793005: Rename LocalFrame::Script() to GetScriptController() (Closed)
Patch Set: Created 3 years, 8 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2009 Google Inc. All rights reserved. 2 * Copyright (C) 2009 Google Inc. All rights reserved.
3 * Copyright (C) 2014 Opera Software ASA. All rights reserved. 3 * Copyright (C) 2014 Opera Software ASA. All rights reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are 6 * modification, are permitted provided that the following conditions are
7 * met: 7 * met:
8 * 8 *
9 * * Redistributions of source code must retain the above copyright 9 * * Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 468 matching lines...) Expand 10 before | Expand all | Expand 10 after
479 element_, script, element_->GetDocument().Url(), OrdinalNumber())) { 479 element_, script, element_->GetDocument().Url(), OrdinalNumber())) {
480 return WebString(); 480 return WebString();
481 } 481 }
482 482
483 UserGestureIndicator gesture_indicator( 483 UserGestureIndicator gesture_indicator(
484 popups_allowed ? DocumentUserGestureToken::Create( 484 popups_allowed ? DocumentUserGestureToken::Create(
485 frame->GetDocument(), UserGestureToken::kNewGesture) 485 frame->GetDocument(), UserGestureToken::kNewGesture)
486 : nullptr); 486 : nullptr);
487 v8::HandleScope handle_scope(ToIsolate(frame)); 487 v8::HandleScope handle_scope(ToIsolate(frame));
488 v8::Local<v8::Value> result = 488 v8::Local<v8::Value> result =
489 frame->Script().ExecuteScriptInMainWorldAndReturnValue( 489 frame->GetScriptController().ExecuteScriptInMainWorldAndReturnValue(
490 ScriptSourceCode(script)); 490 ScriptSourceCode(script));
491 491
492 // Failure is reported as a null string. 492 // Failure is reported as a null string.
493 if (result.IsEmpty() || !result->IsString()) 493 if (result.IsEmpty() || !result->IsString())
494 return WebString(); 494 return WebString();
495 return ToCoreString(v8::Local<v8::String>::Cast(result)); 495 return ToCoreString(v8::Local<v8::String>::Cast(result));
496 } 496 }
497 497
498 void WebPluginContainerImpl::LoadFrameRequest(const WebURLRequest& request, 498 void WebPluginContainerImpl::LoadFrameRequest(const WebURLRequest& request,
499 const WebString& target) { 499 const WebString& target) {
(...skipping 495 matching lines...) Expand 10 before | Expand all | Expand 10 after
995 ComputeClipRectsForPlugin(element_, window_rect, clip_rect, 995 ComputeClipRectsForPlugin(element_, window_rect, clip_rect,
996 unobscured_rect); 996 unobscured_rect);
997 } 997 }
998 GetPluginOcclusions(element_, this->Parent(), FrameRect(), cut_out_rects); 998 GetPluginOcclusions(element_, this->Parent(), FrameRect(), cut_out_rects);
999 // Convert to the plugin position. 999 // Convert to the plugin position.
1000 for (size_t i = 0; i < cut_out_rects.size(); i++) 1000 for (size_t i = 0; i < cut_out_rects.size(); i++)
1001 cut_out_rects[i].Move(-FrameRect().X(), -FrameRect().Y()); 1001 cut_out_rects[i].Move(-FrameRect().X(), -FrameRect().Y());
1002 } 1002 }
1003 1003
1004 } // namespace blink 1004 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/web/WebLocalFrameImpl.cpp ('k') | third_party/WebKit/Source/web/tests/ActivityLoggerTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698