summaryrefslogtreecommitdiffstats
path: root/content/DEPS
diff options
context:
space:
mode:
authorjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-23 03:52:44 +0000
committerjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-23 03:52:44 +0000
commit2fdc43145c368024940eeff48e74d0bd13749799 (patch)
tree63f9aa5fcdfaa6d653ffe5a6a55e5941d04c06fa /content/DEPS
parentc1978abe9e90c9471994d744bc4f511bc116658d (diff)
downloadchromium_src-2fdc43145c368024940eeff48e74d0bd13749799.zip
chromium_src-2fdc43145c368024940eeff48e74d0bd13749799.tar.gz
chromium_src-2fdc43145c368024940eeff48e74d0bd13749799.tar.bz2
Revert 195688 "Enable touch based selection and editing for webp..."
This crashes on http://build.chromium.org/p/chromium.chromiumos/buildstatus?builder=Linux%20ChromiumOS%20Tests%20%28dbg%29%281%29&number=18415 and http://build.chromium.org/p/chromium.chromiumos/buildstatus?builder=Linux%20ChromiumOS%20Tests%20%28dbg%29%281%29%28Precise%29&number=2887 with: [ RUN ] RenderWidgetHostViewAuraTest.DestroyFullscreenOnBlur Xlib: extension "RANDR" missing on display ":9.0". Received signal 11 <unknown> 000000000000 [0x7fd160de519c] base::debug::StackTrace::StackTrace() [0x7fd160de4a46] base::debug::(anonymous namespace)::StackDumpSignalHandler() [0x7fd15c58a8f0] <unknown> [0x7fd162e9c56a] content::RenderWidgetHostViewAura::OnWindowFocused() [0x7fd16b555f92] aura::FocusManager::FocusWindow() [0x7fd16b56c3f1] aura::Window::Focus() [0x0000008830e8] content::RenderWidgetHostViewAuraTest_DestroyFullscreenOnBlur_Test::TestBody() [0x000000e9ec43] testing::internal::HandleSehExceptionsInMethodIfSupported<>() [0x000000e9c16e] testing::internal::HandleExceptionsInMethodIfSupported<>() [0x000000e910a6] testing::Test::Run() [0x000000e918ca] testing::TestInfo::Run() [0x000000e91ff8] testing::TestCase::Run() [0x000000e96fa3] testing::internal::UnitTestImpl::RunAllTests() [0x000000e9fa94] testing::internal::HandleSehExceptionsInMethodIfSupported<>() [0x000000e9c9b7] testing::internal::HandleExceptionsInMethodIfSupported<>() [0x000000e95a72] testing::UnitTest::Run() [0x000000e589f8] base::TestSuite::Run() [0x000000df11cc] content::UnitTestTestSuite::Run() [0x0000009f4e6a] main [0x7fd15a8b3c4d] __libc_start_main [0x0000005a4039] <unknown> r8: 000000000000005c r9: 0101010101010101 r10: 0000000000000000 r11: 00007fd15a91c03e r12: 0000000000000000 r13: 00007fffd00893b0 r14: 0000000000000000 r15: 0000000000000000 di: 00007fd157b720c8 si: 0000000000000000 bp: 00007fffd00889a0 bx: 0000000000000000 dx: 00000000000015b6 ax: cdcdcdcdcdcdcdcd cx: 0000000000000076 sp: 00007fffd0088760 ip: 00007fd162e9c56a efl: 0000000000010282 cgf: 0000000000000033 erf: 0000000000000000 trp: 000000000000000d msk: 0000000000000000 cr2: 0000000000000000 when relanding, please also patch in r195696 to fix the win aura components build failure > Enable touch based selection and editing for webpages behind a flag. > > BUG=115237 > > Review URL: https://chromiumcodereview.appspot.com/12321005 TBR=varunjain@chromium.org Review URL: https://codereview.chromium.org/13890008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@195702 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/DEPS')
-rw-r--r--content/DEPS1
1 files changed, 0 insertions, 1 deletions
diff --git a/content/DEPS b/content/DEPS
index 71d3a15..79b961e 100644
--- a/content/DEPS
+++ b/content/DEPS
@@ -20,7 +20,6 @@ include_rules = [
"+crypto",
"+grit/content_resources.h",
"+grit/ui_resources.h",
- "+grit/ui_strings.h",
"+grit/webkit_chromium_resources.h",
"+grit/webkit_resources.h",
"+grit/webkit_strings.h",