mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Rename CEF1 files from /trunk to /trunk/cef1 (issue #564).
git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@570 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
@@ -1,33 +0,0 @@
|
||||
Index: message_loop.cc
|
||||
===================================================================
|
||||
--- message_loop.cc (revision 122508)
|
||||
+++ message_loop.cc (working copy)
|
||||
@@ -362,9 +362,13 @@
|
||||
}
|
||||
|
||||
void MessageLoop::AssertIdle() const {
|
||||
+ DCHECK(IsIdle());
|
||||
+}
|
||||
+
|
||||
+bool MessageLoop::IsIdle() const {
|
||||
// We only check |incoming_queue_|, since we don't want to lock |work_queue_|.
|
||||
base::AutoLock lock(incoming_queue_lock_);
|
||||
- DCHECK(incoming_queue_.empty());
|
||||
+ return incoming_queue_.empty();
|
||||
}
|
||||
|
||||
bool MessageLoop::is_running() const {
|
||||
Index: message_loop.h
|
||||
===================================================================
|
||||
--- message_loop.h (revision 122508)
|
||||
+++ message_loop.h (working copy)
|
||||
@@ -350,6 +350,9 @@
|
||||
// Asserts that the MessageLoop is "idle".
|
||||
void AssertIdle() const;
|
||||
|
||||
+ // Returns true if the MessageLoop is "idle".
|
||||
+ bool IsIdle() const;
|
||||
+
|
||||
#if defined(OS_WIN)
|
||||
void set_os_modal_loop(bool os_modal_loop) {
|
||||
os_modal_loop_ = os_modal_loop;
|
@@ -1,27 +0,0 @@
|
||||
Index: common.gypi
|
||||
===================================================================
|
||||
--- common.gypi (revision 102269)
|
||||
+++ common.gypi (working copy)
|
||||
@@ -9,6 +9,9 @@
|
||||
# Variables expected to be overriden on the GYP command line (-D) or by
|
||||
# ~/.gyp/include.gypi.
|
||||
'variables': {
|
||||
+ # Directory for CEF source files. This will be set by cef.gypi.
|
||||
+ 'cef_directory%' : '',
|
||||
+
|
||||
# Putting a variables dict inside another variables dict looks kind of
|
||||
# weird. This is done so that 'host_arch', 'chromeos', etc are defined as
|
||||
# variables within the outer variables dict here. This is necessary
|
||||
Index: mac/strip_save_dsym
|
||||
===================================================================
|
||||
--- mac/strip_save_dsym (revision 102269)
|
||||
+++ mac/strip_save_dsym (working copy)
|
||||
@@ -48,7 +48,7 @@
|
||||
"bundle"]
|
||||
macho_types_re = "Mach-O (?:64-bit )?(?:" + "|".join(macho_types) + ")"
|
||||
|
||||
- file_cmd = subprocess.Popen(["/usr/bin/file", "-b", "--", macho],
|
||||
+ file_cmd = subprocess.Popen(["/usr/bin/file", "-b", "-L", "--", macho],
|
||||
stdout=subprocess.PIPE)
|
||||
|
||||
archs = []
|
@@ -1,35 +0,0 @@
|
||||
Index: page/FrameView.cpp
|
||||
===================================================================
|
||||
--- page/FrameView.cpp (revision 106313)
|
||||
+++ page/FrameView.cpp (working copy)
|
||||
@@ -157,10 +157,12 @@
|
||||
m_page = page;
|
||||
m_page->addScrollableArea(this);
|
||||
|
||||
+#if 0
|
||||
if (m_frame == m_page->mainFrame()) {
|
||||
ScrollableArea::setVerticalScrollElasticity(ScrollElasticityAllowed);
|
||||
ScrollableArea::setHorizontalScrollElasticity(ScrollElasticityAllowed);
|
||||
}
|
||||
+#endif
|
||||
}
|
||||
}
|
||||
}
|
||||
Index: platform/chromium/ScrollbarOverlayUtilitiesChromiumMac.mm
|
||||
===================================================================
|
||||
--- platform/chromium/ScrollbarOverlayUtilitiesChromiumMac.mm (revision 101144)
|
||||
+++ platform/chromium/ScrollbarOverlayUtilitiesChromiumMac.mm (working copy)
|
||||
@@ -356,9 +356,13 @@
|
||||
|
||||
bool isScrollbarOverlayAPIAvailable()
|
||||
{
|
||||
+#if 0
|
||||
static bool apiAvailable = [lookUpNSScrollerImpClass() respondsToSelector:@selector(scrollerImpWithStyle:controlSize:horizontal:replacingScrollerImp:)] &&
|
||||
[lookUpNSScrollerImpPairClass() instancesRespondToSelector:@selector(scrollerStyle)];
|
||||
return apiAvailable;
|
||||
+#else
|
||||
+ return false;
|
||||
+#endif
|
||||
}
|
||||
|
||||
#endif // USE(WK_SCROLLBAR_PAINTER)
|
@@ -1,14 +0,0 @@
|
||||
Index: pylib/gyp/input.py
|
||||
===================================================================
|
||||
--- pylib/gyp/input.py (revision 1107)
|
||||
+++ pylib/gyp/input.py (working copy)
|
||||
@@ -666,7 +666,8 @@
|
||||
# that don't load quickly, this can be faster than
|
||||
# <!(python modulename param eters). Do this in |build_file_dir|.
|
||||
oldwd = os.getcwd() # Python doesn't like os.open('.'): no fchdir.
|
||||
- os.chdir(build_file_dir)
|
||||
+ if not build_file_dir is None:
|
||||
+ os.chdir(build_file_dir)
|
||||
|
||||
parsed_contents = shlex.split(contents)
|
||||
py_module = __import__(parsed_contents[0])
|
@@ -1,14 +0,0 @@
|
||||
Index: CachedResource.cpp
|
||||
===================================================================
|
||||
--- CachedResource.cpp (revision 103399)
|
||||
+++ CachedResource.cpp (working copy)
|
||||
@@ -366,6 +366,9 @@
|
||||
|
||||
void CachedResource::addClient(CachedResourceClient* client)
|
||||
{
|
||||
+ if (isPurgeable())
|
||||
+ makePurgeable(false);
|
||||
+
|
||||
addClientToSet(client);
|
||||
didAddClient(client);
|
||||
}
|
Reference in New Issue
Block a user