summaryrefslogtreecommitdiffstats
path: root/webkit/webkit.gyp
Commit message (Collapse)AuthorAgeFilesLines
* Moving ShowContextMenu out of WebView_delegate and into WebViewClientyaar@chromium.org2009-10-091-0/+1
| | | | | | | | (Part of the Webkit API refactoring effort). Review URL: http://codereview.chromium.org/265011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28567 0039d316-1c4b-4281-b951-d872f2087c98
* AppCache StorageAPIsmichaeln@google.com2009-10-091-0/+8
| | | | | | | | | TEST=none yet, these are just API definitions stubbed out for now BUG=none Review URL: http://codereview.chromium.org/209071 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28513 0039d316-1c4b-4281-b951-d872f2087c98
* Add pieces needed by upcoming memory purge implementation:pkasting@chromium.org2009-10-071-0/+2
| | | | | | | | | | | * Get/set object cache disabled state * Add accessor for CrossOriginPreflightResultCache BUG=23400 TEST=none Review URL: http://codereview.chromium.org/257057 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28299 0039d316-1c4b-4281-b951-d872f2087c98
* Stop glue from exporting webcore headers.thestig@chromium.org2009-10-071-3/+0
| | | | | | | | BUG=10051 TEST=none Review URL: http://codereview.chromium.org/255100 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28282 0039d316-1c4b-4281-b951-d872f2087c98
* Move MediaPlayerAction to WebMediaPlayerAction. Switch to an enum and adarin@chromium.org2009-10-071-0/+1
| | | | | | | | | | | | boolean to express the action. R=ajwong BUG=10033 TEST=none Review URL: http://codereview.chromium.org/251103 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28236 0039d316-1c4b-4281-b951-d872f2087c98
* Implement NPN_GetValueForURL and NPN_SetValueForURL and add a stub for ↵jam@chromium.org2009-10-071-3/+0
| | | | | | | | | NPN_GetAuthenticationInfo. With these NPAPI functions there's no need to simulate being in Firefox and implement NPN_GetValue for NPNVserviceManager. TEST=run manual test that Ken added in test\data\plugin over http Review URL: http://codereview.chromium.org/251101 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28200 0039d316-1c4b-4281-b951-d872f2087c98
* Move runFileChooser from webview_delegate to WebViewClient.yaar@chromium.org2009-10-061-0/+3
| | | | | | | | More details here: http://code.google.com/p/chromium/issues/detail?id=23385 Review URL: http://codereview.chromium.org/259031 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28134 0039d316-1c4b-4281-b951-d872f2087c98
* Implementation of application cache update algorithm.jennb@chromium.org2009-10-061-0/+2
| | | | | | | | | | | Does not include storage nor processing of pending master entries. TEST=verify update functionality BUG=none Review URL: http://codereview.chromium.org/201070 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28123 0039d316-1c4b-4281-b951-d872f2087c98
* DevTools: fix 'devtools.html' generation on Linux.mnaganov@chromium.org2009-10-061-0/+3
| | | | | | | | | BUG=23858 TEST=interactive_ui_tests Review URL: http://codereview.chromium.org/256076 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28102 0039d316-1c4b-4281-b951-d872f2087c98
* Add comments setting emacs and vim tab width and expansion variables.sgk@google.com2009-10-061-0/+6
| | | | | | | | BUG=none TEST=successful builds Review URL: http://codereview.chromium.org/256059 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28089 0039d316-1c4b-4281-b951-d872f2087c98
* Ported Chrome's WebGL implementation to Linux. Required changes tokbr@google.com2009-10-051-0/+1
| | | | | | | | | | | | | | GLEW's bootstrapping sequence on both X11 and Windows platforms to avoid linking against libGL.so.1 directly due to http://crbug.com/16800 . Made GLEW's inclusion of glu.h optional. Tested on Linux, Mac and Windows. BUG=http://crbug.com/21852 TEST=none (runs existing WebGL tests; more coming) Review URL: http://codereview.chromium.org/258024 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28062 0039d316-1c4b-4281-b951-d872f2087c98
* Exposes WebCore's FontCache through the webkit APIjamesr@chromium.org2009-10-051-0/+2
| | | | | | | | | | | WebCore has a static FontCache that holds handles to platform-specific font data. It exposes a few knobs that might be useful to track or minimize memory usage. This patch exposes an API to experiment with. TEST=none BUG=none Review URL: http://codereview.chromium.org/251081 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28021 0039d316-1c4b-4281-b951-d872f2087c98
* DevTools: auto-generate devtools.html from WebKit's inspector.htmlmnaganov@chromium.org2009-10-051-19/+46
| | | | | | | | | BUG=21685 TEST=none Review URL: http://codereview.chromium.org/243078 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27980 0039d316-1c4b-4281-b951-d872f2087c98
* Another stab at the Chromium side of storage events. Re-submission of ↵jorlow@chromium.org2009-10-031-0/+5
| | | | | | | | | | | | | | | | | http://src.chromium.org/viewvc/chrome?view=rev&revision=27756 with slight changes in dom_storage_dispatch er_host.cc TBR=darin TEST=Manually inspected that storage events fired. Will turn on more layout tests in a subsequent patch. BUG=19972 Original review URL: http://codereview.chromium.org/223013 Review URL: http://codereview.chromium.org/258010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27943 0039d316-1c4b-4281-b951-d872f2087c98
* Move the clipboard stuff out of base and into app/clipboard. I renamedbrettw@chromium.org2009-10-031-0/+1
| | | | | | | | | | | clipboard_util to clipboard_util_win since it's Windows-only. This patch makes test_shell depend on app as well. There should be no logic change. TEST=none BUG=none Review URL: http://codereview.chromium.org/260003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27937 0039d316-1c4b-4281-b951-d872f2087c98
* Ported Chrome's WebGL implementation to Mac OS X. Removed code whichkbr@google.com2009-10-021-1/+8
| | | | | | | | | | | | | used the GPU to vertically flip the framebuffer. Updated GLEW to use standard dlopen / dlsym rather than deprecated mach-o/dyld functions; updated README.chromium. BUG=http://crbug.com/21852 TEST=none (runs existing WebGL tests; more coming) Review URL: http://codereview.chromium.org/256037 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27902 0039d316-1c4b-4281-b951-d872f2087c98
* SocketStreamHandle implementation (skelton) for chromium.ukai@chromium.org2009-10-021-0/+1
| | | | | | | | | BUG=12497 TEST=none Review URL: http://codereview.chromium.org/256010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27835 0039d316-1c4b-4281-b951-d872f2087c98
* Reverting 27756.jorlow@chromium.org2009-10-011-5/+0
| | | | | | Review URL: http://codereview.chromium.org/249058 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27759 0039d316-1c4b-4281-b951-d872f2087c98
* Another stab at the Chromium side of storage events. The WebKit side can be ↵jorlow@chromium.org2009-10-011-0/+5
| | | | | | | | | | | found here: https://bugs.webkit.org/show_bug.cgi?id=29655 TEST=Manually inspected that storage events fired. Will turn on more layout tests in a subsequent patch. BUG=19972 Review URL: http://codereview.chromium.org/223013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27756 0039d316-1c4b-4281-b951-d872f2087c98
* Hook up webkit/api/public/WebView.hdarin@chromium.org2009-09-301-0/+1
| | | | | | | | | | | | | | This change does not completely eliminate webkit/glue/webview.h. Instead, the old WebView extends from the new WebView temporarily as we complete the transition. R=dglazkov BUG=10033 TEST=none Review URL: http://codereview.chromium.org/257001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27620 0039d316-1c4b-4281-b951-d872f2087c98
* One part of http://codereview.chromium.org/223013/showjorlow@chromium.org2009-09-301-0/+1
| | | | | | | | | | | Split so it's not a 2 sided patch. TEST=none BUG=none Review URL: http://codereview.chromium.org/242056 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27575 0039d316-1c4b-4281-b951-d872f2087c98
* Incorporated initial WebGL implementation for Chrome, currentlykbr@google.com2009-09-281-0/+23
| | | | | | | | | | | | | | | | | disabled in the build. Change ENABLE_3D_CANVAS to 1 in src/third_party/WebKit/WebKit/chromium/features.gypi and regenerate project files to compile. Current code is Windows-specific and requires the sandbox to be disabled. Follow-on work will add ports to other platforms and eventually work with the sandbox enabled. This CL follows https://bugs.webkit.org/show_bug.cgi?id=29664 . BUG=http://code.google.com/p/chromium/issues/detail?id=21852 TEST=none (runs preexisting WebGL layout tests; more coming) Review URL: http://codereview.chromium.org/219001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27404 0039d316-1c4b-4281-b951-d872f2087c98
* Downstreamed v8 extension building & webkit_chromium_port flagyaar@chromium.org2009-09-241-0/+16
| | | | | | | | | | 1. Downstreamed building webkit/extension/v8/*.cc files, which were built by upstream webcore by mistake. Now glue will build them. I tested that even though webcore still builds them, there are no errors if glue also builds them. 2. Added webkit_chromium_port variable to build/common.gypi which is turned off by default. Currently, nothing uses it but the chrome port will need it. Review URL: http://codereview.chromium.org/220026 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27122 0039d316-1c4b-4281-b951-d872f2087c98
* Upstreamings parts of webkit.gyp (step 3)yaar@chromium.org2009-09-231-3/+3
| | | | | | | | | | | | | | | | This is step 3 a multi-step process that is part of the webkit chromium port. This step includes: A. Removal of features.gypi, webcore.gyp and javascriptcore.gyp. All three now live upstream on webkit. B. Changing downstream dependencies to point at new upstream gyp files. Remaining steps: * Implement a mechanism to allow downstream override of upstream features.gypi. Will be part of the upstream chromium build mechanism. Review URL: http://codereview.chromium.org/212050 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27000 0039d316-1c4b-4281-b951-d872f2087c98
* Rolling back 26904, didn't take chrome branding into account.bradnelson@google.com2009-09-231-14/+21
| | | | | | | | | | BUG=None TEST=None TBR=sgk Review URL: http://codereview.chromium.org/219007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26906 0039d316-1c4b-4281-b951-d872f2087c98
* Changing the grd files in chrome/webkit/app to be compiled to sepratebradnelson@google.com2009-09-231-21/+14
| | | | | | | | | | | | | | | | directories to prevent them from stomping each other when they have names that are the same. Also adding some dependencies on theme_resources, webkit_resources, that were missing, but undetected due to everyone sharing the same output directory. BUG=22385 TEST=None Review URL: http://codereview.chromium.org/208056 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26904 0039d316-1c4b-4281-b951-d872f2087c98
* Move FTP LIST parsing code to the renderer process.phajdan.jr@chromium.org2009-09-221-0/+2
| | | | | | | | | TEST=none BUG=none Review URL: http://codereview.chromium.org/210027 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26860 0039d316-1c4b-4281-b951-d872f2087c98
* Refactor the DB code to make it accessible from test_shell.dumi@chromium.org2009-09-221-0/+13
| | | | | | | | | BUG=21442 TEST=none Review URL: http://codereview.chromium.org/203074 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26855 0039d316-1c4b-4281-b951-d872f2087c98
* Enable webkit.gyp compiler warnings on mac only.tony@chromium.org2009-09-221-0/+8
| | | | | | | | | | | Linux fails in opt build due to strict aliasing in WebCore. BUG=21140 Review URL: http://codereview.chromium.org/215040 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26831 0039d316-1c4b-4281-b951-d872f2087c98
* Rolling back change 26798. Didn't catch all the missing dependencies.bradnelson@google.com2009-09-221-9/+12
| | | | | | | | | | BUG=None TEST=None TBR=sgk Review URL: http://codereview.chromium.org/210038 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26799 0039d316-1c4b-4281-b951-d872f2087c98
* Fixing up webkit_strings and webkit_resources to use grit scanner to decidebradnelson@google.com2009-09-221-12/+9
| | | | | | | | | | | | | inputs and outputs. Also changing these to so that they don't collide as in issue 22385. BUG=22385 TEST=None TBR=sgk Review URL: http://codereview.chromium.org/217013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26798 0039d316-1c4b-4281-b951-d872f2087c98
* Disable warnings on linux too. opt build is failing.tony@chromium.org2009-09-211-7/+0
| | | | | | | | | TBR=evan Review URL: http://codereview.chromium.org/216040 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26733 0039d316-1c4b-4281-b951-d872f2087c98
* Disable compiler warnings on mac. Some crept in since the last time.tony@chromium.org2009-09-211-1/+1
| | | | | | | | | | | Will fix offline. TBR=mark Review URL: http://codereview.chromium.org/215037 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26732 0039d316-1c4b-4281-b951-d872f2087c98
* Enable compiler -Werror and -Wall on our webkit code for mac and linux.tony@chromium.org2009-09-211-0/+7
| | | | | | | | | | | | | | | | | This fixes some initialization order, removes unused varibles, and fixes a couple signed/unsigned comparison errors. Please check the signed/unsigned cases. We can't enable it for windows yet because MSVC complains about headers pulled in from WebCore. We'll have to wait until the API is upstreamed. BUG=21140 Review URL: http://codereview.chromium.org/214024 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26728 0039d316-1c4b-4281-b951-d872f2087c98
* DevTools: Get rid of utility functions and ExecuteUtilityFunction as a ↵pfeldman@chromium.org2009-09-211-1/+0
| | | | | | | | whole. Eliminates the need in double-JSON of InjectedScript-related functions. Review URL: http://codereview.chromium.org/201017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26684 0039d316-1c4b-4281-b951-d872f2087c98
* Fold WebEditingClient into WebViewClient.darin@chromium.org2009-09-181-1/+0
| | | | | | | | | | R=dglazkov BUG=none TEST=none Review URL: http://codereview.chromium.org/211032 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26631 0039d316-1c4b-4281-b951-d872f2087c98
* Upstreamings parts of webkit.gyp (step 1)yaar@chromium.org2009-09-181-920/+6
| | | | | | | | | | | | | | | | | | This is step 1 a multi-step process that is part of the webkit chromium port. This step includes: A. Refactoring the wtf, pcre & webcore targets into separate files javascriptcore.gypi and webcore.gyp, which would eventually move upstream. B. Refactoring the feature_define variables into features.gypi, to allow two sets of feature defines - one for chromium port and one for chromium. C. Refactoring the config target into config.gyp, since currently both javascriptcore and webcore target depend on it. Next steps: 2. Eliminate config dependency. 3. Make features.gypi only override built-in variables that live upstream (so we don't have to maintain 2 parallel feature lists). 4. Really move webcore.gyp & javascriptcore.gyp to webkit.org Review URL: http://codereview.chromium.org/212003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26584 0039d316-1c4b-4281-b951-d872f2087c98
* Introduce WebKit::WebSecurityOrigin as a wrapper arounddarin@chromium.org2009-09-181-0/+2
| | | | | | | | | | | | | | | | | WebCore::SecurityOrigin. This provides us a little wiggle room in the future in case we ever want to provide more details about a security origin beyond just its stringified value. This was done on recommendation from Adam Barth. R=jorlow BUG=21967 TEST=none Review URL: http://codereview.chromium.org/211013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26554 0039d316-1c4b-4281-b951-d872f2087c98
* Check for supported schemes and examine request methods at key points. We ↵michaeln@google.com2009-09-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | support http, https, and file (dbg only) URLs for now. * Added IsSchemeSupported, IsMethodSupported and IsMethodAndSchemeSupported helpers, and string constants. * Check for supported schemes and methods during cache selection and during request interception. Must be GET for cache selectino, GET or HEAD for request interception. * Renamed some data members in WebApplicationCacheHostImpl to more closely match naming elsewhere. * Added AppCacheHost::Observer to make life easier. (I like the observer model, and even noticed that the chrome code base has a multi-threaded version too (ala Gears)... nice :) * Switched to using the observer model in AppCacheRequestDispatcher instead of a WeakPtr. One of the observable methods is OnDestructionImminent(host). * Added gyp dependency on the net library BUG=none TEST=none Review URL: http://codereview.chromium.org/205017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26537 0039d316-1c4b-4281-b951-d872f2087c98
* Revert change 26523 "Upstreamings parts of webkit.gyp (step 1)" because it ↵nsylvain@chromium.org2009-09-181-6/+920
| | | | | | | | breaks the mac webkit build badly. Review URL: http://codereview.chromium.org/210017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26525 0039d316-1c4b-4281-b951-d872f2087c98
* Upstreamings parts of webkit.gyp (step 1)yaar@chromium.org2009-09-171-920/+6
| | | | | | | | | | | | | | | | | | | | | | This is step 1 a multi-step process that is part of the webkit chromium port. This step includes: A. Refactoring the wtf, pcre & webcore targets into separate files javascriptcore.gypi and webcore.gyp, which would eventually move upstream. B. Refactoring the feature_define variables into features.gypi, to allow two sets of feature defines - one for chromium port and one for chromium. C. Refactoring the config target into config.gyp, since currently both javascriptcore and webcore target depend on it. Next steps: 2. Eliminate config dependency. 3. Make features.gypi only override built-in variables that live upstream (so we don't have to maintain 2 parallel feature lists). 4. Really move webcore.gyp & javascriptcore.gyp to webkit.org Review URL: http://codereview.chromium.org/212003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26523 0039d316-1c4b-4281-b951-d872f2087c98
* Add all locales to the appropriate generated file lists in .gyp files.thestig@chromium.org2009-09-171-14/+7
| | | | | | | | BUG=none TEST=none Review URL: http://codereview.chromium.org/208002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26494 0039d316-1c4b-4281-b951-d872f2087c98
* Bring the Mac Chromium render theme up to date and easier to keep merged. ↵avi@chromium.org2009-09-171-1/+11
| | | | | | | | | | | Chromium side of things. BUG=http://crbug.com/19604 TEST=no visible change on Leopard, draws correctly on Snow Leopard Review URL: http://codereview.chromium.org/173212 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26471 0039d316-1c4b-4281-b951-d872f2087c98
* Hook up WebViewClient, part 1.darin@chromium.org2009-09-161-0/+1
| | | | | | | | | | | | | | This change makes WebViewDelegate extend from WebViewClient as a temporary means to start having consumers implement and use WebViewClient. R=dglazkov BUG=10033 TEST=none Review URL: http://codereview.chromium.org/196128 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26355 0039d316-1c4b-4281-b951-d872f2087c98
* Force inclusion of build/common.gypi for all chromium gyp files.yaar@chromium.org2009-09-151-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | Why: Simpler build code. If everybody includes it, it should be included automatically. Why now: The webkit chromium builds need it be specified, since can't default to build/common.gypi. What was done: 1. build/common.gypi's contents were moved to a new file build/gyp_chromium.gypi 2. tools/gyp/gyp_chromium was moved to build/gyp_chromium and made to automatically include build/gyp_chromium.gypi. 3. lots of gyp files were fixed to not refer to build/common.gypi any more. 4. o3d which also builds independently of chrome, was fixed to have a gyp_o3d that includes gyp_chromium.gypi too. 5. build/common.gypi was left empty, because there are some external projects that still refer to it. Things that are left to do after this patch is in: 1. The following external files (in other repositories) need to stop include common.gypi ./third_party/hunspell/hunspell.gyp ./third_party/icu/icu.gyp ./v8/tools/gyp/v8.gyp 2. Once nobody refers to common.gypi anymore, delete common.gypi -or- Delete gyp_chromium.gypi and move its content back to common.gypi Tested on mac, win and linux. On win, got a few unit tests errors on chrome bookmarks, which should not be related. I'm running again with clobber to verify. Review URL: http://codereview.chromium.org/206006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26302 0039d316-1c4b-4281-b951-d872f2087c98
* Fix the Linux shared build.thestig@chromium.org2009-09-151-1/+2
| | | | | | | | BUG=none TEST=none Review URL: http://codereview.chromium.org/203076 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26291 0039d316-1c4b-4281-b951-d872f2087c98
* * Fleshed out AppCacheHost class a fair amount, in particular the cache ↵michaeln@google.com2009-09-151-0/+2
| | | | | | | | | | | | | | | | selection algorithm. * Added some AppCacheHost unit tests. * Introduced AppCacheRequestHandler class, which replaces the clunkyApp CacheInterceptor::ExtraInfo struct. This impl is entirely skeletal stubs for now. TEST=appcache_unittest.cc, but really needs more BUG=none Review URL: http://codereview.chromium.org/192043 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26275 0039d316-1c4b-4281-b951-d872f2087c98
* linux: drop my libxul hack; it didn't workevan@chromium.org2009-09-121-26/+0
| | | | | | | | | I think I misunderstood nspluginwrapper, and it didn't actually work on the machine I thought I had tested it on. Review URL: http://codereview.chromium.org/195075 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26071 0039d316-1c4b-4281-b951-d872f2087c98
* WTF and PCRE should use JavaScriptCore/config.h and WebCore should usemark@chromium.org2009-09-111-41/+1
| | | | | | | | | | | | | | | | WebCore/config.h. I cleaned up the config target in webkit.gyp so it doesn't copy config.h around. This way wtf/pcre and webcore each use the appropriate config file. Tested on mac/linux/win platforms. Patch by Yaar Schnitman <yaar@chromium.org> Code review URL: http://codereview.chromium.org/196098 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26053 0039d316-1c4b-4281-b951-d872f2087c98
* Modify our webkit code to make sure it does not call intonsylvain@chromium.org2009-09-111-2/+0
| | | | | | | | | | | glue directly. Everything now goes through webkitclient. This is the first step to be able to split webkit in its own dll. Review URL: http://codereview.chromium.org/196051 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25967 0039d316-1c4b-4281-b951-d872f2087c98