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

Side by Side Diff: webkit/port/bindings/v8/v8_proxy.cpp

Issue 41017: WebKit merge 41498:41530. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: address darin's comments Created 11 years, 9 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2008, Google Inc. 1 // Copyright (c) 2008, Google Inc.
2 // All rights reserved. 2 // 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 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
125 #include "Range.h" 125 #include "Range.h"
126 #include "RangeException.h" 126 #include "RangeException.h"
127 #include "Rect.h" 127 #include "Rect.h"
128 #include "RGBColor.h" 128 #include "RGBColor.h"
129 #include "Screen.h" 129 #include "Screen.h"
130 #include "ScriptExecutionContext.h" 130 #include "ScriptExecutionContext.h"
131 #include "SecurityOrigin.h" 131 #include "SecurityOrigin.h"
132 #include "Settings.h" 132 #include "Settings.h"
133 #include "StyleSheet.h" 133 #include "StyleSheet.h"
134 #include "StyleSheetList.h" 134 #include "StyleSheetList.h"
135 #include "SVGColor.h"
136 #include "SVGPaint.h"
135 #include "TextEvent.h" 137 #include "TextEvent.h"
136 #include "TextMetrics.h" 138 #include "TextMetrics.h"
137 #include "TimeRanges.h" 139 #include "TimeRanges.h"
138 #include "TreeWalker.h" 140 #include "TreeWalker.h"
139 #include "XMLHttpRequest.h" 141 #include "XMLHttpRequest.h"
140 #include "XMLHttpRequestUpload.h" 142 #include "XMLHttpRequestUpload.h"
141 #include "XMLHttpRequestException.h" 143 #include "XMLHttpRequestException.h"
142 #include "XMLSerializer.h" 144 #include "XMLSerializer.h"
143 #include "XPathException.h" 145 #include "XPathException.h"
144 #include "XPathExpression.h" 146 #include "XPathExpression.h"
(...skipping 3373 matching lines...) Expand 10 before | Expand all | Expand 10 after
3518 } 3520 }
3519 return ToWebCoreString(v8::Debug::Call(frame_source_name)); 3521 return ToWebCoreString(v8::Debug::Call(frame_source_name));
3520 } 3522 }
3521 3523
3522 void V8Proxy::RegisterExtension(v8::Extension* extension) { 3524 void V8Proxy::RegisterExtension(v8::Extension* extension) {
3523 v8::RegisterExtension(extension); 3525 v8::RegisterExtension(extension);
3524 m_extensions.push_back(extension); 3526 m_extensions.push_back(extension);
3525 } 3527 }
3526 3528
3527 } // namespace WebCore 3529 } // namespace WebCore
OLDNEW
« no previous file with comments | « webkit/glue/webframeloaderclient_impl.cc ('k') | webkit/tools/layout_tests/test_lists/tests_fixable.txt » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698