mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

clang-format objc files (#12673)

Browse source
This commit is contained in:
Shelley Vohr 2018-04-20 14:47:04 -04:00 • committed by Charles Kerr
parent 94236bf4eb
commit 12a57ff1c2
54 changed files with 1298 additions and 1033 deletions
Download patch file Download diff file Expand all files Collapse all files

32
atom/browser/osr/osr_render_widget_host_view_mac.mm
View file

@ -12,9 +12,8 @@
namespace atom {
class MacHelper :
public content::BrowserCompositorMacClient,
public ui::AcceleratedWidgetMacNSView {
class MacHelper : public content::BrowserCompositorMacClient,
public ui::AcceleratedWidgetMacNSView {
public:
explicit MacHelper(OffScreenRenderWidgetHostView* view) : view_(view) {
[this->AcceleratedWidgetGetNSView() setWantsLayer:YES];
@ -53,13 +52,13 @@ class MacHelper :
}
void AcceleratedWidgetGetVSyncParameters(
base::TimeTicks* timebase, base::TimeDelta* interval) const override {
base::TimeTicks* timebase,
base::TimeDelta* interval) const override {
*timebase = base::TimeTicks();
*interval = base::TimeDelta();
}
void AcceleratedWidgetSwapCompleted() override {
}
void AcceleratedWidgetSwapCompleted() override {}
private:
OffScreenRenderWidgetHostView* view_;
@ -74,30 +73,25 @@ OffScreenRenderWidgetHostView::GetAcceleratedWidgetMac() const {
return nullptr;
}
void OffScreenRenderWidgetHostView::SetActive(bool active) {
}
void OffScreenRenderWidgetHostView::SetActive(bool active) {}
void OffScreenRenderWidgetHostView::ShowDefinitionForSelection() {
}
void OffScreenRenderWidgetHostView::ShowDefinitionForSelection() {}
bool OffScreenRenderWidgetHostView::SupportsSpeech() const {
return false;
}
void OffScreenRenderWidgetHostView::SpeakSelection() {
}
void OffScreenRenderWidgetHostView::SpeakSelection() {}
bool OffScreenRenderWidgetHostView::IsSpeaking() const {
return false;
}
void OffScreenRenderWidgetHostView::StopSpeaking() {
}
void OffScreenRenderWidgetHostView::StopSpeaking() {}
void OffScreenRenderWidgetHostView::SelectionChanged(
const base::string16& text,
size_t offset,
const gfx::Range& range) {
void OffScreenRenderWidgetHostView::SelectionChanged(const base::string16& text,
size_t offset,
const gfx::Range& range) {
if (range.is_empty() || text.empty()) {
selected_text_.clear();
} else {
@ -141,4 +135,4 @@ OffScreenRenderWidgetHostView::GetDelegatedFrameHost() const {
return browser_compositor_->GetDelegatedFrameHost();
}
} // namespace atom
} // namespace atom

10
atom/browser/osr/osr_web_contents_view_mac.mm
View file

@ -16,12 +16,12 @@
NSMutableParagraphStyle* paragraphStyle =
[[[NSParagraphStyle defaultParagraphStyle] mutableCopy] autorelease];
[paragraphStyle setAlignment:NSCenterTextAlignment];
NSDictionary* attributes = [NSDictionary
dictionaryWithObject:paragraphStyle
forKey:NSParagraphStyleAttributeName];
NSDictionary* attributes =
[NSDictionary dictionaryWithObject:paragraphStyle
forKey:NSParagraphStyleAttributeName];
NSAttributedString* text =
[[[NSAttributedString alloc] initWithString:str
attributes:attributes] autorelease];
[[[NSAttributedString alloc] initWithString:str attributes:attributes]
autorelease];
NSRect frame = NSMakeRect(0, (self.frame.size.height - text.size.height) / 2,
self.frame.size.width, text.size.height);
[str drawInRect:frame withAttributes:attributes];