diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-18 12:40:26 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-18 12:40:26 +0000 |
| commit | d38f0991f8a25a28d86a96152158059578e82017 (patch) | |
| tree | 47c311ba665b31b43c63b9f8b8668d6a297a31cd /webkit | |
| parent | 4052c7343b977d7865405600d7e99b016f06dec4 (diff) | |
| download | chromium_src-d38f0991f8a25a28d86a96152158059578e82017.zip chromium_src-d38f0991f8a25a28d86a96152158059578e82017.tar.gz chromium_src-d38f0991f8a25a28d86a96152158059578e82017.tar.bz2 | |
Also scan .m and .mm files in checkdeps.py
- add necessary DEPS rules
- fix skia includes in test_shell to contain full path (third_party/skia/include/core/SkBitmap.h instead of just SkBitmap.h)
- remove forbidden chrome/common include from app/resource_bundle_mac.mm
Review URL: http://codereview.chromium.org/113147
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@16273 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/tools/DEPS | 4 | ||||
| -rw-r--r-- | webkit/tools/test_shell/simple_clipboard_impl.cc | 2 | ||||
| -rw-r--r-- | webkit/tools/test_shell/test_shell.cc | 2 | ||||
| -rw-r--r-- | webkit/tools/test_shell/test_shell_mac.mm | 2 |
4 files changed, 7 insertions, 3 deletions
diff --git a/webkit/tools/DEPS b/webkit/tools/DEPS index ef02b16..84a57f5 100644 --- a/webkit/tools/DEPS +++ b/webkit/tools/DEPS @@ -1,4 +1,8 @@ include_rules = [
"+chrome/common",
"+skia/ext",
+
+ # Allow inclusion of WebKit mac headers.
+ # This may need to be cleaned up, see http://crbug.com/12149
+ "+mac",
]
diff --git a/webkit/tools/test_shell/simple_clipboard_impl.cc b/webkit/tools/test_shell/simple_clipboard_impl.cc index 264dfa5..bb58c8b 100644 --- a/webkit/tools/test_shell/simple_clipboard_impl.cc +++ b/webkit/tools/test_shell/simple_clipboard_impl.cc @@ -12,7 +12,7 @@ #include "googleurl/src/gurl.h" #include "webkit/glue/scoped_clipboard_writer_glue.h" -#include "SkBitmap.h" +#include "third_party/skia/include/core/SkBitmap.h" // Clipboard glue diff --git a/webkit/tools/test_shell/test_shell.cc b/webkit/tools/test_shell/test_shell.cc index ef5e8e7..bb609ca 100644 --- a/webkit/tools/test_shell/test_shell.cc +++ b/webkit/tools/test_shell/test_shell.cc @@ -43,7 +43,7 @@ #include "webkit/tools/test_shell/test_navigation_controller.h" #include "webkit/tools/test_shell/test_shell_switches.h" -#include "SkBitmap.h" +#include "third_party/skia/include/core/SkBitmap.h" namespace { diff --git a/webkit/tools/test_shell/test_shell_mac.mm b/webkit/tools/test_shell/test_shell_mac.mm index 5be826d..c7a4a53 100644 --- a/webkit/tools/test_shell/test_shell_mac.mm +++ b/webkit/tools/test_shell/test_shell_mac.mm @@ -42,7 +42,7 @@ #include "webkit/tools/test_shell/simple_resource_loader_bridge.h" #include "webkit/tools/test_shell/test_navigation_controller.h" -#import "third_party/skia/include/core/SkBitmap.h" +#include "third_party/skia/include/core/SkBitmap.h" #import "mac/DumpRenderTreePasteboard.h" |