summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-10-16Merge "webkit: workaround incompatible operand types"HEADmastermainNick Kralevich
2013-10-13webkit: workaround incompatible operand typessynergydev
Works around the following: error: incompatible operand types ('WebCore::RenderStyle *' and 'bool') Change-Id: Ic87e958d9bc06ce0a3ae203c8b4812d0e3a2aaef
2013-06-25am 956986db: Merge "Fix the problem that m_url is not renewed in ↵tools_r22.2Selim Gurun
WebRequest::OnReceivedRedirect()." * commit '956986dbdf3b1743aa23250cd55e95b3ca7bb9b7': Fix the problem that m_url is not renewed in WebRequest::OnReceivedRedirect().
2013-06-25Merge "Fix the problem that m_url is not renewed in ↵jb-mr1.1-dev-plus-aospSelim Gurun
WebRequest::OnReceivedRedirect()."
2013-06-19Fix the problem that m_url is not renewed in WebRequest::OnReceivedRedirect().Masaki Miyahara
[Phenomenon] "Security warning" dialog is not displayed at SSL site using self-signed certification. [Cause] Although ssl authentication error in redirection destination url, m_url(managed in Webkit) is still redirection origin url.
2013-05-01am 2fec4ff3: Keep LTR selection within the text range.George Mount
* commit '2fec4ff3dd57cda25cbcb9a009a745dd49173c0a': Keep LTR selection within the text range.
2013-05-01Keep LTR selection within the text range.android-4.3_r3.1android-4.3_r3android-4.3_r2.3android-4.3_r2.2android-4.3_r2.1android-4.3_r2android-4.3_r1.1android-4.3_r1android-4.3_r0.9.1android-4.3_r0.9android-4.3.1_r1jb-mr2.0.0-releasejb-mr2.0-releasejb-mr2-releaseGeorge Mount
Bug 8556162 The end caret position for LTR text can be one beyond the range of the text. This change places the selection region back into the text so that the proper text is selected. Change-Id: I470ee5e3438190aab9f5fb12deca95249d9d887e
2013-04-09am 3416e5ae: Add liblogYing Wang
* commit '3416e5ae328ef637a7f8b9f521cafa28b68947e6': Add liblog
2013-04-09Add liblogYing Wang
Bug: 8580410 Change-Id: I17bdc7cec475a9d730d08b96ffbedd5401f5da56
2013-04-05am 11d7657e: Merge "Switch to prebuilt bison"Ying Wang
* commit '11d7657ebc4dfb1462db8cdc8b48ffa25478e442': Switch to prebuilt bison
2013-04-06Merge "Switch to prebuilt bison"tools_r22Ying Wang
2013-04-05Switch to prebuilt bisonYing Wang
Now we have prebuilt bison 2.7 for both Linux and Mac OS X. We don't need the LOCAL_BISON or LOCAL_YACC any more. Bug: 8517572 Change-Id: I11319b7e154bbfe6355c98bd1d7f5f22ed727f85
2013-04-05am 7e516b57: Switch to prebuilt bisonYing Wang
* commit '7e516b571b654603b28b01361c58eea94abc1927': Switch to prebuilt bison
2013-04-05Switch to prebuilt bisonYing Wang
Now we have prebuilt bison 2.7 for both Linux and Mac OS X. We don't need the LOCAL_BISON or LOCAL_YACC any more. Bug: 8517572 Change-Id: I11319b7e154bbfe6355c98bd1d7f5f22ed727f85
2013-04-05am 76bdf274: Rename old chromium logtag to chromium_netKristian Monsen
* commit '76bdf274a35fbc9f94d90438e38cab35b1e9f4da': Rename old chromium logtag to chromium_net
2013-04-04am a8614ada: Merge "Build fix with newer bison 2.6"Wink Saville
* commit 'a8614adaf3a38d693c9715bfe5addada00b41da6': Build fix with newer bison 2.6
2013-04-04Rename old chromium logtag to chromium_netKristian Monsen
This is to make it easier to see what is from the chromium library and what is from the chromium_net library. Change-Id: Idb3a660aa7d864d68691743bd15f0ce59cd4dae2
2013-04-04Merge "Build fix with newer bison 2.6"Wink Saville
2013-04-04am c15e83e3: Build fix with newer bison 2.6Wink Saville
* commit 'c15e83e3313f9adc8c47e19be5d8218738b663d0': Build fix with newer bison 2.6
2013-04-04Build fix with newer bison 2.6Wink Saville
From: http://trac.webkit.org/changeset/124099 Bug: 8517572 Change-Id: Iaead93f01d6a86180c21e320ef56a4620619ce00
2013-04-04Build fix with newer bison 2.6Wink Saville
From: http://trac.webkit.org/changeset/124099 Bug: 8517572 Change-Id: Iaead93f01d6a86180c21e320ef56a4620619ce00
2013-04-01am b2e091a5: DO NOT MERGE Fix memory leak when creating SkBitmapProcShaderBjörn Isaksson
* commit 'b2e091a5ffd9e2c395084b2c0bb09a35645af3a3': DO NOT MERGE Fix memory leak when creating SkBitmapProcShader
2013-04-01am ad53c7b2: Merge "Fix memory leak when creating SkBitmapProcShader"John Reck
* commit 'ad53c7b21c120bdaa4012ae67500803a1b614f37': Fix memory leak when creating SkBitmapProcShader
2013-04-01DO NOT MERGE Fix memory leak when creating SkBitmapProcShaderBjörn Isaksson
cherry pick from AOSP/master A SkShader is ref counted, but the first but unref() was never called for the local reference in PlatformGraphicsContextSkia::drawBitmapPattern(). Change-Id: I2d1a2e95eeaf479e332a2dbd4e1e9f1b8baac0f7
2013-04-01Merge "Fix memory leak when creating SkBitmapProcShader"John Reck
2013-03-28Fix memory leak when creating SkBitmapProcShaderBjörn Isaksson
A SkShader is ref counted, but the first but unref() was never called for the local reference in PlatformGraphicsContextSkia::drawBitmapPattern(). Change-Id: Ia1936d62f052f9440ef0316cc642b0aebd79cfe1
2013-03-26Ignore d6f13da9Jean-Baptiste Queru
2013-03-26am 30ca089e: Merge "Tweaks for forward compatibility"Jean-Baptiste Queru
* commit '30ca089e04a091c4eea95d62185d120a61f0e0ba': Tweaks for forward compatibility
2013-03-26Merge "Tweaks for forward compatibility"Jean-Baptiste Queru
2013-03-11am d5a63fb6: am 1ea06700: am cf076e61: (-s ours) am 61c04aad: (-s ours) ↵Jean-Baptiste Queru
Reconcile with jb-mr1-release - do not merge * commit 'd5a63fb6d763551b31f0dd9563ccc17e4652094b':
2013-03-11am 1ea06700: am cf076e61: (-s ours) am 61c04aad: (-s ours) Reconcile with ↵Jean-Baptiste Queru
jb-mr1-release - do not merge * commit '1ea067001d14ae1a5eb52c9e8c27a9fd9b109c78':
2013-03-11am cf076e61: (-s ours) am 61c04aad: (-s ours) Reconcile with jb-mr1-release ↵Jean-Baptiste Queru
- do not merge * commit 'cf076e61dbf727a931a6be1cc2811d795a165f77':
2013-03-11am 61c04aad: (-s ours) Reconcile with jb-mr1-release - do not mergeJean-Baptiste Queru
* commit '61c04aad1e2313a22822173f3776b85d664984ae':
2013-03-11Reconcile with jb-mr1-release - do not mergeJean-Baptiste Queru
2013-03-07Remove reference to ganeshJean-Baptiste Queru
Change-Id: I26c5f6348cea0018a8129e0e6ffdb3b0cfe61d82
2013-03-06Tweaks for forward compatibilityJean-Baptiste Queru
Change-Id: I136fcbbc14072ee5f5281d09445f28d083ed3ce1
2013-03-05am 59ef364a: Merge "Tracking libcore change to use longs instead of ints to ↵Brian Carlstrom
store pointers in OpenSSL binding" * commit '59ef364a8888ce8ec05d55f9093536ecf6d43aa6': Tracking libcore change to use longs instead of ints to store pointers in OpenSSL binding
2013-03-04Merge "Tracking libcore change to use longs instead of ints to store ↵Brian Carlstrom
pointers in OpenSSL binding"
2013-02-27Tracking libcore change to use longs instead of ints to store pointers in ↵Brian Carlstrom
OpenSSL binding Change-Id: I819170e26536bdf8f37fda4986506b029be5ebd3
2013-02-22Fix assignment type.Ying Wang
Actually I need a new commit to kick the build cache scheduler :-). Change-Id: Icecda566e3d2f5a12be29580c6ce83a5be8dbb3c
2013-02-22Merge remote-tracking branch 'goog/master-chromium' into 'goog/master'Derek Sollenberger
bug: 6906025
2013-02-21Update SkCanvas subclass to override the proper superclass virtuals.Derek Sollenberger
bug: 8167188 Change-Id: Ica8d741cfde62a161e24f3558471d2c190f7fe5e
2013-02-20am 8f409a96: Merge remote-tracking branch \'goog/jb-mr2-release\'Ed Heyl
* commit '8f409a964f8ece608f4eb34fe5c7d23ec16c8687': Revert "Merge remote-tracking branch 'goog/master-chromium' into 'goog/master'" DO NOT MERGE
2013-02-20Merge remote-tracking branch 'goog/jb-mr2-release'Ed Heyl
2013-02-19merge in jb-mr2-release history after reset to masterThe Android Automerger
2013-02-15am fcc2b346: fix build: SurfaceTextureClient to Surface renameMathias Agopian
* commit 'fcc2b346069b347a4a2fc2615c548ad5f01808c0': fix build: SurfaceTextureClient to Surface rename
2013-02-15fix build: SurfaceTextureClient to Surface renameMathias Agopian
Change-Id: I4fffda5c0ad18b8693e731427a98a98d8270cf76
2013-02-15am 50dbebbe: fix build: SurfaceTextureClient to Surface renameMathias Agopian
* commit '50dbebbe7b246a0756c750ff18d5b77d6e4a2a68': fix build: SurfaceTextureClient to Surface rename
2013-02-15fix build: SurfaceTextureClient to Surface renameMathias Agopian
Change-Id: I47f20c1df5c6427c37b0b276f86ba3cca1cb0caa
2013-02-15am 4533237f: Refactoring: Rename SurfaceTextureClient to SurfaceMathias Agopian
* commit '4533237f156ff61f2486d0e6d748eafa8ce4d3d3': Refactoring: Rename SurfaceTextureClient to Surface
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-05 00:24:11 +0000