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

Side by Side Diff: WebKit/chromium/src/WebScriptController.cpp

Issue 3453022: Merge 68061 - 2010-09-22 Matt Perry <mpcomplete@chromium.org>... (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/517/
Patch Set: Created 10 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 | « WebKit/chromium/src/FrameLoaderClientImpl.cpp ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 25 matching lines...) Expand all
36 #include "V8Proxy.h" 36 #include "V8Proxy.h"
37 37
38 #include "WebString.h" 38 #include "WebString.h"
39 39
40 using namespace WebCore; 40 using namespace WebCore;
41 41
42 namespace WebKit { 42 namespace WebKit {
43 43
44 void WebScriptController::registerExtension(v8::Extension* extension) 44 void WebScriptController::registerExtension(v8::Extension* extension)
45 { 45 {
46 V8Proxy::registerExtension(extension, WebString()); 46 V8Proxy::registerExtension(extension);
47 } 47 }
48 48
49 void WebScriptController::registerExtension(v8::Extension* extension, 49 void WebScriptController::registerExtension(v8::Extension* extension,
50 const WebString& schemeRestriction) 50 const WebString& schemeRestriction)
51 { 51 {
52 V8Proxy::registerExtension(extension, schemeRestriction); 52 V8Proxy::registerExtension(extension, schemeRestriction);
53 } 53 }
54 54
55 void WebScriptController::registerExtension(v8::Extension* extension, 55 void WebScriptController::registerExtension(v8::Extension* extension,
56 int extensionGroup) 56 int extensionGroup)
57 { 57 {
58 V8Proxy::registerExtension(extension, extensionGroup); 58 V8Proxy::registerExtension(extension, extensionGroup);
59 } 59 }
60 60
61 void WebScriptController::enableV8SingleThreadMode() 61 void WebScriptController::enableV8SingleThreadMode()
62 { 62 {
63 enableStringImplCache(); 63 enableStringImplCache();
64 enableFasterDOMStoreAccess(); 64 enableFasterDOMStoreAccess();
65 } 65 }
66 66
67 void WebScriptController::flushConsoleMessages() 67 void WebScriptController::flushConsoleMessages()
68 { 68 {
69 WebCore::V8Proxy::processConsoleMessages(); 69 WebCore::V8Proxy::processConsoleMessages();
70 } 70 }
71 71
72 } // namespace WebKit 72 } // namespace WebKit
OLDNEW
« no previous file with comments | « WebKit/chromium/src/FrameLoaderClientImpl.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698